diff --git a/ci/OWNERS b/ci/OWNERS index 052135bf6a68..34a8f652f16e 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -26,10 +26,10 @@ # Libraries /lib @infinisil @hsjobeki -/lib/generators.nix @infinisil @hsjobeki @Profpatsch -/lib/cli.nix @infinisil @hsjobeki @Profpatsch -/lib/debug.nix @infinisil @hsjobeki @Profpatsch -/lib/asserts.nix @infinisil @hsjobeki @Profpatsch +/lib/generators.nix @infinisil @hsjobeki +/lib/cli.nix @infinisil @hsjobeki +/lib/debug.nix @infinisil @hsjobeki +/lib/asserts.nix @infinisil @hsjobeki /lib/path/* @infinisil @hsjobeki /lib/fileset @infinisil @hsjobeki /maintainers/github-teams.json @infinisil @@ -75,7 +75,7 @@ /pkgs/pkgs-lib @Stunkymonkey @h7x4 # Nixpkgs build-support -/pkgs/build-support/writers @lassulus @Profpatsch +/pkgs/build-support/writers @lassulus # Nixpkgs make-disk-image /doc/build-helpers/images/makediskimage.section.md @raitobezarius @@ -335,8 +335,8 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/build-support/dlang @jtbx @TomaSajt # Dhall -/pkgs/development/dhall-modules @Gabriella439 @Profpatsch -/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch +/pkgs/development/dhall-modules @Gabriella439 +/pkgs/development/interpreters/dhall @Gabriella439 # Agda /pkgs/build-support/agda @NixOS/agda @@ -349,9 +349,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/development/idris-modules @Infinisil /pkgs/development/compilers/idris2 @mattpolzin -# Bazel -/pkgs/by-name/ba/bazel_7 @Profpatsch - # NixOS modules for e-mail and dns services /nixos/modules/services/mail/mailman.nix @peti /nixos/modules/services/mail/postfix.nix @peti diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 5d8e778e85b3..7cbe9c27dd07 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -41,7 +41,6 @@ "description": "Maintenance of https://bazel.build/ and related packages", "id": 5468470, "maintainers": { - "Profpatsch": 3153638 }, "members": { "aherrmann": 732652, diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 4a6081ea0561..bbbe172038d5 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -164,7 +164,7 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro - [prometheus-nats-exporter](https://github.com/nats-io/prometheus-nats-exporter), a Prometheus exporter for NATS. Available as [services.prometheus.exporters.nats](#opt-services.prometheus.exporters.nats.enable). -- [pyLoad](https://pyload.net/), a FOSS download manager written in Python. Available as [services.pyload](#opt-services.pyload.enable). +- [pyLoad](https://pyload.net/), a FOSS download manager written in Python. Available as `services.pyload`. - [Python Matter Server](https://github.com/home-assistant-libs/python-matter-server), a Matter Controller Server exposing websocket connections for use with other services, notably Home Assistant. diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 93698e98ed86..0b93852ee432 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -129,6 +129,8 @@ - `services.statsd` has been removed because the packages it relies on do not exist anymore in nixpkgs. +- `services.pyload` has been removed because the package it relies on does not exist anymore in nixpkgs due to vulnerabilities and being unmaintained. + - `services.tandoor-recipes` now uses a sub-directory for media files by default starting with `26.05`. Existing setups should move media files out of the data directory and adjust `services.tandoor-recipes.extraConfig.MEDIA_ROOT` accordingly. See [Migrating media files for pre 26.05 installations](#module-services-tandoor-recipes-migrating-media). - `rustic` was upgraded to `0.11.x`, which contains breaking [changes to command-line parameters and configuration file](https://rustic.cli.rs/docs/breaking_changes.html#0110). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3347adb1d145..c1056ec727eb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1347,7 +1347,6 @@ ./services/networking/pptpd.nix ./services/networking/privoxy.nix ./services/networking/prosody.nix - ./services/networking/pyload.nix ./services/networking/quassel.nix ./services/networking/quicktun.nix ./services/networking/r53-ddns.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 8843fdd68f79..199cb3fb2f59 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -486,6 +486,9 @@ in (mkRemovedOptionModule [ "programs" "spacefm" ] '' spacefm has been removed since it was unmaintained upstream. '') + (mkRemovedOptionModule [ "services" "pyload" ] '' + services.pyload has been removed since the pyload-ng package had vulnerabilities and was unmaintained in nixpkgs. + '') # Do NOT add any option renames here, see top of the file ]; } diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index ca0a88246528..d4a99ba8a7b6 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -80,6 +80,28 @@ in systemd.sockets."polkit-agent-helper".wantedBy = [ "sockets.target" ]; + systemd.services."polkit-agent-helper@".serviceConfig = lib.mkMerge [ + # The upstream unit inherits stderr to the polkit agent, which causes + # agent processes to misinterpret diagnostic output from PAM modules + # as protocol errors, resulting in tight re-execution loops. + { StandardError = "journal"; } + + # The upstream unit uses PrivateDevices=yes and ProtectHome=yes, + # which prevents PAM modules from accessing hardware (e.g. FIDO + # tokens via /dev/hidraw*) or reading key files from home directories. + (lib.mkIf config.security.pam.u2f.enable { + # Override upstream PrivateDevices=yes to allow access to /dev/hidraw* + PrivateDevices = false; + DeviceAllow = [ + "/dev/urandom r" + "char-hidraw rw" + ]; + # Override upstream ProtectHome=yes so pam_u2f can read + # ~/.config/Yubico/u2f_keys (the default key file location) + ProtectHome = "read-only"; + }) + ]; + # The polkit daemon reads action/rule files environment.pathsToLink = [ "/share/polkit-1" ]; diff --git a/nixos/modules/services/networking/pyload.nix b/nixos/modules/services/networking/pyload.nix deleted file mode 100644 index 858c97fdf54e..000000000000 --- a/nixos/modules/services/networking/pyload.nix +++ /dev/null @@ -1,176 +0,0 @@ -{ - config, - lib, - pkgs, - utils, - ... -}: -let - cfg = config.services.pyload; - - stateDir = "/var/lib/pyload"; -in -{ - meta.maintainers = with lib.maintainers; [ ambroisie ]; - - options = with lib; { - services.pyload = { - enable = mkEnableOption "pyLoad download manager"; - - package = mkPackageOption pkgs "pyLoad" { default = [ "pyload-ng" ]; }; - - listenAddress = mkOption { - type = types.str; - default = "localhost"; - example = "0.0.0.0"; - description = "Address to listen on for the web UI."; - }; - - port = mkOption { - type = types.port; - default = 8000; - example = 9876; - description = "Port to listen on for the web UI."; - }; - - downloadDirectory = mkOption { - type = types.path; - default = "${stateDir}/downloads"; - example = "/mnt/downloads"; - description = "Directory to store downloads."; - }; - - user = mkOption { - type = types.str; - default = "pyload"; - description = "User under which pyLoad runs, and which owns the download directory."; - }; - - group = mkOption { - type = types.str; - default = "pyload"; - description = "Group under which pyLoad runs, and which owns the download directory."; - }; - - credentialsFile = mkOption { - type = with types; nullOr path; - default = null; - example = "/run/secrets/pyload-credentials.env"; - description = '' - File containing {env}`PYLOAD_DEFAULT_USERNAME` and - {env}`PYLOAD_DEFAULT_PASSWORD` in the format of an `EnvironmentFile=`, - as described by {manpage}`systemd.exec(5)`. - - If not given, they default to the username/password combo of - pyload/pyload. - ''; - }; - }; - }; - - config = lib.mkIf cfg.enable { - systemd.tmpfiles.settings.pyload = { - ${cfg.downloadDirectory}.d = { inherit (cfg) user group; }; - }; - - systemd.services.pyload = { - description = "pyLoad download manager"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - # NOTE: unlike what the documentation says, it looks like `HOME` is not - # defined with this service definition... - # Since pyload tries to do the equivalent of `cd ~`, it needs to be able - # to resolve $HOME, which fails when `RootDirectory` is set. - # FIXME: check if `SetLoginEnvironment` fixes this issue in version 255 - environment = { - HOME = stateDir; - PYLOAD__WEBUI__HOST = cfg.listenAddress; - PYLOAD__WEBUI__PORT = toString cfg.port; - }; - - serviceConfig = { - ExecStart = utils.escapeSystemdExecArgs [ - (lib.getExe cfg.package) - "--userdir" - "${stateDir}/config" - "--storagedir" - cfg.downloadDirectory - ]; - - User = cfg.user; - Group = cfg.group; - - EnvironmentFile = lib.optional (cfg.credentialsFile != null) cfg.credentialsFile; - - StateDirectory = "pyload"; - WorkingDirectory = stateDir; - RuntimeDirectory = "pyload"; - RuntimeDirectoryMode = "0700"; - RootDirectory = "/run/pyload"; - BindReadOnlyPaths = [ - builtins.storeDir # Needed to run the python interpreter - ]; - BindPaths = [ - cfg.downloadDirectory - ]; - - # Hardening options - LockPersonality = true; - NoNewPrivileges = true; - PrivateDevices = true; - PrivateMounts = true; - PrivateTmp = true; - PrivateUsers = true; - ProcSubset = "pid"; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectProc = "invisible"; - ProtectSystem = "strict"; - RemoveIPC = true; - RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX"; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@resources" - "~@privileged" - ]; - UMask = "0002"; - CapabilityBoundingSet = [ - "~CAP_BLOCK_SUSPEND" - "~CAP_BPF" - "~CAP_CHOWN" - "~CAP_IPC_LOCK" - "~CAP_KILL" - "~CAP_LEASE" - "~CAP_LINUX_IMMUTABLE" - "~CAP_NET_ADMIN" - "~CAP_SYS_ADMIN" - "~CAP_SYS_BOOT" - "~CAP_SYS_CHROOT" - "~CAP_SYS_NICE" - "~CAP_SYS_PACCT" - "~CAP_SYS_PTRACE" - "~CAP_SYS_RESOURCE" - "~CAP_SYS_TTY_CONFIG" - ]; - }; - }; - - users.users.pyload = lib.mkIf (cfg.user == "pyload") { - isSystemUser = true; - group = cfg.group; - home = stateDir; - }; - - users.groups.pyload = lib.mkIf (cfg.group == "pyload") { }; - }; -} diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index d069480f3d70..a35f32f594ef 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -157,6 +157,7 @@ let --uid=nextcloud \ --same-dir \ --pty \ + --pipe \ --wait \ --collect \ --service-type=exec \ diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 1330995524c7..a66687e3b36e 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -57,7 +57,6 @@ in boot.extraModulePackages = [ config.boot.kernelPackages.ena ]; - boot.initrd.kernelModules = [ "xen-blkfront" ]; boot.initrd.availableKernelModules = [ "nvme" ]; boot.kernelParams = let diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index d299ead82a1b..2289d9156d0d 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -87,6 +87,7 @@ rec { (onFullSupported "nixos.tests.containers-ip") (onSystems [ "x86_64-linux" ] "nixos.tests.docker") (onFullSupported "nixos.tests.env") + (onSystems [ "x86_64-linux" "aarch64-linux" ] "nixos.tests.ec2-userdata") # Way too many manual retries required on Hydra. # Apparently it's hard to track down the cause. diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0f612f58da6d..4e11dbced014 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -489,9 +489,8 @@ in early-mount-options = runTest ./early-mount-options.nix; earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix; easytier = runTest ./easytier.nix; - ec2-config = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-config or { }; ec2-image = runTest ./ec2-image.nix; - ec2-nixops = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).boot-ec2-nixops or { }; + ec2-userdata = (handleTestOn [ "x86_64-linux" ] ./ec2.nix { }).ec2-userdata or { }; echoip = runTest ./echoip.nix; ejabberd = runTest ./xmpp/ejabberd.nix; elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { }; @@ -1221,6 +1220,7 @@ in pam-oath-login = runTest ./pam/pam-oath-login.nix; pam-pgsql = runTest ./pam/pam-pgsql.nix; pam-u2f = runTest ./pam/pam-u2f.nix; + pam-u2f-polkit = runTest ./pam/pam-u2f-polkit.nix; pam-ussh = runTest ./pam/pam-ussh.nix; pam-zfs-key = runTest ./pam/zfs-key.nix; pangolin = runTest ./pangolin.nix; @@ -1348,7 +1348,6 @@ in pulseaudio = discoverTests (import ./pulseaudio.nix); pulseaudio-tcp = runTest ./pulseaudio-tcp.nix; pykms = runTest ./pykms.nix; - pyload = runTest ./pyload.nix; qbittorrent = runTest ./qbittorrent.nix; qboot = handleTestOn [ "x86_64-linux" "i686-linux" ] ./qboot.nix { }; qemu-vm-credentials-fwcfg = runTest { diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index ae9a79db5403..c8c26be813cd 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -18,12 +18,6 @@ let ../modules/testing/test-instrumentation.nix ../modules/profiles/qemu-guest.nix { - # Hack to make the partition resizing work in QEMU. - boot.initrd.postDeviceCommands = mkBefore '' - ln -s vda /dev/xvda - ln -s vda1 /dev/xvda1 - ''; - amazonImage.format = "qcow2"; # In a NixOS test the serial console is occupied by the "backdoor" @@ -31,30 +25,6 @@ let # the configuration in virtualisation/amazon-image.nix. systemd.services."serial-getty@ttyS0".enable = mkForce false; - # Needed by nixos-rebuild due to the lack of network - # access. Determined by trial and error. - system.extraDependencies = with pkgs; [ - # Needed for a nixos-rebuild. - busybox - cloud-utils - desktop-file-utils - libxslt.bin - mkinitcpio-nfs-utils - stdenv - stdenvNoCC - texinfo - unionfs-fuse - lndir - - # These are used in the configure-from-userdata tests - # for EC2. Httpd and valgrind are requested by the - # configuration. - apacheHttpd - apacheHttpd.doc - apacheHttpd.man - valgrind.doc - ]; - nixpkgs.pkgs = pkgs; } ]; @@ -68,8 +38,8 @@ let in { - boot-ec2-nixops = makeEc2Test { - name = "nixops-userdata"; + ec2-userdata = makeEc2Test { + name = "ec2-userdata"; meta.timeout = 600; inherit image; sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key! @@ -116,49 +86,4 @@ in machine.wait_for_file("/etc/ec2-metadata/user-data") ''; }; - - boot-ec2-config = makeEc2Test { - name = "config-userdata"; - meta.broken = true; # amazon-init wants to download from the internet while building the system - inherit image; - sshPublicKey = snakeOilPublicKey; - - # ### https://channels.nixos.org/nixos-unstable nixos - userData = '' - { pkgs, ... }: - - { - imports = [ - - - - ]; - environment.etc.testFile = { - text = "whoa"; - }; - - networking.hostName = "ec2-test-vm"; # required by services.httpd - - services.httpd = { - enable = true; - adminAddr = "test@example.org"; - virtualHosts.localhost.documentRoot = "''${pkgs.valgrind.doc}/share/doc/valgrind/html"; - }; - networking.firewall.allowedTCPPorts = [ 80 ]; - } - ''; - script = '' - machine.start() - - # amazon-init must succeed. if it fails, make the test fail - # immediately instead of timing out in wait_for_file. - machine.wait_for_unit("amazon-init.service") - - machine.wait_for_file("/etc/testFile") - assert "whoa" in machine.succeed("cat /etc/testFile") - - machine.wait_for_unit("httpd.service") - assert "Valgrind" in machine.succeed("curl http://localhost") - ''; - }; } diff --git a/nixos/tests/pam/pam-u2f-polkit.nix b/nixos/tests/pam/pam-u2f-polkit.nix new file mode 100644 index 000000000000..0db4d0b1b578 --- /dev/null +++ b/nixos/tests/pam/pam-u2f-polkit.nix @@ -0,0 +1,90 @@ +{ hostPkgs, ... }: + +{ + name = "pam-u2f-polkit"; + + qemu.package = hostPkgs.qemu_test.override { u2fEmuSupport = true; }; + + nodes.machine = + { pkgs, ... }: + { + virtualisation.qemu.options = [ + "-usb" + "-device u2f-emulated" + ]; + + security.polkit.enable = true; + security.pam.u2f.enable = true; + + environment.systemPackages = with pkgs; [ + libfido2 + pam_u2f + ]; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + + # The upstream polkit-agent-helper@.service has PrivateDevices=yes and + # DevicePolicy=strict with only /dev/null allowed. This blocks hidraw. + # Verify that: run a command under the upstream defaults and show it fails. + machine.fail( + "systemd-run --wait --pipe " + "--property=PrivateDevices=yes " + "--property=DevicePolicy=strict " + "--property='DeviceAllow=/dev/null rw' " + "test -c /dev/hidraw0" + ) + + # The PR overrides PrivateDevices=no and adds DeviceAllow for hidraw. + # Verify that the actual polkit-agent-helper@ unit got these overrides. + props = machine.succeed("systemctl show polkit-agent-helper@dummy.service") + assert "PrivateDevices=no" in props, f"Expected PrivateDevices=no, got: {props}" + assert "ProtectHome=read-only" in props, f"Expected ProtectHome=read-only, got: {props}" + + # Run fido2-token under the same constraints as the fixed service. + # This proves the device is not just visible but actually usable + # inside the polkit-agent-helper@ sandbox. + machine.succeed( + "systemd-run --wait --pipe " + "--property=PrivateDevices=no " + "--property=DevicePolicy=strict " + "--property='DeviceAllow=/dev/null rw' " + "--property='DeviceAllow=/dev/urandom r' " + "--property='DeviceAllow=char-hidraw rw' " + "--property=ProtectHome=read-only " + "--property=PrivateNetwork=yes " + "--property=ProtectSystem=strict " + "--property=ProtectKernelModules=yes " + "--property=ProtectKernelLogs=yes " + "--property=ProtectKernelTunables=yes " + "--property=ProtectControlGroups=yes " + "--property=ProtectClock=yes " + "--property=ProtectHostname=yes " + "--property=LockPersonality=yes " + "--property=MemoryDenyWriteExecute=yes " + "--property=NoNewPrivileges=yes " + "--property=PrivateTmp=yes " + "--property=RemoveIPC=yes " + "--property='RestrictAddressFamilies=AF_UNIX' " + "--property=RestrictNamespaces=yes " + "--property=RestrictRealtime=yes " + "--property=RestrictSUIDSGID=yes " + "--property=SystemCallArchitectures=native " + "fido2-token -I /dev/hidraw0" + ) + + # Also verify that pamu2fcfg can register a credential inside the sandbox + # (needs hidraw + urandom access) + machine.succeed( + "systemd-run --wait --pipe " + "--property=PrivateDevices=no " + "--property=DevicePolicy=strict " + "--property='DeviceAllow=/dev/null rw' " + "--property='DeviceAllow=/dev/urandom r' " + "--property='DeviceAllow=char-hidraw rw' " + "--property=ProtectHome=read-only " + "pamu2fcfg" + ) + ''; +} diff --git a/nixos/tests/pam/pam-u2f.nix b/nixos/tests/pam/pam-u2f.nix index 17b9e19e4cc5..65a3ce7c459f 100644 --- a/nixos/tests/pam/pam-u2f.nix +++ b/nixos/tests/pam/pam-u2f.nix @@ -1,29 +1,70 @@ -{ ... }: +{ hostPkgs, ... }: { name = "pam-u2f"; + qemu.package = hostPkgs.qemu_test.override { u2fEmuSupport = true; }; + nodes.machine = - { ... }: + { pkgs, ... }: { + virtualisation.qemu.options = [ + "-usb" + "-device u2f-emulated" + ]; + security.pam.u2f = { enable = true; - control = "required"; + control = "sufficient"; settings = { - cue = true; debug = true; - interactive = true; - origin = "nixos-test"; - # Freeform option - userpresence = 1; + origin = "pam://nixos-test"; }; }; + + users.users.alice = { + isNormalUser = true; + uid = 1000; + }; + + environment.systemPackages = with pkgs; [ + libfido2 + pam_u2f + ]; + + # Allow non-root users to access the virtual U2F device + services.udev.extraRules = '' + KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666" + ''; }; testScript = '' machine.wait_for_unit("multi-user.target") + machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'") + + # The virtual U2F device should be recognized + machine.succeed("fido2-token -L | grep -q hidraw") + + # Register a U2F credential for alice + machine.succeed("mkdir -p /home/alice/.config/Yubico") machine.succeed( - 'egrep "auth required .*/lib/security/pam_u2f.so.*cue.*debug.*interactive.*origin=nixos-test.*userpresence=1" /etc/pam.d/ -R' + "pamu2fcfg -u alice -o pam://nixos-test" + " > /home/alice/.config/Yubico/u2f_keys" ) + machine.succeed("chown -R alice:users /home/alice/.config") + + # Log in as alice on tty2. With control=sufficient, pam_u2f runs + # before pam_unix. The emulated device auto-approves user presence, + # so alice is authenticated by her U2F key — no password needed. + machine.send_key("alt-f2") + machine.wait_until_succeeds("[ $(fgconsole) = 2 ]") + machine.wait_for_unit("getty@tty2.service") + machine.wait_until_tty_matches("2", "login: ") + machine.send_chars("alice\n") + + # alice should get a shell without being asked for a password + machine.wait_until_succeeds("pgrep -u alice bash") + machine.send_chars("touch /tmp/u2f-login-success\n") + machine.wait_for_file("/tmp/u2f-login-success") ''; } diff --git a/nixos/tests/pyload.nix b/nixos/tests/pyload.nix deleted file mode 100644 index 317f1c43a53d..000000000000 --- a/nixos/tests/pyload.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, ... }: -{ - name = "pyload"; - meta.maintainers = with lib.maintainers; [ ambroisie ]; - - nodes = { - machine = - { ... }: - { - services.pyload = { - enable = true; - - listenAddress = "0.0.0.0"; - port = 9876; - }; - - networking.firewall.allowedTCPPorts = [ 9876 ]; - }; - - client = { }; - }; - - testScript = '' - start_all() - - machine.wait_for_unit("pyload.service") - - with subtest("Web interface accessible locally"): - machine.wait_until_succeeds("curl -fs localhost:9876") - - client.wait_for_unit("network.target") - - with subtest("Web interface accessible from a different machine"): - client.wait_until_succeeds("curl -fs machine:9876") - ''; -} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix index e91e668584d1..78ab34496281 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix @@ -11,18 +11,18 @@ vimUtils, }: let - version = "0.4.3-nightly.0a18692-unstable-2026-03-24"; + version = "0.5.1-nightly.538c593-unstable-2026-04-01"; src = fetchFromGitHub { owner = "dmtrKovalenko"; repo = "fff.nvim"; - rev = "eb577ea4f39f7b9296ff8c6b4bf2b2899d017ded"; - hash = "sha256-m/KykUyhE3xUVmmE84xUaqW0T4fbuRp6iAVBbCioiCI="; + rev = "538c593b7ba173b08beec15e6bce66fccb8f6ab0"; + hash = "sha256-e+x1ELa2m60j2cQ9g99XSrAMMvmF3WtlMF5HWYrrJps="; }; fff-nvim-lib = rustPlatform.buildRustPackage { pname = "fff-nvim-lib"; inherit version src; - cargoHash = "sha256-hMwPyPc4V0pTxpn1U3ay31KttFeoU54h6Z4HGv8nFYQ="; + cargoHash = "sha256-K6xAzx6YqzrDUalZ1rE4eOBRc1xvXVhac14krskl87M="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 9f0fdede4b0f..f847e370173a 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.1.89"; - hash = "sha256-9GASgI7ifhxAj4L6Xf1MGyGsiFcC5NZb2ICCjLUf5Qw="; + version = "2.1.90"; + hash = "sha256-8xHAEqxxCA0bw/4eNFL2PutMquD2H7FO1o2yycAJ4ME="; }; postInstall = '' diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 75381a0223a5..fb410074b8da 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3828,8 +3828,8 @@ let mktplcRef = { name = "ansible"; publisher = "redhat"; - version = "26.3.0"; - hash = "sha256-c6NcQsJe2sjJH/nBhStHYWKNSfJtU3CLHpv+2qPlyqM="; + version = "26.3.5"; + hash = "sha256-IKSozGy4S04pSsbhpXVgsqQvJNzaxVkoSrLwhFb4Ag4="; }; meta = { description = "Ansible language support"; diff --git a/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix b/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix index ad971694f375..bb599efa6dc2 100644 --- a/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix +++ b/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix @@ -7,13 +7,13 @@ }: mkLibretroCore rec { core = "fbalpha2012"; - version = "0-unstable-2025-12-12"; + version = "0-unstable-2026-03-31"; src = fetchFromGitHub { owner = "libretro"; repo = "fbalpha2012"; - rev = "c547d8cf3f7748f4094cee658a5d31ec1b79ece4"; - hash = "sha256-owy8IuJ/dAEbUH7hGCR3oLiI4tYuwsNfRYRl6LmyYfc="; + rev = "15af60bf24e3dc2267a38e3c8532450ebec86317"; + hash = "sha256-7QfDk/j7akaORSekdx96mcDgsFp+kAq1/Cxtu3uPe4A="; }; sourceRoot = "${src.name}/svn-current/trunk"; diff --git a/pkgs/applications/emulators/libretro/cores/fmsx.nix b/pkgs/applications/emulators/libretro/cores/fmsx.nix index dc072c5108a3..cb3bb1e20f95 100644 --- a/pkgs/applications/emulators/libretro/cores/fmsx.nix +++ b/pkgs/applications/emulators/libretro/cores/fmsx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fmsx"; - version = "0-unstable-2025-07-31"; + version = "0-unstable-2026-03-31"; src = fetchFromGitHub { owner = "libretro"; repo = "fmsx-libretro"; - rev = "fbe4dfc4c3e3f7eb27089def3d663a905b181845"; - hash = "sha256-1hZQO16SDB8n1wdTP67Kpns3izg/nPGl5M7wjFDBjGc="; + rev = "6b807c588d63677770f7f2ed8b94ca0e9da256ce"; + hash = "sha256-vA9ODUtmmrDPbZjmRJ9IIFELLTD8g8aHmQdo/B/d1fQ="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mgba.nix b/pkgs/applications/emulators/libretro/cores/mgba.nix index 35d0335d940d..c0de852de2a2 100644 --- a/pkgs/applications/emulators/libretro/cores/mgba.nix +++ b/pkgs/applications/emulators/libretro/cores/mgba.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mgba"; - version = "0-unstable-2025-10-13"; + version = "0-unstable-2026-03-30"; src = fetchFromGitHub { owner = "libretro"; repo = "mgba"; - rev = "c758314a639aa0066e7b65a8341448181b73c804"; - hash = "sha256-ev0vzLqZzOr5RW/jf07vXtBmYkcB2m+afADHFBH5zbQ="; + rev = "6ab29fed1b5139f19ac98c523fd4a6a7f0b30e38"; + hash = "sha256-6cCd2tuj2kXTL1w0DUPodaLU0ivNjPyKGytgxrjlwb0="; }; meta = { diff --git a/pkgs/applications/graphics/apngasm/default.nix b/pkgs/applications/graphics/apngasm/default.nix index b5643329c87e..2b13f38498cd 100644 --- a/pkgs/applications/graphics/apngasm/default.nix +++ b/pkgs/applications/graphics/apngasm/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/apngasm/files/apngasm-3.1.10-static.patch?id=45fd0cde71ca2ae0e7e38ab67400d84b86b593d7"; sha256 = "sha256-eKthgInWxXEqN5PupvVf9wVQDElxsPYRFXT7pMc6vIU="; }) + # Boost 1.89+ removed the boost_system CMake component + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/apngasm/files/apngasm-3.1.10-boost-1.89.patch?id=87e57d47db8c7c68acb2dec534e70015d8b1d61e"; + sha256 = "sha256-92oie9owUYP8a1hrJsFCRk8QI4AjTzMXTe+frlmbIuE="; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index a69e70625dd4..9fa56bb1fd20 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -823,7 +823,7 @@ } }, "ungoogled-chromium": { - "version": "146.0.7680.164", + "version": "146.0.7680.177", "deps": { "depot_tools": { "rev": "42786f6e46c25c30dd58f69283ab6fcd0c959f58", @@ -835,16 +835,16 @@ "hash": "sha256-wFCuu4GR0N7QZCwT8UAhqH5moicYQjZ4ZLI58AM4pJ0=" }, "ungoogled-patches": { - "rev": "146.0.7680.164-1", - "hash": "sha256-mqgmG+1TefLshc3QUQrGN2XB99FXJyexE6QI7uD3IXQ=" + "rev": "146.0.7680.177-1", + "hash": "sha256-OMGjomgLuwO0KkqwW3IxLmSbpHM7ZbVUVOiPkQs/N6s=" }, "npmHash": "sha256-ByB1Ea5tduIJZXyydeBWsoS8OPABOgwHe+dNXRssdvc=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "bbd8c5dd25fb2f569d98e626a9517cf2171abdff", - "hash": "sha256-hwZehtGUyuMdHisIaztsYlu0MEftbmmAqN/X+ias4nI=", + "rev": "ae03f7fb2cf1215853896d6a4c15fdceee2badb7", + "hash": "sha256-WVJ6dtDpXnp+Q8N/KEFJZWU9/4xEmpEYcu53MA94PZ8=", "recompress": true }, "src/third_party/clang-format/script": { @@ -914,8 +914,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "e05753c6d05b17b23d514038957469c70b75475c", - "hash": "sha256-SMym7PN2acfw84Z95xWSbN/QV5UIDIOztWxFeTCfBsk=" + "rev": "1c0f91aaa60a1f87725840495cbfd9717e7c77c8", + "hash": "sha256-9Me/9kdDgcDLGP/0lLWpj294IoUp0hDD5hfFjSZbTOc=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -954,8 +954,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "a655251a59c4af3fbf8058bb2572d6a457f896d2", - "hash": "sha256-UKoDytne6QD2d6ojy4mYPjLbo9GB4xy1fUf9C1pLKaE=" + "rev": "10fb89e3179bb7443e66911eb3c795c7aaf022e5", + "hash": "sha256-ATTNb61RG7hS1mapDw0o4ZyBeny4ONI8ZjJLpmbQaKU=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -1474,8 +1474,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "6a75afe9792764f6faa76ad50125781899ca05e8", - "hash": "sha256-S4AAmNw50ToTZIuHl41Pc+Z1MZfUVf0/ZGGIiEr5cXo=" + "rev": "30d129c8800b5626c46fb83fa62db10b9b22b319", + "hash": "sha256-2/Deen9OwDgDRrm5j7Rw27Z2JUX1thX7mnKWRLJbEvM=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1609,8 +1609,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "b2a90ac0037ee7187102ce2c40e5007216ca9a58", - "hash": "sha256-rX6NEN0RbfHPRqJqkGhypwWt/NcREvPaanL+CDxwhA8=" + "rev": "6733aa5ba16e1e1087f339d1151c80c924a6fbf8", + "hash": "sha256-g2GYFVTK8f296v7lUcYPqkI4qDoladsTpnKWb6SGRmw=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1639,8 +1639,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "0e999a528db40a3ef6fa917adf96370a18b87d70", - "hash": "sha256-rkSuZBdFUHJyYmqp2oN3mLjNtKjk569MocyvnICo+uw=" + "rev": "0ad812d268a7820dba9bf848b416aeda4dd1b2e5", + "hash": "sha256-nG4goqqVAAWPMkq8296wCYhnwL93oAL+pF1oaMXyqZI=" } } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 50defe58014f..c748d1f50441 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -191,13 +191,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "cloudamqp_cloudamqp": { - "hash": "sha256-PAH7Avc6WQFQ7fXs7A//SxIEP88uSrN9sWlEYe9Zr+I=", + "hash": "sha256-WVEGtD5Hfb8xu/GymHMknK8n2KgOMW2EzBMvRmbKJug=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.43.1", + "rev": "v1.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-SrGNzwSdkMTyNuVgjUj0tID/Qu6BBusVn+NsgTk4RJI=" + "vendorHash": "sha256-sagrygtfsZWQUuIuGTUldZYYR5OhQfpZDxDKZAaIR4Y=" }, "cloudflare_cloudflare": { "hash": "sha256-D5Kk6xCz3CQWbGHjLKU/+SPBzCYFQlphCTMG6+LvFek=", @@ -1310,11 +1310,11 @@ "vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o=" }, "tencentcloudstack_tencentcloud": { - "hash": "sha256-iUbbxwnRgYtNq8a8qMYB/6HQ7QS/hrvlzL5MMS08rn0=", + "hash": "sha256-xsYh5gDneL3nQDUIHe3fRjObFTGp3ssPq8wlqPWsq7Y=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.82.77", + "rev": "v1.82.82", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1499,12 +1499,12 @@ "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc=" }, "yandex-cloud_yandex": { - "hash": "sha256-ajA9ktS9TIwB/HexEHZCNkkBKtH6BDxjwq4BxLQB82M=", + "hash": "sha256-F2nbu/MImDXHSYPjo3O6K0tsZJ4PTrmB14Ghfvnp5sc=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.193.0", + "rev": "v0.195.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-wD6KGxlNxZZm0lNtzFjfLhitkpxaEgTdcTS4YlOqMqA=" + "vendorHash": "sha256-lSpDmhzCed9NUJkQ35tsrUbMIzx6wnEJ20UFMPbwhWE=" } } diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index be41553ecfe7..a458b4a81af6 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { description = "Mini Web server that let others upload files to your computer"; homepage = "http://stackp.online.fr/droopy"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = [ ]; mainProgram = "droopy"; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/cstring-includes.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/cstring-includes.patch new file mode 100644 index 000000000000..e334777ac14f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/cstring-includes.patch @@ -0,0 +1,74 @@ +diff --git a/src/api/video/nv12_buffer.cc b/src/api/video/nv12_buffer.cc +index ca9dcd867..89d28f23c 100644 +--- a/src/api/video/nv12_buffer.cc ++++ b/src/api/video/nv12_buffer.cc +@@ -16,6 +16,8 @@ + #include "third_party/libyuv/include/libyuv/convert.h" + #include "third_party/libyuv/include/libyuv/scale.h" + ++#include ++ + namespace webrtc { + + namespace { +diff --git a/src/audio/utility/channel_mixer.cc b/src/audio/utility/channel_mixer.cc +index 0f1e66387..33b771b0c 100644 +--- a/src/audio/utility/channel_mixer.cc ++++ b/src/audio/utility/channel_mixer.cc +@@ -15,6 +15,8 @@ + #include "rtc_base/logging.h" + #include "rtc_base/numerics/safe_conversions.h" + ++#include ++ + namespace webrtc { + + ChannelMixer::ChannelMixer(ChannelLayout input_layout, +diff --git a/src/modules/audio_processing/aec3/alignment_mixer.cc b/src/modules/audio_processing/aec3/alignment_mixer.cc +index 7f076dea8..ffd7242b5 100644 +--- a/src/modules/audio_processing/aec3/alignment_mixer.cc ++++ b/src/modules/audio_processing/aec3/alignment_mixer.cc +@@ -10,6 +10,7 @@ + #include "modules/audio_processing/aec3/alignment_mixer.h" + + #include ++#include + + #include "rtc_base/checks.h" + +diff --git a/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc +index 7ef1a030e..5b9ab7137 100644 +--- a/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc ++++ b/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc +@@ -18,6 +18,7 @@ + #include + #include + ++#include + #include + + #include "absl/memory/memory.h" +diff --git a/src/modules/video_coding/utility/ivf_file_reader.cc b/src/modules/video_coding/utility/ivf_file_reader.cc +index 4c08ca613..f82f2bfcb 100644 +--- a/src/modules/video_coding/utility/ivf_file_reader.cc ++++ b/src/modules/video_coding/utility/ivf_file_reader.cc +@@ -10,6 +10,7 @@ + + #include "modules/video_coding/utility/ivf_file_reader.h" + ++#include + #include + #include + +diff --git a/src/net/dcsctp/packet/bounded_byte_writer.h b/src/net/dcsctp/packet/bounded_byte_writer.h +index d754549e4..bf5e3ed42 100644 +--- a/src/net/dcsctp/packet/bounded_byte_writer.h ++++ b/src/net/dcsctp/packet/bounded_byte_writer.h +@@ -12,6 +12,7 @@ + #define NET_DCSCTP_PACKET_BOUNDED_BYTE_WRITER_H_ + + #include ++#include + + #include "api/array_view.h" + \ No newline at end of file diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index f0bcaf973496..bbad5d6cb030 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -31,6 +31,9 @@ let }; patches = [ + # fix build with latest glibc + # upstream PR: https://github.com/desktop-app/tg_owt/pull/172 + ./cstring-includes.patch (fetchpatch { url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; decode = "base64 -d"; diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index f8a9d91aca4f..e6bf4c01c2c3 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ab-av1"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; tag = "v${finalAttrs.version}"; - hash = "sha256-UiBgtA6i5rpXAtiPwihg7sUbmD6lou6IOsb//DWNWwU="; + hash = "sha256-kT0BJr4xoYigKObD6vZNRieslaJj/MWuqQmhYLWNwvs="; }; - cargoHash = "sha256-1/vxKOlbXZ8HXnVFM9dXB9crobBx8djGDKsjnzc/KwQ="; + cargoHash = "sha256-o64GrmHvwF2VUKw+nIRK0jesSuelxNo0TFnyKaP/YlQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/al/alpine-make-vm-image/package.nix b/pkgs/by-name/al/alpine-make-vm-image/package.nix index 919aa53a24c3..59040257ecca 100644 --- a/pkgs/by-name/al/alpine-make-vm-image/package.nix +++ b/pkgs/by-name/al/alpine-make-vm-image/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "alpine-make-vm-image"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "alpinelinux"; repo = "alpine-make-vm-image"; tag = "v${finalAttrs.version}"; - hash = "sha256-AIwT2JAGnMeMXUXZ0FRJthf22FvFfTTw/2LtZKPSj6g="; + hash = "sha256-U3eJ9wOxxbC9gEDBMXanBmEy0x6YBSsXXf6U5nzVoZ8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index e9a839161a51..8d0e58a9face 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2026-03-21"; + version = "0-unstable-2026-03-30"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "a0305dc2070306a1af52aad9b03096a51f4147e8"; - hash = "sha256-WAbJATvx5dWfpB0PYVVlRCVEygDzUU+qeOmhzRKA8GY="; + rev = "7460ed8d375425f50517119b0df3a57b876b504e"; + hash = "sha256-hFBQGmGKUw/LT1DiyfnTsYO5Lt2c7LBMLRVBMmjYakY="; }; dontConfigure = true; diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index 5911b554f8bd..8a8c73cb89a1 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ansible-doctor"; - version = "8.2.2"; + version = "8.3.0"; pyproject = true; src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; tag = "v${finalAttrs.version}"; - hash = "sha256-gezpY5iaFxNcngAyUnlVRPGo33zUgjdsm2zFlfWUWfA="; + hash = "sha256-lwN6pMKysycMOqVRNrK8+dgGfrsRF2B2EW1Kby0l/0I="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json index 11c396c48204..237942111016 100644 --- a/pkgs/by-name/an/antigravity/information.json +++ b/pkgs/by-name/an/antigravity/information.json @@ -1,22 +1,22 @@ { - "version": "1.20.6", + "version": "1.21.9", "vscodeVersion": "1.107.0", "sources": { "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/linux-x64/Antigravity.tar.gz", - "sha256": "ad382bf321a6216d07f95af1f613e03f5a07fdf6fc6632b769ce83d81afdd567" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/linux-x64/Antigravity.tar.gz", + "sha256": "85ea4d55f52d32fbbf9d92fddc747f10e8d04c1bd00a07721b571fa7f2ef5226" }, "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/linux-arm/Antigravity.tar.gz", - "sha256": "6e17f33d8ccb5622affb3590efccb87c3c4dd505f1d3b0f8506f1c20c39c026a" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/linux-arm/Antigravity.tar.gz", + "sha256": "76d56462e0fad95a98efaf25d06be9c4789e3b8551fe5b936a6858b14c723364" }, "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/darwin-x64/Antigravity.zip", - "sha256": "4e56f3ac83bc0e1803b4d811585d567f3795b14ad57ccec1fcfe8cb02f7cb719" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/darwin-x64/Antigravity.zip", + "sha256": "a8ebdbf3b18c75d39b876541904c95576422e281fd92e45f7f7f4e7231ac769c" }, "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.20.6-5891862175809536/darwin-arm/Antigravity.zip", - "sha256": "c4392cc64a52b7b7066cb1c21c32918854b7cd7297b7efa3b14397fc7d05ad5a" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/darwin-arm/Antigravity.zip", + "sha256": "f9ec42d0a791cc13cbb57a1f7c36b2421e67f180cd0bdfb01fd8fa23ad87440b" } } } diff --git a/pkgs/by-name/ar/archipelago/package.nix b/pkgs/by-name/ar/archipelago/package.nix index 896c6224ab90..84636d1c40e0 100644 --- a/pkgs/by-name/ar/archipelago/package.nix +++ b/pkgs/by-name/ar/archipelago/package.nix @@ -17,10 +17,10 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "archipelago"; - version = "0.6.6"; + version = "0.6.7"; src = fetchurl { url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${finalAttrs.version}/Archipelago_${finalAttrs.version}_linux-x86_64.AppImage"; - hash = "sha256-mJ0bPBBou3BRqEW5QierjD0ohDBQ9J0jnoV4TCf9XOM="; + hash = "sha256-a5UazzqGu7q4Zg1AYHnbQjCTQNdcNaL/gZUjYV3Rk5Q="; }; dontUnpack = true; diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix index 8ce315fdd731..614d2ab56765 100644 --- a/pkgs/by-name/as/asn/package.nix +++ b/pkgs/by-name/as/asn/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "asn"; - version = "0.80.4"; + version = "0.80.5"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; tag = "v${finalAttrs.version}"; - hash = "sha256-o0gHHV0tQeKd/qIGAMhA/cwUuCF7VLVDzngoFU8fGhI="; + hash = "sha256-o+qyNxEV2lPRsCNkkcZbj07hKw4eV45qhB8G34OWmgg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/be/beedii/package.nix b/pkgs/by-name/be/beedii/package.nix index 644e1981c54a..406a21e9abc1 100644 --- a/pkgs/by-name/be/beedii/package.nix +++ b/pkgs/by-name/be/beedii/package.nix @@ -2,26 +2,23 @@ lib, stdenvNoCC, fetchzip, + installFonts, gitUpdater, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "beedii"; version = "1.0.0"; src = fetchzip { - url = "https://github.com/webkul/beedii/releases/download/v${version}/beedii.zip"; + url = "https://github.com/webkul/beedii/releases/download/v${finalAttrs.version}/beedii.zip"; hash = "sha256-MefkmWl7LdhQiePpixKcatoIeOTlrRaO3QA9xWAxJ4Q="; stripRoot = false; }; - installPhase = '' - runHook preInstall + sourceRoot = "${finalAttrs.src.name}/Fonts"; - install -Dm444 Fonts/*.ttf -t $out/share/fonts/truetype/${pname} - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; passthru.updateScript = gitUpdater { url = "https://github.com/webkul/beedii"; @@ -41,4 +38,4 @@ stdenvNoCC.mkDerivation rec { kachick ]; }; -} +}) diff --git a/pkgs/by-name/bg/bgnet/package.nix b/pkgs/by-name/bg/bgnet/package.nix index c8d8e5ccb853..b656dbeda3f6 100644 --- a/pkgs/by-name/bg/bgnet/package.nix +++ b/pkgs/by-name/bg/bgnet/package.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation { homepage = "https://beej.us/guide/bgnet/"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ Profpatsch ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/bi/biz-ud-gothic/package.nix b/pkgs/by-name/bi/biz-ud-gothic/package.nix index 17db66a647e5..9c23d687f81d 100644 --- a/pkgs/by-name/bi/biz-ud-gothic/package.nix +++ b/pkgs/by-name/bi/biz-ud-gothic/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, nix-update-script, }: @@ -17,13 +18,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-7PlIrQX1fnFHXm7mjfoOCVp3GSnLT2GlVZdSoZbh/s4="; }; - installPhase = '' - runHook preInstall + sourceRoot = "${finalAttrs.src.name}/fonts"; - install -Dm444 fonts/ttf/*.ttf -t "$out/share/fonts/truetype/" - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bl/blobfuse/package.nix b/pkgs/by-name/bl/blobfuse/package.nix index ff9c55876039..c7c85ed93ff6 100644 --- a/pkgs/by-name/bl/blobfuse/package.nix +++ b/pkgs/by-name/bl/blobfuse/package.nix @@ -9,19 +9,19 @@ }: let - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-fuse"; rev = "blobfuse2-${version}"; - sha256 = "sha256-iTzVKb8z7lQh40iMZiwjeufColiwU2YrihBLNLjS6JI="; + sha256 = "sha256-PgpXlyFo+rE32wZfjx7h11YmNka4q/6Jbr03CsW0pZc="; }; in buildGoModule { pname = "blobfuse"; inherit version src; - vendorHash = "sha256-9sT+8o+esVYdqYqAfkvyggqPiIIkG78krv+uID9+UBw="; + vendorHash = "sha256-I2/0BzT9KiMBpzReSll0dKY0uzULRx49fcVGD/z4BPQ="; buildInputs = [ fuse3 ]; diff --git a/pkgs/by-name/bo/bodoni-moda/package.nix b/pkgs/by-name/bo/bodoni-moda/package.nix index cd70f1f870b8..c2c1de12fe28 100644 --- a/pkgs/by-name/bo/bodoni-moda/package.nix +++ b/pkgs/by-name/bo/bodoni-moda/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { pname = "bodoni-moda"; @@ -14,14 +15,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-OQi+KKBM+BrmA2pDit6dib5krrQBba5dVCBd2/G5sIM="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - cp fonts/*/*.ttf $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://indestructibletype.com/Bodoni.html"; diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix index c7833538bbc9..870cf31b258a 100644 --- a/pkgs/by-name/ca/cargo-generate/package.nix +++ b/pkgs/by-name/ca/cargo-generate/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-generate"; - version = "0.23.7"; + version = "0.23.8"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; tag = "v${finalAttrs.version}"; - hash = "sha256-1GMgVdRhgZPYCOxn6Y7q+1xgIJL7XSbY/F2tW1N9ckw="; + hash = "sha256-Me3hgG6Z+JSsCjLVxbFDY3/6dUi4KtV6ArugFPgnda0="; }; - cargoHash = "sha256-zO8h567ptsIQmexmdfqC6++xjxxOTjVvJFDB3Hxgt78="; + cargoHash = "sha256-QhXHPnlU77ikaeTQLxBFYIc4j+tEZb0un3kVJanq7ZI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index f256b8bf6cdc..5d8ca451ce6b 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-update"; - version = "18.2.0"; + version = "19.0.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-znDi45NpUVuIalgTh+jEOf4lFfI8MCLvSWgsdyv4gTk="; + hash = "sha256-XK5ky0t8IdQRVsDU6VDB+HzWzgn4uXhlvOS66GPCVn8="; }; - cargoHash = "sha256-bdKmWqCJaJq1iq8pu7BIxrKCT9SdReTMcJIcmAuaqLA="; + cargoHash = "sha256-/teRXWO3alCU4i4WsQaojCNAXVm/DnpxbYysCEb/Ohg="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ci/ciel/package.nix b/pkgs/by-name/ci/ciel/package.nix index 666213423ac9..d3475f4990d3 100644 --- a/pkgs/by-name/ci/ciel/package.nix +++ b/pkgs/by-name/ci/ciel/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ciel"; - version = "3.10.2"; + version = "3.10.3"; src = fetchFromGitHub { owner = "AOSC-Dev"; repo = "ciel-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-lYw1Dzh3zQ9V5TqZGVJ5LTHuAsnEYsJsShkiJcXMGfc="; + hash = "sha256-y6AM3tLACJscGSVh3WhEONSkDmXC2KFL3VKt8a7CdGU="; }; - cargoHash = "sha256-RSdJFjFO0ah2WXazc2QDFQzvNwOKxe0IKiNIjRHO0EQ="; + cargoHash = "sha256-rgflNUoAOKzqXKMoSDbAgqV1tKbFgJUeH0K7RCVC1ME="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ci/ciftilib/package.nix b/pkgs/by-name/ci/ciftilib/package.nix index 0e1497f396a4..8519e82b46e1 100644 --- a/pkgs/by-name/ci/ciftilib/package.nix +++ b/pkgs/by-name/ci/ciftilib/package.nix @@ -42,7 +42,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt \ --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" \ --replace-fail "CMAKE_POLICY(VERSION 2.8.7)" "CMAKE_POLICY(VERSION 3.10)" \ - --replace-fail "CMAKE_POLICY(SET CMP0045 OLD)" "" + --replace-fail "CMAKE_POLICY(SET CMP0045 OLD)" "" \ + --replace-fail "FIND_PACKAGE(Boost REQUIRED COMPONENTS filesystem system)" \ + "FIND_PACKAGE(Boost REQUIRED COMPONENTS filesystem)" ''; meta = { diff --git a/pkgs/by-name/cl/claude-code-bin/manifest.json b/pkgs/by-name/cl/claude-code-bin/manifest.json index d7849a206338..2d800a3ac4f6 100644 --- a/pkgs/by-name/cl/claude-code-bin/manifest.json +++ b/pkgs/by-name/cl/claude-code-bin/manifest.json @@ -1,46 +1,46 @@ { - "version": "2.1.89", - "buildDate": "2026-03-31T23:01:10Z", + "version": "2.1.90", + "buildDate": "2026-04-01T22:59:02Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "f903a5e53f845b1ac5566296b713193827665f28da16300fdca7539cb0669a7f", - "size": 196886384 + "checksum": "73c1a7570501ca743cd2d7467cb4699103534a2138052a4e6cab53c0e09d79c8", + "size": 197828752 }, "darwin-x64": { "binary": "claude", - "checksum": "1322c5eecec8047e9cd7114f7d547ef6a9596563d6bbc7e594167d0f8bc8b406", - "size": 198397008 + "checksum": "9934675063ea4360665b7a43f649c92e6ba5cf93257324af7af1a6b490746395", + "size": 199326928 }, "linux-arm64": { "binary": "claude", - "checksum": "428301f56cf0139e6fbfa55e13be3f0f032ac1eb5ddb8849fbc703ee220c1cca", - "size": 228657728 + "checksum": "15d5089ee7d9981faacf5463eabd427a012814d9fc02113883bb23a4f387ad4a", + "size": 230165056 }, "linux-x64": { "binary": "claude", - "checksum": "903cb3c96b314d86856632c8702f5cdf971b804d0b19ef87446573bcd1d7df1c", - "size": 228473472 + "checksum": "6074e3959989b2958a9abec60adf7b441a0f6f1c7e66401abff0fe54dad04fd6", + "size": 229902976 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "7cb5fd60f3d2366672857077f3bd0f93ab83dffebd8f93c70344afa58bdb91ec", - "size": 221776320 + "checksum": "2508fa1c9c0575cf6fa26f2561ff7f0fd83be5fb4c6f9ec8281dfd5911d44371", + "size": 223218112 }, "linux-x64-musl": { "binary": "claude", - "checksum": "60941916f0a5656a5952a0f2f54228f574f8756ea503119f858724ad43c9b28d", - "size": 223099328 + "checksum": "854746d04db11f543ed8d3836b5316366d965e6b6cfa2ac6312e6f7a5c4b5cb1", + "size": 224201152 }, "win32-x64": { "binary": "claude.exe", - "checksum": "2e312000b538f11d13f1dfc52d4131996895b9a07bd8897d8f9153635d4ea092", - "size": 238557856 + "checksum": "f6be38fbdcadc373e93f751d1286845f58b032690e32be8f64799380a295a79f", + "size": 239622816 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "5f1d597c542aac3a11f557e12c92d0c49220ab77e741014b0599a572d81ca679", - "size": 235014304 + "checksum": "019f7210055cd7a884d13c4e6a0b6caf1a82348ee42950b7b5247a4b0484709c", + "size": 236335776 } } } diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index da19d3d701e2..4e96f6105b39 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.1.89", + "version": "2.1.90", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.1.89", + "version": "2.1.90", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 9abeb47c55e2..d14fdcdbfff9 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -15,14 +15,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.1.89"; + version = "2.1.90"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-FoTm6KDr+8Dzhk4ibZUlU1QLPFdPm/OriUUWqAaFswg="; + hash = "sha256-4/hqWrY2fncQ8p0TxwBAI+mNH98ZDhjvFqB9us7GJK0="; }; - npmDepsHash = "sha256-NI4F5bq0lEuMjLUdkGrml2aOzGbGkdyUckgfeVFEe8o="; + npmDepsHash = "sha256-kWbbIAoNAQ/BtsICmsabkfnS/1Nta5MQ4iX9+oH7WRw="; strictDeps = true; @@ -84,5 +84,6 @@ buildNpmPackage (finalAttrs: { xiaoxiangmoe ]; mainProgram = "claude"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; }) diff --git a/pkgs/by-name/co/colobot/package.nix b/pkgs/by-name/co/colobot/package.nix index 41c95d105890..d802ca8d1d18 100644 --- a/pkgs/by-name/co/colobot/package.nix +++ b/pkgs/by-name/co/colobot/package.nix @@ -47,6 +47,12 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'find_package(Boost COMPONENTS system filesystem regex REQUIRED)' \ + 'find_package(Boost COMPONENTS filesystem regex REQUIRED)' + ''; + nativeBuildInputs = [ cmake xmlstarlet diff --git a/pkgs/by-name/co/compress-pptx/inject-dependency-paths.patch b/pkgs/by-name/co/compress-pptx/inject-dependency-paths.patch new file mode 100644 index 000000000000..18cdc17bb823 --- /dev/null +++ b/pkgs/by-name/co/compress-pptx/inject-dependency-paths.patch @@ -0,0 +1,49 @@ +diff --git a/src/compress_pptx/__main__.py b/src/compress_pptx/__main__.py +index 433b6d8..f86c2e2 100644 +--- a/src/compress_pptx/__main__.py ++++ b/src/compress_pptx/__main__.py +@@ -101,7 +101,7 @@ def main(): + "--ffmpeg-path", + type=str, + help="Path to ffmpeg executable", +- default="ffmpeg", ++ default="@ffmpeg@", + ) + cli_args = parser.parse_args() + +diff --git a/src/compress_pptx/compress_pptx.py b/src/compress_pptx/compress_pptx.py +index 0cb5b42..0845aef 100644 +--- a/src/compress_pptx/compress_pptx.py ++++ b/src/compress_pptx/compress_pptx.py +@@ -131,7 +131,7 @@ class CompressPptx: + ffmpeg_video_codec: Optional[str] = None, + ffmpeg_audio_codec: Optional[str] = None, + ffmpeg_extra_options: Optional[str] = None, +- ffmpeg_path: str = "ffmpeg", ++ ffmpeg_path: str = "@ffmpeg@", + ) -> None: + """ + Compress images in a PowerPoint file or extract media. +@@ -187,19 +187,9 @@ class CompressPptx: + + self.file_list: List[FileObj] = [] + +- # Check for ImageMagick - prefer 'magick' but fall back to 'convert'/'identify' +- if which("magick") is not None: +- self.magick_cmd = "magick" +- self.convert_cmd = ["magick", "convert"] +- self.identify_cmd = ["magick", "identify"] +- elif which("convert") is not None and which("identify") is not None: +- self.magick_cmd = "convert" +- self.convert_cmd = ["convert"] +- self.identify_cmd = ["identify"] +- else: +- raise CompressPptxError( +- "ImageMagick not found in PATH. Make sure you have installed ImageMagick and that either 'magick' or 'convert'/'identify' commands are available." +- ) ++ self.magick_cmd = "@magick@" ++ self.convert_cmd = ["@magick@", "convert"] ++ self.identify_cmd = ["@magick@", "identify"] + + required_executables = [] + # add ffmpeg to required executables if user wants media files to be compressed diff --git a/pkgs/by-name/co/compress-pptx/package.nix b/pkgs/by-name/co/compress-pptx/package.nix new file mode 100644 index 000000000000..de14932e44a8 --- /dev/null +++ b/pkgs/by-name/co/compress-pptx/package.nix @@ -0,0 +1,54 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + + # patches + replaceVars, + ffmpeg, + imagemagick, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "compress-pptx"; + version = "1.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "slhck"; + repo = "compress-pptx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+67EdAEWsRY11Pkie6AOz7Sl7MSTMGxZoQYS+M2x07Y="; + }; + + patches = [ + (replaceVars ./inject-dependency-paths.patch { + ffmpeg = lib.getExe ffmpeg; + magick = lib.getExe imagemagick; + }) + ]; + + build-system = with python3Packages; [ uv-build ]; + + dependencies = with python3Packages; [ + ffmpeg-progress-yield + tqdm + ]; + + nativeCheckInputs = [ + python3Packages.pytestCheckHook + ]; + + meta = { + description = "Compress PPTX files"; + longDescription = '' + Compress a PPTX or POTX file, converting all PNG/TIFF images to lossy + JPEGs. + ''; + homepage = "https://github.com/slhck/compress-pptx"; + license = lib.licenses.mit; + changelog = "https://github.com/slhck/compress-pptx/releases/tag/${finalAttrs.src.tag}"; + mainProgram = "compress-pptx"; + maintainers = with lib.maintainers; [ artur-sannikov ]; + }; +}) diff --git a/pkgs/by-name/ct/ctlptl/package.nix b/pkgs/by-name/ct/ctlptl/package.nix index 34e0fc1e83b4..e30477e99352 100644 --- a/pkgs/by-name/ct/ctlptl/package.nix +++ b/pkgs/by-name/ct/ctlptl/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "ctlptl"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "tilt-dev"; repo = "ctlptl"; rev = "v${finalAttrs.version}"; - hash = "sha256-y957JaHg2SnDC6yvwI/0fBFjbEKOfKFsNqOOrqQe+TU="; + hash = "sha256-vbg3gaVCFkQ6jKguNq6ClstEKpTrk9ryUG572emEY4U="; }; - vendorHash = "sha256-gJiarW1uYr5vl9nt+JN6/yRyYr9J0sfDVZcNLLcwPJY="; + vendorHash = "sha256-b9lzCNjO0rrK/kJlw5dssuQD/cyf/Wu/LJ2YNQ645LE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix index 80cf402c0519..431696e03d6f 100644 --- a/pkgs/by-name/cy/cyclonedx-python/package.nix +++ b/pkgs/by-name/cy/cyclonedx-python/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "cyclonedx-python"; - version = "7.2.2"; + version = "7.3.0"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-nTQ0y2zn4idg6x8qVjK8DeZVCMnlXLEJg89ISYabp68="; + hash = "sha256-mBOkSgHGKc77zhcMmdsrlZLXsK2t00VFiGW5eSN2lxc="; }; build-system = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/de/deezer-desktop/package.nix b/pkgs/by-name/de/deezer-desktop/package.nix index 20485351d119..ab20516815a8 100644 --- a/pkgs/by-name/de/deezer-desktop/package.nix +++ b/pkgs/by-name/de/deezer-desktop/package.nix @@ -8,15 +8,15 @@ }: let - version = "7.1.110"; + version = "7.1.120"; srcs = { x86_64-linux = fetchurl { url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz"; - hash = "sha256-g8HAAp36l0GrAg/bJOjlvNT13Z9p/geDbA5XQCk3QvM="; + hash = "sha256-RrsM8Rx/uYJpH9+w/XX0RoPw+N/+nzJCC+KFdbYzSdc="; }; aarch64-linux = fetchurl { url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz"; - hash = "sha256-W6br5bvRwgrfSiwwO5OMwfReev7t3mvI6L0zTIIDiwI="; + hash = "sha256-WgCfX7Av8YoCHmhACyyVtxut0FUfAdgTAXaIBydWTRI="; }; }; diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 31ca39af8b13..108690818904 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -1,7 +1,7 @@ { lib, copyDesktopItems, - electron_40, + electron_41, fetchFromGitHub, deltachat-rpc-server, makeDesktopItem, @@ -21,37 +21,37 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "2.43.0"; + version = "2.48.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-3hpsc/IMBTVHH6Lun9R8Dx3s53sJOb9J1fU1O56MpIc="; + hash = "sha256-9qrxzAoBdCzDaMWZnCPxKy9bISd19aI4U1kRcK85Mzg="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-kDYWu8QrVv1fAyNsPN5xY7QqExbdiM7C+Af0l9HVRDQ="; + hash = "sha256-UcQoY2NvnvWmGjHn1xwi0deyPZjtnbfQJJo32K7TX38="; }; }; - electron = electron_40; + electron = electron_41; in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "2.43.0"; + version = "2.48.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-OIRfh0/E0fg0LepWRREmpcLbUKRSdJA+RWO3vkOu6so="; + hash = "sha256-7LCaZOI9fBzVMyT0RqgGykDvN0eSTz2h6fRXK2kyRDk="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 2; - hash = "sha256-auvoo1YhHptbhTfeRbOQjc8vADCJhByb9efQFyskZPM="; + hash = "sha256-1R8vCGQlT3pvybrcPc2SKbmezprgvrIt0J+BsZHPJ7c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dj/djhtml/package.nix b/pkgs/by-name/dj/djhtml/package.nix index 7a57cf65e0ae..8c4eaf02efc3 100644 --- a/pkgs/by-name/dj/djhtml/package.nix +++ b/pkgs/by-name/dj/djhtml/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "djhtml"; - version = "3.0.10"; + version = "3.0.11"; pyproject = true; src = fetchFromGitHub { owner = "rtts"; repo = "djhtml"; tag = finalAttrs.version; - hash = "sha256-7K7/Zm6ORfza9AD+Jyl+0Q5zlxgF+WpH3a1O18VpT5k="; + hash = "sha256-l3qxPwnEyJ0sZWquaol0bOX7QvImLc8IRTfyE2yqXCo="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix index 58984bca11bd..bf04b27f2c26 100644 --- a/pkgs/by-name/em/emmylua-doc-cli/package.nix +++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix @@ -6,18 +6,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_doc_cli"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-2H/8ILVk5QnLe099a25pzMEqJLRFDxMG/fQ3f5UwgmI="; + hash = "sha256-Zj5nLeTH/4sVElYP+erg6bSTX8jFqF7sqiXfaMam8pE="; }; buildAndTestSubdir = "crates/emmylua_doc_cli"; - cargoHash = "sha256-QdL4KtQ4sJUaviqMzxmC1KW4Qy5wO7c5koy0Pl8Eua0="; + cargoHash = "sha256-JNirHIKXFsiLme5oByerHjB/3lumuAr2u3pNfxh4qa0="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 16330866a4be..7019085acea8 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eww"; - version = "0.6.0-unstable-2025-06-30"; + version = "0.6.0-unstable-2026-03-05"; src = fetchFromGitHub { owner = "elkowar"; repo = "eww"; - rev = "fddb4a09b107237819e661151e007b99b5cab36d"; - hash = "sha256-PJW4LvW9FmkG9HyUtgXOq7MDjYtBc/iJuOxyf29nD0Y="; + rev = "865cf631d5bbb5f9fccc99b3f4cc80b9eeada18c"; + hash = "sha256-fL12XFMsf/efSlbzQc7cCI366CwETkM6sWpEfcF9s6A="; }; cargoHash = "sha256-Kf99eojqXvdbZ3eRS8GBgyLYNpZKJGIJtsOsvhhSVDk="; diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index 4e2490011ad4..2e867e5377b8 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -18,18 +18,18 @@ nix-update-script, }: let - version = "1.0.68"; + version = "1.0.69"; src = fetchFromGitHub { name = "exo"; owner = "exo-explore"; repo = "exo"; tag = "v${version}"; - hash = "sha256-ryaz68vXS/SjPxGsWxtUSlzZrLBxV1tbBmJVraZu3RI="; + hash = "sha256-xHEvjztTSDMwfxdNt16Yo/hX1Fhpwz/zF7mnQsIOteY="; }; python = python3.override { packageOverrides = _final: prev: { - # https://github.com/exo-explore/exo/blob/ba611f9cd0e21d3e63e2327b18fbc888fd085269/pyproject.toml#L67 + # https://github.com/exo-explore/exo/blob/v1.0.69/pyproject.toml#L63 mlx = prev.mlx.overridePythonAttrs (old: { version = "custom"; @@ -39,6 +39,27 @@ let rev = "address-rdma-gpu-locks"; hash = "sha256-GosFIWxIB48Egb1MqJrR3xhsUsQeWdRk5rV93USY6wQ="; }; + + # mlx.meta.changelog fails to evaluate as it depends on mlx.src.tag which is not defined in + # this override + meta = old.meta // { + changelog = ""; + }; + }); + + # https://github.com/exo-explore/exo/blob/v1.0.69/pyproject.toml#L64 + mlx-lm = prev.mlx-lm.overridePythonAttrs (old: { + version = "custom"; + + src = fetchFromGitHub { + owner = "rltakashige"; + repo = "mlx-lm"; + rev = "leo/fix-deepseek-v32-indexer"; + hash = "sha256-sRMykX0hd15VF8tdO5MCjuVxkQvpjeluaS8U+wQvP4Q="; + }; + + # mlx-lm.meta.changelog fails to evaluate as it depends on mlx-lm.src.tag which is not + # defined in this override meta = old.meta // { changelog = ""; }; @@ -56,7 +77,7 @@ let cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname src version; - hash = "sha256-Ga3/Yhg2Wn2w8cnNtq11/AN7K4nht4chSEIVOkYEI/U="; + hash = "sha256-gwOdA2sHz8n4GfNjK+OYmttXUTle4WYmAE2Y0KXYrwg="; }; # Bypass rust nightly features not being available on rust stable @@ -200,6 +221,7 @@ python3Packages.buildPythonApplication (finalAttrs: { # Require internet access: # openai_harmony.HarmonyError: error downloading or loading vocab file: failed to download or load vocab file + "TestParseGptOssMaxTokensTruncation" "test_both_formats_produce_identical_tool_calls" "test_format_a_yields_tool_call" "test_format_b_yields_tool_call" diff --git a/pkgs/by-name/fa/fantasque-sans-mono/package.nix b/pkgs/by-name/fa/fantasque-sans-mono/package.nix index c14e694f0d3a..52dfc6e9f959 100644 --- a/pkgs/by-name/fa/fantasque-sans-mono/package.nix +++ b/pkgs/by-name/fa/fantasque-sans-mono/package.nix @@ -2,23 +2,31 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "fantasque-sans-mono"; version = "1.8.0"; + outputs = [ + "out" + "webfont" + "doc" + ]; + src = fetchzip { - url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono-Normal.zip"; + url = "https://github.com/belluzj/fantasque-sans/releases/download/v${finalAttrs.version}/FantasqueSansMono-Normal.zip"; stripRoot = false; hash = "sha256-MNXZoDPi24xXHXGVADH16a3vZmFhwX0Htz02+46hWFc="; }; + nativeBuildInputs = [ installFonts ]; + installPhase = '' runHook preInstall - install -Dm644 OTF/*.otf -t $out/share/fonts/opentype - install -Dm644 README.md -t $out/share/doc/${pname}-${version} + install -m644 -Dt $doc/share/doc/${finalAttrs.pname}-${finalAttrs.version} {*.md,*.txt} runHook postInstall ''; @@ -30,4 +38,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.rycee ]; }; -} +}) diff --git a/pkgs/by-name/fd/fdtools/package.nix b/pkgs/by-name/fd/fdtools/package.nix index e7cfff46f620..d1a56d54d88f 100644 --- a/pkgs/by-name/fd/fdtools/package.nix +++ b/pkgs/by-name/fd/fdtools/package.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation { description = "Set of utilities for working with file descriptors"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/fl/flashlabel-yxwl/package.nix b/pkgs/by-name/fl/flashlabel-yxwl/package.nix index b862bfd7cb38..ba3f85b4b3e8 100644 --- a/pkgs/by-name/fl/flashlabel-yxwl/package.nix +++ b/pkgs/by-name/fl/flashlabel-yxwl/package.nix @@ -67,7 +67,10 @@ stdenv.mkDerivation rec { - A81 - A81H - C80 + - C801 - C80H + - C80S1 + - C80Y1 - D80 - D80 Pro - Y8 diff --git a/pkgs/by-name/ge/geteltorito/package.nix b/pkgs/by-name/ge/geteltorito/package.nix index 7b367555cc5e..51f042c097ed 100644 --- a/pkgs/by-name/ge/geteltorito/package.nix +++ b/pkgs/by-name/ge/geteltorito/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Extract the initial/default boot image from a CD image if existent"; homepage = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/"; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = [ ]; license = lib.licenses.gpl2Only; mainProgram = "geteltorito"; }; diff --git a/pkgs/by-name/gh/gh-token/package.nix b/pkgs/by-name/gh/gh-token/package.nix index 10b63dd5389f..05a0728f0442 100644 --- a/pkgs/by-name/gh/gh-token/package.nix +++ b/pkgs/by-name/gh/gh-token/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gh-token"; - version = "2.0.9"; + version = "2.0.10"; src = fetchFromGitHub { owner = "Link-"; repo = "gh-token"; rev = "v${version}"; - hash = "sha256-ff3Dzajh/7p0yNSKCHJzJcqkTpf09zuZ6Hp0ygDv6o0="; + hash = "sha256-pjOGEd2c2yRua3qOTEKuTg89YbVBTAIvvZ/Rd8NFesI="; }; vendorHash = "sha256-brAFqWdvaJwURdWb9m8x21nhuXeRxIJX6FsUfGiFIWQ="; diff --git a/pkgs/by-name/gi/github-distributed-owners/package.nix b/pkgs/by-name/gi/github-distributed-owners/package.nix index 579da842b12c..8b47253fa75f 100644 --- a/pkgs/by-name/gi/github-distributed-owners/package.nix +++ b/pkgs/by-name/gi/github-distributed-owners/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "github-distributed-owners"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "andrewring"; repo = "github-distributed-owners"; tag = "v${finalAttrs.version}"; - hash = "sha256-oLRcH1lgRxlYIlyk3bPWO5YmCIq462YUjBjMSPOF7Ic="; + hash = "sha256-Ry7l4hiVWtSm47DYG38N0L7V/z5wNfPm9tt+8Zs5tsI="; }; - cargoHash = "sha256-pt/GoXF/uSU78pZqG8PgFe+tlbwZH2qpGQD7jgC52NM="; + cargoHash = "sha256-xLc9T2rS511/qWyZpqSNFVyfyf4+gzheOF95TpVlUfc="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index ed71a274a6b6..020f408f79d3 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "glaze"; - version = "7.1.0"; + version = "7.2.2"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; tag = "v${finalAttrs.version}"; - hash = "sha256-W48BDsxUrFjjqUFwBcBqHr5Y7h+BtGGWdioGukBqzbE="; + hash = "sha256-E92oxXOcmA4d3s2k0D+DppnHt0Ks900+3W0XoGbbcG4="; }; nativeBuildInputs = [ cmake ]; @@ -31,9 +31,14 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { + homepage = "https://stephenberry.github.io/glaze/"; + changelog = "https://github.com/stephenberry/glaze/releases/tag/v${finalAttrs.version}"; description = "Extremely fast, in memory, JSON and interface library for modern C++"; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ moni ]; + maintainers = with lib.maintainers; [ + moni + miniharinn + ]; license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/go/gojq/package.nix b/pkgs/by-name/go/gojq/package.nix index a50fa19e5dd7..f3cac51e6dfb 100644 --- a/pkgs/by-name/go/gojq/package.nix +++ b/pkgs/by-name/go/gojq/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "gojq"; - version = "0.12.18"; + version = "0.12.19"; src = fetchFromGitHub { owner = "itchyny"; repo = "gojq"; rev = "v${finalAttrs.version}"; - hash = "sha256-9oqyNG8kaM4LmMWOZ2aQqabx97xw6Bt1PgjhVuPU+YE="; + hash = "sha256-egaBNHKKzwDwaUN4GT+Xvt11Nz6ojNMSIrXbcEisyI4="; }; - vendorHash = "sha256-NxhoCbDRduegRcBoZbNi2CB7QRXvqpLv7cAL2mEy9tM="; + vendorHash = "sha256-6UnX9YHh4RGcIFfqaJLxDPxuGQ6KO4UIOryXsoJUjFs="; ldflags = [ "-s" diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix index 39baa4bfe7a5..0c27ac51bc2c 100644 --- a/pkgs/by-name/ho/homepage-dashboard/package.nix +++ b/pkgs/by-name/ho/homepage-dashboard/package.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "homepage-dashboard"; - version = "1.11.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; tag = "v${finalAttrs.version}"; - hash = "sha256-jnv9PnClm/jIQ4uU6c4A1UiAmwoihG0l6k3fUbD47I4="; + hash = "sha256-+ssT+eV/w9mzY2QTbna/RKYLVkeRREt318sc/bVgW1k="; }; pnpmDeps = fetchPnpmDeps { @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-X5j9XppbcasGuC7fUsj4XzbaQFM9WcRcXjgJHN/inR8="; + hash = "sha256-deKVLAmgQEld59PpuaWse+laPoe4L9Ck1IjmgiP26bg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 2fe1ea2668d6..9b81b25d694d 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.159.0"; + version = "0.159.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-R+XUgATk6KHaQ+hTIbFSHEzC0VIzaVLna0mMGDRZILw="; + hash = "sha256-86qlh4did365g75j3fk5gkBp3T3YH3zEnNhaOrPFVcI="; }; - vendorHash = "sha256-qAZ+EnU1Yaom8QHjaMoAJSaN7HslNpwifmBMlgnmmAE="; + vendorHash = "sha256-w6wjKB4jQejxW7IqpZaujxlZSUxWYqHiPI6aqOOD2+0="; checkFlags = let diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix index 3d1f5efa7b9e..0590a268825e 100644 --- a/pkgs/by-name/ir/irrd/package.nix +++ b/pkgs/by-name/ir/irrd/package.nix @@ -65,14 +65,14 @@ in py.pkgs.buildPythonPackage (finalAttrs: { pname = "irrd"; - version = "4.5.1"; + version = "4.5.2"; pyproject = true; src = fetchFromGitHub { owner = "irrdnet"; repo = "irrd"; tag = "v${finalAttrs.version}"; - hash = "sha256-98DXooabwJtjI+m/HNMGBkZKT843bEbTaXJgflVdx/A="; + hash = "sha256-Lr2+3pG22l479mNrn1JFiea+zp+n9qWVX1yTp0Cj4Ds="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/kd/kdotool/package.nix b/pkgs/by-name/kd/kdotool/package.nix index 79ef65e19ac5..f0e0650ce685 100644 --- a/pkgs/by-name/kd/kdotool/package.nix +++ b/pkgs/by-name/kd/kdotool/package.nix @@ -8,29 +8,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { - version = "0.2.2-pre"; + version = "0.2.2"; pname = "kdotool"; src = fetchFromGitHub { owner = "jinliu"; repo = "kdotool"; rev = "v${finalAttrs.version}"; - hash = "sha256-qx4bWAFQcoLM/r4aNzmoZdjclw8ccAW8lKLda6ON1aQ="; + hash = "sha256-aJRqFcKyu4/aqI3WtH9NjzjNgiI6lq0VgCXNGaNdyvE="; }; - patches = [ - # Remove these two on next release. - (fetchpatch { - url = "https://github.com/jinliu/kdotool/commit/049e3f5620ad8c5484241d7d06d742bc17d423ed.patch"; - hash = "sha256-VTpHlT6XMVRgJIeLjxZPHkzaYFZCYtS8IAD0mKZ8rzs="; - }) - (fetchpatch { - url = "https://github.com/jinliu/kdotool/commit/e0a3bff3b5d9882033dd72836e5fcff572b64135.patch"; - hash = "sha256-6IsV9O2h9N/FxGQRHS8qAbEqdr7282ziGza5K52vpPk="; - }) - ]; - - cargoHash = "sha256-ASR2zMwVCKeEZPYQNoO54J00eZyTn1i6FE0NBCJWSCs="; + cargoHash = "sha256-QrJVN2O/pDCIpD1ioFPZyj7au3DQtU3l/I440WsyYWo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix index 0ce3f53e2bba..2840c33984ef 100644 --- a/pkgs/by-name/la/lagrange/package.nix +++ b/pkgs/by-name/la/lagrange/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.20.2"; + version = "1.20.3"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; tag = "v${finalAttrs.version}"; - hash = "sha256-Rin9frCxY7vMJQbErtR7pXss2GciL4LbXg+BFHFNjn4="; + hash = "sha256-i6W4618/r3Xc9dNNxkc9eHlgHK2amZ0FQtq/qtr5sE8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libu2f-emu/package.nix b/pkgs/by-name/li/libu2f-emu/package.nix new file mode 100644 index 000000000000..640402e64d20 --- /dev/null +++ b/pkgs/by-name/li/libu2f-emu/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + openssl, +}: + +stdenv.mkDerivation { + pname = "libu2f-emu"; + version = "0-unstable-2020-09-04"; + + src = fetchFromGitHub { + owner = "Agnoctopus"; + repo = "libu2f-emu"; + rev = "d1c4b9c2e1c42e8931033912c8b609521f2a7756"; + hash = "sha256-kDAXA/v2nb/QAiJpGs0rTjm0t6CdbonTwHHoYhDQExE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + postPatch = '' + # Upstream meson.build uses error() instead of warning() for missing + # doxygen/dot, which fails the configure. + substituteInPlace meson.build \ + --replace-fail "error('Skip doc:" "warning('Skip doc:" \ + --replace-fail "error('Skip dot in doc:" "warning('Skip dot in doc:" + + # Fix header guard typo: TRANSaCTION_H -> TRANSACTION_H + substituteInPlace src/usb/transaction.h \ + --replace-fail "define TRANSaCTION_H" "define TRANSACTION_H" + + # Install headers into a u2f-emu/ subdirectory so consumers can + # use #include (expected by QEMU). + substituteInPlace src/meson.build \ + --replace-fail "install_headers(u2f_emu_headers)" \ + "install_headers(u2f_emu_headers, subdir: 'u2f-emu')" + ''; + + # Disable -Werror: upstream uses OpenSSL EC_KEY APIs deprecated since 3.0. + mesonFlags = [ "--warnlevel=2" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + + meta = { + description = "Universal 2nd Factor (U2F) Emulation C Library"; + homepage = "https://github.com/Agnoctopus/libu2f-emu"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ philiptaron ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ma/material-icons/package.nix b/pkgs/by-name/ma/material-icons/package.nix index 33559df909b4..5a9f94bae8fa 100644 --- a/pkgs/by-name/ma/material-icons/package.nix +++ b/pkgs/by-name/ma/material-icons/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchFromGitHub, nix-update-script, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -19,17 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontConfigure = true; dontBuild = true; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - cp font/*.ttf $out/share/fonts/truetype - - mkdir -p $out/share/fonts/opentype - cp font/*.otf $out/share/fonts/opentype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index 556e3ae1b205..03d7cc2dfefb 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.19.21"; + version = "1.19.22"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-vNWnGLVbwsyD0DqOXe1dfUy/Mym+YhBzGlrZrgZ3RuE="; + hash = "sha256-HRFtKx9g7AsBPl3HlOf+2giDc6a7e4YmQZlg4hElfdI="; }; - vendorHash = "sha256-yj+vCpwyyyw0++V1UHxzV8j1tZ+Jc65eilyef9UShZQ="; + vendorHash = "sha256-K5lC6bvetwaXvufa+FU+noXWXBem/IZ1pkl2eLo7vTc="; excludedPackages = [ "./test" ]; diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index cf117481be8b..363dfc8835c9 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "minijinja"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = finalAttrs.version; - hash = "sha256-l/79Q/5enkhQ3KggSWQKtjlF+bxSzOz73dwDhewM6mo="; + hash = "sha256-aZBC2OypmrPNU/uuaCCjhcFTJn0jl3VPTJYHh0piTxo="; }; - cargoHash = "sha256-WujWLLnz3xSR5H1IOsVYoB1o/R84a+BBdUTROMHz7xA="; + cargoHash = "sha256-TGqfng5SB2tTplZaFWC6BM/L385av6tYTQvcHsSk3h0="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/mk/mktorrent/package.nix b/pkgs/by-name/mk/mktorrent/package.nix index 3bb71c702c4d..1aada679ea06 100644 --- a/pkgs/by-name/mk/mktorrent/package.nix +++ b/pkgs/by-name/mk/mktorrent/package.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/pobrn/mktorrent/wiki"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - Profpatsch winter ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/mp/mpv/scripts/convert.nix b/pkgs/by-name/mp/mpv/scripts/convert.nix index 34243ab928d3..dc2139cb33bb 100644 --- a/pkgs/by-name/mp/mpv/scripts/convert.nix +++ b/pkgs/by-name/mp/mpv/scripts/convert.nix @@ -38,7 +38,7 @@ buildLua { meta = { description = "Convert parts of a video while you are watching it in mpv"; homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = [ ]; longDescription = '' When this script is loaded into mpv, you can hit Alt+W to mark the beginning and Alt+W again to mark the end of the clip. Then a settings window opens. diff --git a/pkgs/by-name/mu/mustache-spec/package.nix b/pkgs/by-name/mu/mustache-spec/package.nix index 0329ac22b946..1f0d6b531ed6 100644 --- a/pkgs/by-name/mu/mustache-spec/package.nix +++ b/pkgs/by-name/mu/mustache-spec/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://mustache.github.io/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Profpatsch ]; + maintainers = [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/mu/muvm/package.nix b/pkgs/by-name/mu/muvm/package.nix index 2c85e4a7eff3..c132cbec943d 100644 --- a/pkgs/by-name/mu/muvm/package.nix +++ b/pkgs/by-name/mu/muvm/package.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "muvm"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "AsahiLinux"; repo = "muvm"; tag = "muvm-${finalAttrs.version}"; - hash = "sha256-k3Jj/Tzu5ZfnADMiVG7pAPqosrkZvhmehi0NMbyudN0="; + hash = "sha256-eXsU2QRJ55gx5RhjT+m9F1KAFqGrd4WwnyR3eMpuIc4="; }; - cargoHash = "sha256-jFNyQD2Hf1K5+wHDRD2WG70IJfZbL+hT/gtjeUnt5Mk="; + cargoHash = "sha256-OP44LRMN4Lp9LaXQ8Oa8B4LRTqlMyaTa0xKn4eoh1LQ="; postPatch = '' substituteInPlace crates/muvm/src/guest/bin/muvm-guest.rs \ diff --git a/pkgs/by-name/ne/nettee/package.nix b/pkgs/by-name/ne/nettee/package.nix index d0ff55435ebd..cad2b11f7b0a 100644 --- a/pkgs/by-name/ne/nettee/package.nix +++ b/pkgs/by-name/ne/nettee/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sourceforge.net/projects/nettee"; description = ''Network "tee" program''; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ Profpatsch ]; + maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "nettee"; }; diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index 7299597c8575..f020830cf1ba 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "nfpm"; - version = "2.45.2"; + version = "2.46.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = "nfpm"; rev = "v${finalAttrs.version}"; - hash = "sha256-MzxN4oQFmhnuR8T5wa5AGKjL+LhlTSBd2tGVf9WsCBc="; + hash = "sha256-dzgC8SnGsKdW95xyq7pXacBvCTrte6QQCjYvo5R4D9I="; }; - vendorHash = "sha256-cq0pcbC0T3klh3D9l0e0u5JPYv1kWYlpeNYyGczGX+A="; + vendorHash = "sha256-HfqPqGpwInTrGjTCA4qJjtngJTCmb+c/sJ1Uhi/CCZ0="; ldflags = [ "-s" diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index 41607ef0fffe..f6518f9553f8 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "omnictl"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-ncffAF1gEsCMeUszgqZExTSYRPkZ6em85S9thM1U3Sc="; + hash = "sha256-IxPsm361gYdYWDy16vai5JsmJ5NWUSIRQ9k2Qnwi2K8="; }; vendorHash = "sha256-snrOKwD4xbMTdjP13KLTVVB7ikXG+yHS8QT60/tHZ3I="; diff --git a/pkgs/tools/networking/ebpf-verifier/default.nix b/pkgs/by-name/pr/prevail/package.nix similarity index 52% rename from pkgs/tools/networking/ebpf-verifier/default.nix rename to pkgs/by-name/pr/prevail/package.nix index b672d2c6297f..dc0228506381 100644 --- a/pkgs/tools/networking/ebpf-verifier/default.nix +++ b/pkgs/by-name/pr/prevail/package.nix @@ -4,28 +4,30 @@ fetchFromGitHub, boost, cmake, - catch2, + catch2_3, + microsoft-gsl, pkg-config, replaceVars, yaml-cpp, }: -stdenv.mkDerivation { - pname = "ebpf-verifier"; - version = "unstable-2023-07-15"; +stdenv.mkDerivation (finalAttrs: { + pname = "prevail"; + version = "0.2.0"; src = fetchFromGitHub { owner = "vbpf"; - repo = "ebpf-verifier"; - rev = "de14d3aa3cd2845b621faf32b599766a66e158cf"; + repo = "prevail"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-gnxB8ZLbTyIYpd61T57LPKFm1MHufeVEq/qN9pu2Vpk="; + hash = "sha256-qlQSoz9GE2Z2rzmrPIj+HnIQmNxiBSgvR40FR9psuDc="; }; patches = [ (replaceVars ./remove-fetchcontent-usage.patch { # We will download them instead of cmake's fetchContent - catch2Src = catch2.src; + catch2Src = catch2_3.src; + gslSrc = microsoft-gsl.src; }) ]; @@ -39,21 +41,35 @@ stdenv.mkDerivation { yaml-cpp ]; + cmakeFlags = [ + (lib.cmakeBool "prevail_ENABLE_TESTS" finalAttrs.doCheck) + ]; + installPhase = '' runHook preInstall mkdir -p $out/bin - cp ../check $out/bin/ebpf-verifier + cp ../bin/prevail $out/bin/prevail runHook postInstall ''; + doCheck = true; + + checkPhase = '' + runHook preCheck + pushd .. + bin/tests + popd + runHook postCheck + ''; + meta = { description = "eBPF verifier based on abstract interpretation"; - homepage = "https://github.com/vbpf/ebpf-verifier"; + homepage = "https://github.com/vbpf/prevail"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = [ ]; - mainProgram = "ebpf-verifier"; + mainProgram = "prevail"; }; -} +}) diff --git a/pkgs/by-name/pr/prevail/remove-fetchcontent-usage.patch b/pkgs/by-name/pr/prevail/remove-fetchcontent-usage.patch new file mode 100644 index 000000000000..84827c87db01 --- /dev/null +++ b/pkgs/by-name/pr/prevail/remove-fetchcontent-usage.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,9 +75,7 @@ + endif () + + FetchContent_Declare(GSL +- GIT_REPOSITORY "https://github.com/microsoft/GSL" +- GIT_TAG "v4.2.0" +- GIT_SHALLOW ON ++ SOURCE_DIR "@gslSrc@" + ) + set(GSL_INSTALL ON CACHE BOOL "Force GSL install to vendor it with prevail" FORCE) + set(GSL_TEST OFF CACHE BOOL "Skip GSL tests when building as a dependency" FORCE) +@@ -196,9 +194,7 @@ + # Tests + if (prevail_ENABLE_TESTS) + FetchContent_Declare(Catch2 +- GIT_REPOSITORY "https://github.com/catchorg/Catch2.git" +- GIT_TAG "v3.13.0" +- GIT_SHALLOW ON ++ SOURCE_DIR "@catch2Src@" + ) + FetchContent_MakeAvailable(Catch2) + diff --git a/pkgs/by-name/py/pyload-ng/declarative-default-user.patch b/pkgs/by-name/py/pyload-ng/declarative-default-user.patch deleted file mode 100644 index 3c3e6f4ba724..000000000000 --- a/pkgs/by-name/py/pyload-ng/declarative-default-user.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/pyload/core/__init__.py b/src/pyload/core/__init__.py -index 4324fc700..f7fcd66ec 100644 ---- a/src/pyload/core/__init__.py -+++ b/src/pyload/core/__init__.py -@@ -46,8 +46,8 @@ class Exit(Exception): - # improve external scripts - class Core: - LOCALE_DOMAIN = APPID -- DEFAULT_USERNAME = APPID -- DEFAULT_PASSWORD = APPID -+ DEFAULT_USERNAME = os.getenv("PYLOAD_DEFAULT_USERNAME", APPID) -+ DEFAULT_PASSWORD = os.getenv("PYLOAD_DEFAULT_PASSWORD", APPID) - DEFAULT_DATADIR = os.path.join( - os.getenv("APPDATA") or USERHOMEDIR, "pyLoad" if os.name == "nt" else ".pyload" - ) diff --git a/pkgs/by-name/py/pyload-ng/declarative-env-config.patch b/pkgs/by-name/py/pyload-ng/declarative-env-config.patch deleted file mode 100644 index 42f89ee485cb..000000000000 --- a/pkgs/by-name/py/pyload-ng/declarative-env-config.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/pyload/core/__init__.py b/src/pyload/core/__init__.py -index 4324fc700..5d915a85e 100644 ---- a/src/pyload/core/__init__.py -+++ b/src/pyload/core/__init__.py -@@ -128,6 +128,13 @@ class Core: - else: - self._debug = max(0, int(debug)) - -+ # Allow setting any option declaratively, for the NixOS module -+ for env, value in os.environ.items(): -+ if not env.startswith("PYLOAD__"): -+ continue -+ section, opt = env.removeprefix("PYLOAD__").lower().split("__") -+ self.config.set(section, opt, value) -+ - # If no argument set, read storage dir from config file, - # otherwise save setting to config dir - if storagedir is None: diff --git a/pkgs/by-name/py/pyload-ng/package.nix b/pkgs/by-name/py/pyload-ng/package.nix deleted file mode 100644 index e28840eb72ea..000000000000 --- a/pkgs/by-name/py/pyload-ng/package.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - fetchPypi, - nixosTests, - python3, -}: - -python3.pkgs.buildPythonApplication (finalAttrs: { - version = "0.5.0b3.dev88"; - pname = "pyload-ng"; - pyproject = true; - - src = fetchPypi { - inherit (finalAttrs) version; - # The uploaded tarball uses an underscore in recent releases - pname = "pyload_ng"; - hash = "sha256-6YVYXiYxUkpQmDG/aGEgBlJy2oUGCNDkIsUt0TRcaro="; - }; - - patches = [ - # Makes it possible to change the default username/password in the module - ./declarative-default-user.patch - # Makes it possible to change the configuration through environment variables - # in the NixOS module (aimed mostly at listen address/port) - ./declarative-env-config.patch - ]; - - postPatch = '' - # relax version bounds - sed -i -E 's/([A-z0-9]*)~=[^;]*(.*)/\1\2/' setup.cfg - ''; - - dependencies = with python3.pkgs; [ - bitmath - certifi - cheroot - cryptography - dukpy - filetype - flask - flask-babel - flask-caching - flask-compress - flask-session - flask-themes2 - pycurl - semver - setuptools - ]; - - optional-dependencies = { - plugins = with python3.pkgs; [ - beautifulsoup4 # for some plugins - colorlog # colorful console logging - pillow # for some CAPTCHA plugin - send2trash # send some files to trash instead of deleting them - slixmpp # XMPP plugin - ]; - }; - - passthru.tests = { - inherit (nixosTests) pyload; - }; - - meta = { - description = "Free and open-source download manager with support for 1-click-hosting sites"; - homepage = "https://github.com/pyload/pyload"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ ruby0b ]; - mainProgram = "pyload"; - }; -}) diff --git a/pkgs/by-name/qe/qemu/package.nix b/pkgs/by-name/qe/qemu/package.nix index 5dde5e581158..be472939ad21 100644 --- a/pkgs/by-name/qe/qemu/package.nix +++ b/pkgs/by-name/qe/qemu/package.nix @@ -92,6 +92,8 @@ fuse3, canokeySupport ? false, canokey-qemu, + u2fEmuSupport ? false, + libu2f-emu, capstoneSupport ? !minimal, capstone, valgrindSupport ? false, @@ -245,6 +247,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals uringSupport [ liburing ] ++ lib.optionals fuseSupport [ fuse3 ] ++ lib.optionals canokeySupport [ canokey-qemu ] + ++ lib.optionals u2fEmuSupport [ libu2f-emu ] ++ lib.optionals capstoneSupport [ capstone ] ++ lib.optionals valgrindSupport [ valgrind-light ]; @@ -329,6 +332,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional uringSupport "--enable-linux-io-uring" ++ lib.optional fuseSupport "--enable-fuse" ++ lib.optional canokeySupport "--enable-canokey" + ++ lib.optional u2fEmuSupport "--enable-u2f" ++ lib.optional capstoneSupport "--enable-capstone" ++ lib.optional (!pluginsSupport) "--disable-plugins" ++ lib.optional (!enableBlobs) "--disable-install-blobs" diff --git a/pkgs/by-name/ra/rauthy/package.nix b/pkgs/by-name/ra/rauthy/package.nix index 4277dd469d50..0d154575efe4 100644 --- a/pkgs/by-name/ra/rauthy/package.nix +++ b/pkgs/by-name/ra/rauthy/package.nix @@ -11,6 +11,7 @@ wasm-bindgen-cli_0_2_108, binaryen, lld, + rust-jemalloc-sys-unprefixed, }: let version = "0.34.3"; @@ -98,6 +99,8 @@ rustPlatform.buildRustPackage (finalAttrs: { perl ]; + buildInputs = [ rust-jemalloc-sys-unprefixed ]; + preBuild = '' cp -r ${frontend}/lib/node_modules/frontend/dist/templates/html/ templates/html cp -r ${frontend}/lib/node_modules/frontend/dist/static/ static diff --git a/pkgs/by-name/se/sealcurses/package.nix b/pkgs/by-name/se/sealcurses/package.nix index efc40858f655..b27da69d7ff5 100644 --- a/pkgs/by-name/se/sealcurses/package.nix +++ b/pkgs/by-name/se/sealcurses/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation { pname = "sealcurses"; - version = "0-unstable-2024-12-02"; # No release yet + version = "0-unstable-2026-03-22"; # No release yet src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "sealcurses"; - rev = "310348a6b88678a47d371c7edfcc1e8c76ca1677"; - hash = "sha256-SEK3w6pVrYi+h2l5RuULpORYPnm8H78lEVR01cMkku0="; + rev = "35c2e0332301f7aa14d3a849b30a844d65fa81bd"; + hash = "sha256-ILskZo5BNw4JK6n0ig2ULkUI7k9mdPjuk4VVEB7jx8c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/secrethound/package.nix b/pkgs/by-name/se/secrethound/package.nix index bb7835df2731..18eb778b9839 100644 --- a/pkgs/by-name/se/secrethound/package.nix +++ b/pkgs/by-name/se/secrethound/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "secrethound"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "rafabd1"; repo = "SecretHound"; rev = "v${finalAttrs.version}"; - hash = "sha256-TyN7byX4rkRXrKzcx/u/LYNqVRBue2YNJRnkF+f34jQ="; + hash = "sha256-mZ2rZMjNKLJ+AQQlEGUwgSpIAhqbHG53wUNDIEtJXwI="; }; vendorHash = "sha256-oTyI3/+evDTzyH+BjfSP0A1r2bYVAMxtWRsg0G1d2zQ="; diff --git a/pkgs/by-name/se/sem/package.nix b/pkgs/by-name/se/sem/package.nix index f600970bef51..313402ea4955 100644 --- a/pkgs/by-name/se/sem/package.nix +++ b/pkgs/by-name/se/sem/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "sem"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "semaphoreci"; repo = "cli"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-sWj0eenqZBanHO2E047Jd0MlphgzszvD+1ZsMFHiQ00="; + sha256 = "sha256-+MNl+JOpC3FgzWBVybTDqV6VE4cdBafQ77IYcXO4j48="; }; vendorHash = "sha256-XEr/vXamJ7GTRpXNdcVQ9PcUVvQ8EW3pmq/tEZMHSDo="; diff --git a/pkgs/by-name/se/seshat/package.nix b/pkgs/by-name/se/seshat/package.nix index 681773a54d7c..91830d01f6c8 100644 --- a/pkgs/by-name/se/seshat/package.nix +++ b/pkgs/by-name/se/seshat/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: let @@ -18,13 +19,7 @@ stdenvNoCC.mkDerivation { stripRoot = false; }; - installPhase = '' - runHook preInstall - - install -D -m444 -t $out/share/fonts/opentype $src/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://dotcolon.net/font/seshat/"; diff --git a/pkgs/by-name/sh/shelfmark-frontend/package.nix b/pkgs/by-name/sh/shelfmark-frontend/package.nix index d8f448281fe8..95fcfeac6214 100644 --- a/pkgs/by-name/sh/shelfmark-frontend/package.nix +++ b/pkgs/by-name/sh/shelfmark-frontend/package.nix @@ -9,7 +9,7 @@ buildNpmPackage (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/src/frontend"; - npmDepsHash = "sha256-RAzotFGj0FGpfF7iyB5f2fdKFvMLcpJx142yplRwboU="; + npmDepsHash = "sha256-VCnxEcaqWo31oIpF6X8Lid4I/aaQCQZ9l9rV6TTqXPI="; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/sh/shelfmark/package.nix b/pkgs/by-name/sh/shelfmark/package.nix index 464e4755bef4..ca13ad35ae59 100644 --- a/pkgs/by-name/sh/shelfmark/package.nix +++ b/pkgs/by-name/sh/shelfmark/package.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "shelfmark"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "calibrain"; repo = "shelfmark"; tag = "v${finalAttrs.version}"; - hash = "sha256-t4t7je7Y/aezx/EX7paJIcsCq5qyZeU/+mPLeZ8oTPg="; + hash = "sha256-Fe7zu51gFG2QgcBWcGkFi64CdZW4ohZg+7jdmeMFVLI="; }; nativeBuildInputs = [ @@ -90,7 +90,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/calibrain/shelfmark"; changelog = "https://github.com/calibrain/shelfmark/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.jamiemagee ]; + maintainers = with lib.maintainers; [ + jamiemagee + pyrox0 + ]; mainProgram = "shelfmark"; }; }) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 8d6c7f4e0f37..4ffffd4064e1 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "signalbackup-tools"; - version = "20260306"; + version = "20260325"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = finalAttrs.version; - hash = "sha256-mGJkkE+sT+FKd2tSAXcmDAmKbsE9H9k5IyQbzxJcvjY="; + hash = "sha256-5Tb9bY0sZvCUlYkGpmu6hVi7EOEMaygEH9x3tbyo2T4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 33cf6716b6b8..3de192463d64 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -36,20 +36,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qsqg6WKfpPOZwvH6aFcDVjIAJcBckClqE/1g92JvR2M="; + hash = "sha256-2OBTX4Lh3dx7NbuWsvyB4FzXk6ywDcp6LswhlRlBjCI="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-R+/njKBraRPgWLnhBXy969ILA/fn0wyq6OkYgJnS1WM="; + vendorHash = "sha256-EfGCeVsD4yYUBEkSCbRdmMitZfJmQffcbScKaAOX+0o="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_9; fetcherVersion = 3; - hash = "sha256-N/LKkE0I6sIiO0+wGvPZMgaWKUPcq7Gjpsw5Oj9cvqI="; + hash = "sha256-HKAK0XwudDuMk/1l6FH1h/FS0xUhzE0s37tpXDdtMU4="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index ef21f148c744..c719cc855d05 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.69"; + version = "3.16.72"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-OSN3K2lSag5aA58UmfI1JMvmksuEVwlT7TOeBOsEmX8="; + hash = "sha256-4jL8uNtLxjFObsp34uYAdPinNHZEcLk+wQ9Dg2wGxgk="; }; outputs = [ diff --git a/pkgs/by-name/ta/tagtime/package.nix b/pkgs/by-name/ta/tagtime/package.nix index d877baf57d2b..3a665b9c59c0 100644 --- a/pkgs/by-name/ta/tagtime/package.nix +++ b/pkgs/by-name/ta/tagtime/package.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation { ''; homepage = "https://messymatters.com/tagtime/"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = [ ]; mainProgram = "tagtimed"; }; } diff --git a/pkgs/by-name/ta/takao/package.nix b/pkgs/by-name/ta/takao/package.nix index 58f9b29720bb..80ea2828316a 100644 --- a/pkgs/by-name/ta/takao/package.nix +++ b/pkgs/by-name/ta/takao/package.nix @@ -2,25 +2,19 @@ lib, stdenvNoCC, fetchurl, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "takao"; version = "00303.01"; src = fetchurl { - url = "mirror://ubuntu/pool/universe/f/fonts-takao/fonts-takao_${version}.orig.tar.gz"; + url = "mirror://ubuntu/pool/universe/f/fonts-takao/fonts-takao_${finalAttrs.version}.orig.tar.gz"; hash = "sha256-0wjHNv1yStp0q9D0WfwjgUYoUKcCrXA5jFO8PEVgq5k="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts - cp *.ttf $out/share/fonts - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Japanese TrueType Gothic, P Gothic, Mincho, P Mincho fonts"; @@ -29,4 +23,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with lib.maintainers; [ serge ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix index b83d7a9e9b80..6bfcd6120daa 100644 --- a/pkgs/by-name/ta/tanka/package.nix +++ b/pkgs/by-name/ta/tanka/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "tanka"; - version = "0.36.3"; + version = "0.36.4"; src = fetchFromGitHub { owner = "grafana"; repo = "tanka"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ukWPmOEFOMnjwqTy9GkA8+WF3ItXUUvuh8EdKngLlT8="; + sha256 = "sha256-t40sGSXKb7Q0WvMl4D7J59FurbkGRX8PHA34WM2Hnwk="; }; - vendorHash = "sha256-nO0nv7tpUovtooeCr6zFA2mgCvuaLszrjU0EpcMMRmE="; + vendorHash = "sha256-4Ojuu4Jv++yh/wbJATdd/uozFb9gDVv3nD64Iy5EjQQ="; doCheck = false; # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK diff --git a/pkgs/by-name/ta/tar2ext4/package.nix b/pkgs/by-name/ta/tar2ext4/package.nix index a5181813a91f..44bc4792427a 100644 --- a/pkgs/by-name/ta/tar2ext4/package.nix +++ b/pkgs/by-name/ta/tar2ext4/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "tar2ext4"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-/ImyicXRBGclnUEpqygNYhknFYJmRqBqKkz/gNxVLWQ="; + sha256 = "sha256-8FPEGQ6DBYYnT6mIjYmSTRfHMloS42oB8xPU5wmFLwI="; }; sourceRoot = "${finalAttrs.src.name}/cmd/tar2ext4"; diff --git a/pkgs/by-name/te/terraform-mcp-server/package.nix b/pkgs/by-name/te/terraform-mcp-server/package.nix index 1062be057f8f..9132fe3def87 100644 --- a/pkgs/by-name/te/terraform-mcp-server/package.nix +++ b/pkgs/by-name/te/terraform-mcp-server/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "terraform-mcp-server"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-+fqhSF+5XNqmIgqUBNNDUOUkVwV8ZdMjqWxNSxMKMrA="; + hash = "sha256-V+TcIuw9SrSbqtjZMM5CSUjPof9xpdwN0NKGrU7M6kQ="; }; - vendorHash = "sha256-L6Fak8NKEQOzeX/xFpqsqSS/BgtFUKGkFD2+418bANE="; + vendorHash = "sha256-8bKDnnByc6tId7mWCaSxY9zgoBW7Ajlmd33xuMrJp1E="; ldflags = [ "-X main.version=${finalAttrs.version}" diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix index f9228af431ae..3583ad5ab012 100644 --- a/pkgs/by-name/ul/ultrastardx/package.nix +++ b/pkgs/by-name/ul/ultrastardx/package.nix @@ -82,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ diogotcorreia - Profpatsch ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix index 92ee709ea333..964d42178027 100644 --- a/pkgs/by-name/wa/wavelog/package.nix +++ b/pkgs/by-name/wa/wavelog/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wavelog"; - version = "2.3.1"; + version = "2.4"; src = fetchFromGitHub { owner = "wavelog"; repo = "wavelog"; tag = finalAttrs.version; - hash = "sha256-BHe+d2tKDQ+EVbMA8SaDmowrF6q5OOko5NuAwjXGwOE="; + hash = "sha256-ELCLVZ0CiXcefxDKpE3AODDzDCgnljXY/ooy0U+ut54="; }; installPhase = '' diff --git a/pkgs/by-name/we/webeep-sync/package.nix b/pkgs/by-name/we/webeep-sync/package.nix new file mode 100644 index 000000000000..911c34414df8 --- /dev/null +++ b/pkgs/by-name/we/webeep-sync/package.nix @@ -0,0 +1,125 @@ +{ + stdenvNoCC, + fetchFromGitHub, + pnpm_10, + fetchPnpmDeps, + pnpmConfigHook, + writableTmpDirAsHomeHook, + makeWrapper, + electron, + nodejs, + zip, + makeDesktopItem, + copyDesktopItems, + lib, + nix-update-script, + withDebug ? false, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "webeep-sync"; + version = "1.0.3-unstable-2026-03-24"; + + src = fetchFromGitHub { + owner = "toto04"; + repo = "webeep-sync"; + rev = "eabae4471b32660358c8bf95a985473f145d160a"; + hash = "sha256-wQUNhuhuARLJG0ZYRVpIAgUIbYDFTLC3sRH762HOmBY="; + }; + + nativeBuildInputs = [ + pnpmConfigHook + pnpm_10 + writableTmpDirAsHomeHook + makeWrapper + nodejs + zip + electron + copyDesktopItems + ]; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-IuI1asHqq2n1/hqf1NlRUG5/GU7HTLKCjalNooyPcO4="; + pnpm = pnpm_10; + fetcherVersion = 3; + }; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + }; + + patches = [ ./workspace.patch ]; # TODO: waiting for PR https://github.com/toto04/webeep-sync/pull/138 + + preBuild = '' + # create the electron archive to be used by electron-packager + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + + pushd electron-dist + zip -0Xqr ../electron.zip . + popd + + rm -r electron-dist + + # force @electron/packager to use our electron instead of downloading it + substituteInPlace node_modules/.pnpm/@electron+packager@*/node_modules/@electron/packager/dist/packager.js \ + --replace-fail "await this.getElectronZipPath(downloadOpts)" "'$(pwd)/electron.zip'" + ''; + + buildPhase = '' + runHook preBuild + pnpm config set node-linker hoisted + pnpm run package | cat + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ${lib.optionalString (!withDebug) '' + find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + + ''} + + rm -rf node_modules/.pnpm/{*electron*,*typescript*,prettier*,eslint*,@babel*,react-icons*} + # remove symlinks to the previously deleted packages + find node_modules packages/**/node_modules -xtype l -delete + + mkdir -p $out/lib/node_modules/${finalAttrs.pname} + cp -r .webpack node_modules $out/lib/node_modules/${finalAttrs.pname}/ + + makeWrapper ${electron}/bin/electron $out/bin/${finalAttrs.pname} \ + ${lib.optionalString withDebug ''--set NODE_OPTIONS "--enable-source-maps"''} \ + --add-flags "$out/lib/node_modules/${finalAttrs.pname}/.webpack/x64/main/index.js" \ + --add-flags "--user-data-dir=\$HOME/.config/${finalAttrs.pname}" + + for size in 32 48 64 72 96 128 256; do + install -Dm644 static/icons/icon-$size"x"$size.png \ + $out/share/icons/hicolor/$size"x"$size/apps/${finalAttrs.pname}.png + done + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = finalAttrs.pname; + exec = finalAttrs.pname; + icon = finalAttrs.pname; # Matches the PNG name we installed earlier + desktopName = "WeBeep Sync"; + comment = finalAttrs.meta.description; + categories = [ "Education" ]; + }) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Keep all your WeBeep files synced on your computer"; + homepage = "https://github.com/toto04/webeep-sync"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.lnk3 ]; + mainProgram = "webeep-sync"; + }; +}) diff --git a/pkgs/by-name/we/webeep-sync/workspace.patch b/pkgs/by-name/we/webeep-sync/workspace.patch new file mode 100644 index 000000000000..c56d7646b0d0 --- /dev/null +++ b/pkgs/by-name/we/webeep-sync/workspace.patch @@ -0,0 +1,8 @@ +--- a/pnpm-workspace.yaml ++++ b/pnpm-workspace.yaml +@@ -1,3 +1,5 @@ ++packages: ++ - '.' + allowBuilds: + '@parcel/watcher': true + electron: true diff --git a/pkgs/by-name/yj/yj/package.nix b/pkgs/by-name/yj/yj/package.nix index 6a0db061fd44..5ad7e7aefaf4 100644 --- a/pkgs/by-name/yj/yj/package.nix +++ b/pkgs/by-name/yj/yj/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { description = "Convert YAML <=> TOML <=> JSON <=> HCL"; license = lib.licenses.asl20; mainProgram = "yj"; - maintainers = with lib.maintainers; [ Profpatsch ]; + maintainers = [ ]; homepage = "https://github.com/sclevine/yj"; }; }) diff --git a/pkgs/by-name/zi/zigbee2mqtt/package.nix b/pkgs/by-name/zi/zigbee2mqtt/package.nix index 5038cc8e0fb3..52365017d72a 100644 --- a/pkgs/by-name/zi/zigbee2mqtt/package.nix +++ b/pkgs/by-name/zi/zigbee2mqtt/package.nix @@ -14,20 +14,20 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "zigbee2mqtt"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; tag = finalAttrs.version; - hash = "sha256-PsgQ1/h9YCQNV58PB7o3CQyfuOXzU878I9qIfozX02w="; + hash = "sha256-LdrsHOeRXeNccpf1UNg20y82M75PGt070zVbmQYYsVg="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-MM184JsFVGqOALyQjCyR3QnHqHoQr39lnodq5v4cXAQ="; + hash = "sha256-8ioe9/gSI9u9ehrnj3L1j+vPS9p+nJGs2d8TdZTEsk4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix index c314c3c90bca..081eaba71c7f 100644 --- a/pkgs/by-name/zo/zotero/package.nix +++ b/pkgs/by-name/zo/zotero/package.nix @@ -27,13 +27,13 @@ let nodejs = nodejs_22; pname = "zotero"; - version = "8.0.3"; + version = "8.0.5"; src = fetchFromGitHub { owner = "zotero"; repo = "zotero"; tag = version; - hash = "sha256-I6s6m8CG1b1BXQK2qIdOqmsNyxzwj3fAfFFuHK7t6ec="; + hash = "sha256-Amk2ehdzrQjFhx1eEHcnq+Z+un+2bT/u4kpbWqD5Sbc="; fetchSubmodules = true; }; @@ -326,6 +326,7 @@ buildNpmPackage (finalAttrs: { meta = { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; + changelog = "https://www.zotero.org/support/changelog"; mainProgram = "zotero"; license = lib.licenses.agpl3Only; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/development/compilers/zig/fetcher.nix b/pkgs/development/compilers/zig/fetcher.nix index abb8acaa0838..f64f3de8f841 100644 --- a/pkgs/development/compilers/zig/fetcher.nix +++ b/pkgs/development/compilers/zig/fetcher.nix @@ -8,11 +8,12 @@ version, name ? "${pname}-${version}", src, + fetchAll ? false, hash ? lib.fakeHash, -}@args: +}: runCommand "${name}-zig-deps" { - inherit (args) src; + inherit src fetchAll; nativeBuildInputs = [ zig ]; @@ -26,7 +27,7 @@ runCommand "${name}-zig-deps" runHook unpackPhase cd $sourceRoot - zig build --fetch + zig build --fetch''${fetchAll:+=all} mv $ZIG_GLOBAL_CACHE_DIR/p $out '' diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 1d1d63abd4b6..8469662958ee 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -382,8 +382,6 @@ package-maintainers: - cornelis poscat: - hinit - Profpatsch: - - gitit psibi: - path-pieces - persistent diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4f99fa1f35ad..0234a9e16268 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -274745,7 +274745,6 @@ self: { description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; maintainers = [ - lib.maintainers.Profpatsch lib.maintainers.sternenseemann ]; } diff --git a/pkgs/development/interpreters/elixir/1.20.nix b/pkgs/development/interpreters/elixir/1.20.nix index f640da61fa16..82a43c1fa202 100644 --- a/pkgs/development/interpreters/elixir/1.20.nix +++ b/pkgs/development/interpreters/elixir/1.20.nix @@ -1,7 +1,7 @@ import ./generic-builder.nix { - version = "1.20.0-rc.3"; - hash = "sha256-n0Y9HHb3sppliLMADUiNZKsNStghH8WwsOsjYzIzNoU="; - # https://hexdocs.pm/elixir/1.20.0-rc.2/compatibility-and-deprecations.html#between-elixir-and-erlang-otp - minimumOTPVersion = "26"; - maximumOTPVersion = "28"; + version = "1.20.0-rc.4"; + hash = "sha256-sboB+GW3T+t9gEcOGtd6NllmIlyWio1+cgWyyxE+484="; + # https://hexdocs.pm/elixir/1.20.0-rc.4/compatibility-and-deprecations.html#between-elixir-and-erlang-otp + minimumOTPVersion = "27"; + maximumOTPVersion = "29"; } diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index a37debea366e..98a47c617d02 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "26.0.3"; + version = "26.0.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-CTOnJKsx9hDtLhDnuJSGc/lBQ2ZcDm3/Iie7awusGho="; + hash = "sha256-gsrqhFCxZRrTbA5MMWARrN6lFVp4Q3D5Jz7MDYbXznY="; }; meta = { diff --git a/pkgs/development/python-modules/azure-kusto-ingest/default.nix b/pkgs/development/python-modules/azure-kusto-ingest/default.nix index 1def8cac3ddd..25bccb378d7d 100644 --- a/pkgs/development/python-modules/azure-kusto-ingest/default.nix +++ b/pkgs/development/python-modules/azure-kusto-ingest/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "azure-kusto-ingest"; - version = "6.0.2"; + version = "6.0.3"; pyproject = true; src = fetchFromGitHub { owner = "Azure"; repo = "azure-kusto-python"; tag = "v${version}"; - hash = "sha256-jg8VueMohp7z45va5Z+cF0Hz+RMW4Vd5AchJX/wngLc="; + hash = "sha256-n69KpWZpAVMjr7d1QRQ/J/SgeTLkadJUhCgD62F6O7w="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/ddgs/default.nix b/pkgs/development/python-modules/ddgs/default.nix index 5e712ce28a76..2bed55f3dd9b 100644 --- a/pkgs/development/python-modules/ddgs/default.nix +++ b/pkgs/development/python-modules/ddgs/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "ddgs"; - version = "9.11.4"; + version = "9.12.0"; pyproject = true; src = fetchFromGitHub { owner = "deedy5"; repo = "ddgs"; tag = "v${finalAttrs.version}"; - hash = "sha256-+UefNpWKq1Rcm90M+hQavEORYZF4FWC1FzH7TfAH6WA="; + hash = "sha256-z6IFwQwtyqKW0mn+z3K1aoFkFoPH0OOofukmTIk5gVs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dukpy/default.nix b/pkgs/development/python-modules/dukpy/default.nix deleted file mode 100644 index 5e022acb209a..000000000000 --- a/pkgs/development/python-modules/dukpy/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - buildPythonPackage, - setuptools, - mutf8, - webassets, - pytestCheckHook, - mock, -}: - -buildPythonPackage rec { - pname = "dukpy"; - version = "0.5.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "amol-"; - repo = "dukpy"; - tag = version; - hash = "sha256-ZoBkCpilqPwDy0njwXqUIVgKt16jDCdnbDk7EfxzWOM="; - }; - - postPatch = '' - substituteInPlace tests/test_webassets_filter.py \ - --replace-fail "class PyTestTemp" "class _Temp" \ - --replace-fail "PyTestTemp" "Temp" - ''; - - build-system = [ setuptools ]; - - dependencies = [ mutf8 ]; - - optional-dependencies = { - webassets = [ webassets ]; - }; - - nativeCheckInputs = [ - pytestCheckHook - mock - ] - ++ optional-dependencies.webassets; - - disabledTests = [ "test_installer" ]; - - preCheck = '' - rm -r dukpy - ''; - - pythonImportsCheck = [ "dukpy" ]; - - meta = { - description = "Simple JavaScript interpreter for Python"; - homepage = "https://github.com/amol-/dukpy"; - changelog = "https://github.com/amol-/dukpy/releases/tag/${src.tag}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ruby0b ]; - mainProgram = "dukpy"; - # error: 'TARGET_OS_BRIDGE' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] - # https://github.com/amol-/dukpy/issues/82 - broken = stdenv.cc.isClang; - }; -} diff --git a/pkgs/development/python-modules/flask-themes2/default.nix b/pkgs/development/python-modules/flask-themes2/default.nix deleted file mode 100644 index 206ac1f9097b..000000000000 --- a/pkgs/development/python-modules/flask-themes2/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools, - flask, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "flask-themes2"; - version = "1.0.1"; - pyproject = true; - - src = fetchPypi { - pname = "Flask-Themes2"; - inherit version; - hash = "sha256-gsMgQQXjhDfQRhm7H0kBy8jKxd75WY+PhHR6Rk/PUPs="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ flask ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = { - description = "Easily theme your Flask app"; - homepage = "https://github.com/sysr-q/flask-themes2"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ruby0b ]; - }; -} diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 39c1ece4a0f3..15ded2114cd0 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -12,13 +12,13 @@ buildPythonPackage (finalAttrs: { pname = "google-cloud-org-policy"; - version = "1.16.1"; + version = "1.17.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_org_policy"; inherit (finalAttrs) version; - hash = "sha256-KleKj6JhG4pi/XAM82C/VndJED2nvK1+NzvT1lm7zpE="; + hash = "sha256-93GJ7n9loo83VfhV9xC4tnuYYuKmtqk7B15vnak7/yA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 983346872eb4..349359e90fe0 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.42.0"; + version = "1.44.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_securitycenter"; inherit version; - hash = "sha256-zwCV0I0vBIgvVRXG31JX8M00u8mzXGMCw/5QpEMKa+Q="; + hash = "sha256-ir0rdSUREsfGTyR8YbSWbpDd1GxYOZ2hj8f7jwTmVsc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 252a034cbdc6..5173483e2350 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.18.0"; + version = "2.19.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_videointelligence"; inherit version; - hash = "sha256-sq45vSLRhiGGhKKXwvovpjblh05p059xlQTXKfRGOf0="; + hash = "sha256-ezIMGKBHWwjd6bYKD7/fiRUyDCCWYVn62AtVlAidVh4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/iapws/default.nix b/pkgs/development/python-modules/iapws/default.nix index b146f948d7bd..43179ef17252 100644 --- a/pkgs/development/python-modules/iapws/default.nix +++ b/pkgs/development/python-modules/iapws/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "iapws"; - version = "1.5.4"; + version = "1.5.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-nw+qOaln12/F5flfYdki4TVFMZLgK/h10HJC8T1uqlU="; + hash = "sha256-yG4eFxVRh3/pzrA+5BXkpJBtLlJpj/nVZWeEYJc5300="; }; propagatedBuildInputs = [ scipy ]; diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix index 5a052f19d89b..f236d6774f5f 100644 --- a/pkgs/development/python-modules/json-stream/default.nix +++ b/pkgs/development/python-modules/json-stream/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "json-stream"; - version = "2.4.1"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "daggaz"; repo = "json-stream"; tag = "v${version}"; - hash = "sha256-oZYVRgDSl15/UJmhTAoLk3UoVimQeLGNOjNXLH6GTtY="; + hash = "sha256-iSJY53VImv9GSIC2IB969zzYYNg7gFKJH8QQFpjzrQU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index 2b7b7937f7ce..2aa27525f45b 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "karton-dashboard"; - version = "1.6.0"; + version = "1.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "karton-dashboard"; tag = "v${version}"; - hash = "sha256-VzBC7IATF8QBtTXMv4vmorAzBlImEsayjenQ2Uz5jIo="; + hash = "sha256-DYfL//i1gJ0ci7jVPtrMKC8j+i5/L8rvmbs8zz6Eq2M="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index c349bb061a24..c72af825812d 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-dYJnOyDpAoiJg3LcqxfrT4E9WWSGW5DQdFs/CrOMbtQ="; + hash = "sha256-Rw7YNt7kO8AXHcBcaMLao2GKfDgWa4BE1/g2DNjNj6Y="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index d59ca6b09cc9..17794a696d85 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -167,7 +167,7 @@ let llm = buildPythonPackage rec { pname = "llm"; - version = "0.29"; + version = "0.30"; pyproject = true; build-system = [ setuptools ]; @@ -176,7 +176,7 @@ let owner = "simonw"; repo = "llm"; tag = version; - hash = "sha256-51WHV8ZvyUJgr+a3jFUoZ2hPlv2oiA4rrgalqZEFIfM="; + hash = "sha256-+8fwx7sS1vFSTqb+p2uDLqWW/UIx8WoW3kYJihznRRg="; }; patches = [ diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix index 6d7f0ee85296..8b97384dcab5 100644 --- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "mkdocs-jupyter"; - version = "0.25.1"; + version = "0.26.1"; pyproject = true; src = fetchPypi { pname = "mkdocs_jupyter"; inherit version; - hash = "sha256-DpJy/0lH4OxoPJJCOkv7QqJkd8EDqxpquCd+LcyPev4="; + hash = "sha256-fIDA05U96R5bQKDTIJIzeVyPgAJDqymOTsOOBQTtpjA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/mlx-lm/default.nix b/pkgs/development/python-modules/mlx-lm/default.nix index f46a8786a06d..d86518623c1f 100644 --- a/pkgs/development/python-modules/mlx-lm/default.nix +++ b/pkgs/development/python-modules/mlx-lm/default.nix @@ -79,6 +79,12 @@ buildPythonPackage (finalAttrs: { "tests/test_models.py::TestModels::test_gated_delta_masked" ]; + disabledTests = [ + # ValueError: [rope] dims must be positive but got 0 + # Reported upstream: https://github.com/ml-explore/mlx-lm/issues/1089 + "test_all_models" + ]; + meta = { description = "Run LLMs with MLX"; homepage = "https://github.com/ml-explore/mlx-lm"; diff --git a/pkgs/development/python-modules/mlx-vlm/default.nix b/pkgs/development/python-modules/mlx-vlm/default.nix index 9a5f6d6bc133..9319be349917 100644 --- a/pkgs/development/python-modules/mlx-vlm/default.nix +++ b/pkgs/development/python-modules/mlx-vlm/default.nix @@ -9,13 +9,13 @@ # dependencies datasets, fastapi, + miniaudio, mlx, mlx-lm, numpy, opencv-python, pillow, requests, - soundfile, tqdm, transformers, uvicorn, @@ -26,35 +26,32 @@ rich, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mlx-vlm"; - version = "0.3.9"; + version = "0.4.2"; pyproject = true; src = fetchFromGitHub { owner = "Blaizzy"; repo = "mlx-vlm"; - tag = "v${version}"; - hash = "sha256-L+llrfFo4C++JZ3GjpZi16wMZNXtKrYh3pxhZ5N1n/4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-GmeMcANmztICfYR9Ca5wQfLOugOlK1mt5j3q616n6TQ="; }; build-system = [ setuptools ]; - pythonRelaxDeps = [ - "opencv-python" - ]; dependencies = [ datasets fastapi + miniaudio mlx mlx-lm numpy opencv-python pillow requests - soundfile tqdm transformers uvicorn @@ -91,11 +88,11 @@ buildPythonPackage rec { meta = { description = "Inference and fine-tuning of Vision Language Models (VLMs) on your Mac using MLX"; homepage = "https://github.com/Blaizzy/mlx-vlm"; - changelog = "https://github.com/Blaizzy/mlx-vlm/releases/tag/${src.tag}"; + changelog = "https://github.com/Blaizzy/mlx-vlm/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = [ "aarch64-darwin" ]; }; -} +}) diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index 3e72fc401a41..6cdc7cb6e6c9 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -33,6 +33,7 @@ let gguf-tools = fetchFromGitHub { owner = "antirez"; repo = "gguf-tools"; + # Tag from https://github.com/ml-explore/mlx/blob/v0.31.1/mlx/io/CMakeLists.txt#L14 rev = "8fa6eb65236618e28fd7710a0fba565f7faa1848"; hash = "sha256-15FvyPOFqTOr5vdWQoPnZz+mYH919++EtghjozDlnSA="; }; @@ -40,14 +41,14 @@ let in buildPythonPackage (finalAttrs: { pname = "mlx"; - version = "0.30.5"; + version = "0.31.1"; pyproject = true; src = fetchFromGitHub { owner = "ml-explore"; repo = "mlx"; tag = "v${finalAttrs.version}"; - hash = "sha256-SV/3MXt+SuJ69XfLfXycold6KgtXSM7OE0KwMSNw+eE="; + hash = "sha256-PiNk/MdMw9Vpat2KuslBTyaFuK+mJ4UvwJqBnysvvUU="; }; patches = [ diff --git a/pkgs/development/python-modules/modal/default.nix b/pkgs/development/python-modules/modal/default.nix index 41e6c4ad3b5e..472504368099 100644 --- a/pkgs/development/python-modules/modal/default.nix +++ b/pkgs/development/python-modules/modal/default.nix @@ -38,14 +38,14 @@ buildPythonPackage (finalAttrs: { pname = "modal"; - version = "1.3.5"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "modal-labs"; repo = "modal-client"; tag = "py/v${finalAttrs.version}"; - hash = "sha256-DjCEnQ+H03Ga0My2qHGEEF4Ae5HnmlWNvwL+jLdo0pg="; + hash = "sha256-Ol6KYncP1F9EHbcyJmScuBwev79/vxrKWlO/ZkoxOhQ="; }; sourceRoot = "${finalAttrs.src.name}/py"; diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix index fcd5b2b2c813..334304cad94a 100644 --- a/pkgs/development/python-modules/napari-console/default.nix +++ b/pkgs/development/python-modules/napari-console/default.nix @@ -14,7 +14,7 @@ qtpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "napari-console"; version = "0.1.4"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "napari"; repo = "napari-console"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-z1pyG31g+fvTNLbWc2W56zDf33HCx8PvPKwIIc/x2VA="; }; @@ -31,6 +31,9 @@ buildPythonPackage rec { setuptools-scm ]; + pythonRelaxDeps = [ + "ipykernel" + ]; dependencies = [ ipykernel ipython @@ -47,4 +50,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ SomeoneSerge ]; }; -} +}) diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix index 47970169b677..a5db48cec83d 100644 --- a/pkgs/development/python-modules/napari-npe2/default.nix +++ b/pkgs/development/python-modules/napari-npe2/default.nix @@ -15,6 +15,7 @@ pydantic-extra-types, pyyaml, rich, + tomli, tomli-w, typer, @@ -33,14 +34,14 @@ buildPythonPackage (finalAttrs: { pname = "napari-npe2"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; src = fetchFromGitHub { owner = "napari"; repo = "npe2"; tag = "v${finalAttrs.version}"; - hash = "sha256-aZOs9wTYcblt9EZftYHKFWI/GvpZcC2KqVTAis15+Iw="; + hash = "sha256-cR7hf5v+RgcENY3rSHnOB4E/TONVYvHKS5i3Kv1Sbuc="; }; build-system = [ @@ -56,6 +57,7 @@ buildPythonPackage (finalAttrs: { pydantic-extra-types pyyaml rich + tomli tomli-w typer ]; diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 725091b56a15..026a0cb3b56a 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonAtLeast, fetchFromGitHub, # build-system @@ -24,12 +23,13 @@ napari-console, napari-npe2, napari-svg, - numpydoc, pandas, pillow, pint, psutil, pydantic, + pydantic-extra-types, + pydantic-settings, pyopengl, pyyaml, scikit-image, @@ -44,6 +44,7 @@ # tests hypothesis, + pooch, pretend, pyautogui, pytest-pretty, @@ -56,18 +57,14 @@ buildPythonPackage (finalAttrs: { pname = "napari"; - version = "0.6.6"; + version = "0.7.0"; pyproject = true; - # napari uses pydantic v1 which is not compatible with python 3.14 - # ValueError: '__slots__' in __slots__ conflicts with class variable - disabled = pythonAtLeast "3.14"; - src = fetchFromGitHub { owner = "napari"; repo = "napari"; tag = "v${finalAttrs.version}"; - hash = "sha256-F0l6GWyZ6n4HNZW7XyUk4ZBPQfrAW4DWixCaRHViDPI="; + hash = "sha256-fDt9n4+yQcA03IO7sMhcpiP3TfOWfyvbCjY7ImEj+Qg="; }; postPatch = '' @@ -86,11 +83,6 @@ buildPythonPackage (finalAttrs: { qt6.qtbase ]; - pythonRelaxDeps = [ - "app-model" - "psygnal" - "vispy" - ]; dependencies = [ app-model appdirs @@ -104,12 +96,13 @@ buildPythonPackage (finalAttrs: { napari-console napari-npe2 napari-svg - numpydoc pandas pillow pint psutil pydantic + pydantic-extra-types + pydantic-settings pyopengl pyyaml scikit-image @@ -134,6 +127,7 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ hypothesis + pooch pretend pyautogui pytest-pretty @@ -189,6 +183,7 @@ buildPythonPackage (finalAttrs: { # Fatal Python error: Aborted "test_add_layer_data_to_viewer_optional" "test_from_layer_data_tuple_accept_deprecating_dict" + "test_layer_rename_updates_combobox" "test_layers_populate_immediately" "test_magicgui_add_data" "test_magicgui_add_future_data" diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index cad5d2ee997a..1b947ee117cd 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -2,15 +2,16 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, + hatch-vcs, lxml, paramiko, - setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "ncclient"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; src = fetchFromGitHub { @@ -25,11 +26,12 @@ buildPythonPackage rec { postFetch = '' sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/ncclient/_version.py ''; - hash = "sha256-vSX+9nTl4r6vnP/vmavdmdChzOC8P2G093/DQNMQwS4="; + hash = "sha256-A1e1YE+RW6mkuhF9eEUPiMiKw3YuHqA+4pNqJpYtAJU="; }; build-system = [ - setuptools + hatchling + hatch-vcs ]; dependencies = [ diff --git a/pkgs/development/python-modules/openfga-sdk/default.nix b/pkgs/development/python-modules/openfga-sdk/default.nix index 7322a562c256..de7010bb74b2 100644 --- a/pkgs/development/python-modules/openfga-sdk/default.nix +++ b/pkgs/development/python-modules/openfga-sdk/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "openfga-sdk"; - version = "0.9.9"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "openfga"; repo = "python-sdk"; tag = "v${version}"; - hash = "sha256-bkDeIQJ+5VDMkBDorEMczsN7Ex04SaxhxulXLtUW/CM="; + hash = "sha256-yopZJMGv2cVJZsTXqU7vaQN31QOwCW/kg0gghqt6rus="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/primp/Cargo.lock b/pkgs/development/python-modules/primp/Cargo.lock index 03d9d52291e3..efd3b54351ae 100644 --- a/pkgs/development/python-modules/primp/Cargo.lock +++ b/pkgs/development/python-modules/primp/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "adler2" @@ -32,15 +32,6 @@ dependencies = [ "alloc-no-stdlib", ] -[[package]] -name = "alloca" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a7d05ea6aea7e9e64d25b9156ba2fee3fdd659e34e41063cd2fc7cd020d7f4" -dependencies = [ - "cc", -] - [[package]] name = "allocator-api2" version = "0.2.21" @@ -53,56 +44,12 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" -[[package]] -name = "anstream" -version = "0.6.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - [[package]] name = "anstyle" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" -[[package]] -name = "anstyle-parse" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" -dependencies = [ - "anstyle", - "once_cell_polyfill", - "windows-sys 0.61.2", -] - [[package]] name = "anyhow" version = "1.0.102" @@ -368,12 +315,6 @@ dependencies = [ "cc", ] -[[package]] -name = "colorchoice" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" - [[package]] name = "compression-codecs" version = "0.4.37" @@ -469,11 +410,10 @@ dependencies = [ [[package]] name = "criterion" -version = "0.8.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "950046b2aa2492f9a536f5f4f9a3de7b9e2476e575e05bd6c333371add4d98f3" +checksum = "e1c047a62b0cc3e145fa84415a3191f628e980b194c2755aa12300a4e6cbd928" dependencies = [ - "alloca", "anes", "cast", "ciborium", @@ -482,7 +422,6 @@ dependencies = [ "itertools", "num-traits", "oorandom", - "page_size", "plotters", "rayon", "regex", @@ -494,9 +433,9 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.8.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8d80a2f4f5b554395e47b5d8305bc3d27813bacb73493eb1001e8f76dae29ea" +checksum = "9b1bcc0dc7dfae599d84ad0b1a55f80cde8af3725da8313b528da95ef783e338" dependencies = [ "cast", "itertools", @@ -636,16 +575,6 @@ dependencies = [ "syn", ] -[[package]] -name = "env_filter" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a1c3cc8e57274ec99de65301228b537f1e4eedc1b8e0f9411c6caac8ae7308f" -dependencies = [ - "log", - "regex", -] - [[package]] name = "env_logger" version = "0.10.2" @@ -659,19 +588,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "env_logger" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2daee4ea451f429a58296525ddf28b45a3b64f1acf6587e2067437bb11e218d" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "jiff", - "log", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -893,7 +809,7 @@ version = "0.4.13" dependencies = [ "atomic-waker", "bytes", - "env_logger 0.10.2", + "env_logger", "fnv", "futures-core", "futures-sink", @@ -1380,12 +1296,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" - [[package]] name = "itertools" version = "0.13.0" @@ -1401,30 +1311,6 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" -[[package]] -name = "jiff" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359" -dependencies = [ - "jiff-static", - "log", - "portable-atomic", - "portable-atomic-util", - "serde_core", -] - -[[package]] -name = "jiff-static" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "jobserver" version = "0.1.34" @@ -1723,12 +1609,6 @@ dependencies = [ "portable-atomic", ] -[[package]] -name = "once_cell_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" - [[package]] name = "oorandom" version = "11.1.5" @@ -1789,16 +1669,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "page_size" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "parking_lot" version = "0.12.5" @@ -1987,15 +1857,6 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" -[[package]] -name = "portable-atomic-util" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5" -dependencies = [ - "portable-atomic", -] - [[package]] name = "potential_utf" version = "0.1.4" @@ -2032,7 +1893,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" dependencies = [ - "env_logger 0.10.2", + "env_logger", "log", ] @@ -2048,71 +1909,23 @@ dependencies = [ [[package]] name = "primp" -version = "1.1.3" +version = "1.2.1" dependencies = [ - "base64", - "brotli", - "bytes", - "cookie", - "cookie_store", "criterion", - "doc-comment", - "encoding_rs", - "env_logger 0.11.9", - "flate2", - "futures-channel", - "futures-core", - "futures-util", "h2", - "h3", - "h3-quinn", - "hickory-resolver", "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-tls", - "hyper-util", - "js-sys", - "libc", - "log", - "mime", - "mime_guess", - "native-tls", - "num_cpus", - "once_cell", - "percent-encoding", - "pin-project-lite", - "quinn", "rand 0.10.0", + "reqwest", "rustls", - "rustls-native-certs", - "rustls-pki-types", "serde", "serde_json", - "serde_urlencoded", - "sync_wrapper", "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-util", - "tower", - "tower-http", - "tower-service", "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", - "wasm-streams", - "web-sys", - "webpki-roots", - "zstd", ] [[package]] name = "primp-python" -version = "1.1.3" +version = "1.2.1" dependencies = [ "anyhow", "bytes", @@ -2296,6 +2109,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ + "aws-lc-rs", "bytes", "getrandom 0.3.4", "lru-slab", @@ -2493,6 +2307,68 @@ version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" +[[package]] +name = "reqwest" +version = "0.13.2" +dependencies = [ + "base64", + "brotli", + "bytes", + "cookie", + "cookie_store", + "doc-comment", + "encoding_rs", + "env_logger", + "flate2", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "h3", + "h3-quinn", + "hickory-resolver", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-tls", + "hyper-util", + "js-sys", + "libc", + "log", + "mime", + "mime_guess", + "native-tls", + "num_cpus", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-native-certs", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tokio-util", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test", + "wasm-streams", + "web-sys", + "webpki-roots", + "zstd", +] + [[package]] name = "resolv-conf" version = "0.7.6" @@ -2543,14 +2419,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.36" +version = "0.23.37" dependencies = [ "aws-lc-rs", "base64", "bencher", "brotli", "brotli-decompressor", - "env_logger 0.10.2", + "env_logger", "hashbrown 0.16.1", "hex", "log", @@ -2571,6 +2447,7 @@ dependencies = [ "x509-parser", "zeroize", "zlib-rs", + "zstd", ] [[package]] @@ -2907,7 +2784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom 0.3.4", "once_cell", "rustix", "windows-sys 0.61.2", @@ -3227,18 +3104,18 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typed-builder" -version = "0.23.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31aa81521b70f94402501d848ccc0ecaa8f93c8eb6999eb9747e72287757ffda" +checksum = "cd9d30e3a08026c78f246b173243cf07b3696d274debd26680773b6773c2afc7" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.23.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076a02dc54dd46795c2e9c8282ed40bcfb1e22747e955de9389a1de28190fb26" +checksum = "3c36781cc0e46a83726d9879608e4cf6c2505237e263a8eb8c24502989cfdb28" dependencies = [ "proc-macro2", "quote", @@ -3305,12 +3182,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - [[package]] name = "uuid" version = "1.21.0" diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix index ecc0afe08e29..13ea9755691c 100644 --- a/pkgs/development/python-modules/primp/default.nix +++ b/pkgs/development/python-modules/primp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "primp"; - version = "1.1.3"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "deedy5"; repo = "primp"; tag = "v${finalAttrs.version}"; - hash = "sha256-ahTIEStYQ5M7EYidQYpYEVbYwwFFRfBXErWOMDdgNnk="; + hash = "sha256-3NAu8hAHdazsV+KEH7gUms8XGKW84nasHnygIz5jRa8="; }; # The Cargo.lock is not pushed upstream @@ -43,7 +43,10 @@ buildPythonPackage (finalAttrs: { pytestCheckHook pytest-asyncio ]; - disabledTestPaths = [ "crates/primp-python/tests/test_impersonate.py" ]; + disabledTestPaths = [ + "crates/primp-python/tests/test_impersonate.py" + "crates/primp-python/tests/test_header_order.py" + ]; # Tests crash with Abort trap: 6 on Darwin due to tokio runtime # initialization in PyInit_pyo3_async_runtimes being blocked by the sandbox. diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 392207f7282f..657b8dce7c2a 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -17,14 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "pubnub"; - version = "10.6.1"; + version = "10.6.2"; pyproject = true; src = fetchFromGitHub { owner = "pubnub"; repo = "python"; tag = finalAttrs.version; - hash = "sha256-EZfJ+DAZdaF1jf2nU2dUXZ7tQlGNXUMsIGyj4cjmdOs="; + hash = "sha256-YEcxDFO3UK7U17YgIENoxYN/hxqFw58cA2Dg4WJCOvU="; }; pythonRelaxDeps = [ "httpx" ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 6010f38fb497..a461f7ea4211 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage (finalAttrs: { pname = "pyexploitdb"; - version = "0.3.19"; + version = "0.3.20"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-6lLacEjLsq7d39Ih5aQbXnoiSsHm4O4LV8e22VnMw90="; + hash = "sha256-rz+juMgqJJ9PaJVfg79+j26MSV2enG3dH5fOJrU1g+E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix index 08f2d8b1fbd5..c793da08d7f5 100644 --- a/pkgs/development/python-modules/python-lsp-ruff/default.nix +++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix @@ -14,16 +14,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python-lsp-ruff"; - version = "2.3.0"; + version = "2.3.1"; pyproject = true; src = fetchFromGitHub { owner = "python-lsp"; repo = "python-lsp-ruff"; - tag = "v${version}"; - hash = "sha256-jtfDdZ68AroXlmR+AIVk/b3WpZk78BCtT8TUh4ELZZI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-1dgtuUX1GWKRiZOl5BYB/U8ecg42eTUMZqRYPKzHW/Y="; }; postPatch = @@ -70,8 +70,8 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/python-lsp/python-lsp-ruff"; description = "Ruff linting plugin for pylsp"; - changelog = "https://github.com/python-lsp/python-lsp-ruff/releases/tag/v${version}"; + changelog = "https://github.com/python-lsp/python-lsp-ruff/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ linsui ]; }; -} +}) diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 5e3a8ddd6fdd..4cd63dd9c6b7 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -6,6 +6,7 @@ fetchPypi, poetry-core, setuptools, + setuptools-scm, ipykernel, networkx, numpy, @@ -18,17 +19,18 @@ buildPythonPackage rec { pname = "qcelemental"; - version = "0.30.1"; + version = "0.50.0rc3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WMNKl4hfW/GIOwHNekZSwguaM64LLerQarEhOgqb2rs="; + hash = "sha256-caQmd7zoDzyd4YT9c5J/7oz2eEbhWpirgZHcnOTwz7k="; }; build-system = [ poetry-core setuptools + setuptools-scm ]; dependencies = [ @@ -53,8 +55,25 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcelemental" ]; + # These tests require network access + disabledTestPaths = [ + "qcelemental/tests/test_gph_uno_bipartite.py" + "qcelemental/tests/test_model_general.py" + "qcelemental/tests/test_model_results.py" + "qcelemental/tests/test_molecule.py" + "qcelemental/tests/test_molparse_align_chiral.py" + "qcelemental/tests/test_molparse_from_schema.py" + "qcelemental/tests/test_molparse_from_string.py" + "qcelemental/tests/test_molparse_pubchem.py" + "qcelemental/tests/test_molparse_to_schema.py" + "qcelemental/tests/test_molparse_to_string.py" + "qcelemental/tests/test_molutil.py" + "qcelemental/tests/test_utils.py" + "qcelemental/tests/test_zqcschema.py" + ]; + meta = { - broken = stdenv.hostPlatform.isDarwin || pythonAtLeast "3.14"; # https://github.com/MolSSI/QCElemental/issues/375 + broken = stdenv.hostPlatform.isDarwin; description = "Periodic table, physical constants and molecule parsing for quantum chemistry"; homepage = "https://github.com/MolSSI/QCElemental"; changelog = "https://github.com/MolSSI/QCElemental/blob/v${version}/docs/changelog.rst"; diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index e8fe59a5878a..87496c5f6476 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -16,19 +16,24 @@ qcelemental, scipy, setuptools, + setuptools-scm, + pydantic-settings, }: buildPythonPackage rec { pname = "qcengine"; - version = "0.34.0"; + version = "0.50.0rc2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-VKULy45bYn5TmxU7TbOVK98r0pRMWAwissmgx0Ee/8w="; + hash = "sha256-XIxHFemTXXsqCLAHizzrEt0tVdfp6vY0Pl4CHv+EzDM="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ msgpack @@ -38,6 +43,7 @@ buildPythonPackage rec { pydantic pyyaml qcelemental + pydantic-settings ]; optional-dependencies = { @@ -55,12 +61,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcengine" ]; + # These tests require network access + disabledTestPaths = [ + "qcengine/tests/test_harness_canonical.py" + ]; + meta = { description = "Quantum chemistry program executor and IO standardizer (QCSchema) for quantum chemistry"; homepage = "https://molssi.github.io/QCElemental/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ sheepforce ]; mainProgram = "qcengine"; - broken = pythonAtLeast "3.14"; # https://github.com/MolSSI/QCEngine/issues/481 }; } diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 67ad65250e0d..0882f7c9a2b5 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -21,14 +21,14 @@ buildPythonPackage (finalAttrs: { pname = "qtconsole"; - version = "5.7.1"; + version = "5.7.2"; pyproject = true; src = fetchFromGitHub { owner = "jupyter"; repo = "qtconsole"; tag = finalAttrs.version; - hash = "sha256-3NXW/6W0Gr8/LnB6VfHgFWJdwty4gLe2D8YzXn0/Cds="; + hash = "sha256-GL6CAXijlgc/3nj9KaJJgK+AIq6wHdEf0kpgryJ3KuQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 744ac7df4938..94a240c50425 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -35,18 +35,21 @@ buildPythonPackage (finalAttrs: { pname = "spyder-kernels"; - version = "3.1.3"; + version = "3.1.4"; pyproject = true; src = fetchFromGitHub { owner = "spyder-ide"; repo = "spyder-kernels"; tag = "v${finalAttrs.version}"; - hash = "sha256-BhXJZB4lZuNqesJBcuAmOHTM38fMir4tTnr+mmwBaqA="; + hash = "sha256-HMkenC9a+UZ0VCFx+q9K6KQ8BdTvpc4nHukhEqCLGXo="; }; build-system = [ setuptools ]; + pythonRelaxDeps = [ + "ipykernel" + ]; dependencies = [ cloudpickle ipykernel diff --git a/pkgs/development/python-modules/stable-baselines3/default.nix b/pkgs/development/python-modules/stable-baselines3/default.nix index c6a81f6be253..cb752b201af5 100644 --- a/pkgs/development/python-modules/stable-baselines3/default.nix +++ b/pkgs/development/python-modules/stable-baselines3/default.nix @@ -20,31 +20,20 @@ rich, tqdm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "stable-baselines3"; - version = "2.7.1"; + version = "2.8.0"; pyproject = true; src = fetchFromGitHub { owner = "DLR-RM"; repo = "stable-baselines3"; - tag = "v${version}"; - hash = "sha256-ucfdXyOYgevrKQ+RQbuoLjhGEvlzwH80yognMNbJlgQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-eMtkcPvTtdy0gqedCD8NxlC85rDEB9Dam5fIKujEWp4="; }; - postPatch = - # Environment version v0 for `CliffWalking` is deprecated - '' - substituteInPlace "tests/test_vec_normalize.py" \ - --replace-fail "CliffWalking-v0" "CliffWalking-v1" - ''; - build-system = [ setuptools ]; - pythonRelaxDeps = [ - "gymnasium" - ]; - dependencies = [ cloudpickle gymnasium @@ -83,8 +72,8 @@ buildPythonPackage rec { meta = { description = "PyTorch version of Stable Baselines, reliable implementations of reinforcement learning algorithms"; homepage = "https://github.com/DLR-RM/stable-baselines3"; - changelog = "https://github.com/DLR-RM/stable-baselines3/releases/tag/v${version}"; + changelog = "https://github.com/DLR-RM/stable-baselines3/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ derdennisop ]; }; -} +}) diff --git a/pkgs/development/python-modules/synchronicity/default.nix b/pkgs/development/python-modules/synchronicity/default.nix index 1509b56d96db..45ff33aad211 100644 --- a/pkgs/development/python-modules/synchronicity/default.nix +++ b/pkgs/development/python-modules/synchronicity/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "synchronicity"; - version = "0.11.1"; + version = "0.12.1"; pyproject = true; src = fetchFromGitHub { owner = "modal-labs"; repo = "synchronicity"; rev = "v${finalAttrs.version}"; - hash = "sha256-Uyn4apHILBwjHoMkr52IkcFlaX7jx3WzuzZfvdxcDFo="; + hash = "sha256-/yN7FrOIVB30MVUZxqy607uG+niF7flxOLh94DvIrhM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/torch-c-dlpack-ext/default.nix b/pkgs/development/python-modules/torch-c-dlpack-ext/default.nix new file mode 100644 index 000000000000..07d254591587 --- /dev/null +++ b/pkgs/development/python-modules/torch-c-dlpack-ext/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + apache-tvm-ffi, + + # build-system + setuptools, + + # dependencies + torch, +}: + +buildPythonPackage (finalAttrs: { + pname = "torch-c-dlpack-ext"; + inherit (apache-tvm-ffi) version src; + pyproject = true; + + sourceRoot = "${finalAttrs.src.name}/addons/torch_c_dlpack_ext"; + + build-system = [ + apache-tvm-ffi + setuptools + ]; + + dependencies = [ + torch + ]; + + pythonImportsCheck = [ "torch_c_dlpack_ext" ]; + + # No tests + doCheck = false; + + meta = { + description = "Ahead-Of-Time (AOT) compiled module to support faster DLPack conversion in DLPack"; + homepage = "https://github.com/apache/tvm-ffi/tree/main/addons/torch_c_dlpack_ext"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix index 055139daed20..6b51b06424de 100644 --- a/pkgs/development/python-modules/urllib3-future/default.nix +++ b/pkgs/development/python-modules/urllib3-future/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "urllib3-future"; - version = "2.18.901"; + version = "2.19.900"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "urllib3.future"; tag = version; - hash = "sha256-y6DRN24U2vxLRcVw9w9E4FMlk71W44x7UYSJrS6hfuA="; + hash = "sha256-6jRc3hxPSFV+vhAzbSudKuCGV0l+X2aTKXPZnAAs0Bk="; }; postPatch = '' diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix index a7dd567d9b89..c92961ef09e5 100644 --- a/pkgs/development/tools/database/cdb/default.nix +++ b/pkgs/development/tools/database/cdb/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { meta = { homepage = "https://cr.yp.to/cdb.html"; license = lib.licenses.publicDomain; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/kgt/default.nix b/pkgs/development/tools/kgt/default.nix index e578ff678773..bdfaf883d443 100644 --- a/pkgs/development/tools/kgt/default.nix +++ b/pkgs/development/tools/kgt/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation { homepage = "https://github.com/katef/kgt"; license = lib.licenses.bsd2; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ Profpatsch ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 9815212c4b89..b54f3967ead2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -231,7 +231,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - Profpatsch uncenter amaanq ]; diff --git a/pkgs/servers/home-assistant/custom-components/frigate/package.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix index 641b20bafbd4..6b83f51daafd 100644 --- a/pkgs/servers/home-assistant/custom-components/frigate/package.nix +++ b/pkgs/servers/home-assistant/custom-components/frigate/package.nix @@ -28,6 +28,11 @@ buildHomeAssistantComponent rec { hash = "sha256-fgsYznTqJrEh4niyGfksnflRp1PpljrlzJBvs8gKn54="; }; + patches = [ + # https://github.com/blakeblackshear/frigate-hass-integration/pull/1070 + ./service-to-action.patch + ]; + dependencies = [ hass-web-proxy-lib titlecase diff --git a/pkgs/servers/home-assistant/custom-components/frigate/service-to-action.patch b/pkgs/servers/home-assistant/custom-components/frigate/service-to-action.patch new file mode 100644 index 000000000000..5bc2bbda90d0 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/frigate/service-to-action.patch @@ -0,0 +1,21 @@ +index 9d3ba82..dabf566 100644 +--- a/tests/test_integration_services.py ++++ b/tests/test_integration_services.py +@@ -137,7 +137,7 @@ async def test_review_summarize_service_version_check( + await setup_mock_frigate_config_entry(hass, client=client) + + # Verify service is not available (should not be registered for version < 0.17) +- with pytest.raises(Exception, match="service_not_found"): ++ with pytest.raises(Exception, match="Action frigate.review_summarize not found"): + await hass.services.async_call( + "frigate", + SERVICE_REVIEW_SUMMARIZE, +@@ -156,7 +156,7 @@ async def test_review_summarize_service_no_integration( + # Don't set up any Frigate integration + + # When no integration is configured, the service won't exist +- with pytest.raises(Exception, match="service_not_found"): ++ with pytest.raises(Exception, match="Action frigate.review_summarize not found"): + await hass.services.async_call( + "frigate", + SERVICE_REVIEW_SUMMARIZE, diff --git a/pkgs/servers/home-assistant/custom-components/sensi/package.nix b/pkgs/servers/home-assistant/custom-components/sensi/package.nix index 07bde216193c..846e086699da 100644 --- a/pkgs/servers/home-assistant/custom-components/sensi/package.nix +++ b/pkgs/servers/home-assistant/custom-components/sensi/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "iprak"; domain = "sensi"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { inherit owner; repo = domain; tag = "v${version}"; - hash = "sha256-dyA4L/2FjyI4BM3IZHKE4UD+jUbrNs5dGKZGD1a1duY="; + hash = "sha256-FTyFxQd2upNUKhfSfd5rEr5BLpu6veYHrExHUazTamU="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix index d8ac0a9b6699..44cd8530269e 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "sankey-chart"; - version = "3.10.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "MindFreeze"; repo = "ha-sankey-chart"; rev = "v${version}"; - hash = "sha256-3SRPtj86EbXu59kqeUoJyenCBrIIyqQhw0+7LgB0jwI="; + hash = "sha256-dwviZVfs8CAdawUuaVHYmGWBri+X6r962kX8xiFhzsM="; }; - npmDepsHash = "sha256-cCRc1UKixxr11eWC7W6Gw7DNKVhrZ1G7EukkfmyPY2Y="; + npmDepsHash = "sha256-Kpv43sPc/+1E7TJzzncOBQbV2lVTNIfMC3gYWXDP/6k="; installPhase = '' runHook preInstall diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index 25212f3f17b2..ab4a491fc181 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -6,13 +6,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "26.01.0"; + version = "26.04.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-3PjKFARsN3BE5c3/JonNj+LpKBPT1N3hc1bK6NdWDTQ="; + hash = "sha256-H5Vuf+VIrurs9lwad/K4klElXvM1kg6LEjm/wgv1/z8="; }; postInstall = '' diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 6e7074ead176..9fabf29831a5 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation { description = "Ultrastar karaoke song creation tool"; homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Creator"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ Profpatsch ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index 822f27bff0fc..a7c2f7d0ad95 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -151,6 +151,6 @@ stdenv.mkDerivation { mainProgram = "UltraStar-Manager"; homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Manager"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ Profpatsch ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/ebpf-verifier/remove-fetchcontent-usage.patch b/pkgs/tools/networking/ebpf-verifier/remove-fetchcontent-usage.patch deleted file mode 100644 index 8a4af1bee19a..000000000000 --- a/pkgs/tools/networking/ebpf-verifier/remove-fetchcontent-usage.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d7cf256..cb94e5a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,8 +6,7 @@ project(ebpf_verifier) - include(FetchContent) - FetchContent_Declare( - Catch2 -- GIT_REPOSITORY https://github.com/catchorg/Catch2.git -- GIT_TAG ac93f1943762f6fc92f0dc5bac0d720a33a27530 -+ SOURCE_DIR @catch2Src@ - ) - FetchContent_MakeAvailable(Catch2) - diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1eb7c5699b06..bbb45c9d419d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -197,7 +197,7 @@ lib.makeExtensible ( nixComponents_2_31 = (nixDependencies.callPackage ./modular/packages.nix rec { version = "2.31.3"; - inherit (self.nix_2_30.meta) teams; + inherit teams; otherSplices = generateSplicesForNixComponents "nixComponents_2_31"; src = fetchFromGitHub { owner = "NixOS"; @@ -212,42 +212,10 @@ lib.makeExtensible ( nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything; - nixComponents_2_32 = - (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.32.6"; - inherit (self.nix_2_31.meta) teams; - otherSplices = generateSplicesForNixComponents "nixComponents_2_32"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - tag = version; - hash = "sha256-5aH3xppfBs8j6P7A2wq8WQ05yJvlL7x0gQbWk4RN5eY="; - }; - }).appendPatches - (patches_common ++ [ lowdown30Patch ]); - - nix_2_32 = addTests "nix_2_32" self.nixComponents_2_32.nix-everything; - - nixComponents_2_33 = - (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.33.3"; - inherit (self.nix_2_32.meta) teams; - otherSplices = generateSplicesForNixComponents "nixComponents_2_33"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - tag = version; - hash = "sha256-2Mga4e9ZtOPLwYqF4+hcjdsTImcA7TKUvDDfaF7jqEo="; - }; - }).appendPatches - (patches_common ++ [ lowdown30Patch ]); - - nix_2_33 = addTests "nix_2_33" self.nixComponents_2_33.nix-everything; - nixComponents_2_34 = (nixDependencies.callPackage ./modular/packages.nix rec { version = "2.34.4"; - inherit (self.nix_2_33.meta) teams; + inherit teams; otherSplices = generateSplicesForNixComponents "nixComponents_2_34"; src = fetchFromGitHub { owner = "NixOS"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 69322770da6c..616a7fb71c05 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -625,6 +625,7 @@ mapAliases { e17gtk = throw "'e17gtk' has been removed because it was archived upstream."; # Added 2026-01-15 eask = throw "'eask' has been renamed to/replaced by 'eask-cli'"; # Converted to throw 2025-10-27 easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17 + ebpf-verifier = warnAlias "'ebpf-verifier' has been renamed to 'prevail'" prevail; # Added 2026-04-01 EBTKS = throw "'EBTKS' has been renamed to/replaced by 'ebtks'"; # Converted to throw 2025-10-27 ec2-utils = throw "'ec2-utils' has been renamed to/replaced by 'amazon-ec2-utils'"; # Converted to throw 2025-10-27 ecryptfs = throw "'ecryptfs' has been removed due to lack of maintenance. Consider using 'fscrypt', 'gocryptfs' or 'cryfs' instead."; # Added 2026-01-14 @@ -1674,6 +1675,7 @@ mapAliases { purple-vk-plugin = throw "'purple-vk-plugin' has been removed as upstream repository was deleted and no active forks are found."; # Added 2025-09-17 purple-xmpp-http-upload = throw "'purple-xmpp-http-upload' has been renamed to/replaced by 'pidginPackages.purple-xmpp-http-upload'"; # Converted to throw 2025-10-27 pyCA = warnAlias "'pyCA' was renamed to 'pyca'" pyca; # Added 2026-02-12 + pyload-ng = throw "'pyload-ng' has been removed due to vulnerabilities and being unmaintained"; # Added 2026-03-21 pyo3-pack = throw "'pyo3-pack' has been renamed to/replaced by 'maturin'"; # Converted to throw 2025-10-27 pypolicyd-spf = throw "'pypolicyd-spf' has been renamed to/replaced by 'spf-engine'"; # Converted to throw 2025-10-27 python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb5759dcc792..b825be4e14e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -403,10 +403,6 @@ with pkgs; dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { }; - ebpf-verifier = callPackage ../tools/networking/ebpf-verifier { - catch2 = catch2_3; - }; - enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { }; inherit (gridlock) nyarr; @@ -1125,7 +1121,7 @@ with pkgs; waydroid-nftables = waydroid.override { withNftables = true; }; - winbox = winbox3; + winbox = winbox4; ### APPLICATIONS/VERSION-MANAGEMENT diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3542ee3fb112..16c34fd10658 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -181,6 +181,7 @@ mapAliases { docker_pycreds = throw "'docker_pycreds' has been renamed to/replaced by 'docker-pycreds'"; # Converted to throw 2025-10-29 dogpile_cache = throw "'dogpile_cache' has been renamed to/replaced by 'dogpile-cache'"; # Converted to throw 2025-10-29 duckduckgo-search = throw "duckduckgo-search was renamed to ddgs, use ddgs instead"; # added 2025-10-20 + dukpy = throw "'dukpy' was removed as the only consumer pyload-ng was removed"; # added 2026-03-21 easyeda2ato = throw "easyeda2ato as been removed in favor of atopile-easyda2kicad"; # added 2025-06-08 EasyProcess = throw "'EasyProcess' has been renamed to/replaced by 'easyprocess'"; # Converted to throw 2025-10-29 editdistance-s = throw "editdistance-s has been removed since it was added solely for the identity package, which has moved on to ukkonen"; # added 2025-08-04 @@ -204,6 +205,7 @@ mapAliases { filesplit = throw "filesplit has been removed, since it is unmaintained"; # added 2025-08-20 flask-security-too = throw "'flask-security-too' has been renamed to/replaced by 'flask-security'"; # Converted to throw 2025-10-29 flask-silk = throw "flask-silk was removed, as it is unmaintained since 2018."; # added 2025-05-25 + flask-themes2 = throw "'flask-themes2' was removed as the only consumer pyload-ng was removed"; # added 2026-03-21 flask_assets = throw "'flask_assets' has been renamed to/replaced by 'flask-assets'"; # Converted to throw 2025-10-29 flask_elastic = throw "'flask_elastic' has been renamed to/replaced by 'flask-elastic'"; # Converted to throw 2025-10-29 flask_login = throw "'flask_login' has been renamed to/replaced by 'flask-login'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94a3b02b205b..0139394c19fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4763,8 +4763,6 @@ self: super: with self; { dufte = callPackage ../development/python-modules/dufte { }; - dukpy = callPackage ../development/python-modules/dukpy { }; - dulwich = callPackage ../development/python-modules/dulwich { inherit (pkgs) gnupg; }; dunamai = callPackage ../development/python-modules/dunamai { }; @@ -5727,8 +5725,6 @@ self: super: with self; { flask-themer = callPackage ../development/python-modules/flask-themer { }; - flask-themes2 = callPackage ../development/python-modules/flask-themes2 { }; - flask-unsign = callPackage ../development/python-modules/flask-unsign { }; flask-versioned = callPackage ../development/python-modules/flask-versioned { }; @@ -19453,6 +19449,8 @@ self: super: with self; { torch-bin = callPackage ../development/python-modules/torch/bin { triton = self.triton-bin; }; + torch-c-dlpack-ext = callPackage ../development/python-modules/torch-c-dlpack-ext { }; + torch-geometric = callPackage ../development/python-modules/torch-geometric { }; # Required to test triton