diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 73d72ad15740..d799da0f9df9 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -121,6 +121,8 @@ - `fetchtorrent`, when using the "rqbit" backend, erroneously started fetching files into a subdirectory in Nixpkgs 24.11. The original behaviour – which matches the behaviour using the "transmission" backend – has now been restored. Users reliant on the erroneous behaviour can temporarily maintain it by adding `flatten = false` to the `fetchtorrent` arguments; Nix will produce an evaluation warning for anyone using `backend = "rqbit"` without `flatten = true`. +- `steamcontroller` has been removed due to lack of upstream maintenance. Consider using `sc-controller` instead. + - `linux` and all other Linux kernel packages have moved all in-tree kernel modules into a new `modules` output. - `webfontkitgenerator` has been renamed to `webfont-bundler`, following the rename of the upstream project. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 465a7f392869..1c862445d161 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2203,12 +2203,6 @@ githubId = 4679721; name = "Artur Cygan"; }; - artuuge = { - email = "artuuge@gmail.com"; - github = "artuuge"; - githubId = 10285250; - name = "Artur E. Ruuge"; - }; arunoruto = { email = "mirza.arnaut45@gmail.com"; github = "arunoruto"; @@ -2703,6 +2697,14 @@ githubId = 426541; name = "Tim Kleinschmidt"; }; + azey7f = { + email = "me@azey.net"; + github = "azey7f"; + githubId = 41077433; + name = "azey"; + # assuming my nameservers are up: gpg --auto-key-locate clear,nodefault,cert,dane --locate-keys me@azey.net + keys = [ { fingerprint = "2CCB 3403 43FE 8A2B 91CE 7F75 F94F 4A71 C5C2 1E8F"; } ]; + }; azuwis = { email = "azuwis@gmail.com"; github = "azuwis"; @@ -3198,12 +3200,6 @@ githubId = 442623; name = "Ben Pye"; }; - benwbooth = { - email = "benwboooth@gmail.com"; - github = "benwbooth"; - githubId = 75972; - name = "Ben Booth"; - }; benwis = { name = "Ben Wishovich"; email = "ben@benw.is"; @@ -6839,12 +6835,6 @@ githubId = 349909; name = "David Percy"; }; - dpflug = { - email = "david@pflug.email"; - github = "dpflug"; - githubId = 108501; - name = "David Pflug"; - }; dr460nf1r3 = { email = "root@dr460nf1r3.org"; github = "dr460nf1r3"; @@ -15462,12 +15452,6 @@ name = "madonius"; matrix = "@madonius:entropia.de"; }; - Madouura = { - email = "madouura@gmail.com"; - github = "Madouura"; - githubId = 93990818; - name = "Madoura"; - }; maeve = { email = "mrey@mailbox.org"; matrix = "@maeve:catgirl.cloud"; @@ -22254,18 +22238,6 @@ githubId = 1217934; name = "José Romildo Malaquias"; }; - romner-set = { - email = "admin@cynosure.red"; - github = "romner-set"; - githubId = 41077433; - name = "romner-set"; - keys = [ - { - # uploaded to https://keys.openpgp.org - fingerprint = "4B75 244B 0279 9598 FF3B C21F 95FC 58F1 8CFD FAB0"; - } - ]; - }; ronanmacf = { email = "macfhlar@tcd.ie"; github = "RonanMacF"; @@ -25978,12 +25950,6 @@ name = "Chinmay D. Pai"; keys = [ { fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; } ]; }; - thyol = { - name = "thyol"; - email = "thyol@pm.me"; - github = "thyol"; - githubId = 81481634; - }; tiagolobocastro = { email = "tiagolobocastro@gmail.com"; github = "tiagolobocastro"; @@ -28654,14 +28620,6 @@ githubId = 37774475; name = "Yusuf Duran"; }; - yuu = { - email = "yuunix@grrlz.net"; - matrix = "@yuu:matrix.org"; - github = "yuuyins"; - githubId = 86538850; - name = "Yuu Yin"; - keys = [ { fingerprint = "9F19 3AE8 AA25 647F FC31 46B5 416F 303B 43C2 0AC3"; } ]; - }; yvan-sraka = { email = "yvan@sraka.xyz"; github = "yvan-sraka"; diff --git a/nixos/modules/services/home-automation/wyoming/piper.nix b/nixos/modules/services/home-automation/wyoming/piper.nix index 250d46c76bbd..c43f7ab1e00f 100644 --- a/nixos/modules/services/home-automation/wyoming/piper.nix +++ b/nixos/modules/services/home-automation/wyoming/piper.nix @@ -103,8 +103,8 @@ in useCUDA = mkOption { type = bool; - default = config.cudaSupport; - defaultText = literalExpression "config.cudaSupport"; + default = pkgs.config.cudaSupport; + defaultText = literalExpression "pkgs.config.cudaSupport"; description = '' Whether to accelerate the underlying onnxruntime library with CUDA. ''; diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix index 64ceb30d0fa5..35ad8a4efae7 100644 --- a/nixos/modules/services/networking/privoxy.nix +++ b/nixos/modules/services/networking/privoxy.nix @@ -145,7 +145,7 @@ in freeformType = configType; options.listen-address = mkOption { - type = types.str; + type = types.either types.str (types.listOf types.str); default = "127.0.0.1:8118"; description = "Pair of address:port the proxy server is listening to."; }; diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix index d293aa05758f..fd85f29e300e 100644 --- a/nixos/modules/services/networking/zeronet.nix +++ b/nixos/modules/services/networking/zeronet.nix @@ -133,5 +133,7 @@ with lib; ] "Zeronet will log by default in /var/lib/zeronet") ]; - meta.maintainers = with maintainers; [ Madouura ]; + meta = { + inherit (pkgs.zeronet) maintainers; + }; } diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index f8e7bb573ca9..8a32cf302fa1 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -256,7 +256,9 @@ in LockPersonality = true; MemoryDenyWriteExecute = true; - ProcSubset = "pid"; + # Meilisearch needs to determine cgroup memory limits to set its own memory limits. + # This means this can't be set to "pid" + ProcSubset = "all"; ProtectProc = "invisible"; NoNewPrivileges = true; diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index 6fdfb0c831b5..a68066c30df0 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -360,6 +360,7 @@ in MACHINE_LEARNING_WORKERS = "1"; MACHINE_LEARNING_WORKER_TIMEOUT = "120"; MACHINE_LEARNING_CACHE_FOLDER = "/var/cache/immich"; + XDG_CACHE_HOME = "/var/cache/immich"; IMMICH_HOST = "localhost"; IMMICH_PORT = "3003"; }; diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 0e71bde0a452..f1b3dfe1bbad 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -23,9 +23,9 @@ with lib; wantedBy = [ "multi-user.target" - "sshd.service" + "sshd-keygen.service" ]; - before = [ "sshd.service" ]; + before = [ "sshd-keygen.service" ]; after = [ "fetch-ec2-metadata.service" ]; path = [ pkgs.iproute2 ]; @@ -80,7 +80,7 @@ with lib; systemd.services.print-host-key = { description = "Print SSH Host Key"; wantedBy = [ "multi-user.target" ]; - after = [ "sshd.service" ]; + after = [ "sshd-keygen.service" ]; script = '' # Print the host public key on the console so that the user # can obtain it securely by parsing the output of diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 3b6b88766400..8d4ff2aae9a8 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -449,6 +449,9 @@ in requires = [ "incus.socket" ]; wantedBy = config.systemd.services.incus.wantedBy; + # restarting this service will affect instances + restartIfChanged = false; + serviceConfig = { ExecStart = "${incus-startup} start"; ExecStop = "${incus-startup} stop"; diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index f82fb5a99aee..b6ab82b1acb5 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -242,10 +242,6 @@ in # containers cannot reach aardvark-dns otherwise networking.firewall.interfaces.${network_interface}.allowedUDPPorts = lib.mkIf dns_enabled [ 53 ]; - virtualisation.podman.extraPackages = [ - pkgs.iptables - ] - ++ lib.optional config.networking.nftables.enable pkgs.nftables; virtualisation.containers = { enable = true; # Enable common /etc/containers configuration containersConf.settings = { diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 868c6b347adb..24b5daf04534 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -1,7 +1,9 @@ { pkgs, ... }: { name = "bcachefs"; - meta.maintainers = with pkgs.lib.maintainers; [ Madouura ]; + meta = { + inherit (pkgs.bcachefs-tools.meta) maintainers; + }; nodes.machine = { pkgs, ... }: diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b00565a89bb3..ae1974398da2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5555,6 +5555,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + git-dashboard-nvim = buildVimPlugin { + pname = "git-dashboard-nvim"; + version = "2025-01-02"; + src = fetchFromGitHub { + owner = "juansalvatore"; + repo = "git-dashboard-nvim"; + rev = "c54fa2faf8ebe1c4091cc0c17c840835534943a6"; + sha256 = "0b7b6glp89pqyff21fnhhbh1r7iwdn7w3f0wklmxvl1cai49mh1y"; + }; + meta.homepage = "https://github.com/juansalvatore/git-dashboard-nvim/"; + meta.hydraPlatforms = [ ]; + }; + git-messenger-vim = buildVimPlugin { pname = "git-messenger.vim"; version = "2025-05-30"; @@ -12011,6 +12024,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + oil-git-nvim = buildVimPlugin { + pname = "oil-git.nvim"; + version = "2025-09-03"; + src = fetchFromGitHub { + owner = "benomahony"; + repo = "oil-git.nvim"; + rev = "d1f27a5982df35b70fb842aa6bbfac10735c7265"; + sha256 = "03pl0n7qs51kbqgzfwkcyinmnbl9wyfbbd6ihqzr06mr9xrgf221"; + }; + meta.homepage = "https://github.com/benomahony/oil-git.nvim/"; + meta.hydraPlatforms = [ ]; + }; + oil-git-status-nvim = buildVimPlugin { pname = "oil-git-status.nvim"; version = "2025-04-03"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d0544c3f74af..c24cdcbc1e70 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2789,6 +2789,10 @@ assertNoAdditions { ]; }; + oil-git-nvim = super.oil-git-nvim.overrideAttrs { + dependencies = [ self.oil-nvim ]; + }; + oil-git-status-nvim = super.oil-git-status-nvim.overrideAttrs { dependencies = [ self.oil-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e0414406be83..626164676424 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -425,6 +425,7 @@ https://github.com/ndmitchell/ghcid/,, https://github.com/eagletmt/ghcmod-vim/,, https://github.com/f-person/git-blame.nvim/,, https://github.com/akinsho/git-conflict.nvim/,HEAD, +https://github.com/juansalvatore/git-dashboard-nvim/,HEAD, https://github.com/rhysd/git-messenger.vim/,, https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD, https://github.com/polarmutex/git-worktree.nvim/,HEAD, @@ -923,6 +924,7 @@ https://github.com/nvimdev/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, https://github.com/refractalize/oil-git-status.nvim/,HEAD, +https://github.com/benomahony/oil-git.nvim/,HEAD, https://github.com/eero-lehtinen/oklch-color-picker.nvim/,HEAD, https://github.com/nomnivore/ollama.nvim/,HEAD, https://github.com/yonlu/omni.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 7ba29d4496cc..02bb8393bfda 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4323,8 +4323,8 @@ let mktplcRef = { publisher = "sonarsource"; name = "sonarlint-vscode"; - version = "4.27.0"; - hash = "sha256-0BqIJL9Vyccjsov1JQil3dRUdo9w8ecOUotVKzBlYGQ="; + version = "4.30.0"; + hash = "sha256-sMiIxsMip2ep8ySOERHIAj+Ndwo+GnPhh9uaUncXO9k="; }; meta.license = lib.licenses.lgpl3Only; }; diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix index 5eca08b9f684..effe46dde609 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "snes9x"; - version = "0-unstable-2025-08-11"; + version = "0-unstable-2025-09-18"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; - rev = "b33f2afb33c61d675aaf0319bd3b8cc8d6924d49"; - hash = "sha256-hhe52Ob+WC+wktXIYUoEfOq/FKyKGfeeX+BYyQ3xgXE="; + rev = "b43619754a595ec6feb089a387638118037ef74b"; + hash = "sha256-b6YC4qisHPdJtM1IEsrwUjCBZ6JElZuKvakApOLGGvY="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix b/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix index 791877778ebb..a5df2346dbd7 100644 --- a/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix +++ b/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "thepowdertoy"; - version = "0-unstable-2024-09-30"; + version = "0-unstable-2025-09-16"; src = fetchFromGitHub { owner = "libretro"; repo = "ThePowderToy"; - rev = "5d9c749780063b87bd62ddb025dee4241f196f26"; - hash = "sha256-BYeQ2WZgyvjDH5+akrVP5TlLq6Go3NKXB7zeR9oaaJ8="; + rev = "cb3cd4c2e5beddb98b34e6b800fa24e8f96322d9"; + hash = "sha256-k3XWkkSuQC3IBhhI96qkTrlGH/oJu941HaAvR28V5i0="; }; extraNativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index a2952a3f5da5..0db487ac04c3 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -156,7 +156,6 @@ buildPythonApplication rec { description = "Open Source gaming platform for GNU/Linux"; license = licenses.gpl3Plus; maintainers = with maintainers; [ - Madouura rapiteanu iedame ]; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index af0a3989708a..98f5c355d226 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -79,7 +79,6 @@ buildFHSEnv { # Adventure Game Studio allegro - dumb # Battle.net jansson diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index dec3523a35d4..c2001a2c3e28 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -335,13 +335,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-0ewJLIrKCdTAb3+up7xdbxXscr3hmcIWWcAEGp2TaG4=", + "hash": "sha256-WyIXWOpplukkdCVcI6EyJxcpL1lE+gOwkgLM7ZYjPMM=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.73.0", + "rev": "v3.74.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RsIuWBhiziUeil/buqOKNH5tPuuWcMoGbKKQUMH17sc=" + "vendorHash": "sha256-29N8ejKj9kuo56hPZkdrQDEF4nwNNzAS1+BSsYOvvl0=" }, "deno": { "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=", @@ -615,13 +615,13 @@ "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=" }, "htpasswd": { - "hash": "sha256-Kc3L8oqQOP+k8PZAWkRApDj+3LRgs3P3mm4vX2QcUdg=", + "hash": "sha256-ALTyTTVyS2HHenmk8HVwtQenCmJX05kyXifJTzzmnHE=", "homepage": "https://registry.terraform.io/providers/loafoe/htpasswd", "owner": "loafoe", "repo": "terraform-provider-htpasswd", - "rev": "v1.2.1", + "rev": "v1.5.0", "spdx": "MIT", - "vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs=" + "vendorHash": "sha256-6+ZQVWc4/2RoNjQLzetLTl9L8AdbFu2uFmqJ9Kxcc7Q=" }, "http": { "hash": "sha256-IXqKZ9RQP0kZVxc9OfaWglF8GeycSAl5DATdqc8n35g=", @@ -1219,13 +1219,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-hNMZbrihV+xlfamXRaGszQRqO8Tn2829rd4+pH83lrU=", + "hash": "sha256-cZnG8WohzR4OPBoX9PHdbvsziPfcsR75apXZX8EwtEQ=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.19.1", + "rev": "v9.21.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-wpm7J8kfkm4vDZhZ0koQsgpW5JwWY7DngSYXfaWh3FQ=" + "vendorHash": "sha256-TMoZ1uR7G9oC7/9CiwC9rIJazqB9g6Xb+vxvYX2T9RY=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index d6436ac072dd..c5987aabec27 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.108"; + stable = "0.0.110"; ptb = "0.0.160"; canary = "0.0.756"; development = "0.0.85"; @@ -26,7 +26,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-hKFhylEovj89WxpTexkzR9C6tN47V9iDKQYpCjgojvw="; + hash = "sha256-WwMEtpMlaR5psraDsvTNOb4nPwnGnVif4DgmdE9gCtc="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; diff --git a/pkgs/by-name/al/alcom/deps.json b/pkgs/by-name/al/alcom/deps.json deleted file mode 100644 index f20f43450945..000000000000 --- a/pkgs/by-name/al/alcom/deps.json +++ /dev/null @@ -1,92 +0,0 @@ -[ - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", - "version": "8.0.1", - "hash": "sha256-vAqIkIrtqiJbQ8ngqSfxLA4XUyfqO1lr7NiYch5+TTc=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "8.0.1", - "hash": "sha256-QbUQXjCzr8j8u/5X0af9jE++EugdoxMhT08F49MZX74=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", - "version": "8.0.1", - "hash": "sha256-tiSDf189+7K788Z2qVmsP3PeUzkByUCtcjXR9onOdXA=" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", - "version": "8.0.1", - "hash": "sha256-tYR6xGWvWoR0ITYHra9bsOxIhzhe/GYNVpB4R7KkKik=" - }, - { - "pname": "Microsoft.DotNet.ILCompiler", - "version": "8.0.1", - "hash": "sha256-u4JMGIe/rmXOzx+Y2tC5qlkP5aNVMHy6AQnYwxsXsN4=" - }, - { - "pname": "Microsoft.NET.ILLink.Tasks", - "version": "8.0.1", - "hash": "sha256-SopZpGaZ48/8dpUwDFDM3ix+g1rP4Yqs1PGuzRp+K7c=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "8.0.1", - "hash": "sha256-g4RhRWUP4o3dkNt2hV0ZNRRwDGIuAJ6gY02d3xhtFzY=" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "8.0.1", - "hash": "sha256-+fUVeiQ2qXBtP4HI+8+/SLqZOEuKi9/zC/pX9g+rhqs=" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-arm64", - "version": "8.0.1", - "hash": "sha256-aRGVm8Ckd+uhkuAnJAuqHH6+muT+sXf+b+6nZ/Md77c=" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-x64", - "version": "8.0.1", - "hash": "sha256-UiJ5KdJdLg+/eDHsC4HgvYaY9h3av+/92VPoEixHDgQ=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", - "version": "8.0.1", - "hash": "sha256-JeYU02u4ln0v56QeCs+8ZLWhRlNxZ6c/xHr8Jy3koww=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "8.0.1", - "hash": "sha256-jajBI5GqG2IIcsIMgxTHfXbMapoXrZGl/EEhShwYq7w=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", - "version": "8.0.1", - "hash": "sha256-TJbkjj3koeFN068auqXUojMLPrihO6sEMIPqglW7uTE=" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-x64", - "version": "8.0.1", - "hash": "sha256-SYctZpDlsEHxmy+/Oa1Qp99mpx8I7icYoSBKczF1Ybo=" - }, - { - "pname": "runtime.linux-arm64.Microsoft.DotNet.ILCompiler", - "version": "8.0.1", - "hash": "sha256-oCzhhcSp2ZZ+R8ITzhVn21nmT+R6upf3IzsRtke4xxY=" - }, - { - "pname": "runtime.linux-x64.Microsoft.DotNet.ILCompiler", - "version": "8.0.1", - "hash": "sha256-BMDOdOJFDuItIL8gbYKJdoycvf2rJ8RI8FHsaaYYflY=" - }, - { - "pname": "runtime.osx-arm64.Microsoft.DotNet.ILCompiler", - "version": "8.0.1", - "hash": "sha256-7FJEqNLs8DvqsSJQZETbL2uvRrqO5M1ReWCYkXtqVAE=" - }, - { - "pname": "runtime.osx-x64.Microsoft.DotNet.ILCompiler", - "version": "8.0.1", - "hash": "sha256-WOJqlt/ONpCqhfB2S++rY+iRqW6mlAddxGoqaC/boCM=" - } -] diff --git a/pkgs/by-name/al/alcom/disable-updater-artifacts.patch b/pkgs/by-name/al/alcom/disable-updater-artifacts.patch index adc26d420178..17e739d312c6 100644 --- a/pkgs/by-name/al/alcom/disable-updater-artifacts.patch +++ b/pkgs/by-name/al/alcom/disable-updater-artifacts.patch @@ -1,5 +1,5 @@ diff --git a/vrc-get-gui/Tauri.toml b/vrc-get-gui/Tauri.toml -index ff969dbb..1339d861 100644 +index cd180da8..66a81aa9 100644 --- a/vrc-get-gui/Tauri.toml +++ b/vrc-get-gui/Tauri.toml @@ -34,8 +34,6 @@ icon = [ @@ -8,6 +8,6 @@ index ff969dbb..1339d861 100644 -createUpdaterArtifacts = "v1Compatible" # remove if ci # we do not generate updater artifacts in CI - - [bundle.linux.deb] - desktopTemplate = "alcom.desktop" - + [[bundle.fileAssociations]] + # note: for macOS we directory use info.plist for registering file association. + description = "ALCOM Project Template" diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index 95b60c92cca5..f4905db6beda 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -1,8 +1,6 @@ { - buildDotnetModule, cargo-about, cargo-tauri, - dotnetCorePackages, fetchFromGitHub, fetchNpmDeps, glib-networking, @@ -20,33 +18,16 @@ }: let pname = "alcom"; - version = "1.0.1"; + version = "1.1.4"; src = fetchFromGitHub { owner = "vrc-get"; repo = "vrc-get"; tag = "gui-v${version}"; - fetchSubmodules = true; - hash = "sha256-cOx7X3xfTBYpXhv1zIRStaIpyGWSp+d7qzdJLGzXtDY="; + hash = "sha256-pGWDMQIS2WgtnqRoOXRZrc25kJ5c6TY6UE2aZtpxN/s="; }; subdir = "vrc-get-gui"; - - dotnetSdk = dotnetCorePackages.sdk_8_0; - dotnetRuntime = dotnetCorePackages.runtime_8_0; - - dotnetBuild = buildDotnetModule { - inherit pname version src; - - dotnet-sdk = dotnetSdk; - dotnet-runtime = dotnetRuntime; - - projectFile = [ - "vrc-get-litedb/dotnet/vrc-get-litedb.csproj" - "vrc-get-litedb/dotnet/LiteDB/LiteDB/LiteDB.csproj" - ]; - nugetDeps = ./deps.json; - }; in rustPlatform.buildRustPackage { inherit pname version src; @@ -58,7 +39,6 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ cargo-about cargo-tauri.hook - dotnetSdk nodejs npmHooks.npmConfigHook wrapGAppsHook4 @@ -73,41 +53,24 @@ rustPlatform.buildRustPackage { libsoup_3 makeBinaryWrapper webkitgtk_4_1 - ] - ++ dotnetSdk.packages - ++ dotnetBuild.nugetDeps; + ]; - cargoHash = "sha256-Ph6QZW21JYQJgrUecN+MklWuY51iKC2glPEdgxw+3r8="; + cargoHash = "sha256-JuZHfpOYuLNdb03srECx73GK5ajgL6bHlbKbiuMN2NE="; buildAndTestSubdir = subdir; npmDeps = fetchNpmDeps { inherit src; sourceRoot = "${src.name}/${subdir}"; - hash = "sha256-lWQPBILZn8VGoILfEY2bMxGaBL2ALGbvcT5RqanTNyY="; + hash = "sha256-snXOfAtanLPhQNo0mg/r8UUXJua2X+52t7+7QS1vOkI="; }; npmRoot = subdir; - preConfigure = '' - dotnet restore "vrc-get-litedb/dotnet/vrc-get-litedb.csproj" \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true - ''; - - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - wrapProgram $out/bin/ALCOM \ - --set APPIMAGE ALCOM - ''; - - passthru = { - inherit (dotnetBuild) fetch-deps; - }; - meta = { description = "Experimental GUI application to manage VRChat Unity Projects"; homepage = "https://github.com/vrc-get/vrc-get"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Scrumplex ]; broken = stdenv.hostPlatform.isDarwin; - mainProgram = "alcom"; + mainProgram = "ALCOM"; }; } diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 10e19510338b..85d16bbd509f 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,36 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1757347273-geb1b63" - } - }, - "node_modules/@colors/colors": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", - "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", - "license": "MIT", - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/@dabh/diagnostics": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", - "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", - "license": "MIT", - "dependencies": { - "colorspace": "1.1.x", - "enabled": "2.0.x", - "kuler": "^2.0.0" - } - }, - "node_modules/@msgpack/msgpack": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.8.0.tgz", - "integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==", - "license": "ISC", - "engines": { - "node": ">= 10" + "@sourcegraph/amp": "^0.0.1758297686-ge5ccb5" } }, "node_modules/@napi-rs/keyring": { @@ -257,18 +228,11 @@ } }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1757347273-geb1b63", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1757347273-geb1b63.tgz", - "integrity": "sha512-HGz6ImderQxdxcd1cLkXP27aaiTsrAt5h53M3YMdH+7HHcI/S/YraQp2e0U8Kt+j43dbeKj6/M4/X4xrMnU3RQ==", + "version": "0.0.1758297686-ge5ccb5", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1758297686-ge5ccb5.tgz", + "integrity": "sha512-fU/Lw/yYfeUwF0+1MUuCdDcqZVEygeLwjMPoIFl9kg8R3u2jgZGVqtbfaS8q6MI8CGCVPQTs/rDgP4nVE0jmyg==", "dependencies": { - "@napi-rs/keyring": "^1.1.9", - "commander": "^11.1.0", - "jsonc-parser": "^3.3.1", - "neovim": "^5.3.0", - "open-simplex-noise": "^2.5.0", - "winston": "^3.17.0", - "wrap-ansi": "^9.0.0", - "xdg-basedir": "^5.1.0" + "@napi-rs/keyring": "1.1.9" }, "bin": { "amp": "dist/main.js" @@ -276,432 +240,6 @@ "engines": { "node": ">=20" } - }, - "node_modules/@types/triple-beam": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", - "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==", - "license": "MIT" - }, - "node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/async": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", - "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "license": "MIT" - }, - "node_modules/color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.3", - "color-string": "^1.6.0" - } - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "license": "MIT" - }, - "node_modules/color-string": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", - "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", - "license": "MIT", - "dependencies": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "node_modules/colorspace": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", - "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", - "license": "MIT", - "dependencies": { - "color": "^3.1.3", - "text-hex": "1.0.x" - } - }, - "node_modules/commander": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", - "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", - "license": "MIT", - "engines": { - "node": ">=16" - } - }, - "node_modules/emoji-regex": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", - "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", - "license": "MIT" - }, - "node_modules/enabled": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", - "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", - "license": "MIT" - }, - "node_modules/fecha": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", - "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==", - "license": "MIT" - }, - "node_modules/fn.name": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", - "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", - "license": "MIT" - }, - "node_modules/get-east-asian-width": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz", - "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==", - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "license": "ISC" - }, - "node_modules/is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "license": "MIT" - }, - "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/jsonc-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", - "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==", - "license": "MIT" - }, - "node_modules/kuler": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", - "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", - "license": "MIT" - }, - "node_modules/logform": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz", - "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==", - "license": "MIT", - "dependencies": { - "@colors/colors": "1.6.0", - "@types/triple-beam": "^1.3.2", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^2.3.1", - "triple-beam": "^1.3.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, - "node_modules/neovim": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/neovim/-/neovim-5.3.0.tgz", - "integrity": "sha512-32Cypq6qh7vzJ5wuVPPzIsBdOlvwo0do8/3jxLu+RGdneFSJjh5CYi0ScHHAw/2HLtIjRKhRjJMXeze21M+uyw==", - "license": "MIT", - "dependencies": { - "@msgpack/msgpack": "^2.8.0", - "winston": "3.14.1" - }, - "bin": { - "neovim-node-host": "bin/cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/neovim/node_modules/winston": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.1.tgz", - "integrity": "sha512-CJi4Il/msz8HkdDfXOMu+r5Au/oyEjFiOZzbX2d23hRLY0narGjqfE5lFlrT5hfYJhPtM8b85/GNFsxIML/RVA==", - "license": "MIT", - "dependencies": { - "@colors/colors": "^1.6.0", - "@dabh/diagnostics": "^2.0.2", - "async": "^3.2.3", - "is-stream": "^2.0.0", - "logform": "^2.6.0", - "one-time": "^1.0.0", - "readable-stream": "^3.4.0", - "safe-stable-stringify": "^2.3.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.7.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/one-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", - "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", - "license": "MIT", - "dependencies": { - "fn.name": "1.x.x" - } - }, - "node_modules/open-simplex-noise": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/open-simplex-noise/-/open-simplex-noise-2.5.0.tgz", - "integrity": "sha512-co7x8uWxGcgFtsJNBFqI9ylq+5Isotz2hZR7dsD5Sl+RDPGBeMEG41KAfF+5gF10ksi9Pg6DNpMHEoyTKLbejQ==", - "license": "Unlicense" - }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/safe-stable-stringify": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz", - "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==", - "license": "MIT", - "engines": { - "node": ">=10" - } - }, - "node_modules/simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", - "license": "MIT", - "dependencies": { - "is-arrayish": "^0.3.1" - } - }, - "node_modules/stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", - "license": "MIT", - "engines": { - "node": "*" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/text-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", - "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", - "license": "MIT" - }, - "node_modules/triple-beam": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", - "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==", - "license": "MIT", - "engines": { - "node": ">= 14.0.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "license": "MIT" - }, - "node_modules/winston": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz", - "integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==", - "license": "MIT", - "dependencies": { - "@colors/colors": "^1.6.0", - "@dabh/diagnostics": "^2.0.2", - "async": "^3.2.3", - "is-stream": "^2.0.0", - "logform": "^2.7.0", - "one-time": "^1.0.0", - "readable-stream": "^3.4.0", - "safe-stable-stringify": "^2.3.1", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.9.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/winston-transport": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz", - "integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==", - "license": "MIT", - "dependencies": { - "logform": "^2.7.0", - "readable-stream": "^3.6.2", - "triple-beam": "^1.3.0" - }, - "engines": { - "node": ">= 12.0.0" - } - }, - "node_modules/wrap-ansi": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", - "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "license": "MIT", - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/xdg-basedir": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz", - "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } } } } diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index c5422673c020..72b03dbfa0c7 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -9,11 +9,11 @@ buildNpmPackage (finalAttrs: { pname = "amp-cli"; - version = "0.0.1757347273-geb1b63"; + version = "0.0.1758297686-ge5ccb5"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; - hash = "sha256-8bB7sBdKUZMpHFjRQdEg++Ea3Uv4ykIc88ITAfIzzdM="; + hash = "sha256-D2jElEhvrcuuDIzfB+XAI4VCyYAOC6pu/xNMxkn16o4="; }; postPatch = '' @@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-CUoT9JzvYvaPBqQrKo5XESISVzi9jRvPcbBVPHETIF4="; + npmDepsHash = "sha256-dePLix9roMYlnYMqBq1nwRQEHdyXdtSEgvsoo7yD3QQ="; propagatedBuildInputs = [ ripgrep diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix index 257f972e4f47..83e41338ce27 100644 --- a/pkgs/by-name/ap/apache-answer/package.nix +++ b/pkgs/by-name/ap/apache-answer/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "apache-answer"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "apache"; repo = "answer"; tag = "v${version}"; - hash = "sha256-OocQsCqyVHjkpGSDS23RbOJ+b10Ax32G2hok5bgNDTI="; + hash = "sha256-QrLYkGiEDBB4uUzG2yrlEUYXpQxovKFBmGZjLbZiGKk="; }; webui = stdenv.mkDerivation { @@ -55,7 +55,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-jKpUJD8rq+ZvTgJVaI+AfrwMzrrai+cfd4hjoDLYnxc="; + vendorHash = "sha256-mWSKoEYj23fy6ix3mK1/5HeGugp1UAUO+iwInXkzgU4="; doCheck = false; # TODO checks are currently broken upstream diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index 49889b2ee150..39d4bb316fba 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -121,9 +121,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Open-source multi-system emulator with a focus on accuracy and preservation"; license = lib.licenses.isc; mainProgram = "ares"; - maintainers = with lib.maintainers; [ - Madouura - ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 726f34680caf..3b8b9108386e 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "argocd"; - version = "3.1.1"; + version = "3.1.6"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-+StoJfRlWOnXBAt+D9cxaAc9gn9V4h9QWogtMPf3V+A="; + hash = "sha256-RdqMkyQBJaAJv660bCe+C84BFQNu06t3AaYSz4aMlBA="; }; ui = stdenv.mkDerivation { @@ -45,7 +45,7 @@ buildGoModule rec { }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-tYHA1WlziKWOvv3uF3tTSrvqDoHBVRhUnKZXOxT1rMk="; + vendorHash = "sha256-oI0N6V8enziJK21VCgQ4KUOWqbC5TcZd3QnWiTTeTHQ="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile diff --git a/pkgs/by-name/ar/argtable/package.nix b/pkgs/by-name/ar/argtable/package.nix index cb874b99da80..8a6a7b6c5314 100644 --- a/pkgs/by-name/ar/argtable/package.nix +++ b/pkgs/by-name/ar/argtable/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { are essential but tedious to implement for a robust CLI program. ''; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ artuuge ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 4fc892085bae..93918899894f 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -46,14 +46,14 @@ stdenvNoCC.mkDerivation ( } rec { pname = "Avalonia"; - version = "11.3.5"; + version = "11.3.6"; src = fetchFromGitHub { owner = "AvaloniaUI"; repo = "Avalonia"; tag = version; fetchSubmodules = true; - hash = "sha256-o3KMfHNFDksz+8WO5TPoHPxVvjwuSZrwmB7kl+rvGDw="; + hash = "sha256-ulGaYlhWxSWKLMh6Hy6gzFuDl4rmF3NDlcAL12YYtAg="; }; patches = [ diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix index e11f3b35dd7a..1fc4de499a2c 100644 --- a/pkgs/by-name/ba/bash-language-server/package.nix +++ b/pkgs/by-name/ba/bash-language-server/package.nix @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { preInstall = '' # remove unnecessary files rm node_modules/.modules.yaml - pnpm --ignore-scripts --prod prune + CI=true pnpm --ignore-scripts --prod prune rm -r node_modules/.pnpm/@mixmark-io*/node_modules/@mixmark-io/domino/{test,.yarn} find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + # https://github.com/pnpm/pnpm/issues/3645 diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index ab7c589f2076..3e1aa6f6fdb4 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -134,7 +134,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ davidak johnrtitor - Madouura ]; platforms = lib.platforms.linux; mainProgram = "bcachefs"; diff --git a/pkgs/by-name/bl/blaze/package.nix b/pkgs/by-name/bl/blaze/package.nix index 4b0568307701..793a318d45c0 100644 --- a/pkgs/by-name/bl/blaze/package.nix +++ b/pkgs/by-name/bl/blaze/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: { description = "High performance C++ math library"; homepage = "https://bitbucket.org/blaze-lib/blaze"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/br/brmodelo/package.nix b/pkgs/by-name/br/brmodelo/package.nix index 409b2e82cabb..05091a73916c 100644 --- a/pkgs/by-name/br/brmodelo/package.nix +++ b/pkgs/by-name/br/brmodelo/package.nix @@ -127,6 +127,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/chcandido/brModelo"; license = licenses.gpl3; mainProgram = "brmodelo"; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix index 041fc92998af..066c7b2535fb 100644 --- a/pkgs/by-name/bt/btop/package.nix +++ b/pkgs/by-name/bt/btop/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "aristocratos"; repo = "btop"; rev = "v${version}"; - hash = "sha256-4H9UjewJ7UFQtTQYwvHZL3ecPiChpfT6LEZwbdBCIa0="; + hash = "sha256-ZLT+Hc1rvBFyhey+imbgGzSH/QaVxIh/jvDKVSmDrA0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 8d887c7026f5..c47115de90a6 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, cmake, + espeak-ng, fetchpatch, ffmpeg, fontconfig, @@ -18,6 +19,7 @@ libusb1, libwebp, nix-update-script, + onnxruntime, optipng, piper-tts, pkg-config, @@ -36,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "8.7.0"; + version = "8.10.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-LP5Yfjdz2GB/6LvvvNd7XPuBYSTKyJ5JE1PeuPL6kyQ="; + hash = "sha256-ByDUoF9C5FE8ZlQ/zP4H43b9+zUIsgah5/FO5mtXsMU="; }; patches = [ @@ -79,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + espeak-ng ffmpeg fontconfig hunspell @@ -91,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { libstemmer libuchardet libusb1 - piper-tts + onnxruntime podofo_0_10 poppler-utils qt6.qtbase @@ -145,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional unrarSupport unrardll )) + piper-tts xdg-utils ] ++ lib.optional speechSupport speechd-minimal; diff --git a/pkgs/by-name/ca/capnproto/fix-libatomic.patch b/pkgs/by-name/ca/capnproto/fix-libatomic.patch new file mode 100644 index 000000000000..a72036c463d8 --- /dev/null +++ b/pkgs/by-name/ca/capnproto/fix-libatomic.patch @@ -0,0 +1,35 @@ +From dfbbc505817bd0c3e01af5865196629c2a2a2b5e Mon Sep 17 00:00:00 2001 +From: Marie Ramlow +Date: Wed, 10 Sep 2025 20:12:39 +0200 +Subject: [PATCH] Check if libatomic is needed + +--- + c++/src/kj/CMakeLists.txt | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/c++/src/kj/CMakeLists.txt b/c++/src/kj/CMakeLists.txt +index 7114ddb80e..8ce355b8b0 100644 +--- a/c++/src/kj/CMakeLists.txt ++++ b/c++/src/kj/CMakeLists.txt +@@ -84,6 +84,21 @@ target_compile_features(kj PUBLIC cxx_std_20) + if(UNIX AND NOT ANDROID) + target_link_libraries(kj PUBLIC pthread) + endif() ++ ++include(CheckCXXSourceCompiles) ++check_cxx_source_compiles("#include ++int main() { ++ std::atomic w1; ++ std::atomic w2; ++ std::atomic w4; ++ std::atomic w8; ++ return ++w1 + ++w2 + ++w4 + ++w8; ++}" CAPNP_BUILDS_WITHOUT_LIBATOMIC) ++ ++if(NOT CAPNP_BUILDS_WITHOUT_LIBATOMIC) ++ target_link_libraries(kj PUBLIC atomic) ++endif() ++ + #make sure the lite flag propagates to all users (internal + external) of this library + target_compile_definitions(kj PUBLIC ${CAPNP_LITE_FLAG}) + #make sure external consumers don't need to manually set the include dirs diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix index 10e758fcfa39..5dce43d12f35 100644 --- a/pkgs/by-name/ca/capnproto/package.nix +++ b/pkgs/by-name/ca/capnproto/package.nix @@ -46,6 +46,8 @@ clangStdenv.mkDerivation rec { patches = [ # https://github.com/capnproto/capnproto/pull/2377 ./fix-libucontext.patch + # https://github.com/capnproto/capnproto/pull/2410 + ./fix-libatomic.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/cd/cdrkit/cmake-4.patch b/pkgs/by-name/cd/cdrkit/cmake-4.patch new file mode 100644 index 000000000000..ce46355e8e6d --- /dev/null +++ b/pkgs/by-name/cd/cdrkit/cmake-4.patch @@ -0,0 +1,9 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57edba6..f28af86 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,3 +1,4 @@ ++CMAKE_MINIMUM_REQUIRED(VERSION 3.10) + PROJECT (cdrkit C) + SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit) + diff --git a/pkgs/by-name/cd/cdrkit/package.nix b/pkgs/by-name/cd/cdrkit/package.nix index 38f7594874df..7a98a58240ae 100644 --- a/pkgs/by-name/cd/cdrkit/package.nix +++ b/pkgs/by-name/cd/cdrkit/package.nix @@ -12,16 +12,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdrkit"; - version = "1.1.11-3.5"; + version = "1.1.11-4"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "cdrkit"; rev = "debian/9%${finalAttrs.version}"; - hash = "sha256-T7WhztbpVvGegF6rTHGTkEALq+mcAtTerzDQ3f6Cq78="; + hash = "sha256-oOqvSA2MAURf0YOrWM5Ft6Ln43gXw7SEvNxxRrDs8sI="; }; + patches = [ + ./cmake-4.patch + ]; + nativeBuildInputs = [ cmake quilt diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index eb2466dfc8ef..a68926cbab21 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -17,6 +17,18 @@ let tag = "v${version}"; hash = "sha256-nklizCiu7Nmynjd5WU5oX/v2TWy9xFVF4GkmCwFKZLI="; }; + + # The `serializable` package eventually got renamed `py_serializable`, therefore we need + # to patch the imports; + # _c.f._ https://github.com/madpah/serializable/pull/155 . + postPatch = '' + find . -name '*.py' | xargs -I{} sed -i \ + -e 's/serializable\./py_serializable\./g' \ + -e 's/@serializable/@py_serializable/g' \ + -e 's/from serializable/from py_serializable/g' \ + -e 's/import serializable/import py_serializable/g' \ + {} + ''; }); }; }; @@ -25,14 +37,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.461"; + version = "3.2.471"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-CKsQn5IAbfVR/j+wHs1rohFvwNO3f2FZ7UBps5ic5Rk="; + hash = "sha256-dAUokMpBvd2lAKNQJJqAthBUNoI3S1C7gat4Jda7bZk="; }; pythonRelaxDeps = [ @@ -41,8 +53,8 @@ python3.pkgs.buildPythonApplication rec { "bc-python-hcl2" "boto3" "botocore" + "cachetools" "cloudsplaining" - "cyclonedx-python-lib" "dpath" "igraph" "importlib-metadata" diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 9fd6328e2333..e58724c1231f 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.130.0"; + version = "1.131.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-4HAGseBeMfHP5eqaOkpakgtzA3+kv5ue9uvTQSOIHCA="; + hash = "sha256-im+w6vYsLdJ/i88mG/anFjPYgE1HfvJIemLEse0pzco="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/cl/clblas/package.nix b/pkgs/by-name/cl/clblas/package.nix index 12d59ec6d89e..a168188c8d2d 100644 --- a/pkgs/by-name/cl/clblas/package.nix +++ b/pkgs/by-name/cl/clblas/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { This package contains a library of BLAS functions on top of OpenCL. ''; license = licenses.asl20; - maintainers = with maintainers; [ artuuge ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix index dd3378440f32..fffeaa3145c0 100644 --- a/pkgs/by-name/cl/clickhouse/generic.nix +++ b/pkgs/by-name/cl/clickhouse/generic.nix @@ -21,14 +21,17 @@ darwin, findutils, libiconv, + removeReferencesTo, rustSupport ? true, rustc, cargo, rustPlatform, nix-update-script, }: - -llvmPackages_19.stdenv.mkDerivation (finalAttrs: { +let + llvmStdenv = llvmPackages_19.stdenv; +in +llvmStdenv.mkDerivation (finalAttrs: { pname = "clickhouse" + lib.optionalString lts "-lts"; inherit version; @@ -70,6 +73,7 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { python3 perl llvmPackages_19.lld + removeReferencesTo ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ nasm @@ -154,8 +158,12 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: { substituteInPlace $out/etc/clickhouse-server/config.xml \ --replace-fail "/var/log/clickhouse-server/clickhouse-server.err.log" "1" \ --replace-fail "trace" "warning" + remove-references-to -t ${llvmStdenv.cc} $out/bin/clickhouse ''; + # canary for the remove-references-to hook failing + disallowedReferences = [ llvmStdenv.cc ]; + # Basic smoke test doCheck = true; checkPhase = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/by-name/co/commitizen/package.nix similarity index 71% rename from pkgs/development/python-modules/commitizen/default.nix rename to pkgs/by-name/co/commitizen/package.nix index 1337a6add589..6d323466d044 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/by-name/co/commitizen/package.nix @@ -2,45 +2,25 @@ lib, commitizen, fetchFromGitHub, - buildPythonPackage, gitMinimal, - pythonOlder, stdenv, installShellFiles, - poetry-core, nix-update-script, - testers, - argcomplete, - charset-normalizer, - colorama, - decli, - importlib-metadata, - jinja2, - packaging, - pyyaml, - questionary, - termcolor, - tomlkit, - py, - pytest-freezer, - pytest-mock, - pytest-regressions, - pytest7CheckHook, - deprecated, + python3Packages, + versionCheckHook, + writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "commitizen"; - version = "4.8.3"; + version = "4.9.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "commitizen-tools"; repo = "commitizen"; tag = "v${version}"; - hash = "sha256-ukmLvv1/Ez04UhwXcb5QYiVWXCV7LvYd13Go6ASxsxI="; + hash = "sha256-vHA+TvKs9TOu/0/FpxLHHbDgshQFhP9Dwe6ZMnUOBKc="; }; pythonRelaxDeps = [ @@ -49,15 +29,16 @@ buildPythonPackage rec { "termcolor" ]; - build-system = [ poetry-core ]; + build-system = with python3Packages; [ poetry-core ]; nativeBuildInputs = [ installShellFiles ]; - dependencies = [ + dependencies = with python3Packages; [ argcomplete charset-normalizer colorama decli + deprecated importlib-metadata jinja2 packaging @@ -68,23 +49,25 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - argcomplete - deprecated gitMinimal + versionCheckHook + writableTmpDirAsHomeHook + ] + ++ (with python3Packages; [ + argcomplete py pytest-freezer pytest-mock pytest-regressions pytest7CheckHook - ]; + ]); + + versionCheckProgramArg = "version"; pythonImportsCheck = [ "commitizen" ]; # The tests require a functional git installation - # which requires a valid HOME directory. preCheck = '' - export HOME="$(mktemp -d)" - git config --global user.name "Nix Builder" git config --global user.email "nix-builder@nixos.org" git init . @@ -105,7 +88,7 @@ buildPythonPackage rec { postInstall = let - register-python-argcomplete = lib.getExe' argcomplete "register-python-argcomplete"; + register-python-argcomplete = lib.getExe' python3Packages.argcomplete "register-python-argcomplete"; in lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cz \ @@ -116,19 +99,15 @@ buildPythonPackage rec { passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = commitizen; - command = "cz version"; - }; }; - meta = with lib; { + meta = { description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs"; homepage = "https://github.com/commitizen-tools/commitizen"; - changelog = "https://github.com/commitizen-tools/commitizen/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; + changelog = "https://github.com/commitizen-tools/commitizen/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; mainProgram = "cz"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ lovesegfault anthonyroussel ]; diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix index 57a6d4f060ba..94a6c7cfd0fc 100644 --- a/pkgs/by-name/cr/crowdsec/package.nix +++ b/pkgs/by-name/cr/crowdsec/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.6.11"; + version = "1.7.0"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = "crowdsec"; tag = "v${version}"; - hash = "sha256-fHnd/pnmVAPvCtae4aRS66tXmMp6DgNagqWNrT9hcw8="; + hash = "sha256-ILGvHSDONyq6O1V/xm4lanSTmkdkMAwvvhoUtM2b7Gc="; }; - vendorHash = "sha256-ImrXOD3kIlNsEZOTeMA6UFvMZCnfMOTZOXtY3ger8YI="; + vendorHash = "sha256-B9VZlNks7/ozay5+di++sbLwIKN98P7U+o6knVaKlqo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/by-name/cu/cubiomes-viewer/package.nix similarity index 55% rename from pkgs/applications/misc/cubiomes-viewer/default.nix rename to pkgs/by-name/cu/cubiomes-viewer/package.nix index eafd42bf38e9..1978424fedf1 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/by-name/cu/cubiomes-viewer/package.nix @@ -2,20 +2,16 @@ lib, stdenv, fetchFromGitHub, - qtbase, - qmake, - qttools, - wrapQtAppsHook, + qt5, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cubiomes-viewer"; version = "4.1.2"; src = fetchFromGitHub { owner = "Cubitect"; - repo = pname; - rev = version; + repo = "cubiomes-viewer"; + tag = finalAttrs.version; hash = "sha256-izDKS08LNT2rV5rIxlWRHevJAKEbAVzekjfZy0Oen1I="; fetchSubmodules = true; }; @@ -27,13 +23,13 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - qtbase + qt5.qtbase ]; nativeBuildInputs = [ - qmake - qttools - wrapQtAppsHook + qt5.qmake + qt5.qttools + qt5.wrapQtAppsHook ]; preBuild = '' @@ -45,17 +41,27 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin - cp cubiomes-viewer $out/bin + ${ + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p "$out/Applications/" + cp -R cubiomes-viewer.app "$out/Applications/cubiomes-viewer.app" + ln -s "$out/Applications/cubiomes-viewer.app/Contents/MacOS/cubiomes-viewer" "$out/bin/cubiomes-viewer" + '' + else + '' + cp cubiomes-viewer $out/bin - mkdir -p $out/share/{pixmaps,applications} - cp rc/icons/map.png $out/share/pixmaps/com.github.cubitect.cubiomes-viewer.png - cp etc/com.github.cubitect.cubiomes-viewer.desktop $out/share/applications + mkdir -p $out/share/{pixmaps,applications} + cp rc/icons/map.png $out/share/pixmaps/com.github.cubitect.cubiomes-viewer.png + cp etc/com.github.cubitect.cubiomes-viewer.desktop $out/share/applications + '' + } runHook postInstall ''; - meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; + meta = { homepage = "https://github.com/Cubitect/cubiomes-viewer"; description = "Graphical Minecraft seed finder and map viewer"; mainProgram = "cubiomes-viewer"; @@ -63,8 +69,8 @@ stdenv.mkDerivation rec { Cubiomes Viewer provides a graphical interface for the efficient and flexible seed-finding utilities provided by cubiomes and a map viewer for the Minecraft biomes and structure generation. ''; - platforms = platforms.all; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ hqurve ]; + platforms = lib.platforms.all; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ hqurve ]; }; -} +}) diff --git a/pkgs/by-name/cy/cyclone-scheme/package.nix b/pkgs/by-name/cy/cyclone-scheme/package.nix index 178c427c63ae..ee9618ae9a16 100644 --- a/pkgs/by-name/cy/cyclone-scheme/package.nix +++ b/pkgs/by-name/cy/cyclone-scheme/package.nix @@ -7,7 +7,7 @@ }: let - version = "0.34.0"; + version = "0.36.0"; bootstrap = stdenv.mkDerivation { pname = "cyclone-bootstrap"; inherit version; @@ -16,7 +16,7 @@ let owner = "justinethier"; repo = "cyclone-bootstrap"; rev = "v${version}"; - sha256 = "sha256-kJBPb0Ej32HveY/vdGpH2gyxSwq8Xq7muneFIw3Y7hM="; + sha256 = "sha256-8WK4rsLK3gi9a6PKFaT3KRK256rEDTTO6QvqYrOtYDs="; }; enableParallelBuilding = true; @@ -36,7 +36,7 @@ stdenv.mkDerivation { owner = "justinethier"; repo = "cyclone"; rev = "v${version}"; - sha256 = "sha256-4U/uOTbFpPTC9BmO6Wkhy4PY8UCFVt5eHSGqrOlKT/U="; + sha256 = "sha256-5h8jZ8EBgiLLYH/j3p7CqsQGXHhjGtQfOnxPbFnT5WM="; }; enableParallelBuilding = true; @@ -47,10 +47,12 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with lib; { + meta = { homepage = "https://justinethier.github.io/cyclone/"; description = "Brand-new compiler that allows practical application development using R7RS Scheme"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ siraben ]; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix index d00ffc4d1e84..64c051d6c136 100644 --- a/pkgs/by-name/db/dbus-cpp/package.nix +++ b/pkgs/by-name/db/dbus-cpp/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dbus-cpp"; - version = "5.0.4"; + version = "5.0.5"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lib-cpp/dbus-cpp"; tag = finalAttrs.version; - hash = "sha256-ki4bnwRpvmB9yzt/Mn3MQs1Dr6Vrcs2D0tvCjvvfmq4="; + hash = "sha256-+QqmZsBFmYRwaAFqRyMBxVFFrjZGBDdMaW4YD/7D2gU="; }; outputs = [ @@ -94,7 +94,9 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; - versionCheck = true; + # Not bumped for 5.0.5: https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/9 + # Try again on next bump. + versionCheck = finalAttrs.version != "5.0.5"; }; updateScript = gitUpdater { }; }; diff --git a/pkgs/by-name/di/diamond/package.nix b/pkgs/by-name/di/diamond/package.nix index 86989d891ed5..2ae68a476cc0 100644 --- a/pkgs/by-name/di/diamond/package.nix +++ b/pkgs/by-name/di/diamond/package.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/bbuchfink/diamond"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ thyol ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix index 7a7651ca334d..25f704b90df3 100644 --- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix +++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix @@ -168,7 +168,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/shiiion/dolphin"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ Madouura ]; broken = stdenv.hostPlatform.isDarwin; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/du/duf/package.nix b/pkgs/by-name/du/duf/package.nix index 22a898f7ae87..45ec5bf6f90e 100644 --- a/pkgs/by-name/du/duf/package.nix +++ b/pkgs/by-name/du/duf/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "duf"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; tag = "v${finalAttrs.version}"; - hash = "sha256-cIHFWFSsfS5UG2QKkFEEB34Q1l0pjuICxQlGfgWnLeY="; + hash = "sha256-d/co7EaDk0m/oYxWFATxQYCdH3Z9r8eTtOOo+M+HD4o="; }; vendorHash = "sha256-Br2jagMynnzH77GNA7NeWbM5qSHbhfW5Bo7X2b6OX28="; diff --git a/pkgs/by-name/du/dumb/package.nix b/pkgs/by-name/du/dumb/package.nix deleted file mode 100644 index 48d25f2601fd..000000000000 --- a/pkgs/by-name/du/dumb/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - allegro, - SDL2, -}: - -stdenv.mkDerivation rec { - pname = "dumb"; - version = "2.0.3"; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - allegro - SDL2 - ]; - - src = fetchFromGitHub { - owner = "kode54"; - repo = "dumb"; - rev = version; - sha256 = "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6"; - }; - - cmakeFlags = [ - "-DBUILD_EXAMPLES='OFF'" - ]; - - meta = with lib; { - homepage = "https://github.com/kode54/dumb"; - description = "Module/tracker based music format parser and player library"; - license = licenses.free; # Derivative of GPL - maintainers = with maintainers; [ Madouura ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/by-name/ea/easyjson/package.nix b/pkgs/by-name/ea/easyjson/package.nix index 97d6ddd6f845..17686896ed13 100644 --- a/pkgs/by-name/ea/easyjson/package.nix +++ b/pkgs/by-name/ea/easyjson/package.nix @@ -23,6 +23,5 @@ buildGoModule rec { description = "Fast JSON serializer for Go"; mainProgram = "easyjson"; license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index 7e416ec9fffe..8d9da626e16d 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -6,18 +6,19 @@ protobuf, nixosTests, nix-update-script, + installShellFiles, withQuic ? false, # with QUIC protocol support }: rustPlatform.buildRustPackage rec { pname = "easytier"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "EasyTier"; repo = "EasyTier"; tag = "v${version}"; - hash = "sha256-0TuRNxf8xDhwUjBXJsv7dhgeYjr/voIt+/0tinImUhA="; + hash = "sha256-89uRsLeSNR2I+QX0k1VJ0sMrUYLbApEJClk3aFr0faY="; }; # remove if rust 1.89 merged @@ -28,16 +29,24 @@ rustPlatform.buildRustPackage rec { --replace-fail 'rust-version = "1.89.0"' "" ''; - cargoHash = "sha256-FQC3JD051fEZQO9UriNzJPrxE0QcSQ8p3VTk3tQGPBc="; + cargoHash = "sha256-rioo3Eg5xGg4PI4beXWheeymVNq+zZP9uhbfU584u0g="; nativeBuildInputs = [ protobuf rustPlatform.bindgenHook + installShellFiles ]; buildNoDefaultFeatures = stdenv.hostPlatform.isMips; buildFeatures = lib.optional stdenv.hostPlatform.isMips "mips" ++ lib.optional withQuic "quic"; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd easytier \ + --bash <($out/bin/easytier-cli gen-autocomplete bash) \ + --fish <($out/bin/easytier-cli gen-autocomplete fish) \ + --zsh <($out/bin/easytier-cli gen-autocomplete zsh) + ''; + doCheck = false; # tests failed due to heavy rely on network passthru = { diff --git a/pkgs/by-name/ed/edk2/fix-cross-compilation-antlr-dlg.patch b/pkgs/by-name/ed/edk2/fix-cross-compilation-antlr-dlg.patch new file mode 100644 index 000000000000..3667d324a269 --- /dev/null +++ b/pkgs/by-name/ed/edk2/fix-cross-compilation-antlr-dlg.patch @@ -0,0 +1,27 @@ +diff --git i/BaseTools/Source/C/VfrCompile/GNUmakefile w/BaseTools/Source/C/VfrCompile/GNUmakefile +index ad6c350876..bc30e25cd3 100644 +--- i/BaseTools/Source/C/VfrCompile/GNUmakefile ++++ w/BaseTools/Source/C/VfrCompile/GNUmakefile +@@ -32,6 +32,9 @@ LINKER = $(CXX) + + EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h + ++CC_FOR_BUILD ?= $(CC) ++CXX_FOR_BUILD ?= $(CXX) ++ + MAKEROOT ?= ../.. + + include $(MAKEROOT)/Makefiles/header.makefile +@@ -61,10 +64,10 @@ VfrLexer.cpp VfrLexer.h: Pccts/dlg/dlg VfrParser.dlg + Pccts/dlg/dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg + + Pccts/antlr/antlr: +- $(MAKE) -C Pccts/antlr ++ $(MAKE) -C Pccts/antlr CC=$(CC_FOR_BUILD) CXX=$(CXX_FOR_BUILD) + + Pccts/dlg/dlg: +- $(MAKE) -C Pccts/dlg ++ $(MAKE) -C Pccts/dlg CC=$(CC_FOR_BUILD) CXX=$(CXX_FOR_BUILD) + + ATokenBuffer.o: Pccts/h/ATokenBuffer.cpp + $(CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@ diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index df99f6598093..781d71ef3078 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -33,14 +33,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "edk2"; - version = "202505"; + version = "202508"; srcWithVendoring = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; tag = "edk2-stable${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-VuiEqVpG/k7pfy0cOC6XmY+8NBtU/OHdDB9Y52tyNe8="; + hash = "sha256-YZcjPGPkUQ9CeJS9JxdHBmpdHsAj7T0ifSZWZKyNPMk="; }; src = applyPatches { @@ -53,12 +53,8 @@ stdenv.mkDerivation (finalAttrs: { url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch"; hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; }) - # https://github.com/tianocore/edk2/pull/5658 - (fetchpatch { - name = "fix-cross-compilation-antlr-dlg.patch"; - url = "https://github.com/tianocore/edk2/commit/a34ff4a8f69a7b8a52b9b299153a8fac702c7df1.patch"; - hash = "sha256-u+niqwjuLV5tNPykW4xhb7PW2XvUmXhx5uvftG1UIbU="; - }) + + ./fix-cross-compilation-antlr-dlg.patch ]; # FIXME: unvendor OpenSSL again once upstream updates @@ -86,10 +82,13 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "-C BaseTools" ]; - env.NIX_CFLAGS_COMPILE = - "-Wno-return-type" - + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" - + lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined"; + env = { + NIX_CFLAGS_COMPILE = + "-Wno-return-type" + + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" + + lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined"; + PYTHON_COMMAND = lib.getExe pythonEnv; + }; hardeningDisable = [ "format" diff --git a/pkgs/by-name/em/emhash/package.nix b/pkgs/by-name/em/emhash/package.nix new file mode 100644 index 000000000000..8a66cc2f4e7d --- /dev/null +++ b/pkgs/by-name/em/emhash/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "emhash"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "ktprime"; + repo = "emhash"; + tag = "v${finalAttrs.version}"; + hash = "sha256-dFj/QaGdTJYdcxKlS9tES6OHae8xPMnrG9ccRNM/hi8="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + # By default, it will try to build the benchmark suite, + # but we only care about the headers copied by the install target. + "-DWITH_BENCHMARKS=Off" + ]; + + passthru.update-script = nix-update-script { }; + + meta = { + homepage = "https://github.com/ktprime/emhash"; + changelog = "https://github.com/ktprime/emhash/releases/tag/v${finalAttrs.version}"; + description = "Fast and memory efficient c++ flat hash map/set"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ blenderfreaky ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/em/emmet-language-server/package.nix b/pkgs/by-name/em/emmet-language-server/package.nix index b29dfe084c91..a9a9e566d2d4 100644 --- a/pkgs/by-name/em/emmet-language-server/package.nix +++ b/pkgs/by-name/em/emmet-language-server/package.nix @@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # remove unnecessary and non-deterministic files preInstall = '' - pnpm --ignore-scripts --prod prune + CI=true pnpm --ignore-scripts --prod prune find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + # https://github.com/pnpm/pnpm/issues/3645 find node_modules -xtype l -delete diff --git a/pkgs/by-name/ep/epson-escpr/package.nix b/pkgs/by-name/ep/epson-escpr/package.nix index a90a7f95e675..f7e09e922f3a 100644 --- a/pkgs/by-name/ep/epson-escpr/package.nix +++ b/pkgs/by-name/ep/epson-escpr/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { nssmdns4 = true; };''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ artuuge ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/es/esptool/package.nix b/pkgs/by-name/es/esptool/package.nix index 1625973a4feb..4b726bd6d9f0 100644 --- a/pkgs/by-name/es/esptool/package.nix +++ b/pkgs/by-name/es/esptool/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "esptool"; - version = "5.0.2"; + version = "5.1.0"; pyproject = true; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; tag = "v${version}"; - hash = "sha256-oRvtEBp88tmgjjIuoQS5ySm4I0aD/Zs8VLRUZo0sh/I="; + hash = "sha256-pdkL/QfrrTs/NdXlsr+2Yo+r8UTFLkxw4E6XGDAt1yE="; }; postPatch = '' diff --git a/pkgs/by-name/et/etesync-dav/package.nix b/pkgs/by-name/et/etesync-dav/package.nix index c9cb508296cc..979a20a36dc8 100644 --- a/pkgs/by-name/et/etesync-dav/package.nix +++ b/pkgs/by-name/et/etesync-dav/package.nix @@ -46,7 +46,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "etesync-dav"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ - thyol valodim ]; broken = stdenv.hostPlatform.isDarwin; # pyobjc-framework-Cocoa is missing diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix index bbeeecc224d5..ffc5a6f0ac49 100644 --- a/pkgs/by-name/et/etherpad-lite/package.nix +++ b/pkgs/by-name/et/etherpad-lite/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { preInstall = '' # remove unnecessary files rm node_modules/.modules.yaml - pnpm prune --prod --ignore-scripts + CI=true pnpm prune --prod --ignore-scripts find -type f \( -name "*.d.ts" -o -name "*.map" \) -exec rm -rf {} + # remove non-deterministic files diff --git a/pkgs/by-name/fa/fava/package.nix b/pkgs/by-name/fa/fava/package.nix index 91790a6bda90..e20ea15fb424 100644 --- a/pkgs/by-name/fa/fava/package.nix +++ b/pkgs/by-name/fa/fava/package.nix @@ -8,17 +8,17 @@ let src = buildNpmPackage (finalAttrs: { pname = "fava-frontend"; - version = "1.30.5"; + version = "1.30.6"; src = fetchFromGitHub { owner = "beancount"; repo = "fava"; tag = "v${finalAttrs.version}"; - hash = "sha256-46ze+1sdgXq9Unhu1ec4buXbH3s/PCcfCx+rmYc+fZw="; + hash = "sha256-AMbKGIfR/URu7RpyBKSR3lzfIliRWjnUNNjLvu9KmfM="; }; sourceRoot = "${finalAttrs.src.name}/frontend"; - npmDepsHash = "sha256-ImBNqccAd61c9ASzklcooQyh7BYdgJW9DTcQRmFHqho="; + npmDepsHash = "sha256-geou0+Ges0jjrlXG9m3u1GMdf0Qt2pTd8vRGh9gAWJ4="; makeCacheWritable = true; preBuild = '' @@ -34,7 +34,7 @@ let in python3Packages.buildPythonApplication { pname = "fava"; - version = "1.30.5"; + version = "1.30.6"; pyproject = true; inherit src; diff --git a/pkgs/by-name/fo/folo/package.nix b/pkgs/by-name/fo/folo/package.nix index 2503f7132bff..20a2b970fe2c 100644 --- a/pkgs/by-name/fo/folo/package.nix +++ b/pkgs/by-name/fo/folo/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { cd ../.. # Remove dev dependencies. - pnpm --ignore-scripts prune --prod + CI=true pnpm --ignore-scripts prune --prod # Clean up broken symlinks left behind by `pnpm prune` find node_modules/.bin -xtype l -delete diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index e2623b4148a3..8175f086deb8 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -41,14 +41,14 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "11.1.0"; + version = "11.1.1"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-2vR2M0OU0d5AXE5ujXeb4Aol568mDqH/v40Z8P+5ZCI="; + hash = "sha256-gItynq665YLHdSXcUrtgIp282t/TBjThDgAYyVYesx0="; }; vendorHash = "sha256-eVOmUozNLHRiNwIhbf7ebVNdRiMAtLMdYI7pnALvl8U="; diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix index 8572f2b421d5..86d29a924da5 100644 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "11.0.5"; - hash = "sha256-r1PR2WfJUvt+5K9RQi+9+xJmhtpqP6cGzEk77DiZUlE="; + version = "11.0.6"; + hash = "sha256-7rX0B1db0HbZa/em3hX+yzAi4rqsDysJPx3dIInGxpY="; npmDepsHash = "sha256-1lY08jBTx3DRhoaup02076EL9n85y57WCsS/cNcM4aw="; vendorHash = "sha256-Jh8u+iCBhYdKcLj4IzcKtJBnzvclvUeYbR/hjMN+cPs="; lts = true; diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 764186bdc75c..87ddff6892ee 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "12.0.3"; - hash = "sha256-3uXGDX1uKxXehiMBG1cMIttJFRACIm3UE8U2OtUWjOQ="; + version = "12.0.4"; + hash = "sha256-g6PNJYiGR7tUpurVL1gvGzJzDoMCLmkGiLLsSZfkbYQ="; npmDepsHash = "sha256-V8FUoL9y36bagkg8Scttv/IzKg+MIIqp7witvT8bSWA="; vendorHash = "sha256-GE3trnaWuAVSEfi11tZo5JXedWOYOMzcHQ3GFyISVTQ="; lts = false; diff --git a/pkgs/by-name/fr/frugally-deep/package.nix b/pkgs/by-name/fr/frugally-deep/package.nix index 7435378c68f4..461cabc0194f 100644 --- a/pkgs/by-name/fr/frugally-deep/package.nix +++ b/pkgs/by-name/fr/frugally-deep/package.nix @@ -1,19 +1,25 @@ { lib, stdenv, + fetchpatch, fetchFromGitHub, gitUpdater, cmake, functionalplus, eigen, nlohmann_json, - doctest, python3Packages, buildTests ? false, # Needs tensorflow + # for tests + doctest, + rocmPackages, }: stdenv.mkDerivation (finalAttrs: { pname = "frugally-deep"; + # be careful bumping this, frugally-deep may change its model metadata format + # in ways that only fail at runtime. MIOpen is currently the only package + # relying on this, run passthru.tests.miopen-can-load-models to check version = "0.15.24-p0"; src = fetchFromGitHub { @@ -23,6 +29,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yg2SMsYOOSOgsdwIH1bU3iPM45z6c7WeIrgOddt3um4="; }; + patches = [ + (fetchpatch { + # Backport CMake 4 compat so we can stay on 0.15 for now + name = "update-minimum-cmake4-huntergate.patch"; + url = "https://github.com/Dobiasd/frugally-deep/commit/30a4ce4c932ca810a5a77c4ab943a520bb1048fe.patch"; + hash = "sha256-J5z+jQis8N2mzWu2Qm7J0fPkrplpjgDCOAJT7binz04="; + }) + ]; + nativeBuildInputs = [ cmake ] @@ -43,13 +58,17 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = lib.optionals buildTests [ "-DFDEEP_BUILD_UNITTEST=ON" ]; + passthru.tests.miopen-can-load-models = + rocmPackages.miopen.passthru.tests.can-load-models.override + { + frugally-deep = finalAttrs.finalPackage; + }; passthru.updateScript = gitUpdater; meta = with lib; { description = "Header-only library for using Keras (TensorFlow) models in C++"; homepage = "https://github.com/Dobiasd/frugally-deep"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ Madouura ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index 155f2301fb6f..124107d22a61 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gale"; - version = "1.9.6"; + version = "1.9.7"; src = fetchFromGitHub { owner = "Kesomannen"; repo = "gale"; tag = finalAttrs.version; - hash = "sha256-zgwxr04MGs8EqrZBY5y8F1GNiaJbJUvpND52oLXtCrk="; + hash = "sha256-XEc8h7A1q+WfPl2HojFt2oIlAnNswq3X0o6jMZrEjCQ="; }; postPatch = '' @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-+ZZwYpYvIYmZFg9PA7kD/mBU1TrpEQIsoMmHSWyX+Xc="; + cargoHash = "sha256-zaTbb1+JK9mA9Tvnatw8lse5PBhKknDM48mN/sWLQ6w="; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/ge/geticons/package.nix b/pkgs/by-name/ge/geticons/package.nix index 8abc67d636a7..323f8c3c5660 100644 --- a/pkgs/by-name/ge/geticons/package.nix +++ b/pkgs/by-name/ge/geticons/package.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { mainProgram = "geticons"; homepage = "https://git.sr.ht/~zethra/geticons"; license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index 147140ad9f37..ba682b859429 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.61.1"; + version = "4.62.0"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-zHYUe5fAjK34zCjTYkg4pvvjRsaeuCyu7Gelcqki8P0="; + hash = "sha256-JcCfrrb/xAvILfHgnKoRxjWG4fvi4kVg0W+s+y25A6Y="; }; - npmDepsHash = "sha256-eLT2ejLOtEI7eqWikBc/wFrStCuvYHvlZk9JiMPfuUI="; + npmDepsHash = "sha256-J/my72RPPwg1r1t4vO3CgMnGDP7H/Cc3apToypaK1YI="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix index 7c23051c394a..65e818f74680 100644 --- a/pkgs/by-name/go/go-ios/package.nix +++ b/pkgs/by-name/go/go-ios/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, nix-update-script, @@ -27,7 +28,7 @@ buildGoModule rec { "restapi" ]; - postPatch = '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace ncm/linux_commands.go \ --replace-fail "ip " "${lib.getExe' iproute2 "ip"} " diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 88553c5fe451..2df272959a36 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2025-09-05"; + version = "2.3.0-rolling-2025-09-20"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "3b9b6a53cac8bcc6a25fb28df81ad295fc5f9402"; - hash = "sha256-GJdZxGHQ6FWznY/PO3YN0yyfQ7RX8ilgEzXA4XciOqk="; + rev = "c3930f0fd75cc1f232b9298592d88b35b648e999"; + hash = "sha256-pSWEPXhXTe+El1OwcJFzqHosqrCkKxVs38TeiI/3kRI="; }; outputs = [ diff --git a/pkgs/by-name/ic/iconpack-obsidian/package.nix b/pkgs/by-name/ic/iconpack-obsidian/package.nix index e349b8f291c5..bf82309f6a84 100644 --- a/pkgs/by-name/ic/iconpack-obsidian/package.nix +++ b/pkgs/by-name/ic/iconpack-obsidian/package.nix @@ -31,12 +31,28 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; installPhase = '' + runHook preInstall + mkdir -p $out/share/icons mv Obsidian* $out/share/icons for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + + # Fix broken symlink only if needed + # https://github.com/NixOS/nixpkgs/issues/394218 + + broken_symlink="$out/share/icons/Obsidian/actions/96/lock.svg" + target_svg="$out/share/icons/Obsidian/actions/scalable/system-lock-screen.svg" + + if [ -h "$broken_symlink" ] && [ ! -e "$broken_symlink" ]; then + echo "=== Fixing broken symlink: $broken_symlink" + rm -f "$broken_symlink" + ln -s "$target_svg" "$broken_symlink" + fi + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/by-name/ig/igraph/package.nix b/pkgs/by-name/ig/igraph/package.nix index 0b6525f6e774..89400f253c05 100644 --- a/pkgs/by-name/ig/igraph/package.nix +++ b/pkgs/by-name/ig/igraph/package.nix @@ -25,13 +25,13 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !bla stdenv.mkDerivation (finalAttrs: { pname = "igraph"; - version = "0.10.16"; + version = "0.10.17"; src = fetchFromGitHub { owner = "igraph"; repo = "igraph"; rev = finalAttrs.version; - hash = "sha256-Qs2WXAiAQhQ077KEtkapr8ckw6Jlbxj6qwyiplsEaLY="; + hash = "sha256-NzLn2GXpMgwE8fY1vp5SU0Y7EfyVpQfphGdqU6sQGW4="; }; postPatch = '' diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index c60c6b1e1d55..2a6650de5dd2 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.62.2"; + version = "0.64.0"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-dtRQeB2E/setGm0DEM/ikywU0LIRhOOjyRV0yuvuJQU="; + hash = "sha256-Ai2mozqw8n+L6Yv04OLyiADmXBT4k573qzazePsmfP4="; }; - cargoHash = "sha256-EGIBBriAhqeAUQqlWPcAGdBAYWmYYnvc3ncYGc0ir3o="; + cargoHash = "sha256-oiEBOFDiOKPFsqZcW98hi1xiKEbo2YNXv5Cw1jCg5vw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/jb/jbrowse/package.nix b/pkgs/by-name/jb/jbrowse/package.nix index daef63642506..c1a005d67606 100644 --- a/pkgs/by-name/jb/jbrowse/package.nix +++ b/pkgs/by-name/jb/jbrowse/package.nix @@ -36,7 +36,7 @@ appimageTools.wrapType2 { mainProgram = "jbrowse-desktop"; homepage = "https://jbrowse.org/jb2/"; license = licenses.asl20; - maintainers = with maintainers; [ benwbooth ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix index 2478508925ec..400e2e0703ad 100644 --- a/pkgs/by-name/je/jellyseerr/package.nix +++ b/pkgs/by-name/je/jellyseerr/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild pnpm build - pnpm prune --prod --ignore-scripts + CI=true pnpm prune --prod --ignore-scripts rm -rf .next/cache # Clean up broken symlinks left behind by `pnpm prune` diff --git a/pkgs/by-name/jf/jflap/package.nix b/pkgs/by-name/jf/jflap/package.nix index fbc7a152c8ce..8f40b8794261 100644 --- a/pkgs/by-name/jf/jflap/package.nix +++ b/pkgs/by-name/jf/jflap/package.nix @@ -67,7 +67,6 @@ stdenvNoCC.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ grnnja - yuu ]; platforms = jre8.meta.platforms; }; diff --git a/pkgs/by-name/jx/jxplorer/package.nix b/pkgs/by-name/jx/jxplorer/package.nix index e0e324fb3ab8..eded0c62f9f2 100644 --- a/pkgs/by-name/jx/jxplorer/package.nix +++ b/pkgs/by-name/jx/jxplorer/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { description = "Java Ldap Browser"; homepage = "https://sourceforge.net/projects/jxplorer/"; license = lib.licenses.asl11; - maintainers = with maintainers; [ benwbooth ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "jxplorer"; }; diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix index 9c32fb24d70d..d4afe126caa4 100644 --- a/pkgs/by-name/ke/kexec-tools/package.nix +++ b/pkgs/by-name/ke/kexec-tools/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { "riscv32-linux" "sparc-linux" "sparc64-linux" + "powerpc-linux" ]; license = licenses.gpl2Only; mainProgram = "kexec"; diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix index 4c3f199d7677..51ec26644676 100644 --- a/pkgs/by-name/ko/kokkos/package.nix +++ b/pkgs/by-name/ko/kokkos/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { asl20 llvm-exception ]; - maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/li/libcpuid/package.nix b/pkgs/by-name/li/libcpuid/package.nix index a757fb275278..8bd2cb2b68d1 100644 --- a/pkgs/by-name/li/libcpuid/package.nix +++ b/pkgs/by-name/li/libcpuid/package.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ orivej - artuuge ]; platforms = platforms.x86; }; diff --git a/pkgs/by-name/li/libpinyin/package.nix b/pkgs/by-name/li/libpinyin/package.nix index d82d0f5f52e9..3805e616ca9a 100644 --- a/pkgs/by-name/li/libpinyin/package.nix +++ b/pkgs/by-name/li/libpinyin/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libpinyin"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "libpinyin"; repo = "libpinyin"; tag = finalAttrs.version; - hash = "sha256-EexmZFGvuMextbiMZ6mSV58UUUjVVGMQubtS6DzoBs0="; + hash = "sha256-g3DgRYmLrXqAGxbyiI96UKT1gsJxLlx14K+2HzWR7nI="; }; postUnpack = '' diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index ecacacb73c0b..dc2d3f80a703 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.691"; + version = "0.692"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-rqdxnwrvzCWU+A6+VFiffNvUV76s6gIJ//IbhB1BFos="; + hash = "sha256-GMpSXCiM9QznRAfAsGF+UuzyqS84vGkEy6EZPObRUMk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ma/mako/package.nix b/pkgs/by-name/ma/mako/package.nix index de44821b8b94..bdc8c3f4e988 100644 --- a/pkgs/by-name/ma/mako/package.nix +++ b/pkgs/by-name/ma/mako/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lightweight Wayland notification daemon"; - homepage = "https://wayland.emersion.fr/mako/"; + homepage = "https://github.com/emersion/mako"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dywedir diff --git a/pkgs/by-name/mc/mcat-unwrapped/package.nix b/pkgs/by-name/mc/mcat-unwrapped/package.nix index c41828527550..207bb11e20cc 100644 --- a/pkgs/by-name/mc/mcat-unwrapped/package.nix +++ b/pkgs/by-name/mc/mcat-unwrapped/package.nix @@ -2,6 +2,9 @@ lib, rustPlatform, fetchFromGitHub, + installShellFiles, + stdenv, + buildPackages, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -17,6 +20,25 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-c3OJURz6eObjIC6AHUP6l/a5zYFV0QZ3VIxShFCcm4U="; + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = + let + mcat = + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then + placeholder "out" + else + buildPackages.mcat-unwrapped; + in + '' + installShellCompletion --cmd mcat \ + --bash <(${mcat}/bin/mcat --generate bash) \ + --fish <(${mcat}/bin/mcat --generate fish) \ + --zsh <(${mcat}/bin/mcat --generate zsh) + ''; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/mc/mcat/package.nix b/pkgs/by-name/mc/mcat/package.nix index 9af71573fb08..c5953236638e 100644 --- a/pkgs/by-name/mc/mcat/package.nix +++ b/pkgs/by-name/mc/mcat/package.nix @@ -18,6 +18,7 @@ runCommand "mcat" } '' mkdir -p $out/bin + ln -s "${mcat-unwrapped}/share" "$out/share" makeWrapper ${lib.getExe mcat-unwrapped} $out/bin/mcat --prefix PATH : ${ lib.makeBinPath ((lib.optional useChromium chromium) ++ (lib.optional useFfmpeg ffmpeg-headless)) } diff --git a/pkgs/by-name/md/mdbook-epub/package.nix b/pkgs/by-name/md/mdbook-epub/package.nix index 47ba7ab77374..45824e68e41c 100644 --- a/pkgs/by-name/md/mdbook-epub/package.nix +++ b/pkgs/by-name/md/mdbook-epub/package.nix @@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://michael-f-bryan.github.io/mdbook-epub"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ - yuu matthiasbeyer ]; }; diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index 515893a91bd3..b1f6d2d8e615 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.14.5"; + version = "1.14.9"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; tag = "v${version}"; - hash = "sha256-faIjS3B019eYefOIklJMuUVcCzkM3bHu/HJ1kaERtUA="; + hash = "sha256-4d7/RxL8+ZJXnoU2zOl6W6f5/KsuqrS95IYttC81zVA="; }; - vendorHash = "sha256-mh66gH4ln/D2OWaD+VISTysszjpPGg2dHF29BD1i6z8="; + vendorHash = "sha256-2DlhNr1P6NEeV5IIum19LWufFlOcXxfLH93k3jkwnDA="; ldflags = [ "-s" diff --git a/pkgs/by-name/mo/monolith/package.nix b/pkgs/by-name/mo/monolith/package.nix index 7a5bab5489eb..628467cb92f6 100644 --- a/pkgs/by-name/mo/monolith/package.nix +++ b/pkgs/by-name/mo/monolith/package.nix @@ -24,12 +24,13 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; checkFlags = [ "--skip=tests::cli" ]; @@ -41,7 +42,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Y2Z/monolith"; license = licenses.cc0; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix index 5a0ee6c7f2cb..3451f9429615 100644 --- a/pkgs/by-name/mu/mujoco/package.nix +++ b/pkgs/by-name/mu/mujoco/package.nix @@ -18,8 +18,8 @@ let abseil-cpp = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "76bb24329e8bf5f39704eb10d21b9a80befa7c81"; - hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk="; + rev = "987c57f325f7fa8472fa84e1f885f7534d391b0d"; + hash = "sha256-6Ro7miql9+wcArsOKTjlyDSyD91rmmPsIfO5auk9kiI="; }; benchmark = fetchFromGitHub { owner = "google"; @@ -86,7 +86,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mujoco"; - version = "3.3.5"; + version = "3.3.6"; # Bumping version? Make sure to look though the MuJoCo's commit # history for bumped dependency pins! @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "google-deepmind"; repo = "mujoco"; tag = finalAttrs.version; - hash = "sha256-HykExdosK5XpAOQeic/jsc6yYxjdoiaP8rRkA/yAfuU="; + hash = "sha256-6lZ36XFMsjzck/ouSSiX47+dxbEzXgrMhw1Mi3PEnq4="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; diff --git a/pkgs/by-name/mu/muon/darwin-clang.patch b/pkgs/by-name/mu/muon/darwin-clang.patch new file mode 100644 index 000000000000..170e7864c630 --- /dev/null +++ b/pkgs/by-name/mu/muon/darwin-clang.patch @@ -0,0 +1,15 @@ +diff --git a/src/functions/kernel/dependency.c b/src/functions/kernel/dependency.c +index fbfc86f6..46f9be9d 100644 +--- a/src/functions/kernel/dependency.c ++++ b/src/functions/kernel/dependency.c +@@ -377,10 +377,6 @@ get_dependency_extraframework(struct workspace *wk, struct dep_lookup_ctx *ctx, + } + + struct obj_compiler *comp = get_obj_compiler(wk, compiler); +- if (comp->type[toolchain_component_compiler] != compiler_apple_clang) { +- L("skipping extraframework dependency lookup: compiler type is not apple clang"); +- return true; +- } + + if (!comp->fwdirs) { + obj cmd; diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index 92fe65a060a1..dd760d4519f4 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -1,31 +1,36 @@ { lib, stdenv, + fetchFromGitHub, fetchFromSourcehut, - fetchurl, + callPackage, + coreutils, curl, libarchive, libpkgconf, pkgconf, - python3, samurai, - scdoc, zlib, embedSamurai ? false, + # docs buildDocs ? true, + scdoc, + # tests + runTests ? false, + gettext, + muon, + nasm, + pkg-config, + python3, + writableTmpDirAsHomeHook, }: - stdenv.mkDerivation (finalAttrs: { pname = "muon" + lib.optionalString embedSamurai "-embedded-samurai"; - version = "0.4.0"; + version = "0.5.0"; - src = fetchFromSourcehut { - name = "muon-src"; - owner = "~lattis"; - repo = "muon"; - tag = finalAttrs.version; - hash = "sha256-xTdyqK8t741raMhjjJBMbWnAorLMMdZ02TeMXK7O+Yw="; - }; + srcs = builtins.attrValues (lib.filterAttrs (_: v: v.use or true) finalAttrs.passthru.srcsAttrs); + + sourceRoot = "muon-src"; outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ]; @@ -34,8 +39,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!embedSamurai) [ samurai ] ++ lib.optionals buildDocs [ - (python3.withPackages (ps: [ ps.pyyaml ])) scdoc + ] + ++ lib.optionals (buildDocs || finalAttrs.doCheck) [ + (python3.withPackages (ps: [ ps.pyyaml ])) ]; buildInputs = [ @@ -47,80 +54,95 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - postUnpack = - let - # URLs manually extracted from subprojects directory - meson-docs-wrap = fetchurl { - name = "meson-docs-wrap"; - url = "https://github.com/muon-build/meson-docs/archive/5bc0b250984722389419dccb529124aed7615583.tar.gz"; - hash = "sha256-5MmmiZfadCuUJ2jy5Rxubwf4twX0jcpr+TPj5ssdSbM="; - }; + postUnpack = '' + for src in $srcs; do + name=$(stripHash $src) - meson-tests-wrap = fetchurl { - name = "meson-tests-wrap"; - url = "https://github.com/muon-build/meson-tests/archive/591b5a053f9aa15245ccbd1d334cf3f8031b1035.tar.gz"; - hash = "sha256-6GXfcheZyB/S/xl/j7pj5EAWtsmx4N0fVhLPMJ2wC/w="; - }; - in - '' - mkdir -p $sourceRoot/subprojects/meson-docs - pushd $sourceRoot/subprojects/meson-docs - ${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap} --strip-components=1"} - popd + # skip the main project, only move subprojects + [ "$name" == "$sourceRoot" ] && continue - mkdir -p $sourceRoot/subprojects/meson-tests - pushd $sourceRoot/subprojects/meson-tests - tar xvf ${meson-tests-wrap} --strip-components=1 - popd - ''; + cp -r "$name" "$sourceRoot/subprojects/$name" + chmod +w -R "$sourceRoot/subprojects/$name" + rm "$sourceRoot/subprojects/$name.wrap" + done + ''; + + patches = [ ./darwin-clang.patch ]; postPatch = '' - patchShebangs bootstrap.sh + find subprojects -name "*.py" -exec chmod +x {} \; + patchShebangs subprojects '' - + lib.optionalString buildDocs '' - patchShebangs subprojects/meson-docs/docs/genrefman.py + + lib.optionalString finalAttrs.doCheck '' + substituteInPlace \ + "subprojects/meson-tests/common/14 configure file/test.py.in" \ + "subprojects/meson-tests/common/274 customtarget exe for test/generate.py" \ + "subprojects/meson-tests/native/8 external program shebang parsing/script.int.in" \ + --replace-fail "/usr/bin/env" "${coreutils}/bin/env" + + substituteInPlace \ + "subprojects/meson-tests/meson.build" \ + --replace-fail "['common/66 vcstag', {'python': true}]," "" ''; - # tests try to access "~" - postConfigure = '' - export HOME=$(mktemp -d) - ''; + enableParallelBuilding = true; buildPhase = let muonBool = lib.mesonBool; muonEnable = lib.mesonEnable; + muonOption = lib.mesonOption; + bootstrapFlags = lib.optionalString (!embedSamurai) "CFLAGS=\"$CFLAGS -DBOOTSTRAP_NO_SAMU\""; + # see `muon options -a` to see built-in options cmdlineForMuon = lib.concatStringsSep " " [ + (muonOption "prefix" (placeholder "out")) + # don't let muon override stdenv C flags + (muonEnable "auto_features" true) + (muonOption "buildtype" "plain") + (muonOption "optimization" "plain") + (muonOption "wrap_mode" "nodownload") + # muon features (muonBool "static" stdenv.targetPlatform.isStatic) - (muonEnable "docs" buildDocs) + (muonEnable "man-pages" buildDocs) + (muonEnable "meson-docs" buildDocs) + (muonEnable "meson-tests" finalAttrs.doCheck) (muonEnable "samurai" embedSamurai) + (muonEnable "tracy" false) + (muonEnable "website" false) ]; cmdlineForSamu = "-j$NIX_BUILD_CORES"; in '' runHook preBuild - ${ - lib.optionalString (!embedSamurai) "CFLAGS=\"$CFLAGS -DBOOTSTRAP_NO_SAMU\"" - } ./bootstrap.sh stage-1 - + ${bootstrapFlags} ./bootstrap.sh stage-1 ./stage-1/muon-bootstrap setup ${cmdlineForMuon} stage-2 ${lib.optionalString embedSamurai "./stage-1/muon-bootstrap"} samu ${cmdlineForSamu} -C stage-2 - ./stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3 - ${lib.optionalString embedSamurai "./stage-2/muon"} samu ${cmdlineForSamu} -C stage-3 - runHook postBuild ''; - # tests are failing because they don't find Python - doCheck = false; + # tests only pass when samurai is embedded + doCheck = embedSamurai && runTests; + + nativeCheckInputs = [ + # "common/220 fs module" + writableTmpDirAsHomeHook + # "common/44 pkgconfig-gen" + pkg-config + # "frameworks/6 gettext" + gettext + ] + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + # "nasm/*" tests + nasm + ]; checkPhase = '' runHook preCheck - ./stage-3/muon -C stage-3 test + ./stage-2/muon -C stage-2 test -d dots -S -j$NIX_BUILD_CORES runHook postCheck ''; @@ -128,22 +150,55 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - stage-3/muon -C stage-3 install + stage-2/muon -C stage-2 install runHook postInstall ''; - meta = with lib; { - homepage = "https://muon.build/"; - description = "Implementation of Meson build system in C99"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # typical `ar failure` + passthru.srcsAttrs = { + muon-src = fetchFromSourcehut { + name = "muon-src"; + owner = "~lattis"; + repo = "muon"; + tag = finalAttrs.version; + hash = "sha256-bWEYWUD+GK8R3yVnDTnzFWmm4KAuVPI+1yMfCXWcG/A="; + }; + meson-docs = fetchFromGitHub { + name = "meson-docs"; + repo = "meson-docs"; + owner = "muon-build"; + rev = "1017b3413601044fb41ad04977445e68a80e8181"; + hash = "sha256-aFpyJFIqybLNKhm/kyfCjYylj7DE6muI1+OUh4Cq4WY="; + passthru.use = buildDocs; + }; + meson-tests = fetchFromGitHub { + name = "meson-tests"; + repo = "meson-tests"; + owner = "muon-build"; + rev = "db92588773a24f67cda2f331b945825ca3a63fa7"; + hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM="; + passthru.use = finalAttrs.doCheck; + }; + }; + + # tests are run here in package tests, rather than enabling doCheck by + # default, to reduce the number of required dependencies. + passthru.tests.test = (muon.overrideAttrs { pname = "muon-tests"; }).override { + buildDocs = false; + embedSamurai = true; + runTests = true; + }; + + passthru.updateScript = callPackage ./update.nix { }; + + meta = { + homepage = "https://muon.build"; + description = "Implementation of the meson build system in C99"; + license = lib.licenses.gpl3Only; + maintainers = [ ]; + platforms = lib.platforms.unix; mainProgram = "muon"; }; }) # TODO LIST: -# 1. automate sources acquisition (especially wraps) -# 2. setup hook -# 3. tests +# 1. setup hook diff --git a/pkgs/by-name/mu/muon/update.nix b/pkgs/by-name/mu/muon/update.nix new file mode 100644 index 000000000000..e870efce07c1 --- /dev/null +++ b/pkgs/by-name/mu/muon/update.nix @@ -0,0 +1,35 @@ +{ + lib, + writeShellApplication, + common-updater-scripts, + curl, + gnugrep, +}: + +lib.getExe (writeShellApplication { + name = "update-muon"; + + runtimeInputs = [ + common-updater-scripts + curl + gnugrep + ]; + + text = '' + REPO=$(nix-instantiate --raw --eval -E "with import ./. {}; muon.srcsAttrs.muon-src.meta.homepage") + MUON_VERSION=$(list-git-tags --url="$REPO" | tail -1) + + update-source-version "muon" \ + "$MUON_VERSION" \ + --version-key=version \ + --source-key=srcsAttrs.muon-src + update-source-version "muon" \ + "$(curl -s "$REPO/blob/$MUON_VERSION/subprojects/meson-docs.wrap" | grep -oP "revision = \K.+$")" \ + --version-key=srcsAttrs.meson-docs.rev \ + --source-key=srcsAttrs.meson-docs + update-source-version "muon" \ + "$(curl -s "$REPO/blob/$MUON_VERSION/subprojects/meson-tests.wrap" | grep -oP "revision = \K.+$")" \ + --version-key=srcsAttrs.meson-tests.rev \ + --source-key=srcsAttrs.meson-tests + ''; +}) diff --git a/pkgs/by-name/mu/muscle/package.nix b/pkgs/by-name/mu/muscle/package.nix index ef63da97cf76..7d85ef8aebdb 100644 --- a/pkgs/by-name/mu/muscle/package.nix +++ b/pkgs/by-name/mu/muscle/package.nix @@ -36,7 +36,6 @@ gccStdenv.mkDerivation rec { homepage = "https://www.drive5.com/muscle/"; maintainers = with maintainers; [ unode - thyol ]; }; } diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix index d651ff1dd103..b95960a857f5 100644 --- a/pkgs/by-name/mv/mvnd/package.nix +++ b/pkgs/by-name/mv/mvnd/package.nix @@ -1,8 +1,8 @@ { + lib, fetchFromGitHub, graalvmPackages, installShellFiles, - lib, makeWrapper, maven, mvnd, @@ -24,18 +24,17 @@ in maven.buildMavenPackage rec { pname = "mvnd"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "apache"; repo = "maven-mvnd"; rev = version; - sha256 = "sha256-c1jD7m4cOdPWQEoaUMcNap2zvvX7H9VaWQv8JSgAnRU="; + sha256 = "sha256-vlJG2uDY93iri1X7SYPRufAIN4fhAjCd8gCeCdz/QDE="; }; - patches = [ ./patches/0001-update-groovy-for-compatibility-with-Java-24.patch ]; # need graalvm at build-time for the `native-image` tool mvnJdk = graalvmPackages.graalvm-ce; - mvnHash = "sha256-/Ful6v3hfm+0aa0vBQhqMK6VE+93L3o7pwZ6wmeXzQY="; + mvnHash = "sha256-n6ZKEXDzyzMfUZt3WHkwCDB68gm30UGrFecffFy7ytA="; nativeBuildInputs = [ graalvmPackages.graalvm-ce @@ -44,22 +43,25 @@ maven.buildMavenPackage rec { ]; mvnDepsParameters = mvnParameters; - mvnParameters = lib.concatStringsSep " " [ - "-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository - "-Drat.skip=true" # skip license checks; they require manaul approval and should have already been run upstream - "-Dspotless.skip=true" # skip formatting checks + mvnParameters = lib.concatStringsSep " " ( + [ + "-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository + "-Drat.skip=true" # skip license checks; they require manaul approval and should have already been run upstream + "-Dspotless.skip=true" # skip formatting checks - # skip tests that fail in the sandbox - "-pl" - "!integration-tests" - "-Dtest=!org.mvndaemon.mvnd.client.OsUtilsTest,!org.mvndaemon.mvnd.cache.impl.CacheFactoryTest" - "-Dsurefire.failIfNoSpecifiedTests=false" + # skip tests that fail in the sandbox + "-pl" + "!integration-tests" + "-Dtest=!org.mvndaemon.mvnd.client.OsUtilsTest,!org.mvndaemon.mvnd.cache.impl.CacheFactoryTest,!org.mvndaemon.mvnd.client.NoDaemonTest" + "-Dsurefire.failIfNoSpecifiedTests=false" - "-Pnative" - # propagate linker args required by the darwin build - # see `buildGraalvmNativeImage` - ''-Dgraalvm-native-static-opt="-H:-CheckToolchain $(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n)"'' - ]; + "-Pnative" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # see `buildGraalvmNativeImage` + "-DbuildArgs=-H:-CheckToolchain" + ] + ); installPhase = '' runHook preInstall diff --git a/pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch b/pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch deleted file mode 100644 index 8bbf9dbd41ab..000000000000 --- a/pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4d92b26f6cfc7c5f164caf11c1d5325815058624 Mon Sep 17 00:00:00 2001 -From: Nathan Regner -Date: Fri, 16 May 2025 23:28:13 -0600 -Subject: [PATCH] build: update groovy for compatibility with Java 24 - ---- - pom.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pom.xml b/pom.xml -index c1cec38b..7534ffd5 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -80,7 +80,7 @@ - - 24.0.2 - 0.10.2 -- 4.0.22 -+ 4.0.24 - 1.0 - 3.26.3 - 3.9.9 -@@ -91,7 +91,7 @@ - - - 3.2.0 -- 3.0.2 -+ 4.2.0 - 1.6.0 - 1.10.3 - 1.0.25 --- -2.49.0 - diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 910b12362955..073b2d38efc1 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { rm node_modules/.modules.yaml rm packages/nodes-base/dist/types/nodes.json - pnpm --ignore-scripts prune --prod + CI=true pnpm --ignore-scripts prune --prod find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + rm -rf node_modules/.pnpm/{typescript*,prettier*} shopt -s globstar diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix index fcfbc48c6f9f..f293b4e6351b 100644 --- a/pkgs/by-name/ne/nextpnr/package.nix +++ b/pkgs/by-name/ne/nextpnr/package.nix @@ -23,20 +23,13 @@ let }; pname = "nextpnr"; - version = "0.8"; - - prjxray_src = fetchFromGitHub { - owner = "f4pga"; - repo = "prjxray"; - rev = "faf9c774a340e39cf6802d009996ed6016e63521"; - hash = "sha256-BEv7vJoOHWHZoc9EXbesfwFFClkuiSpVwHUrj4ahUcA="; - }; + version = "0.9"; prjbeyond_src = fetchFromGitHub { owner = "YosysHQ-GmbH"; repo = "prjbeyond-db"; - rev = "06d3b424dd0e52d678087c891c022544238fb9e3"; - hash = "sha256-nmyFFUO+/J2lb+lPATEjdYq0d21P1fN3N94JXR8brZ0="; + rev = "f49f66be674d9857c657930353b867ba94bcbdd7"; + hash = "sha256-B/VmKgMu6f2Y8umE+NgGD5W0FYBIfDcMVwgHocFzreA="; }; in @@ -47,7 +40,7 @@ stdenv.mkDerivation rec { owner = "YosysHQ"; repo = "nextpnr"; tag = "${pname}-${version}"; - hash = "sha256-lconcmLACxWxC41fTIkUaGbfp79G98YdHA4mRJ9Qo1w="; + hash = "sha256-rpg99k7rSNU4p5D0iXipLgNNOA2j0PdDsz8JTxyYNPM="; fetchSubmodules = true; }; @@ -80,9 +73,12 @@ stdenv.mkDerivation rec { "-DTRELLIS_LIBDIR=${trellis}/lib/trellis" "-DGOWIN_BBA_EXECUTABLE=${python3Packages.apycula}/bin/gowin_bba" "-DUSE_OPENMP=ON" - "-DHIMBAECHEL_UARCH=all" + + # gatemate excluded due to non-reproducible build https://github.com/YosysHQ/prjpeppercorn/issues/9 + # xilinx excluded due to needing vivado https://github.com/f4pga/prjxray?tab=readme-ov-file#step-1 + "-DHIMBAECHEL_UARCH=example;gowin;ng-ultra" + "-DHIMBAECHEL_GOWIN_DEVICES=all" - "-DHIMBAECHEL_PRJXRAY_DB=${prjxray_src}" "-DHIMBAECHEL_PRJBEYOND_DB=${prjbeyond_src}" ] ++ (lib.optional enableGui "-DBUILD_GUI=ON"); diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index a12f3c2b610b..514ee9b68ef2 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -13,19 +13,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ni"; - version = "25.0.0"; + version = "26.0.1"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "ni"; tag = "v${finalAttrs.version}"; - hash = "sha256-kYV6pvxqpFAxlefUApmKODa+mqnio43YvjQvM4o1Wl0="; + hash = "sha256-R4X6X9Yys7zq8+3vGj0vamVsqLM0i/NO9HLTDlofX54="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-Xa515YJW6LNp0QAiAhL4Tt/PDdWWBKWDB357brzU478="; + hash = "sha256-eeZGLwiN8uu0GL8CGCAHsV2JepaZDcfnBipaLLWdXzw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ni/nix-tour/package.nix b/pkgs/by-name/ni/nix-tour/package.nix index 53d9124ff435..4fb5d9121f93 100644 --- a/pkgs/by-name/ni/nix-tour/package.nix +++ b/pkgs/by-name/ni/nix-tour/package.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ qknight - yuu ]; mainProgram = "nix-tour"; }; diff --git a/pkgs/by-name/ni/nixf-diagnose/package.nix b/pkgs/by-name/ni/nixf-diagnose/package.nix index 52f6f55ce003..6ff2f797a510 100644 --- a/pkgs/by-name/ni/nixf-diagnose/package.nix +++ b/pkgs/by-name/ni/nixf-diagnose/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nixf-diagnose"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "inclyc"; repo = "nixf-diagnose"; tag = finalAttrs.version; - hash = "sha256-8kcA2/ZMREKtXUM5rlAWRQL/C8+JNocZegq2ZHqbiSA="; + hash = "sha256-vHW2AnUxBuG9mlpMB0f9eK4M1VlJPm5YtwjXksx/uik="; }; env.NIXF_TIDY_PATH = lib.getExe nixf; - cargoHash = "sha256-9rWQfoaMXFs83cYHtJPL0ogA9hPh7q3mK1DG4Q4CCq0="; + cargoHash = "sha256-L6wiYUzlzginjhu23EBPAteZ2nTIqUE6mC2q1yfKWs4="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nz/nzbget/package.nix b/pkgs/by-name/nz/nzbget/package.nix index ea5cd7be3753..fc14d4964e83 100644 --- a/pkgs/by-name/nz/nzbget/package.nix +++ b/pkgs/by-name/nz/nzbget/package.nix @@ -22,19 +22,19 @@ let par2TurboSrc = fetchFromGitHub { owner = "nzbgetcom"; repo = "par2cmdline-turbo"; - rev = "v1.3.0"; # from cmake/par2-turbo.cmake - hash = "sha256-tNzf//StwE1A5XcmYlKapoaq/dFqMikHsQg3lsyKFj4="; + rev = "v1.3.0-20250808"; # from cmake/par2-turbo.cmake + hash = "sha256-ZP8AI5htmEcxQQtvgShcQ8qNoRL+jBR1BdKS6yyuB/E="; }; in stdenv.mkDerivation (finalAttrs: { pname = "nzbget"; - version = "25.2"; + version = "25.3"; src = fetchFromGitHub { owner = "nzbgetcom"; repo = "nzbget"; rev = "v${finalAttrs.version}"; - hash = "sha256-eFI4zFTMHlAdqsYyg0scrko0mWhlGPDqMPXTH45GHvY="; + hash = "sha256-ecTz+axqPOlRe0wi7IRiESn2JjLbalI+sQVKqrvrAoU="; }; patches = [ diff --git a/pkgs/by-name/nz/nzbget/remove-git-usage.patch b/pkgs/by-name/nz/nzbget/remove-git-usage.patch index 2ddf4eca14af..226b52cb9fe7 100644 --- a/pkgs/by-name/nz/nzbget/remove-git-usage.patch +++ b/pkgs/by-name/nz/nzbget/remove-git-usage.patch @@ -1,4 +1,4 @@ -From de94ddc6fa6ce4f84b658470842ed0450e932eb1 Mon Sep 17 00:00:00 2001 +From 15dc4c64531845b64b574647fc7218170b100533 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Tue, 25 Feb 2025 20:36:19 -0600 Subject: [PATCH] feat: use pre-fetched par2-turbo @@ -8,7 +8,7 @@ Subject: [PATCH] feat: use pre-fetched par2-turbo 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/cmake/par2-turbo.cmake b/cmake/par2-turbo.cmake -index bb200067..e2d12f10 100644 +index 0062b4d3..c0dd56ea 100644 --- a/cmake/par2-turbo.cmake +++ b/cmake/par2-turbo.cmake @@ -48,18 +48,13 @@ if(CMAKE_SYSROOT) @@ -19,7 +19,7 @@ index bb200067..e2d12f10 100644 - par2-turbo - PREFIX par2-turbo - GIT_REPOSITORY https://github.com/nzbgetcom/par2cmdline-turbo.git -- GIT_TAG v1.3.0 +- GIT_TAG v1.3.0-20250808 - TLS_VERIFY TRUE - GIT_SHALLOW TRUE - GIT_PROGRESS TRUE @@ -28,15 +28,15 @@ index bb200067..e2d12f10 100644 - CMAKE_ARGS ${CMAKE_ARGS} - INSTALL_COMMAND "" +ExternalProject_Add( -+ par2-turbo -+ PREFIX par2-turbo -+ SOURCE_DIR ${CMAKE_BINARY_DIR}/par2-turbo/src/par2-turbo -+ BUILD_BYPRODUCTS ${PAR2_LIBS} -+ CMAKE_ARGS ${CMAKE_ARGS} -+ INSTALL_COMMAND "" ++ par2-turbo ++ PREFIX par2-turbo ++ SOURCE_DIR ${CMAKE_BINARY_DIR}/par2-turbo/src/par2-turbo ++ BUILD_BYPRODUCTS ${PAR2_LIBS} ++ CMAKE_ARGS ${CMAKE_ARGS} ++ INSTALL_COMMAND "" ) set(LIBS ${LIBS} ${PAR2_LIBS}) -- -2.49.0 +2.50.1 diff --git a/pkgs/by-name/op/open5gs-webui/package.nix b/pkgs/by-name/op/open5gs-webui/package.nix new file mode 100644 index 000000000000..76d6c28d1241 --- /dev/null +++ b/pkgs/by-name/op/open5gs-webui/package.nix @@ -0,0 +1,13 @@ +{ + buildNpmPackage, + open5gs, +}: + +buildNpmPackage (finalAttrs: { + pname = "${open5gs.pname}-webui"; + inherit (open5gs) src version meta; + + sourceRoot = "${finalAttrs.src.name}/webui"; + + npmDepsHash = "sha256-IpqineYa15GBqoPDJ7RpaDsq+MQIIDcdq7yhwmH4Lzo="; +}) diff --git a/pkgs/by-name/op/open5gs/package.nix b/pkgs/by-name/op/open5gs/package.nix index a632a445d2f0..5cd935064901 100644 --- a/pkgs/by-name/op/open5gs/package.nix +++ b/pkgs/by-name/op/open5gs/package.nix @@ -1,7 +1,5 @@ { stdenv, - nodejs, - buildNpmPackage, lib, fetchFromGitHub, meson, @@ -62,21 +60,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2k+S+OXfdskJPtDUFSxb/+2UZcUiOZzRSSGgsEJWolc="; }; - webui = buildNpmPackage { - pname = finalAttrs.pname + "-webui"; - inherit (finalAttrs) src version meta; - - sourceRoot = "${finalAttrs.src.name}/webui"; - - npmDepsHash = "sha256-IpqineYa15GBqoPDJ7RpaDsq+MQIIDcdq7yhwmH4Lzo="; - - installPhase = '' - rm -rf node_modules - mkdir $out - cp -r * $out - ''; - }; - nativeBuildInputs = [ meson ninja @@ -113,9 +96,6 @@ stdenv.mkDerivation (finalAttrs: { cp -R --no-preserve=mode,ownership ${finalAttrs.diameter} subprojects/freeDiameter cp -R --no-preserve=mode,ownership ${finalAttrs.libtins} subprojects/libtins cp -R --no-preserve=mode,ownership ${finalAttrs.promc} subprojects/prometheus-client-c - - rm -rf webui/* - cp -r ${finalAttrs.webui}/* webui/ ''; postInstall = '' diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index fb9a69acdb16..fe71005c1b3b 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openasar"; - version = "0-unstable-2025-07-15"; + version = "0-unstable-2025-09-17"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "92abbb0e3efc39e553fd24e9125c42cdba1318ec"; - hash = "sha256-9PTseQdQ6YbeuBbcBnPr+OXP5wNYDJgv8s9sn8hGSgk="; + rev = "bf8a71e2fcf1c77761092b7b899839164e3a596c"; + hash = "sha256-gKaqLIlEJUUTbXBQ0E97bHS6Z1HFdmEt8jsvkQH4hI8="; }; postPatch = '' diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index 01fe1ccef7ea..217144492e6d 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ord"; - version = "0.23.2"; + version = "0.23.3"; src = fetchFromGitHub { owner = "ordinals"; repo = "ord"; rev = version; - hash = "sha256-p9WjZ8QsY5fvL91zPUKnK8p0ZJvAxzmPbN/UVWSNjqk="; + hash = "sha256-+e5l+ez/cDqoyqF05jv6bs1l82pHTMtGFdMEtUln/qM="; }; - cargoHash = "sha256-c3+yM7jJyIl2XpSOeqdeQP2OdRc7/t/epDTMoOa/66A="; + cargoHash = "sha256-LPClIma05n+e+mDy0ycaap84yzmDR+VnrT3RqGnfBLA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix index ca0fc8341a53..f5f8b696368c 100644 --- a/pkgs/by-name/os/osv-scanner/package.nix +++ b/pkgs/by-name/os/osv-scanner/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; tag = "v${version}"; - hash = "sha256-6s399GG2k0bkaLTwtMpt87BszzpS+GD4glt2/52Cb3A="; + hash = "sha256-gleQ/Bh+oLYy3iP6FsqtihoLz4jerRnx14dB2cBbf60="; }; - vendorHash = "sha256-Ph7ukPx2BD2GKnxooWqH2jYoHoeTow+ta9ZaY+3dIX4="; + vendorHash = "sha256-F1QioqSFQvSJd7JByyUakjn9QSpF2hqEkyx10ei/sKk="; subPackages = [ "cmd/osv-scanner" diff --git a/pkgs/by-name/pi/pip-audit/package.nix b/pkgs/by-name/pi/pip-audit/package.nix index 721a9a8fd921..2f4e7b3d56d3 100644 --- a/pkgs/by-name/pi/pip-audit/package.nix +++ b/pkgs/by-name/pi/pip-audit/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; version = "2.9.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "trailofbits"; @@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-j8ZKqE7PEwaCTUNnJunqM0A2eyuWfx8zG5i3nmZERow="; }; + pythonRelaxDeps = [ "cyclonedx-python-lib" ]; + build-system = with python3.pkgs; [ flit-core ]; dependencies = diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix index c760c307e9f0..bdda3c057760 100644 --- a/pkgs/by-name/pl/planify/package.nix +++ b/pkgs/by-name/pl/planify/package.nix @@ -22,19 +22,20 @@ libportal-gtk4, libsecret, libsoup_3, + libspelling, sqlite, webkitgtk_6_0, }: stdenv.mkDerivation rec { pname = "planify"; - version = "4.13.4"; + version = "4.14.0"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-lHjMOpCr6ya0k5NMaiZW7jz0EGVUEADA7od87W8DcT8="; + hash = "sha256-QvCESTpHyT6Lu4z7b9DhjFu27PhQwgAo9FY7TMsKy18="; }; nativeBuildInputs = [ @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { libportal-gtk4 libsecret libsoup_3 + libspelling sqlite webkitgtk_6_0 ]; diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index 70b50afc9c85..f719ae5e3e41 100644 --- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-colorizer"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sz6vYG/aqoA3Smu9EDlElvPfE1gcLoUWPT25d//3t4g="; + hash = "sha256-E6VX2naAS2xof5sdnuaSuKueIKecW0fi9SycgLVRQVU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 985a1307aa98..978736798756 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -25,6 +25,8 @@ extraRuntimes ? lib.optionals stdenv.hostPlatform.isLinux [ runc ], # e.g.: runc, gvisor, youki fuse-overlayfs, util-linuxMinimal, + nftables, + iptables, iproute2, catatonit, gvproxy, @@ -44,7 +46,9 @@ let lib.optionals stdenv.hostPlatform.isLinux [ fuse-overlayfs util-linuxMinimal + iptables iproute2 + nftables ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ vfkit diff --git a/pkgs/by-name/pr/prboom-plus/package.nix b/pkgs/by-name/pr/prboom-plus/package.nix deleted file mode 100644 index 9367745fc611..000000000000 --- a/pkgs/by-name/pr/prboom-plus/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - SDL2, - SDL2_mixer, - SDL2_image, - SDL2_net, - fluidsynth, - soundfont-fluid, - portmidi, - dumb, - libvorbis, - libmad, - pcre, -}: - -stdenv.mkDerivation rec { - pname = "prboom-plus"; - version = "2.6.66"; - - src = fetchFromGitHub { - owner = "coelckers"; - repo = "prboom-plus"; - rev = "v${version}"; - sha256 = "sha256-moU/bZ2mS1QfKPP6HaAwWP1nRNZ4Ue5DFl9zBBrJiHw="; - }; - - sourceRoot = "${src.name}/prboom2"; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - SDL2 - SDL2_mixer - SDL2_image - SDL2_net - fluidsynth - portmidi - dumb - libvorbis - libmad - pcre - ]; - - # Fixes impure path to soundfont - prePatch = '' - substituteInPlace src/m_misc.c --replace \ - "/usr/share/sounds/sf3/default-GM.sf3" \ - "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2" - ''; - - meta = with lib; { - homepage = "https://github.com/coelckers/prboom-plus"; - description = "Advanced, Vanilla-compatible Doom engine based on PrBoom"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.ashley ]; - }; -} diff --git a/pkgs/by-name/qu/quicktemplate/package.nix b/pkgs/by-name/qu/quicktemplate/package.nix index 6f6afe08d811..68409b3e7314 100644 --- a/pkgs/by-name/qu/quicktemplate/package.nix +++ b/pkgs/by-name/qu/quicktemplate/package.nix @@ -20,7 +20,6 @@ buildGoModule rec { homepage = "https://github.com/valyala/quicktemplate"; description = "Fast, powerful, yet easy to use template engine for Go"; license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; mainProgram = "qtc"; }; } diff --git a/pkgs/by-name/ra/rapidjson/package.nix b/pkgs/by-name/ra/rapidjson/package.nix index 44f01c91763e..0307b3458b95 100644 --- a/pkgs/by-name/ra/rapidjson/package.nix +++ b/pkgs/by-name/ra/rapidjson/package.nix @@ -90,7 +90,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.dotlambda - lib.maintainers.Madouura lib.maintainers.tobim ]; }; diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index b39198487c7f..ecb9e22f09d8 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication rec { pname = "rclip"; - version = "2.0.7"; + version = "2.0.8"; pyproject = true; src = fetchFromGitHub { owner = "yurijmikhalevich"; repo = "rclip"; tag = "v${version}"; - hash = "sha256-OiAOK6i088TMqD2+PzdSs7UBsycNHa+nqWima0dPYIA="; + hash = "sha256-ScNyy5qWDskKgqxjfRU7y8WBCdThXTjlE3x0oIa8fhU="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 6ce7d03ac7b9..1165087ab22a 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -23,7 +23,7 @@ let in python3Packages.buildPythonApplication rec { pname = "rcu"; - version = "4.0.26"; + version = "4.0.29"; format = "other"; @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { let src-tarball = requireFile { name = "rcu-${version}-source.tar.gz"; - hash = "sha256-yY3OFZVHxhVurfjSEeR+UUNHQdpc08jhgaDEvMWRsLA="; + hash = "sha256-qbHjRKH9GOwBduyod8AOm2SYOjGUH1mYSpCTifOehVM="; url = "https://www.davisr.me/projects/rcu/"; }; in @@ -182,6 +182,9 @@ python3Packages.buildPythonApplication rec { lib.strings.substring versionSuffixPos 1 rcu.version })"; }; + + # Python stuff automatically adds an updateScript that just fails + updateScript = null; }; meta = { @@ -189,7 +192,10 @@ python3Packages.buildPythonApplication rec { description = "All-in-one offline/local management software for reMarkable e-paper tablets"; homepage = "http://www.davisr.me/projects/rcu/"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ OPNA2608 ]; + maintainers = with lib.maintainers; [ + OPNA2608 + m0streng0 + ]; hydraPlatforms = [ ]; # requireFile used as src }; } diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 80322dc6e706..181518cfa829 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.78"; + version = "0.9.81"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-sKk/NwnD9asIqDW75FI7xZf3zNavlorbK08ff+v4O3g="; + hash = "sha256-aj4XBphkIeqGdqiWz3Um1+dGSYF6G3b+9DdN/4qZcZI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index acf6d0799335..24d03ffe4464 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -34,13 +34,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rerun"; - version = "0.24.1"; + version = "0.25.1"; src = fetchFromGitHub { owner = "rerun-io"; repo = "rerun"; tag = finalAttrs.version; - hash = "sha256-unPgvQcYhshdx5NGCl/pLh8UdJ9T6B8Fd0s8G1NSBmE="; + hash = "sha256-YppVNVfVqOATLCoUvpeYYrhivKBb6f4G1JCG1Bl+cjc="; }; # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"' ''; - cargoHash = "sha256-zdq8djnmH8srSd9sml7t6wsbxpTaT3x5/7hkDRgelbg="; + cargoHash = "sha256-jUn7b6t5hS7KjdymxTTP8mKLT671QgKrv7R9uiOkmJU="; cargoBuildFlags = [ "--package rerun-cli" ]; cargoTestFlags = [ "--package rerun-cli" ]; diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix index 09c9a0eeac7a..d46bc3718038 100644 --- a/pkgs/by-name/re/restish/package.nix +++ b/pkgs/by-name/re/restish/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "restish"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "danielgtaylor"; repo = "restish"; tag = "v${version}"; - hash = "sha256-a0ObgFgWEsLYjGmCCi/py2PADAWJ0By+AZ4wh+Yeam4="; + hash = "sha256-eLbeH6i+QbW59DMOHf83olrO8R7Ji975KkJKs621Xi0="; }; - vendorHash = "sha256-qeArar0WnMACUnKBlC+PcFeJPzofwbK440A4M/rQ04U="; + vendorHash = "sha256-bO0z+LCiF/Dp0hKNulBmCgk16NzCCoY32P2/Ieq8y+c="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 @@ -41,6 +41,7 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = restish; + command = "HOME=$(mktemp -d) restish --version"; }; meta = { diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index b42373486121..0dd7cc0575c9 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + installShellFiles, }: buildGoModule rec { @@ -21,8 +22,12 @@ buildGoModule rec { export HOME=$TMPDIR ''; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' rm $out/bin/dists + installShellCompletion --cmd scalingo \ + --bash cmd/autocomplete/scripts/scalingo_complete.bash \ + --zsh cmd/autocomplete/scripts/scalingo_complete.zsh ''; meta = with lib; { diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 02f67b6ac6a1..9c4ad615e723 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-Hqm7WCckdFcePkNzm+JGzRmFtgfjd1GdEFKmwU6O2WU="; + hash = "sha256-haZwGJKRRAguCbY7C+kBIOq5Cr0lymGbRH90oarYUpE="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-bI6hbvFMAuLfKkasAuQDpJ5BGXxw2nUwBNXeYtYTF2k="; + vendorHash = "sha256-joLfVa6xi03JmQBIj08dTyDMPn0q2LqwJtfUJRYW+4c="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch ; fetcherVersion = 1; - hash = "sha256-UqWPOC/j94WTqWUJuE7lwOqIXqhGeeEHgnv+uXlujuM="; + hash = "sha256-QhgND6yxXEJYJM1jkbViAfxNr9FRklYk1YjrnDjZSPc="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/sn/sndio/package.nix b/pkgs/by-name/sn/sndio/package.nix index aa5ba4e85abd..96be144f53d0 100644 --- a/pkgs/by-name/sn/sndio/package.nix +++ b/pkgs/by-name/sn/sndio/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ Madouura ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/sr/sratoolkit/package.nix b/pkgs/by-name/sr/sratoolkit/package.nix index fae32aa5a2b1..19c1a3ef599a 100644 --- a/pkgs/by-name/sr/sratoolkit/package.nix +++ b/pkgs/by-name/sr/sratoolkit/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Collection of tools and libraries for using data in the INSDC Sequence Read Archives"; license = lib.licenses.ncbiPd; maintainers = with lib.maintainers; [ - thyol t4ccer ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/st/stargate-libcds/package.nix b/pkgs/by-name/st/stargate-libcds/package.nix index 362abbd11d16..b39821e94c8d 100644 --- a/pkgs/by-name/st/stargate-libcds/package.nix +++ b/pkgs/by-name/st/stargate-libcds/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C data structure library"; homepage = "https://github.com/stargateaudio/libcds"; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; license = licenses.lgpl3Only; }; } diff --git a/pkgs/by-name/st/statik/package.nix b/pkgs/by-name/st/statik/package.nix index 8c965a73220d..ac3db0c0f565 100644 --- a/pkgs/by-name/st/statik/package.nix +++ b/pkgs/by-name/st/statik/package.nix @@ -32,6 +32,5 @@ buildGoModule rec { description = "Embed files into a Go executable"; mainProgram = "statik"; license = licenses.asl20; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/by-name/st/steamcontroller/package.nix b/pkgs/by-name/st/steamcontroller/package.nix deleted file mode 100644 index 564b04fb4171..000000000000 --- a/pkgs/by-name/st/steamcontroller/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3Packages, - libusb1, - linuxHeaders, -}: - -with python3Packages; - -buildPythonApplication { - pname = "steamcontroller"; - version = "2017-08-11"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "ynsta"; - repo = "steamcontroller"; - rev = "80928ce237925e0d0d7a65a45b481435ba6b931e"; - sha256 = "0lv9j2zv8fmkmc0x9r7fa8zac2xrwfczms35qz1nfa1hr84wniid"; - }; - - postPatch = '' - substituteInPlace src/uinput.py --replace \ - "/usr/include" "${linuxHeaders}/include" - ''; - - buildInputs = [ libusb1 ]; - propagatedBuildInputs = [ - psutil - python3Packages.libusb1 - ]; - doCheck = false; - pythonImportsCheck = [ "steamcontroller" ]; - - meta = with lib; { - description = "Standalone Steam controller driver"; - homepage = "https://github.com/ynsta/steamcontroller"; - license = licenses.mit; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix index 9e234753ccc9..da8f4ba31267 100644 --- a/pkgs/by-name/st/strictdoc/package.nix +++ b/pkgs/by-name/st/strictdoc/package.nix @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/strictdoc-project/strictdoc"; changelog = "https://github.com/strictdoc-project/strictdoc/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ yuu ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "strictdoc"; }; } diff --git a/pkgs/by-name/st/stylelint-lsp/package.nix b/pkgs/by-name/st/stylelint-lsp/package.nix index 6fc0ac292506..b7e4d9dad204 100644 --- a/pkgs/by-name/st/stylelint-lsp/package.nix +++ b/pkgs/by-name/st/stylelint-lsp/package.nix @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { preInstall = '' # remove unnecessary files - pnpm --ignore-scripts prune --prod + CI=true pnpm --ignore-scripts prune --prod rm -rf node_modules/.pnpm/typescript* find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + # https://github.com/pnpm/pnpm/issues/3645 diff --git a/pkgs/by-name/sv/svgcleaner/package.nix b/pkgs/by-name/sv/svgcleaner/package.nix index 2cb0a2c60345..dfcc36d40cea 100644 --- a/pkgs/by-name/sv/svgcleaner/package.nix +++ b/pkgs/by-name/sv/svgcleaner/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/RazrFalcon/SVGCleaner"; changelog = "https://github.com/RazrFalcon/svgcleaner/releases"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; mainProgram = "svgcleaner"; }; } diff --git a/pkgs/by-name/sv/svt-av1/package.nix b/pkgs/by-name/sv/svt-av1/package.nix index 71d65c1d9311..53eed9de216e 100644 --- a/pkgs/by-name/sv/svt-av1/package.nix +++ b/pkgs/by-name/sv/svt-av1/package.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: { aom bsd3 ]; - maintainers = with maintainers; [ Madouura ]; mainProgram = "SvtAv1EncApp"; platforms = platforms.unix; }; diff --git a/pkgs/by-name/ta/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix index 7bd01e8df11e..3ae948f604f0 100644 --- a/pkgs/by-name/ta/tandoor-recipes/common.nix +++ b/pkgs/by-name/ta/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "2.1.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; tag = version; - hash = "sha256-FCCXzWaWjmsWidg1MgUIJtH+KN/gA1d7KBLRj3/1Fec="; + hash = "sha256-ezjeUOlbVoPWfUBs865ixBKet3U6O7UwfvqJY4v1hwQ="; }; - yarnHash = "sha256-vwPwJK+nGuhjJC5BdijAKOv7sgrdev63PWhuZXMD1E0="; + yarnHash = "sha256-1p79Bdsn6KDApYKz9BAwrA97svbB8ub+Wl49MTIumW8="; meta = { homepage = "https://tandoor.dev/"; diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix index 0b270f497b45..1569df1b499b 100644 --- a/pkgs/by-name/ta/taterclient-ddnet/package.nix +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taterclient-ddnet"; - version = "10.5.2"; + version = "10.5.3"; src = fetchFromGitHub { owner = "sjrc6"; repo = "taterclient-ddnet"; tag = "V${finalAttrs.version}"; - hash = "sha256-e+nJ93Fld/F2rLIfhmhC64YVPZdMGKrcKfxGtrQOtSQ="; + hash = "sha256-MHBBDn/3kS1BuZQU7qHdbtuy0JuRRqtzmHVdg8Az+Qc="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index dd9909881ce2..f81328763f31 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.35.4"; + version = "1.36.1"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-4/7lhqdK8JgIpMHFHRajNT/Lz3E1SShYB99PxoeGuz8="; + hash = "sha256-WuxQP0ogbCYuwuIUA8U8UD8usGXuPM2iTCms+yPU8vM="; }; - vendorHash = "sha256-NfkZutoa2LH3q/kYQCVvd3ExtV7RMu0sXKX/RNJLkPU="; + vendorHash = "sha256-wIf8Mo4IkR3CC6PnoGL+Jj5XGDpom3RnXmVLobs6DoM="; proxyVendor = true; ldflags = [ diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix index a72616e3ffc7..0d8fdc114401 100644 --- a/pkgs/by-name/te/teleport_16/package.nix +++ b/pkgs/by-name/te/teleport_16/package.nix @@ -2,6 +2,8 @@ buildTeleport, buildGoModule, wasm-bindgen-cli_0_2_95, + withRdpClient ? true, + extPatches ? [ ], }: buildTeleport rec { version = "16.5.15"; @@ -11,5 +13,5 @@ buildTeleport rec { cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; - inherit buildGoModule; + inherit buildGoModule withRdpClient extPatches; } diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix index 0da2cbc8e850..3213a864918b 100644 --- a/pkgs/by-name/te/teleport_17/package.nix +++ b/pkgs/by-name/te/teleport_17/package.nix @@ -2,6 +2,8 @@ buildTeleport, buildGoModule, wasm-bindgen-cli_0_2_95, + withRdpClient ? true, + extPatches ? [ ], }: buildTeleport rec { @@ -12,5 +14,5 @@ buildTeleport rec { pnpmHash = "sha256-ZONs8z8mgBBQBmqaDGJKqhmtUKBrxE8BGYppbAqpQmg="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; - inherit buildGoModule; + inherit buildGoModule withRdpClient extPatches; } diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix index f0c459886425..96081e9578d7 100644 --- a/pkgs/by-name/te/teleport_18/package.nix +++ b/pkgs/by-name/te/teleport_18/package.nix @@ -2,6 +2,8 @@ buildTeleport, buildGo124Module, wasm-bindgen-cli_0_2_99, + withRdpClient ? true, + extPatches ? [ ], }: buildTeleport rec { @@ -13,4 +15,5 @@ buildTeleport rec { wasm-bindgen-cli = wasm-bindgen-cli_0_2_99; buildGoModule = buildGo124Module; + inherit withRdpClient extPatches; } diff --git a/pkgs/by-name/te/tetrd/package.nix b/pkgs/by-name/te/tetrd/package.nix index d979ba73d92b..d716e7f3fa71 100644 --- a/pkgs/by-name/te/tetrd/package.nix +++ b/pkgs/by-name/te/tetrd/package.nix @@ -82,6 +82,5 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/by-name/te/tewisay/package.nix b/pkgs/by-name/te/tewisay/package.nix index 0a5a57534db7..50a5fa78a04a 100644 --- a/pkgs/by-name/te/tewisay/package.nix +++ b/pkgs/by-name/te/tewisay/package.nix @@ -36,7 +36,6 @@ buildGoModule { homepage = "https://github.com/raymond-w-ko/tewisay"; description = "Cowsay replacement with unicode and partial ansi escape support"; license = with licenses; [ cc0 ]; - maintainers = with maintainers; [ Madouura ]; mainProgram = "tewisay"; }; } diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix index f80ad5c53823..1a9f13363f42 100644 --- a/pkgs/by-name/th/theforceengine/package.nix +++ b/pkgs/by-name/th/theforceengine/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "theforceengine"; - version = "1.22.410"; + version = "1.22.420"; src = fetchFromGitHub { owner = "luciusDXL"; repo = "TheForceEngine"; tag = "v${finalAttrs.version}"; - hash = "sha256-ydZ/S6u3UQNeVRTfzjshlNzLRc1y3FXsTY2NXbUoJBA="; + hash = "sha256-8JhaCIJgyaikoDLesshKiIhOO6OFis0xBYDq4vio4F4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix index d2bf8d043fb5..b9f6e9cc6b17 100644 --- a/pkgs/by-name/ti/tic-80/package.nix +++ b/pkgs/by-name/ti/tic-80/package.nix @@ -73,6 +73,15 @@ stdenv.mkDerivation { "BUILD_WITH_ALL" ]); + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out"/Applications/TIC-80.app/Contents/{MacOS,Resources} + cp bin/tic80 "$out"/Applications/TIC-80.app/Contents/MacOS/tic80 + cp macosx/tic80.plist "$out"/Applications/TIC-80.app/Contents/Info.plist + cp macosx/tic80.icns "$out"/Applications/TIC-80.app/Contents/Resources/tic80.icns + mkdir -p "$out"/bin + ln -s "$out"/Applications/TIC-80.app/Contents/MacOS/tic80 "$out"/bin/tic80 + ''; + nativeBuildInputs = [ cmake curl @@ -109,7 +118,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/nesbox/TIC-80"; license = licenses.mit; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; mainProgram = "tic80"; maintainers = with maintainers; [ blinry ]; }; diff --git a/pkgs/by-name/ti/tinygo/package.nix b/pkgs/by-name/ti/tinygo/package.nix index 7dd741b3a795..7c09a99dba2b 100644 --- a/pkgs/by-name/ti/tinygo/package.nix +++ b/pkgs/by-name/ti/tinygo/package.nix @@ -144,7 +144,6 @@ buildGoModule rec { description = "Go compiler for small places"; license = licenses.bsd3; maintainers = with maintainers; [ - Madouura muscaln ]; }; diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix index fda9841253de..c7bd9417ccb7 100644 --- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix +++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix @@ -120,7 +120,6 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ garaiza-93 - Madouura d3vil0p3r ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/tq/tqsl/package.nix b/pkgs/by-name/tq/tqsl/package.nix index ad01f8e85ea3..6abdc4ea8d53 100644 --- a/pkgs/by-name/tq/tqsl/package.nix +++ b/pkgs/by-name/tq/tqsl/package.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://www.arrl.org/tqsl-download"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = [ maintainers.dpflug ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix index 2d0b979f8494..84593c31a908 100644 --- a/pkgs/by-name/tr/triton-llvm/package.nix +++ b/pkgs/by-name/tr/triton-llvm/package.nix @@ -218,7 +218,6 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ ncsa ]; maintainers = with lib.maintainers; [ SomeoneSerge - Madouura ]; platforms = with lib.platforms; aarch64 ++ x86; }; diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix index faa25ee6f5a1..e17dabd445a2 100644 --- a/pkgs/by-name/ts/tsx/package.nix +++ b/pkgs/by-name/ts/tsx/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # remove devDependencies that are only required to build # and package the typescript code - pnpm prune --prod + CI=true pnpm prune --prod # Clean up broken symlinks left behind by `pnpm prune` # https://github.com/pnpm/pnpm/issues/3645 diff --git a/pkgs/by-name/tu/tunnelgraf/package.nix b/pkgs/by-name/tu/tunnelgraf/package.nix index 7a479b098ba5..254bffb5859d 100644 --- a/pkgs/by-name/tu/tunnelgraf/package.nix +++ b/pkgs/by-name/tu/tunnelgraf/package.nix @@ -1,10 +1,28 @@ { lib, fetchFromGitHub, + fetchPypi, python3, }: -python3.pkgs.buildPythonApplication rec { +let + py = python3.override { + packageOverrides = self: super: { + + # Doesn't work with latest paramiko + paramiko = super.paramiko.overridePythonAttrs (oldAttrs: rec { + version = "3.4.0"; + src = fetchPypi { + pname = "paramiko"; + inherit version; + hash = "sha256-qsCPJqMdxN/9koIVJ9FoLZnVL572hRloEUqHKPPCdNM="; + }; + doCheck = false; + }); + }; + }; +in +py.pkgs.buildPythonApplication rec { pname = "tunnelgraf"; version = "1.0.6"; pyproject = true; @@ -19,14 +37,14 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "click" "deepmerge" - "paramiko" "psutil" "pydantic" + "python-hosts" ]; - build-system = with python3.pkgs; [ hatchling ]; + build-system = with py.pkgs; [ hatchling ]; - dependencies = with python3.pkgs; [ + dependencies = with py.pkgs; [ click deepmerge paramiko @@ -46,7 +64,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Tool to manage SSH tunnel hops to many endpoints"; homepage = "https://github.com/denniswalker/tunnelgraf"; - changelog = "https://github.com/denniswalker/tunnelgraf/releases/tag/v${version}"; + changelog = "https://github.com/denniswalker/tunnelgraf/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "tunnelgraf"; diff --git a/pkgs/by-name/ty/typescript-language-server/package.nix b/pkgs/by-name/ty/typescript-language-server/package.nix index 5bad96099d66..b6df1a673575 100644 --- a/pkgs/by-name/ty/typescript-language-server/package.nix +++ b/pkgs/by-name/ty/typescript-language-server/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "typescript-language-server"; - version = "4.4.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "typescript-language-server"; repo = "typescript-language-server"; rev = "v${finalAttrs.version}"; - hash = "sha256-5JvYTVHZUoTGokOiaJ6FF5dsNXaY7oFsWLf2doZv36Q="; + hash = "sha256-dWTo9OM5gPKj78/KtCMeu59KYL5IhhapOsFtuj9JzVQ="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-05o1aOaUEL/KI5hf7dKL2lKEDxbzpg89CyR8qMi1G8s="; + hash = "sha256-9WezeKRsnwWB98YVhQD1nzrT/T6T3plIVwKhVkOsKPo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/veryfasttree/package.nix b/pkgs/by-name/ve/veryfasttree/package.nix index 89487a913eae..101337caefd6 100644 --- a/pkgs/by-name/ve/veryfasttree/package.nix +++ b/pkgs/by-name/ve/veryfasttree/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "VeryFastTree"; homepage = "https://github.com/citiususc/veryfasttree"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ thyol ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix index dcf860d20446..f61d8d4fd8bd 100644 --- a/pkgs/by-name/vl/vlang/package.nix +++ b/pkgs/by-name/vl/vlang/package.nix @@ -120,7 +120,6 @@ stdenv.mkDerivation { description = "Simple, fast, safe, compiled language for developing maintainable software"; license = licenses.mit; maintainers = with maintainers; [ - Madouura delta231 ]; mainProgram = "v"; diff --git a/pkgs/by-name/vp/vpp/package.nix b/pkgs/by-name/vp/vpp/package.nix index 08756a76a320..89216bc71e7f 100644 --- a/pkgs/by-name/vp/vpp/package.nix +++ b/pkgs/by-name/vp/vpp/package.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { description = "Fast, scalable layer 2-4 multi-platform network stack running in user space"; homepage = "https://s3-docs.fd.io/vpp/${version}/"; license = [ lib.licenses.asl20 ]; - maintainers = with lib.maintainers; [ romner-set ]; + maintainers = with lib.maintainers; [ azey7f ]; mainProgram = "vpp"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index a120e28a8f23..445a7453d89d 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -9,19 +9,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vue-language-server"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "vuejs"; repo = "language-tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-APzsrj/Ap6bSVw6atKYK4mndw2JJLZ8aNlaZL+GYLSM="; + hash = "sha256-oiQUEUBOZrTB7BhRmc4HEGTpbOGGSCiTlO/Cn0sBNtU="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-cgFA2yhq/gjjJFrTzg5QKdk8Lt+BYUo/qFpe6ZSon+k="; + hash = "sha256-BKiTGANch9phNN+zVpPzA+E4MtpM/G3yLiEQObtKLmI="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ''; preInstall = '' - pnpm prune --prod + CI=true pnpm prune --prod find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + # https://github.com/pnpm/pnpm/issues/3645 diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index 6921b3798077..aa8a0bd7f52b 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "weaver"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "weaver"; tag = "v${finalAttrs.version}"; - hash = "sha256-9IPs8XIHPpYO6ukrzHw7qvuogNUj74tn6Jb4UTMTGFo="; + hash = "sha256-kEGz6alm+P6zKR4vxzsyZ67R99tVBjEIK0OEx6SzdvQ="; }; - cargoHash = "sha256-ow6huWumG0xz4AAM/D2v0MaZ0SzmbUnrEkL5ieNS4Io="; + cargoHash = "sha256-//nPXBUi7swKPusaamSJdsUTObnyh+wNc7i8CoyGWrU="; checkFlags = [ # Skip tests requiring network diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix index a30b9e7bad72..e1188885c8ea 100644 --- a/pkgs/by-name/wo/wofi-power-menu/package.nix +++ b/pkgs/by-name/wo/wofi-power-menu/package.nix @@ -6,30 +6,22 @@ wofi, versionCheckHook, nix-update-script, - yq, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wofi-power-menu"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "szaffarano"; repo = "wofi-power-menu"; tag = "v${finalAttrs.version}"; - hash = "sha256-3m4zTmjYn1WGdW5dY4tzYxOxdw0spwYxZFRhdBwWf2I="; + hash = "sha256-EQHmi530ePlYRdjj/b+iF5edQFolZF0oVjSpyOE1Uk8="; }; - postPatch = '' - tomlq -ti '.package.version = "0.3.1"' Cargo.toml - ''; + cargoHash = "sha256-anArTkPkgYj7B2uKFRTN+aotLpdNSBdlkYERGJc0Xbo="; - cargoHash = "sha256-5txhSjCXlGqTmeG9EO1AUbt4syrTD62g4LtfO6nhAes="; - - nativeBuildInputs = [ - makeBinaryWrapper - yq # for `tomlq` - ]; + nativeBuildInputs = [ makeBinaryWrapper ]; postInstall = '' wrapProgram $out/bin/wofi-power-menu \ diff --git a/pkgs/by-name/xa/xan/package.nix b/pkgs/by-name/xa/xan/package.nix index c8d54d8fd162..8e6301e6d52a 100644 --- a/pkgs/by-name/xa/xan/package.nix +++ b/pkgs/by-name/xa/xan/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "xan"; - version = "0.52.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "medialab"; repo = "xan"; tag = version; - hash = "sha256-Enjtp/35rhSsndLFaQw8sGsO43mOes3Se8ElbdcSv0E="; + hash = "sha256-gQqZrN8v5edgTKMmNGS3Pp0xdWH1awSa+dZaBNX7EX4="; }; - cargoHash = "sha256-m3aiX34W6GHgnT6kkb1CsLXyVH5FnxSOh5etCCJJsAs="; + cargoHash = "sha256-CCCBF1ZvRZAtPNOfoU3Im7/wIpFakIbBFH0UjWb3tD0="; # FIXME: tests fail and I do not have the time to investigate. Temporarily disable # tests so that we can manually run and test the package for packaging purposes. diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix index 3155b5fc14d9..47e4e14ce9dd 100644 --- a/pkgs/by-name/xh/xh/package.nix +++ b/pkgs/by-name/xh/xh/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xh"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; tag = "v${finalAttrs.version}"; - hash = "sha256-2c96O5SL6tcPSbxx8NYxG8LDX3ZgyxEMmEeJnKDwb38="; + hash = "sha256-UuWNLsJAoSjDPs/8VzW2vics3A/nsXWR5xmjMqTmYvQ="; }; - cargoHash = "sha256-oncf3Hd85LgKn8KSDIBHXLJ3INzfp0X/Ng9OjAltLB4="; + cargoHash = "sha256-SsJSBkOdQSpbEbFPK+qscSBePUKMLM1UpajpvpR2ZEo="; buildFeatures = lib.optional withNativeTls "native-tls"; diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 2f08efa307b1..189522135f64 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.204.2"; + version = "0.204.3"; outputs = [ "out" @@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-WYdSWyWkCberMBJlow/V7FGQTL0ww1SQ5L0zNsnNg58="; + hash = "sha256-nEaV6VQk294zlkkooe1Xh78GHBNzRizopiN9TjRoZNU="; }; patches = [ @@ -143,7 +143,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}' ''; - cargoHash = "sha256-cDlcwbxE+52YAHLPb+ijJZE9zQwvtm7glfru0qyQWwA="; + cargoHash = "sha256-vbnFXLWgKljlkdQg30tPOX6Kz8EXZoj0I8diwFh//3s="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index d7cdf9614252..d6eb64956ceb 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - pnpm prune --prod + CI=true pnpm prune --prod find node_modules -xtype l -delete mkdir -p $out/{bin,share/zipline} diff --git a/pkgs/by-name/zi/zix/package.nix b/pkgs/by-name/zi/zix/package.nix index 4aefc8fbecb2..e9a57e08a99a 100644 --- a/pkgs/by-name/zi/zix/package.nix +++ b/pkgs/by-name/zi/zix/package.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.com/drobilla/zix/-/blob/${src.rev}/NEWS"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/zr/zrythm/package.nix b/pkgs/by-name/zr/zrythm/package.nix index a61eef83bc09..df928b135fd3 100644 --- a/pkgs/by-name/zr/zrythm/package.nix +++ b/pkgs/by-name/zr/zrythm/package.nix @@ -208,7 +208,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ tshaynik magnetophon - yuu astavie PowerUser64 ]; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 1a37dd5df768..7c42fb497b5c 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -42,12 +42,12 @@ in ); julia_111-bin = wrapJulia ( callPackage (import ./generic-bin.nix { - version = "1.11.6"; + version = "1.11.7"; sha256 = { - x86_64-linux = "e99e52e2029d845097c68f2372d836186f0eb3fb897a9dde0bdf9ee9250d03d5"; - aarch64-linux = "c2c5cdce017cacadaccb7d22aa070f549e4e87c4bb10f15853170ddcb50bf5f4"; - x86_64-darwin = "195a897e031595f59821dbcaf87514faa8d64220334b285c3e9809fce4958f79"; - aarch64-darwin = "01caaa9c25fa1f071003807c8a6739de4941b5ec13751131128e00e21880e639"; + x86_64-linux = "aa5924114ecb89fd341e59aa898cd1882b3cb622ca4972582c1518eff5f68c05"; + aarch64-linux = "f97f80b35c12bdaf40c26f6c55dbb7617441e49c9e6b842f65e8410a388ca6f4"; + x86_64-darwin = "b2c11315df39da478ab0fa77fb228f3fd818f1eaf42dc5cc1223c703f7122fe5"; + aarch64-darwin = "74df9d4755a7740d141b04524a631e2485da9d65065d934e024232f7ba0790b6"; }; }) { } ); @@ -79,8 +79,8 @@ in ); julia_111 = wrapJulia ( callPackage (import ./generic.nix { - version = "1.11.6"; - hash = "sha256-smje9BrcF0lsPg59y14nssvmocYcePZGNUTF9Mc0Foo="; + version = "1.11.7"; + hash = "sha256-puluy9YAV8kdx6mfwbN1F7Nhot+P0cRv/a0dm86Jln0="; patches = [ ./patches/1.11/0002-skip-failing-and-flaky-tests.patch ]; diff --git a/pkgs/development/libraries/libsbsms/common.nix b/pkgs/development/libraries/libsbsms/common.nix index d1144ce2759c..a4e5e72a4518 100644 --- a/pkgs/development/libraries/libsbsms/common.nix +++ b/pkgs/development/libraries/libsbsms/common.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { inherit homepage; description = "Subband sinusoidal modeling library for time stretching and pitch scaling audio"; - maintainers = with lib.maintainers; [ yuu ]; + maintainers = with lib.maintainers; [ ]; license = lib.licenses.gpl2; platforms = lib.platforms.all; }; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index d7c62e7c3143..f4c3e6a2fbd5 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "13.9.0"; + version = "13.10.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-G8iZmgrTR+hqrRLoEdnJnqzU8GFQUrOrGenL6hkjtps="; + hash = "sha256-sN8Qr+ZgKBaZbTgQSGujdZmA3N0fBMFEPnUIWiBkPhg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 2d882dc92005..32932d8ec878 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -9,15 +9,14 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.21"; + version = "0.25"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit version; - pname = "Apycula"; - hash = "sha256-rh+1U1bqyrX3Mv1HUl22ykUHx5Zaq59suc7ZVAOi0mo="; + inherit pname version; + hash = "sha256-CLrceuZbmGygZtPM0ETVvsBosjY3FlQDo0sJh2I1uF0="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/barectf/default.nix b/pkgs/development/python-modules/barectf/default.nix index 968570904067..f3d7187a5e3e 100644 --- a/pkgs/development/python-modules/barectf/default.nix +++ b/pkgs/development/python-modules/barectf/default.nix @@ -50,6 +50,5 @@ buildPythonPackage rec { mainProgram = "barectf"; homepage = "https://github.com/efficios/barectf"; license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 55671d7d987b..90b763598e74 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -14,7 +14,7 @@ }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.0"; pname = "beancount"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "beancount"; repo = "beancount"; tag = version; - hash = "sha256-ogjBW/NGlMmhYlzcx3EWWoVi+OOEv2Wm49tzwMiNb8A="; + hash = "sha256-XWTgaBvB4/SONL44afvprZwJUVrkoda5XLGNxad0kec="; }; build-system = [ diff --git a/pkgs/development/python-modules/beanquery/default.nix b/pkgs/development/python-modules/beanquery/default.nix index 9e016ec860fc..fad735aa6a8d 100644 --- a/pkgs/development/python-modules/beanquery/default.nix +++ b/pkgs/development/python-modules/beanquery/default.nix @@ -4,6 +4,7 @@ click, buildPythonPackage, fetchFromGitHub, + fetchpatch2, python-dateutil, pytestCheckHook, setuptools, @@ -21,6 +22,14 @@ buildPythonPackage rec { hash = "sha256-O7+WCF7s50G14oNTvJAOTvgSoNR9fWcn/m1jv7RHmK8="; }; + patches = [ + (fetchpatch2 { + name = "beancount-workaround.patch"; + url = "https://github.com/beancount/beanquery/commit/aa0776285a25baeedf151e9f582bef0314f76004.patch?full_index=1"; + hash = "sha256-hWL1CDsBSbMqufEQrtEncmyUr5L5VJI+i4xQtnAvQd8="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 19d60975fb10..5ba6a6b19caf 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-auto-recovery"; tag = "v${version}"; - hash = "sha256-9FwQNauWnWQ7BQoKMwYEEc96/iP6iH9SfvHxlZtePOQ="; + hash = "sha256-xnEEq3NVScMbMjZWb4lI+kpy2zr6WlXx3XcBhzN1rZ4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 2b3b5c5c27b8..2d117051ed2a 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "11.0.0"; + version = "11.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; tag = "v${version}"; - hash = "sha256-TS/3O/ojabMUUW8RVd1ymo67rjNoRCtrIqZcUygpW+Y="; + hash = "sha256-XlsVJTyAeqYex5q/07mFLXfMc9vnS5X+stP77i4IbVc="; }; pythonRelaxDeps = [ "py-serializable" ]; diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index 9ea5b128e10d..c9c796b66eb5 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -1,40 +1,28 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, rustPlatform, - pytestCheckHook, - libiconv, - numpy, - protobuf, + + # nativeBuildInputs protoc, + + # buildInputs + protobuf, + + # dependencies pyarrow, typing-extensions, - pythonOlder, + + # tests + numpy, + pytest-asyncio, + pytestCheckHook, }: -let - arrow-testing = fetchFromGitHub { - name = "arrow-testing"; - owner = "apache"; - repo = "arrow-testing"; - rev = "4d209492d514c2d3cb2d392681b9aa00e6d8da1c"; - hash = "sha256-IkiCbuy0bWyClPZ4ZEdkEP7jFYLhM7RCuNLd6Lazd4o="; - }; - - parquet-testing = fetchFromGitHub { - name = "parquet-testing"; - owner = "apache"; - repo = "parquet-testing"; - rev = "50af3d8ce206990d81014b1862e5ce7380dc3e08"; - hash = "sha256-edyv/r5olkj09aHtm8LHZY0b3jUtLNUcufwI41qKYaY="; - }; -in - buildPythonPackage rec { pname = "datafusion"; - version = "40.1.0"; + version = "48.0.0"; pyproject = true; src = fetchFromGitHub { @@ -42,13 +30,14 @@ buildPythonPackage rec { owner = "apache"; repo = "arrow-datafusion-python"; tag = version; - hash = "sha256-5WOSlx4XW9zO6oTY16lWQElShLv0ubflVPfSSEGrFgg="; + # Fetch arrow-testing and parquet-testing (tests assets) + fetchSubmodules = true; + hash = "sha256-9IOkb31f4nFo9mWTr+z5ZG8xSXIZSgW3vCBgLaGxpfI="; }; cargoDeps = rustPlatform.fetchCargoVendor { - name = "datafusion-cargo-deps"; - inherit src; - hash = "sha256-xUpchV4UFEX1HkCpClOwxnEfGLVlOIX4UmzYKiUth9U="; + inherit pname src version; + hash = "sha256-P9NFvhHAGgYIi36CHEPZPr8hmMNp5zrCcmE7NHx51k4="; }; nativeBuildInputs = with rustPlatform; [ @@ -59,9 +48,6 @@ buildPythonPackage rec { buildInputs = [ protobuf - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv ]; dependencies = [ @@ -70,28 +56,26 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook numpy + pytest-asyncio + pytestCheckHook ]; - pythonImportsCheck = [ "datafusion" ]; - - pytestFlags = [ - "--pyargs" - pname + pythonImportsCheck = [ + "datafusion" + "datafusion._internal" ]; preCheck = '' - pushd $TMPDIR - ln -s ${arrow-testing} ./testing - ln -s ${parquet-testing} ./parquet + rm -rf python/datafusion ''; - postCheck = '' - popd - ''; + disabledTests = [ + # Exception: DataFusion error (requires internet access) + "test_register_http_csv" + ]; - meta = with lib; { + meta = { description = "Extensible query execution framework"; longDescription = '' DataFusion is an extensible query execution framework, written in Rust, @@ -99,7 +83,7 @@ buildPythonPackage rec { ''; homepage = "https://arrow.apache.org/datafusion/"; changelog = "https://github.com/apache/arrow-datafusion-python/blob/${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ cpcloud ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ cpcloud ]; }; } diff --git a/pkgs/development/python-modules/datauri/default.nix b/pkgs/development/python-modules/datauri/default.nix index 87da3ec656d3..a2b40cab29f9 100644 --- a/pkgs/development/python-modules/datauri/default.nix +++ b/pkgs/development/python-modules/datauri/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/fcurella/python-datauri"; changelog = "https://github.com/fcurella/python-datauri/releases/tag/${src.tag}"; license = licenses.unlicense; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/decli/default.nix b/pkgs/development/python-modules/decli/default.nix index 5eb381bfb1cd..9f328a75bee3 100644 --- a/pkgs/development/python-modules/decli/default.nix +++ b/pkgs/development/python-modules/decli/default.nix @@ -2,36 +2,33 @@ lib, buildPythonPackage, fetchFromGitHub, + poetry-core, pytestCheckHook, - pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "decli"; - version = "0.6.1"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + version = "0.6.3"; + pyproject = true; src = fetchFromGitHub { owner = "woile"; repo = "decli"; tag = "v${version}"; - hash = "sha256-FZYKNKkQExx/YBn5y/W0+0aMlenuwEctYTL7LAXMZGE="; + hash = "sha256-W4GURqlkHzDwrPAlmiBjc2ZqN//nUK084uRMM7GIme0="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "decli" ]; - meta = with lib; { + meta = { description = "Minimal, easy to use, declarative command line interface tool"; homepage = "https://github.com/Woile/decli"; - changelog = "https://github.com/woile/decli/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ]; + changelog = "https://github.com/woile/decli/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lovesegfault ]; }; } diff --git a/pkgs/development/python-modules/desktop-entry-lib/default.nix b/pkgs/development/python-modules/desktop-entry-lib/default.nix index 1c84612d8f60..69fca060ab38 100644 --- a/pkgs/development/python-modules/desktop-entry-lib/default.nix +++ b/pkgs/development/python-modules/desktop-entry-lib/default.nix @@ -31,6 +31,5 @@ buildPythonPackage rec { homepage = "https://codeberg.org/JakobDev/desktop-entry-lib"; changelog = "https://codeberg.org/JakobDev/desktop-entry-lib/releases/tag/${version}"; license = licenses.bsd2; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index a497e80beb69..49a94dfe4487 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -70,6 +70,6 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-debug-toolbar"; changelog = "https://django-debug-toolbar.readthedocs.io/en/latest/changes.html"; license = licenses.bsd3; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index fdc933f1bca7..b05ea253034f 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "dm-control"; - version = "1.0.31"; + version = "1.0.34"; pyproject = true; src = fetchFromGitHub { owner = "google-deepmind"; repo = "dm_control"; tag = version; - hash = "sha256-myrOrbKjBz+qN61WX54CqIaHsidUUBhgHezsdZvQFJA="; + hash = "sha256-AESUqrUw8EEUKNtZJ5M/dD7xDr+6VGi4yYacJw0q8Ls="; }; build-system = [ diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index de8d5ebb3730..185993a39f13 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -6,8 +6,10 @@ fetchPypi, hatchling, orjson, + python-dateutil, pythonOlder, requests, + typing-extensions, }: buildPythonPackage rec { @@ -24,7 +26,11 @@ buildPythonPackage rec { build-system = [ hatchling ]; - dependencies = [ elastic-transport ]; + dependencies = [ + elastic-transport + python-dateutil + typing-extensions + ]; optional-dependencies = { async = [ aiohttp ]; diff --git a/pkgs/development/python-modules/gwcs/default.nix b/pkgs/development/python-modules/gwcs/default.nix index 7d73a5aa4ce5..2c5767f5cf5a 100644 --- a/pkgs/development/python-modules/gwcs/default.nix +++ b/pkgs/development/python-modules/gwcs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "gwcs"; - version = "0.25.2"; + version = "0.26.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "spacetelescope"; repo = "gwcs"; tag = version; - hash = "sha256-Pj/Ly/qMJdhdY8C/ZPaEV+hsYEh//ARvHitvlkjI8sM="; + hash = "sha256-cJfNVX7rdJASQA3NmZt7d4pvYh6GAteR22jat0kccoo="; }; build-system = [ diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index f88a39d4e957..00496fcc251e 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.80"; + version = "0.81"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; tag = "v${version}"; - hash = "sha256-zKsJ85dd+SE2OL0t/5aHtXoHsz2WuTkg11mo2wlmeTM="; + hash = "sha256-p1+/BRi/4QG524nT9lns1AGc6jeO9KTJNJ2rljkrmko="; }; build-system = [ diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index 62517983f525..38b71768f64c 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-cli"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchPypi { pname = "llama_index_cli"; inherit version; - hash = "sha256-LrlCYjLo2J/98PpnhP+NoJRJ2SDXHQ/MgdB76Tz5Np8="; + hash = "sha256-BEYVnYXFbCkCLByDDJiG9nDV9Z1pNDw8Apo7IO2hqdg="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-node-parser-docling/default.nix b/pkgs/development/python-modules/llama-index-node-parser-docling/default.nix index 8d6b4774997e..96d199750176 100644 --- a/pkgs/development/python-modules/llama-index-node-parser-docling/default.nix +++ b/pkgs/development/python-modules/llama-index-node-parser-docling/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "llama-index-node-parser-docling"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchPypi { pname = "llama_index_node_parser_docling"; inherit version; - hash = "sha256-3D2X5sKAaweJG5w5qVeCEMgvKPZVUdI4/GsSwB9zfQ4="; + hash = "sha256-1Nauru9zoHaUvDiAQ2ZPwGXjwLQj2ztBaCpEHsr3YfM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-readers-docling/default.nix b/pkgs/development/python-modules/llama-index-readers-docling/default.nix index fdad8918d170..508bfcacb95f 100644 --- a/pkgs/development/python-modules/llama-index-readers-docling/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-docling/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llama-index-readers-docling"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchPypi { pname = "llama_index_readers_docling"; inherit version; - hash = "sha256-b9UxJWlh/KnfTIOcKe9jiWCD1VknqeJH2hQjrDNmsOg="; + hash = "sha256-Et17yfWK+SSeWZymN26J4PjKx4FimGaJmMZaXazq5B0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix index e1b95f532a69..d1738cbb470b 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-milvus"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_milvus"; inherit version; - hash = "sha256-8alWmT1CglPpvDqbav7AoahIOcabchsiUmrAbBeOyZI="; + hash = "sha256-qIGFmmiet1VXkQLyy72l2ub5ePyYwozTzisVhQkWmoY="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llama-stack-client/default.nix b/pkgs/development/python-modules/llama-stack-client/default.nix index 3212702eb680..449fdb9d3b30 100644 --- a/pkgs/development/python-modules/llama-stack-client/default.nix +++ b/pkgs/development/python-modules/llama-stack-client/default.nix @@ -31,13 +31,13 @@ buildPythonPackage rec { pname = "llama-stack-client"; - version = "0.2.20"; + version = "0.2.22"; pyproject = true; src = fetchPypi { pname = "llama_stack_client"; inherit version; - hash = "sha256-NWJX8KS7tkIF+J4RPXFZJYU9XjTsdE5yRm2nJ5C6QVs="; + hash = "sha256-mgvHVrkevVOYWO6vHyMcXlxpAOHqT8ztcmxnF/PSfKc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/merkletools/default.nix b/pkgs/development/python-modules/merkletools/default.nix index 71e8a51b4e03..5dc519c801c1 100644 --- a/pkgs/development/python-modules/merkletools/default.nix +++ b/pkgs/development/python-modules/merkletools/default.nix @@ -35,6 +35,5 @@ buildPythonPackage rec { homepage = "https://github.com/Tierion/pymerkletools"; changelog = "https://github.com/Tierion/pymerkletools/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index c673d7e14421..3f98a1df1209 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.3.5"; + version = "1.3.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; tag = "v${version}"; - hash = "sha256-0ey8sV0JDuOjdrOeO/hRxZ847DMcWai0B/YUWZ1VJ48="; + hash = "sha256-6M1C2Y0jYec/yKjigtbaaZiEL23csQAFtuUVMTlaiXk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 9e6ac51e6df8..7704cc1be8c9 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.40.0"; + version = "1.44.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-qoQbYSFL96ovKKZ3KJAeTtwNRJxHjnmGDbSAZ4lTVNw="; + hash = "sha256-KRB3knoNXN6l38CekzbFhHzwuMI92udzfHLTfTQn6v4="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index 1174baa5a92b..91020733522d 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-+fxlUPye2XaCI9stezzDK1oC656IcoK0DkUcJmrxakY="; + hash = "sha256-Emv7DbRC62QHd23E+Yx8AilUlHkx4Dw5XsRfpYRj+14="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/netbox-contract/default.nix b/pkgs/development/python-modules/netbox-contract/default.nix index b0b20ff31db2..8f40a1d28bf0 100644 --- a/pkgs/development/python-modules/netbox-contract/default.nix +++ b/pkgs/development/python-modules/netbox-contract/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { pname = "netbox-contract"; - version = "2.4.1"; + version = "2.4.2"; pyproject = true; disabled = python.pythonVersion != netbox.python.pythonVersion; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mlebreuil"; repo = "netbox-contract"; tag = "v${version}"; - hash = "sha256-2pjApKMybZGzojRF3vH1Ti/Wkmg/tafhpzX+qDkLY8o="; + hash = "sha256-hJz6+vJWhwZJId5Otf1LaFkyaLncuuvai83aCu/aKu0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 7253c4116ad2..3d4bb2a2a5e2 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "opower"; - version = "0.15.4"; + version = "0.15.5"; pyproject = true; src = fetchFromGitHub { owner = "tronikos"; repo = "opower"; tag = "v${version}"; - hash = "sha256-+y2lQnF48b2PKocQw6eEDPNTqZSB4aOALMfNOIVS+Yg="; + hash = "sha256-K0GYXubMKh2B7KYhZOaecBWArTBayl/Wq5Ha3jJyixE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/protonup-ng/default.nix b/pkgs/development/python-modules/protonup-ng/default.nix index 8e69e1c743d3..b082dd68299c 100644 --- a/pkgs/development/python-modules/protonup-ng/default.nix +++ b/pkgs/development/python-modules/protonup-ng/default.nix @@ -36,7 +36,6 @@ buildPythonPackage rec { description = "CLI program and API to automate the installation and update of GloriousEggroll's Proton-GE"; license = licenses.gpl3Only; maintainers = with maintainers; [ - Madouura cafkafk ]; mainProgram = "protonup"; diff --git a/pkgs/development/python-modules/py-melissa-climate/default.nix b/pkgs/development/python-modules/py-melissa-climate/default.nix index 019b84bbf9fc..dc66538400e2 100644 --- a/pkgs/development/python-modules/py-melissa-climate/default.nix +++ b/pkgs/development/python-modules/py-melissa-climate/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "py-melissa-climate"; - version = "2.1.2"; + version = "2.1.4"; pyproject = true; src = fetchFromGitHub { owner = "kennedyshead"; repo = "py-melissa-climate"; - tag = "V${version}"; - hash = "sha256-Z1A0G3g8dyoG+zUxUTqI/OxczvUVy2kSI04YP0WeXso="; + tag = version; + hash = "sha256-zYr+nKdO+lCLLYGSvY16MUs8TxbWcyaoQk9cwNQ704Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index bec89563e1e3..f0740908d6ea 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -76,6 +76,6 @@ buildPythonPackage rec { homepage = "https://github.com/inducer/pycuda/"; description = "CUDA integration for Python"; license = licenses.mit; - maintainers = with maintainers; [ artuuge ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyemoncms/default.nix b/pkgs/development/python-modules/pyemoncms/default.nix index 8651b61f8863..d1faa4e4863f 100644 --- a/pkgs/development/python-modules/pyemoncms/default.nix +++ b/pkgs/development/python-modules/pyemoncms/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyemoncms"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; src = fetchFromGitHub { owner = "Open-Building-Management"; repo = "pyemoncms"; tag = "v${version}"; - hash = "sha256-61i7VKmPSMUrUSgnDtKROdDdM0QDqOTsqnLjGLkgGII="; + hash = "sha256-Bvcnl3av9SF0CNUjg/QDdvENIEgPg26fAJ522jBrL7Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix index 2d2126f8076a..1cac801430c7 100644 --- a/pkgs/development/python-modules/pyiskra/default.nix +++ b/pkgs/development/python-modules/pyiskra/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyiskra"; - version = "0.1.26"; + version = "0.1.27"; pyproject = true; src = fetchFromGitHub { owner = "Iskramis"; repo = "pyiskra"; tag = "v${version}"; - hash = "sha256-RUMMXlLdG4cqBrNOK5f1jv0jSU8n/P3XrvA7l1hij1g="; + hash = "sha256-qPyspRYXolndNMLHG2Ln6eL0emRCYYr/00WhrX876k0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix index e895eb3180ac..2a05a85a4e14 100644 --- a/pkgs/development/python-modules/pylamarzocco/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -4,6 +4,7 @@ aioresponses, bleak, buildPythonPackage, + cryptography, fetchFromGitHub, mashumaro, pytest-asyncio, @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "pylamarzocco"; - version = "2.0.11"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pylamarzocco"; tag = "v${version}"; - hash = "sha256-g0qhNBhcU7Dogcw9WiEk+APk2McU7woXBqgeUS9D8iQ="; + hash = "sha256-dUFjbht0QGrWtSl3JIx1dx4UQs5gFNqKw+UObgH25pk="; }; build-system = [ setuptools ]; @@ -32,6 +33,7 @@ buildPythonPackage rec { dependencies = [ aiohttp bleak + cryptography mashumaro ]; diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix index 95acb47df0c0..b95074abb86b 100644 --- a/pkgs/development/python-modules/pymarshal/default.nix +++ b/pkgs/development/python-modules/pymarshal/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = { description = "Python data serialization library"; homepage = "https://github.com/stargateaudio/pymarshal"; - maintainers = with lib.maintainers; [ yuu ]; + maintainers = with lib.maintainers; [ ]; license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 240e3afc5287..61974b945f77 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.8.10"; + version = "0.8.12"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = "pypck"; tag = version; - hash = "sha256-0wwFkkIBQiRIdkMHsNHvqf1i5bzBNV7eP8uCWOk89oc="; + hash = "sha256-XXlHgr8/Cl3eu1vIDl/XykB2gv8PPkPIFEBG30yUue0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index cdabdace5294..da739b495b11 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -13,11 +13,12 @@ setuptools, samtools, zlib, + nix-update-script, }: -buildPythonPackage { +buildPythonPackage rec { pname = "pysam"; - version = "0.22.1-unstable-2024-10-30"; + version = "0.23.3"; pyproject = true; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is @@ -26,16 +27,19 @@ buildPythonPackage { src = fetchFromGitHub { owner = "pysam-developers"; repo = "pysam"; - rev = "0eae5be21ac3ab3ac7aa770a3931e2977e37b909"; - hash = "sha256-i8glYSpuCRNhNtK4i6eUrerz8daiMfY/YgDwgSuELbc="; + tag = "v${version}"; + hash = "sha256-yOLnfuGQW+j0nHy4MRlwurZMpeRHTGmQ9eLmihcAGoQ="; }; - nativeBuildInputs = [ + build-system = [ cython - samtools setuptools ]; + nativeBuildInputs = [ + samtools + ]; + buildInputs = [ bzip2 curl @@ -73,11 +77,15 @@ buildPythonPackage { "pysam.libchtslib" "pysam.libcutils" "pysam.libcvcf" + "pysam.libcsamtools" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Python module for reading, manipulating and writing genome data sets"; downloadPage = "https://github.com/pysam-developers/pysam"; + changelog = "https://github.com/pysam-developers/pysam/releases/tag/${src.tag}"; homepage = "https://pysam.readthedocs.io"; maintainers = with lib.maintainers; [ unode ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/pytest-reverse/default.nix b/pkgs/development/python-modules/pytest-reverse/default.nix index 7f12878b07ff..964cc1ad72d9 100644 --- a/pkgs/development/python-modules/pytest-reverse/default.nix +++ b/pkgs/development/python-modules/pytest-reverse/default.nix @@ -5,24 +5,21 @@ setuptools, pytest, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "pytest-reverse"; - version = "1.8.0"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + version = "1.9.0"; + pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; repo = "pytest-reverse"; - rev = version; - hash = "sha256-JEJwl/4RL1THQ7cGaS/84KdhIQHB9eLTY5uV+84ald8="; + tag = version; + hash = "sha256-d9wx4N3RnPbOk+dZuJaCdbtXfQQwjGo5MwVNrNVGtlo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ pytest ]; @@ -33,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to reverse test order"; homepage = "https://github.com/adamchainz/pytest-reverse"; - changelog = "https://github.com/adamchainz/pytest-reverse/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/adamchainz/pytest-reverse/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ mbalatsko ]; }; diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 32e200ec031b..5c7d491d44d8 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.44.0"; + version = "2.44.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "Python-roborock"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-Vd6ivFF55EXYymf6ulayW/X1yfNojL5N4p+I2CvWJP4="; + hash = "sha256-HXQqaXsbjzJ52yxP7m3Edc5HijwcGhZ6suu7QAcBu4A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 457b6d21d0f6..9b5de647dcb8 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/inducer/pytools/"; changelog = "https://github.com/inducer/pytools/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ artuuge ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 4ef02cb89b6a..e9d48ee56f23 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -64,7 +64,7 @@ let pname = "ray"; - version = "2.49.1"; + version = "2.49.2"; in buildPythonPackage rec { inherit pname version; @@ -85,28 +85,28 @@ buildPythonPackage rec { # Results are in ./ray-hashes.nix hashes = { x86_64-linux = { - cp310 = "sha256-k4TScFnK+Go4y7y0Iqthto3oczN4S/GyJyLXT9ugHvY="; - cp311 = "sha256-yKA5RHwwSeM226+f8WcylDr/i959U3Y5C8W3HrCMuZY="; - cp312 = "sha256-SEBk/KAnMuC29KCdrQ0ftqvUykttm/fCareheiiHzQk="; - cp313 = "sha256-147zp65IgZ1kD8BQBr8qfKq0ixXFZ6U6ecAV89AFSz0="; + cp310 = "sha256-dFZodq979OSOpLmzt1s02wU9EGTMTUsWcNxM549olK8="; + cp311 = "sha256-VAd93jOMX/ujSaSrYbcjUqPDvmnqW08bQ22Y1AsxJ2M="; + cp312 = "sha256-LsqqUfWIzN2ithVjqL44Q79l36qoOiQFiKMH9Ou4JHE="; + cp313 = "sha256-t9ghTP+G3wRP7HJ+7qvMw7/JsCcdKNYbqSwJ8NEn0B0="; }; aarch64-linux = { - cp310 = "sha256-jzmr4eTqXk3eJWfn5697QffrU/apw9PRy4APt6NlIQQ="; - cp311 = "sha256-y2/eQS5jT5MzPGRrEInk0xhLx/y3/AKBiJGygagCQNI="; - cp312 = "sha256-z2O5FuOZwqTUhCSWEals7ig87zLlRBJhFaStPocsNOs="; - cp313 = "sha256-lOHFBoiXxjVG0J6iY6iETOFjxtgM4wsa863HU3CL5jw="; + cp310 = "sha256-6uB7P+1F9bBBqL+Xlc0m+tJGS+USbv1EfkSEkFoptnc="; + cp311 = "sha256-6tqd2JzNpkOjxsLLpwFrWYmEMtEm4Qs4/tUtdBZTZPQ="; + cp312 = "sha256-3Q2NhkHRQvr+bYPofTwZvVY30h40YI0/9prXHqPi9GI="; + cp313 = "sha256-tMeGlojFGOkC97Yojt7CNlq00opGQpHm0KcEDH0Btfc="; }; x86_64-darwin = { - cp310 = "sha256-mQhrS7MgOL1jt1dWZ/3BQly3Ua/gQ07Q0Vjj0+4Mcm8="; - cp311 = "sha256-Wx4ACGFWodWJZk0ezOPUWJsInLqwnXuHgDYOWzSukHo="; - cp312 = "sha256-+TZd46mmYczwid+qwByLaLoAyYRDMw72eODAJIJyxyI="; - cp313 = "sha256-D7LijIDkWZ/+w6NOkmubASrRw1D0nNuNiJLderk7R4k="; + cp310 = "sha256-PkQb8qzX82jPRRMnUgZsXDuD2IzV+Fdi5wN3S7pPK20="; + cp311 = "sha256-ns6VehOYX3u/QHf0/wIEMU1+malB+V3/Kha0U9U3bcM="; + cp312 = "sha256-Z4TgduRBgiLvjuO2qL/rhn2Hl4A7Jbz8zjvzvFQUvvE="; + cp313 = "sha256-svTw/tk2+vaI6H/9zJNWwDRRPAAlmi8ahYnjRfz728A="; }; aarch64-darwin = { - cp310 = "sha256-+OEt19uCFahu9xg6LJwiECiA4OzQj5Sx0XrZ5gfko1k="; - cp311 = "sha256-lDJtsMg/fzkTUrE1s3qOynN8Gt3xiQKrGQvmuGCKgDk="; - cp312 = "sha256-96cVhV0XnB3Wri6LX4kZY4zeN5pbFXljoL100ReLi1o="; - cp313 = "sha256-XRnlaKjPvM8Si/NPnOSLy9EenwuU2xkEBPa+tVrkldI="; + cp310 = "sha256-CL7EZ1drwDDYvQY4AE4bjgdViJKTSREpiKS9SShoTow="; + cp311 = "sha256-T7n5v2L9XJLSLaIM0qrLSt4fsjAzdl+pJ08KDFC8QvY="; + cp312 = "sha256-1tYS3lxjQbd2/HXt7uW2mLtK9+6Eov8wVSsyqebkp3I="; + cp313 = "sha256-Li/iD6kFYuc2MNqf95MtPtZQfnMpHE2b31ZlN66d7d8="; }; }; in diff --git a/pkgs/development/python-modules/ray/prefetch.sh b/pkgs/development/python-modules/ray/prefetch.sh index e91ca7d77f8f..56722c405849 100755 --- a/pkgs/development/python-modules/ray/prefetch.sh +++ b/pkgs/development/python-modules/ray/prefetch.sh @@ -3,26 +3,26 @@ outfile="ray-hashes.nix" # Clear file -echo "" >$outfile +rm -f $outfile prefetch() { - package_attr="python${1}Packages.ray" - echo "Fetching hash for $package_attr on $2" + package_attr="python${1}Packages.ray" + echo "Fetching hash for $package_attr on $2" - expr="(import { system = \"$2\"; }).$package_attr.src.url" - url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r) + expr="(import { system = \"$2\"; }).$package_attr.src.url" + url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r) - sha256=$(nix-prefetch-url "$url") - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$sha256") + sha256=$(nix-prefetch-url "$url") + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$sha256") - echo -e " cp${1} = \"${hash}\";" >>$outfile - echo + echo -e " cp${1} = \"${hash}\";" >>$outfile + echo } for system in "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"; do - echo "${system} = {" >>$outfile - for python_version in "310" "311" "312" "313"; do - prefetch "$python_version" "$system" - done - echo "};" >>$outfile + echo "${system} = {" >>$outfile + for python_version in "310" "311" "312" "313"; do + prefetch "$python_version" "$system" + done + echo "};" >>$outfile done diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix index 884c0905e21e..308e6bc15233 100644 --- a/pkgs/development/python-modules/reqif/default.nix +++ b/pkgs/development/python-modules/reqif/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/strictdoc-project/reqif"; changelog = "https://github.com/strictdoc-project/reqif/releases/tag/${src.tag}"; license = licenses.asl20; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix index c42d58374018..c0b2e143a8fb 100644 --- a/pkgs/development/python-modules/rerun-sdk/default.nix +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -18,6 +18,7 @@ typing-extensions, # tests + datafusion, pytestCheckHook, torch, }: @@ -64,6 +65,7 @@ buildPythonPackage { pythonImportsCheck = [ "rerun" ]; nativeCheckInputs = [ + datafusion pytestCheckHook torch ]; @@ -74,6 +76,9 @@ buildPythonPackage { disabledTestPaths = [ # "fixture 'benchmark' not found" "tests/python/log_benchmark/test_log_benchmark.py" + + # ConnectionError: Connection error: transport error + "rerun_py/tests/unit/test_datafusion_tables.py" ]; meta = { diff --git a/pkgs/development/python-modules/rki-covid-parser/default.nix b/pkgs/development/python-modules/rki-covid-parser/default.nix deleted file mode 100644 index 655767690105..000000000000 --- a/pkgs/development/python-modules/rki-covid-parser/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - aiohttp, - aioresponses, - buildPythonPackage, - fetchFromGitHub, - pytest-aiohttp, - pytestCheckHook, - pythonOlder, - setuptools, -}: - -buildPythonPackage rec { - pname = "rki-covid-parser"; - version = "1.3.3"; - pyproject = true; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "thebino"; - repo = "rki-covid-parser"; - tag = "v${version}"; - hash = "sha256-e0MJjE4zgBPL+vt9EkgsdGrgqUyKK/1S9ZFxy56PUjc="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ aiohttp ]; - - nativeCheckInputs = [ - aioresponses - pytest-aiohttp - pytestCheckHook - ]; - - disabledTestPaths = [ - # Tests require network access - "tests/test_districts.py" - "tests/test_endpoint_availibility.py" - ]; - - pythonImportsCheck = [ "rki_covid_parser" ]; - - meta = with lib; { - description = "Python module for working with data from the Robert-Koch Institut"; - homepage = "https://github.com/thebino/rki-covid-parser"; - changelog = "https://github.com/thebino/rki-covid-parser/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix deleted file mode 100644 index b889b4826a16..000000000000 --- a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - aiohttp, - buildPythonPackage, - fetchFromGitHub, - pytest-aiohttp, - pytestCheckHook, - pythonOlder, - setuptools, -}: - -buildPythonPackage rec { - pname = "rtsp-to-webrtc"; - version = "0.6.1"; - pyproject = true; - - disabled = pythonOlder "3.10"; - - src = fetchFromGitHub { - owner = "allenporter"; - repo = "rtsp-to-webrtc-client"; - tag = version; - hash = "sha256-D022d2CDKtHTuvEGo8GkOGWHi5sV4g6UwNB9xS2xxIs="; - }; - - build-system = [ setuptools ]; - - dependencies = [ aiohttp ]; - - nativeCheckInputs = [ - pytest-aiohttp - pytestCheckHook - ]; - - pythonImportsCheck = [ "rtsp_to_webrtc" ]; - - meta = with lib; { - description = "Module for RTSPtoWeb and RTSPtoWebRTC"; - homepage = "https://github.com/allenporter/rtsp-to-webrtc-client"; - changelog = "https://github.com/allenporter/rtsp-to-webrtc-client/releases/tag/${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/scanpy/default.nix b/pkgs/development/python-modules/scanpy/default.nix index 44d3f8488279..095f5bbf08df 100644 --- a/pkgs/development/python-modules/scanpy/default.nix +++ b/pkgs/development/python-modules/scanpy/default.nix @@ -165,6 +165,9 @@ buildPythonPackage rec { # fails to find the trivial test script for some reason: "test_external" + + # AssertionError: Not equal to tolerance rtol=1e-07, atol=0 + "test_connectivities_euclidean" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 347c9364e41b..ef4e4ed9719b 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -17,6 +17,7 @@ biom-format, statsmodels, patsy, + array-api-compat, python, pytestCheckHook, @@ -51,6 +52,7 @@ buildPythonPackage rec { biom-format statsmodels patsy + array-api-compat ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -58,11 +60,6 @@ buildPythonPackage rec { # only the $out dir contains the built cython extensions, so we run the tests inside there enabledTestPaths = [ "${placeholder "out"}/${python.sitePackages}/skbio" ]; - disabledTestPaths = [ - # don't know why, but this segfaults - "${placeholder "out"}/${python.sitePackages}/skbio/metadata/tests/test_intersection.py" - ]; - pythonImportsCheck = [ "skbio" ]; meta = { diff --git a/pkgs/development/python-modules/sectools/default.nix b/pkgs/development/python-modules/sectools/default.nix index 2dfd890a3376..3793ccd6912f 100644 --- a/pkgs/development/python-modules/sectools/default.nix +++ b/pkgs/development/python-modules/sectools/default.nix @@ -3,27 +3,24 @@ buildPythonPackage, fetchFromGitHub, ldap3, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "sectools"; - version = "1.4.4"; + version = "1.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "p0dalirius"; repo = "sectools"; tag = version; - hash = "sha256-dI0zokmndMZ4C7aX73WOdyXvOjCQJzZU6C1uXDt97Vg="; + hash = "sha256-P0ixL6zdEcvL7KKbr1LcJyd8mqPZrwklspJmZ/KokEA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ ldap3 ]; + dependencies = [ ldap3 ]; # Module has no tests doCheck = false; @@ -34,7 +31,7 @@ buildPythonPackage rec { description = "Library containing functions to write security tools"; homepage = "https://github.com/p0dalirius/sectools"; changelog = "https://github.com/p0dalirius/sectools/releases/tag/${src.tag}"; - license = with licenses; [ gpl3Only ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index b17c173e0144..a9726c37815c 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.44.0"; + version = "0.45.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "NabuCasa"; repo = "snitun"; tag = version; - hash = "sha256-jZRA/UKamB5fUSvyaemN0Vq4GX6bNL8rsYCgToEkIL4="; + hash = "sha256-LAl6En7qMiGeKciY6UIOgtfaCdHqx/T/ohv9vQvk9gE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sphinx-markdown-tables/default.nix b/pkgs/development/python-modules/sphinx-markdown-tables/default.nix index 6c9d36c69f0c..373bbd63e184 100644 --- a/pkgs/development/python-modules/sphinx-markdown-tables/default.nix +++ b/pkgs/development/python-modules/sphinx-markdown-tables/default.nix @@ -26,7 +26,6 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension for rendering tables written in markdown"; homepage = "https://github.com/ryanfox/sphinx-markdown-tables"; - maintainers = with maintainers; [ Madouura ]; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index e9f655a617af..7973265d7960 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,6 +14,22 @@ pyxdg, pyzmq, wurlitzer, + + # tests + anyio, + django, + flaky, + h5py, + numpy, + pandas, + pillow, + polars, + pyarrow, + pydicom, + pytestCheckHook, + scipy, + writableTmpDirAsHomeHook, + xarray, }: buildPythonPackage rec { @@ -44,8 +60,36 @@ buildPythonPackage rec { wurlitzer ]; - # No tests - doCheck = false; + nativeCheckInputs = [ + anyio + django + flaky + h5py + numpy + pandas + pillow + polars + pyarrow + pydicom + pytestCheckHook + scipy + writableTmpDirAsHomeHook + xarray + ]; + + disabledTests = [ + "test_umr_reload_modules" + # OSError: Kernel failed to start + "test_debug_namespace" + "test_enter_debug_after_interruption" + "test_global_message" + "test_interrupt_long_sleep" + "test_interrupt_short_loop" + "test_matplotlib_inline" + "test_multiprocessing" + "test_np_threshold" + "test_runfile" + ]; pythonImportsCheck = [ "spyder_kernels" ]; diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index 59a2bbd6243c..1cec6aca987b 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { "test_get_keys" "connect_via_proxy" "read_ssh_config" + # Test doesn't work with paramiko < 4.0.0 and the patch above + "test_read_private_key_file" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/systembridgemodels/default.nix b/pkgs/development/python-modules/systembridgemodels/default.nix index c4d522841d2f..4ee187884243 100644 --- a/pkgs/development/python-modules/systembridgemodels/default.nix +++ b/pkgs/development/python-modules/systembridgemodels/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "systembridgemodels"; - version = "4.2.5"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = "system-bridge-models"; tag = version; - hash = "sha256-k7QENmfw27qxacB6j1F8ywYfZyQC27PvnkWWQayk310="; + hash = "sha256-Yh16la+3zk+igdMyHov4rf2M1yAT3JYYe/0IYu/SmVY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tagoio-sdk/default.nix b/pkgs/development/python-modules/tagoio-sdk/default.nix index efc9fff18e22..b7f8944e682e 100644 --- a/pkgs/development/python-modules/tagoio-sdk/default.nix +++ b/pkgs/development/python-modules/tagoio-sdk/default.nix @@ -3,21 +3,20 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, pytestCheckHook, python-dateutil, python-socketio, - pythonOlder, requests, requests-mock, + requests-toolbelt, + sseclient-py, }: buildPythonPackage rec { pname = "tagoio-sdk"; version = "5.0.3"; - format = "pyproject"; - - disabled = pythonOlder "3.9"; + pyproject = true; src = fetchFromGitHub { owner = "tago-io"; @@ -28,15 +27,15 @@ buildPythonPackage rec { pythonRelaxDeps = [ "requests" ]; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp python-dateutil python-socketio requests + requests-toolbelt + sseclient-py ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix index cffd4d5483f2..41d6f6e6596f 100644 --- a/pkgs/development/python-modules/textx/default.nix +++ b/pkgs/development/python-modules/textx/default.nix @@ -62,7 +62,7 @@ let mainProgram = "textx"; homepage = "https://github.com/textx/textx/"; license = licenses.mit; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; }; }; diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index 03ac0195c2d3..d3ebd886d6bf 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, cython, fetchFromGitHub, + fetchpatch, ply, pythonOlder, six, @@ -24,6 +25,12 @@ buildPythonPackage rec { hash = "sha256-idUKqpyRj8lq9Aq6vEEeYEawzRPOdNsySnkgfhwPtMc="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Thriftpy/thriftpy2/commit/0127d259eb4b96acb060cd158ca709f0597b148c.patch"; + sha256 = "sha256-UBcbd8NTkPyko1s9jTjKlQ7HprwtyOZS0m66u1CPH3A="; + }) + ]; build-system = [ setuptools ]; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index c22016654700..10094f9accee 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -317,7 +317,6 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ SomeoneSerge - Madouura derdennisop ]; }; diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix index 7ec4a8f21af1..04c15bf09326 100644 --- a/pkgs/development/python-modules/waterfurnace/default.nix +++ b/pkgs/development/python-modules/waterfurnace/default.nix @@ -3,51 +3,44 @@ buildPythonPackage, click, fetchFromGitHub, - mock, pytestCheckHook, requests, - pythonOlder, + setuptools, websocket-client, }: buildPythonPackage rec { pname = "waterfurnace"; - version = "1.1.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "1.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "sdague"; repo = "waterfurnace"; tag = "v${version}"; - sha256 = "1ba247fw1fvi7zy31zj2wbjq7fajrbxhp139cl9jj67rfvxfv8xf"; + sha256 = "sha256-lix8dU9PxlsXIzKNFuUJkd80cUYXfTXSnFLu1ULACkE="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ click requests websocket-client ]; nativeCheckInputs = [ - mock pytestCheckHook ]; pythonImportsCheck = [ "waterfurnace" ]; - meta = with lib; { + meta = { description = "Python interface to waterfurnace geothermal systems"; - mainProgram = "waterfurnace-debug"; + mainProgram = "waterfurnace"; homepage = "https://github.com/sdague/waterfurnace"; - changelog = "https://github.com/sdague/waterfurnace/blob/v${version}/HISTORY.rst"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/sdague/waterfurnace/blob/${src.tag}/HISTORY.rst"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/wavefile/default.nix b/pkgs/development/python-modules/wavefile/default.nix index c36b099f26d0..3634732ca7e3 100644 --- a/pkgs/development/python-modules/wavefile/default.nix +++ b/pkgs/development/python-modules/wavefile/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { description = "Pythonic libsndfile wrapper to read and write audio files"; homepage = "https://github.com/vokimon/python-wavefile"; changelog = "https://github.com/vokimon/python-wavefile#version-history"; - maintainers = with maintainers; [ yuu ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix index 0760ef3f2270..bcf1f70b0227 100644 --- a/pkgs/development/python-modules/wgpu-py/default.nix +++ b/pkgs/development/python-modules/wgpu-py/default.nix @@ -38,14 +38,14 @@ }: buildPythonPackage rec { pname = "wgpu-py"; - version = "0.23.0"; + version = "0.24.0"; pyproject = true; src = fetchFromGitHub { owner = "pygfx"; repo = "wgpu-py"; tag = "v${version}"; - hash = "sha256-z9MRnhPSI+9lGS0UQ5VnSwdCGdYdNnqlDQmb8JAqmyc="; + hash = "sha256-t6ILhMeDl8pdOKXkDpJPnXZRrKD+pIgS6BWurhGMalk="; }; postPatch = diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix index f3eb04f87c5b..ff7ded208f81 100644 --- a/pkgs/development/python-modules/yara-x/default.nix +++ b/pkgs/development/python-modules/yara-x/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "yara-x"; - version = "1.6.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "yara-x"; tag = "v${version}"; - hash = "sha256-LpdpdzUof+Buz5QQcWUr23AsSyfvUQYPp7RhHWXRb+I="; + hash = "sha256-Ux7BA5LH1HN7Kq84UQw7n7Ad/LmHekdWkLaUIxvp5g8="; }; buildAndTestSubdir = "py"; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-IO8ER92vWO3Q9MntaGwdhEFgy9G35Q3LOG5GU5rJpQY="; + hash = "sha256-o9m1zPDhn5ZxBonQMTFp19jUYMInwW9r/O8UwQpExqk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/6/miopen/default.nix index 3a24c267ffaf..d3d64b2605be 100644 --- a/pkgs/development/rocm-modules/6/miopen/default.nix +++ b/pkgs/development/rocm-modules/6/miopen/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + callPackage, fetchFromGitHub, fetchpatch, rocmUpdateScript, @@ -297,6 +298,17 @@ stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = [ "big-parallel" ]; + passthru.tests = { + # Ensure all .tn.model files can be loaded by whatever version of frugally-deep we have + # This is otherwise hard to verify as MIOpen will only use these models on specific, + # expensive Instinct GPUs + # If MIOpen stops embedding .tn.model files the test will also fail, and can be deleted, + # likely along with the frugally-deep dependency + can-load-models = callPackage ./test-frugally-deep-model-loading.nix { + inherit (finalAttrs) src version; + inherit frugally-deep nlohmann_json; + }; + }; passthru.updateScript = rocmUpdateScript { name = finalAttrs.pname; inherit (finalAttrs.src) owner; diff --git a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.cpp b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.cpp new file mode 100644 index 000000000000..6b64b8099985 --- /dev/null +++ b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.cpp @@ -0,0 +1,55 @@ +#include +#include +#include +#include +#include + +int main() { + std::vector model_files; + std::string src_dir = std::getenv("SRC_DIR") ? std::getenv("SRC_DIR") : "."; + + // collect *tn.model files except _metadata + try { + for (const auto& entry : std::filesystem::recursive_directory_iterator(src_dir)) { + if (entry.is_regular_file()) { + std::string path = entry.path().string(); + if (path.find("tn.model") != std::string::npos && path.find("_metadata.") == std::string::npos) { + model_files.push_back(path); + } + } + } + } catch (const std::exception& e) { + std::cerr << "Error scanning directory: " << e.what() << std::endl; + return 1; + } + + if (model_files.empty()) { + std::cout << "No *.tn.model files found in " << src_dir << std::endl; + return 1; + } + + std::cout << "Found " << model_files.size() << " model files to test" << std::endl; + + int failed_count = 0; + for (const auto& model_file : model_files) { + std::cout << "Loading: " << model_file << " ... "; + std::cout.flush(); + + try { + const auto model = fdeep::load_model(model_file); + std::cout << "OK" << std::endl; + } catch (const std::exception& e) { + std::cout << "FAILED: " << e.what() << std::endl; + failed_count++; + } + } + + if (failed_count > 0) { + std::cerr << "\n" << failed_count << " out of " << model_files.size() + << " models failed to load" << std::endl; + return 1; + } + + std::cout << "\nAll " << model_files.size() << " models loaded successfully!" << std::endl; + return 0; +} diff --git a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix new file mode 100644 index 000000000000..36cadd774a65 --- /dev/null +++ b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + eigen, + frugally-deep, + functionalplus, + nlohmann_json, + src, + version, +}: + +stdenv.mkDerivation { + pname = "miopen-frugally-deep-model-test"; + inherit version src; + + dontConfigure = true; + dontInstall = true; + doCheck = true; + + buildPhase = '' + runHook preBuild + + $CXX -std=c++20 \ + -I${lib.getDev eigen}/include/eigen3 \ + -I${lib.getDev functionalplus}/include \ + -I${lib.getDev frugally-deep}/include \ + -I${lib.getDev nlohmann_json}/include \ + ${./test-frugally-deep-model-loading.cpp} \ + -o test_models + + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + + echo "Running model loading tests..." + SRC_DIR="${src}" ./test_models + mkdir -p $out + + runHook postCheck + ''; + + meta = { + description = "Test that frugally-deep can load MIOpen model files"; + maintainers = with lib.teams; [ rocm ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 8000474af74f..b249f8c25144 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -16,8 +16,8 @@ let hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc="; }; "10" = { - version = "10.15.1"; - hash = "sha256-jFOvAq4+wfsK51N3+NTWIXwtfL5vA8FjUMq/dJPebv8="; + version = "10.17.0"; + hash = "sha256-vZ7FQXZBOR4KyzkSspEr1bA4VAeoLalHRKdAe1Z/208="; }; }; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix index e0be2bb0621c..747457afa821 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix @@ -32,6 +32,10 @@ mkDerivation ( preConfigure = '' make include/.stamp configure nbtool_config.h.in defs.mk.in + '' + + lib.optionalString stdenv.buildPlatform.isDarwin '' + # Fix cross-compilation from darwin, remove after update to netbsd 10.0 + substituteInPlace Makefile --replace-warn "-no-cpp-precomp" "" ''; configurePlatforms = [ diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 41d23aa13240..cd207f1d610c 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -32,24 +32,18 @@ let readConfig = configfile: - lib.listToAttrs ( - map - ( - line: - let - match = lib.match "(.*)=\"?(.*)\"?" line; - in - { - name = lib.elemAt match 0; - value = lib.elemAt match 1; - } - ) - ( - lib.filter (line: !(lib.hasPrefix "#" line || line == "")) ( - lib.splitString "\n" (builtins.readFile configfile) - ) - ) - ); + let + matchLine = + line: + let + match = lib.match "(CONFIG_[^=]+)=([ym])" line; + in + lib.optional (match != null) { + name = lib.elemAt match 0; + value = lib.elemAt match 1; + }; + in + lib.listToAttrs (lib.concatMap matchLine (lib.splitString "\n" (builtins.readFile configfile))); in lib.makeOverridable ( { diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index bdfee03e92e8..d13533e15739 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.12.47"; - hash = "sha256-jR1VqFE1jF5mTRAp+Xxswmh9bMIolJtCk4QgMHzIhao="; + version = "6.12.48"; + hash = "sha256-2dtsMOAqTOgYE7FAMX6XDieI4IfXngnYcUg0JKoQrBs="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "6.16.7"; - hash = "sha256-/CFSGaDbK0pZgGGOOxixwOQgeD1OsbUhtRss4VbXHxE="; + version = "6.16.8"; + hash = "sha256-8CMzqXKbd605TU4XhPqUHVECrmW0OYbazZ4RpSji974="; }; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d4bcf116c8ea..e5679a63fa1c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.9.3"; + version = "2025.9.4"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix index f5a83ee9965b..b5b9d84e6e4f 100644 --- a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "hultenvp"; domain = "solis"; - version = "3.13.1"; + version = "3.13.2"; src = fetchFromGitHub { owner = "hultenvp"; repo = "solis-sensor"; rev = "v${version}"; - hash = "sha256-BhZqJVzNTCZ6XmqR7i6a7bMqk/6V+HXvtqOX4HiYqok="; + hash = "sha256-ny7nnBFDZyStoXMzmegKNzN9Gj1XNYETFXpNzUOs9Qc="; }; dependencies = [ aiofiles ]; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index 109e59fab9e4..490ab6a94803 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.7.2"; + version = "4.8.0"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-/c9hheiNJX3DBeLayX0fBAHBG3AxXHIwAVG6VlmrhnM="; + hash = "sha256-t70Nm695FBBsxnZ2wxPjo86OQ7X2/NLKkhePQ23xj/4="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-uPR26V9o8xnaXhNGnRqIwYtnHPoFznEG2wT+q4ByR1c="; + npmDepsHash = "sha256-TFfyq6wCQ6kAOHn75YqOTOrT17ASvOSnO2mr7qnc+Zw="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a41322917e92..4376780501bf 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -358,7 +358,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.9.3"; + hassVersion = "2025.9.4"; in python.pkgs.buildPythonApplication rec { @@ -379,13 +379,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-iGOpLZMrEu0z+VdQMn1OeI1rw4x3WawQemyOdt7j124="; + hash = "sha256-d2lsyW2yAkIbq7wx/pLu4Qzroblh/TYDx08r6im8cI8="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-iw5RNM6VoiGfCmGgqfqMQot9ArPlKk/tXJUJZNs7Kzg="; + hash = "sha256-mq2cjct4YrURV/T51w/skukwEsUV4iwDphuOftFOUdw="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 0669a31c14a5..70b9dbdfbc34 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -57,7 +57,7 @@ in }; jetty_12 = common { - version = "12.1.0"; - hash = "sha256-wVStusEURjaBYoh/37vO7PvdNFXrn7rLccchWGYzz+8="; + version = "12.1.1"; + hash = "sha256-VHmPhVEqq4eoOwo9O7sbdv6bJB9dCFkN+64jTlnFarM="; }; } diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 033db524760c..06ff39d815be 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -65,8 +65,8 @@ in }; tomcat10 = common { - version = "10.1.44"; - hash = "sha256-4CDC+oZJ8d6au8LdznDdYemX0O0WHuAqMN5LIhJjvpw="; + version = "10.1.46"; + hash = "sha256-RenV71YatGt0x19AwzuD9J4T556Z9zbf+OiUhVfpaNo="; }; tomcat11 = common { diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index ef46416f1d7f..6c521e671de7 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -5,8 +5,8 @@ let in { mir = common { - version = "2.22.0"; - hash = "sha256-46FxyS4Anm1id63GUUCzn9ubTQIvs1+HrXKgZki6fQw="; + version = "2.22.1"; + hash = "sha256-NESLpKedoI+WjnwmtmdTvqo+mbCopb2wCA5J4t49YSk="; }; mir_2_15 = common { diff --git a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix index 39b4c422675b..e8778ca26b10 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix @@ -7,13 +7,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg_roaringbitmap"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "ChenHuajun"; repo = "pg_roaringbitmap"; tag = "v${finalAttrs.version}"; - hash = "sha256-E6vqawnsRsAIajGDgJcTUWV1H8GFFboTjhmVfemUGbs="; + hash = "sha256-5tThowu8k7R33rD/SXINOmzfgSkc4P3lVJ35BeCinZw="; }; meta = { diff --git a/pkgs/servers/web-apps/szurubooru/001-server-pillow-heif.patch b/pkgs/servers/web-apps/szurubooru/001-server-pillow-heif.patch new file mode 100644 index 000000000000..d36d558fbf42 --- /dev/null +++ b/pkgs/servers/web-apps/szurubooru/001-server-pillow-heif.patch @@ -0,0 +1,66 @@ +commit f89ce378d3b405d69635da28dfd57adced23aa17 +Author: kuflierl <41301536+kuflierl@users.noreply.github.com> +Date: Mon Sep 15 20:14:08 2025 +0200 + + server: replace pillow-avif-plugin, pyheif, heif-image-plugin with pillow-heif + +diff --git a/requirements.txt b/requirements.txt +index ffe18f0c..16a72750 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,12 +1,10 @@ + alembic>=0.8.5 + certifi>=2017.11.5 + coloredlogs==5.0 +-heif-image-plugin==0.3.2 + numpy>=1.8.2 +-pillow-avif-plugin~=1.1.0 +-pillow>=4.3.0 ++pillow>=11.2.1 ++pillow-heif>=1.0.0 + psycopg2-binary>=2.6.1 +-pyheif==0.6.1 + pynacl>=1.2.1 + pyRFC3339>=1.0 + pytz>=2018.3 +diff --git a/szurubooru/func/image_hash.py b/szurubooru/func/image_hash.py +index 76d5a846..b89541eb 100644 +--- a/szurubooru/func/image_hash.py ++++ b/szurubooru/func/image_hash.py +@@ -4,13 +4,13 @@ from datetime import datetime + from io import BytesIO + from typing import Any, Callable, List, Optional, Set, Tuple + +-import HeifImagePlugin ++from pillow_heif import register_heif_opener + import numpy as np +-import pillow_avif + from PIL import Image + + from szurubooru import config, errors + ++register_heif_opener() + logger = logging.getLogger(__name__) + + # Math based on paper from H. Chi Wong, Marshall Bern and David Goldberg +diff --git a/szurubooru/func/images.py b/szurubooru/func/images.py +index e135d182..f4b5aa5b 100644 +--- a/szurubooru/func/images.py ++++ b/szurubooru/func/images.py +@@ -7,14 +7,14 @@ import subprocess + from io import BytesIO + from typing import List + +-import HeifImagePlugin +-import pillow_avif ++from pillow_heif import register_heif_opener + from PIL import Image as PILImage + + from szurubooru import errors + from szurubooru.func import mime, util + + logger = logging.getLogger(__name__) ++register_heif_opener() + + + def convert_heif_to_png(content: bytes) -> bytes: diff --git a/pkgs/servers/web-apps/szurubooru/server.nix b/pkgs/servers/web-apps/szurubooru/server.nix index 3c8a95818b4e..594ef1d04859 100644 --- a/pkgs/servers/web-apps/szurubooru/server.nix +++ b/pkgs/servers/web-apps/szurubooru/server.nix @@ -20,10 +20,6 @@ let doCheck = false; }); - pyheif = super.pyheif.overridePythonAttrs (oldAttrs: { - doCheck = false; - }); - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.3.23"; src = fetchPypi { @@ -50,18 +46,20 @@ python.pkgs.buildPythonApplication { src = "${src}/server"; + patches = [ + ./001-server-pillow-heif.patch + ]; + nativeBuildInputs = with python.pkgs; [ setuptools ]; propagatedBuildInputs = with python.pkgs; [ alembic certifi coloredlogs - heif-image-plugin legacy-cgi numpy - pillow-avif-plugin pillow + pillow-heif psycopg2-binary - pyheif pynacl pyrfc3339 pytz diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 9f4da6aa77d6..edd4ed74468f 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -18,17 +18,17 @@ let # keep this in sync with github.com/DataDog/agent-payload dependency - payloadVersion = "5.0.124"; + payloadVersion = "5.0.164"; python = pythonPackages.python; owner = "DataDog"; repo = "datadog-agent"; goPackagePath = "github.com/${owner}/${repo}"; - version = "7.56.2"; + version = "7.70.2"; src = fetchFromGitHub { inherit owner repo; - rev = version; - hash = "sha256-rU3eg92MuGs/6r7oJho2roeUCZoyfqYt1xOERoRPqmQ="; + tag = version; + hash = "sha256-yXtybHWrm+6kWW396FLlRZI0YVuThGuLfSYzoNXAEBU="; }; rtloader = stdenv.mkDerivation { pname = "datadog-agent-rtloader"; @@ -49,11 +49,7 @@ buildGoModule rec { doCheck = false; - vendorHash = - if stdenv.hostPlatform.isDarwin then - "sha256-3Piq5DPMTZUEjqNkw5HZY25An2kATX6Jac9unQfZnZc=" - else - "sha256-FR0Et3DvjJhbYUPy9mpN0QCJ7QDU4VRZFUTL0J1FSXw="; + vendorHash = "sha256-iWOwhfSI7mLmDy6yewV0h9Y4pjYAV6Tz6TxsINOxYMg="; subPackages = [ "cmd/agent" @@ -67,10 +63,14 @@ buildGoModule rec { makeWrapper ]; buildInputs = [ rtloader ] ++ lib.optionals withSystemd [ systemd ]; - PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; + + proxyVendor = true; + + env.PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; tags = [ "ec2" + "kubelet" "python" "process" "log" @@ -97,7 +97,7 @@ buildGoModule rec { postPatch = '' sed -e "s|PyChecksPath =.*|PyChecksPath = filepath.Join(_here, \"..\", \"${python.sitePackages}\")|" \ -e "s|distPath =.*|distPath = filepath.Join(_here, \"..\", \"share\", \"datadog-agent\")|" \ - -i cmd/agent/common/path/path_nix.go + -i pkg/util/defaultpaths/path_nix.go sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \ -i pkg/util/hostname/fqdn_nix.go ''; diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix index 263b5f51d277..5cd012ad4434 100644 --- a/pkgs/tools/networking/dd-agent/integrations-core.nix +++ b/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -42,14 +42,14 @@ let inherit (lib) attrValues mapAttrs; + version = "7.70.2"; src = fetchFromGitHub { owner = "DataDog"; repo = "integrations-core"; - rev = version; - sha256 = "sha256-p5eoNNHQQl314mfUk2t3qQaerPu02GKA+tKkAY7bojk="; + tag = version; + hash = "sha256-3H8nQpy/m53ZjtDfe6s89yowBXnPt+1ARfWxcx+JwQM="; }; - version = "7.56.2"; # Build helper to build a single datadog integration package. buildIntegration = @@ -75,19 +75,13 @@ let pname = "checks-base"; sourceRoot = "datadog_checks_base"; - # Make setuptools build the 'base' and 'checks' modules. - postPatch = '' - substituteInPlace setup.py \ - --replace "from setuptools import setup" "from setuptools import find_packages, setup" \ - --replace "packages=['datadog_checks']" "packages=find_packages()" - ''; - - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ binary cachetools cryptography immutables jellyfish + lazy-loader prometheus-client protobuf pydantic diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b991514bb974..a30a122bbfa3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -779,6 +779,7 @@ mapAliases { du-dust = dust; # Added 2024-01-19 duckstation = throw "'duckstation' has been removed due to being unmaintained"; # Added 2025-08-03 duckstation-bin = throw "'duckstation-bin' has been removed due to being unmaintained"; # Added 2025-08-03 + dumb = throw "'dumb' has been archived by upstream. Upstream recommends libopenmpt as a replacement."; # Added 2025-09-14 dump1090 = dump1090-fa; # Added 2024-02-12 dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17 @@ -2081,6 +2082,7 @@ mapAliases { polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18 poppler_utils = poppler-utils; # Added 2025-02-27 powerline-rs = throw "'powerline-rs' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 + prboom-plus = throw "'prboom-plus' has been removed since it is unmaintained upstream."; # Added 2025-09-14 premake3 = throw "'premake3' has been removed since it is unmaintained. Consider using 'premake' instead"; # Added 2025-05-10 prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20 prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20 @@ -2353,6 +2355,7 @@ mapAliases { starpls-bin = starpls; # Added 2024-10-30 starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 station = throw "station has been removed from nixpkgs, as there were no committers among its maintainers to unblock security issues"; # added 2025-06-16 + steamcontroller = throw "'steamcontroller' has been removed due to lack of upstream maintenance. Consider using 'sc-controller' instead."; # Added 2025-09-20 steamPackages = { steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; # Added 2024-10-16 steam = lib.warnOnInstantiate "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; # Added 2024-10-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e0160c21daf..60bbc25e9021 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1915,8 +1915,6 @@ with pkgs; extraPackages = [ ffmpeg ]; }; - commitizen = with python3Packages; toPythonApplication commitizen; - compactor = callPackage ../applications/networking/compactor { protobuf = protobuf_21; }; @@ -6647,8 +6645,6 @@ with pkgs; ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix { }; - cubiomes-viewer = libsForQt5.callPackage ../applications/misc/cubiomes-viewer { }; - # can't use override - it triggers infinite recursion cmakeMinimal = callPackage ../by-name/cm/cmake/package.nix { isMinimalBuild = true; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d64f7f282c8e..b84c20d1a1b4 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -819,7 +819,7 @@ in src, modDirVersion ? lib.versions.pad 3 version, configfile, - allowImportFromDerivation ? true, + allowImportFromDerivation ? false, }: recurseIntoAttrs ( packagesFor (manualConfig { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 68c0ebc5d27b..622ac5299c6d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -161,6 +161,7 @@ mapAliases ({ codespell = throw "codespell has been promoted to a top-level attribute name: `pkgs.codespell`"; # Added 2022-10-02 ColanderAlchemy = colanderalchemy; # added 2023-02-19 command_runner = command-runner; # added 2024-03-06 + commitizen = throw "commitizen has been promoted to a top-level attribute name: `pkgs.commitizen`"; # added 2025-09-14 CommonMark = commonmark; # added 2023-02-1 ConfigArgParse = configargparse; # added 2021-03-18 configshell = configshell-fb; # added 2025-03-14 @@ -733,12 +734,14 @@ mapAliases ({ retworkx = rustworkx; # added 2023-05-14 rig = throw "rig has been removed because it was pinned to python 2.7 and 3.5, failed to build and is otherwise unmaintained"; # added 2022-11-28 rising = throw "rising has been removed because it was abandoned and archived by upstream"; # added 2024-11-15 + rki-covid-parser = throw "rki-covid-parser has been removed because it is unmaintained and broken"; # added 2025-09-20 rl-coach = "rl-coach was removed because the project is discontinued and was archived by upstream"; # added 2023-05-03 roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 ronin = throw "ronin has been removed because it was unmaintained since 2018"; # added 2024-08-21 ROPGadget = ropgadget; # added 2021-07-06 rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 rtslib = rtslib-fb; # added 2025-03-14 + rtsp-to-webrtc = throw "rtsp-to-webrtc has been removed because it is unmaintained"; # added 2025-09-20 ruamel_base = ruamel-base; # added 2021-11-01 ruamel_yaml = ruamel-yaml; # added 2021-11-01 ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59d1335b3327..0dfbba962745 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2891,8 +2891,6 @@ self: super: with self; { commentjson = callPackage ../development/python-modules/commentjson { }; - commitizen = callPackage ../development/python-modules/commitizen { }; - commoncode = callPackage ../development/python-modules/commoncode { }; commonmark = callPackage ../development/python-modules/commonmark { }; @@ -16025,8 +16023,6 @@ self: super: with self; { rjsmin = callPackage ../development/python-modules/rjsmin { }; - rki-covid-parser = callPackage ../development/python-modules/rki-covid-parser { }; - rkm-codes = callPackage ../development/python-modules/rkm-codes { }; rlax = callPackage ../development/python-modules/rlax { }; @@ -16211,8 +16207,6 @@ self: super: with self; { rtslib-fb = callPackage ../development/python-modules/rtslib-fb { }; - rtsp-to-webrtc = callPackage ../development/python-modules/rtsp-to-webrtc { }; - ruamel-base = callPackage ../development/python-modules/ruamel-base { }; ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml { };