diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index e61912fb3a8e..b1901f4c40ec 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -556,8 +556,7 @@ "members": { "Ericson2314": 1055245, "peterwaller-arm": 52030119, - "rrbutani": 7833358, - "sternenseemann": 3154475 + "rrbutani": 7833358 }, "name": "LLVM" }, @@ -943,6 +942,7 @@ }, "members": { "andir": 638836, + "leona-ya": 11006031, "pyrox0": 35778371 }, "name": "Security review" @@ -997,6 +997,17 @@ }, "name": "systemd" }, + "test-driver": { + "description": "Maintain the NixOS integration test driver.", + "id": 18201265, + "maintainers": { + "Ma27": 6025220, + "kmein": 10352507, + "tfc": 29044 + }, + "members": {}, + "name": "test-driver" + }, "xen-project": { "description": "Maintain the Xen Project Hypervisor and the related tooling ecosystem. Members listed as \"Maintainers\" are recipients of Xen Security Advisories sent to xsa@nixos.org.", "id": 11127725, diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9d9968c5491b..0195daa350c1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17968,6 +17968,12 @@ githubId = 1575834; name = "Michael Adler"; }; + michaelAllen = { + name = "Michael Allen"; + email = "mcallen71398@gmail.com"; + github = "That1LinuxGuy"; + githubId = 207959559; + }; michaelBelsanti = { email = "mbels03@protonmail.com"; name = "Mike Belsanti"; @@ -19102,7 +19108,8 @@ }; MysteryBlokHed = { name = "Adam Thompson-Sharpe"; - email = "hi@adamts.me"; + email = "nix@adamts.me"; + matrix = "@adam:adamts.me"; github = "MysteryBlokHed"; githubId = 13910387; keys = [ { fingerprint = "086E EF20 D54E D348 E5BA 6263 16E9 43E6 596F FB4E"; } ]; diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 9404ebbdf846..6ccf062fd0c6 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -32,6 +32,11 @@ - `boot.vesa` has been removed. It was deprecated in 2020 because Xorg now works better with kernel modesetting. If you still need the legacy VESA 800x600 fallback, set `boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly. +- `authentik` has been updated to 2026.5.3, which changes the default listen address from `0.0.0.0` to `[::]`. + IPv4-only deployments might need to adjust their listen settings. + Deployments running the server and worker in the same network namespace must also set at least the worker + `AUTHENTIK_LISTEN__HTTP` address so that the server and worker do not bind to the same address. + - Support for the legacy U‐Boot image format has been removed from the initrd generators, as it is deprecated upstream and no longer used by any platform in Nixpkgs. - Rustical migrates from `settings.http.host` and `settings.http.port` to `settings.http.bind` to support UNIX domain sockets as well as TCP sockets in one setting. diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index db00cdc11abb..c218d5505566 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -180,7 +180,9 @@ in # Excludes one hook due to missing SELinux binaries. + '' mkdir -p /var/lib/glusterd/hooks/ - ${rsync}/bin/rsync -a --exclude="S10selinux-label-brick.sh" ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/ + # --copy-unsafe-links: the glusterfind hook is a symlink into the package's + # libexec that would dangle once copied verbatim into / (#257863). + ${rsync}/bin/rsync -a --copy-unsafe-links --exclude="S10selinux-label-brick.sh" ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/ ${tlsCmd} '' @@ -189,6 +191,12 @@ in + '' mkdir -p /var/lib/glusterd/glusterfind/.keys mkdir -p /var/lib/glusterd/hooks/1/delete/post/ + '' + # Volume option presets, installed by upstream under $out/var; copy them so + # `gluster volume set group ` works (#33159). + + '' + mkdir -p /var/lib/glusterd/groups/ + ${rsync}/bin/rsync -a ${glusterfs}/var/lib/glusterd/groups/ /var/lib/glusterd/groups/ ''; serviceConfig = { diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix index 61f9d0b5afd9..6c4a44ca6c72 100644 --- a/nixos/modules/services/networking/keepalived/default.nix +++ b/nixos/modules/services/networking/keepalived/default.nix @@ -325,18 +325,28 @@ in assertions = flatten (map vrrpInstanceAssertions vrrpInstances); - networking.firewall = lib.mkIf cfg.openFirewall { - extraCommands = '' - # Allow VRRP and AH packets - ip46tables -A nixos-fw -p vrrp -m comment --comment "services.keepalived.openFirewall" -j ACCEPT - ip46tables -A nixos-fw -p ah -m comment --comment "services.keepalived.openFirewall" -j ACCEPT - ''; + networking.firewall = lib.mkIf cfg.openFirewall ( + if config.networking.nftables.enable then + { + extraInputRules = '' + meta l4proto vrrp counter accept comment "services.keepalived.openFirewall" + meta l4proto ah counter accept comment "services.keepalived.openFirewall" + ''; + } + else + { + extraCommands = '' + # Allow VRRP and AH packets + ip46tables -A nixos-fw -p vrrp -m comment --comment "services.keepalived.openFirewall" -j ACCEPT + ip46tables -A nixos-fw -p ah -m comment --comment "services.keepalived.openFirewall" -j ACCEPT + ''; - extraStopCommands = '' - ip46tables -D nixos-fw -p vrrp -m comment --comment "services.keepalived.openFirewall" -j ACCEPT - ip46tables -D nixos-fw -p ah -m comment --comment "services.keepalived.openFirewall" -j ACCEPT - ''; - }; + extraStopCommands = '' + ip46tables -D nixos-fw -p vrrp -m comment --comment "services.keepalived.openFirewall" -j ACCEPT + ip46tables -D nixos-fw -p ah -m comment --comment "services.keepalived.openFirewall" -j ACCEPT + ''; + } + ); systemd.timers.keepalived-boot-delay = { description = "Keepalive Daemon delay to avoid instant transition to MASTER state"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d6175df3d920..20db8a108573 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -858,7 +858,7 @@ in kbd-setfont-decompress = runTest ./kbd-setfont-decompress.nix; kbd-update-search-paths-patch = runTest ./kbd-update-search-paths-patch.nix; kea = runTest ./kea.nix; - keepalived = runTest ./keepalived.nix; + keepalived = discoverTests (import ./keepalived.nix); keepassxc = runTest ./keepassxc.nix; kerberos = handleTest ./kerberos/default.nix { }; kernel-generic = handleTest ./kernel-generic { }; diff --git a/nixos/tests/glusterfs.nix b/nixos/tests/glusterfs.nix index 9224797704e2..ac4c8e7024f7 100644 --- a/nixos/tests/glusterfs.nix +++ b/nixos/tests/glusterfs.nix @@ -49,6 +49,14 @@ in server1.wait_for_unit("glusterd.service") server2.wait_for_unit("glusterd.service") + # The glusterfind delete hook must be a real file, not the dangling + # symlink it used to be after being copied out of the package (#257863). + server1.succeed("test -f /var/lib/glusterd/hooks/1/delete/post/S57glusterfind-delete-post") + server1.fail("test -L /var/lib/glusterd/hooks/1/delete/post/S57glusterfind-delete-post") + + # The volume option presets must be installed (#33159). + server1.succeed("test -f /var/lib/glusterd/groups/metadata-cache") + server1.wait_until_succeeds("gluster peer status") server2.wait_until_succeeds("gluster peer status") @@ -64,6 +72,9 @@ in server1.succeed("gluster volume create gv0 server1:/data/vg0 server2:/data/vg0") server1.succeed("gluster volume start gv0") + # Applying a group preset needs /var/lib/glusterd/groups populated (#33159). + server1.succeed("gluster volume set gv0 group metadata-cache") + # test clients client1.wait_for_unit("gluster.mount") client2.wait_for_unit("gluster.mount") diff --git a/nixos/tests/keepalived.nix b/nixos/tests/keepalived.nix index d5ffa6e9838d..2bc512446693 100644 --- a/nixos/tests/keepalived.nix +++ b/nixos/tests/keepalived.nix @@ -1,48 +1,60 @@ -{ pkgs, lib, ... }: +let + mkTest = + { useNftables }: + import ./make-test-python.nix ( + { pkgs, lib, ... }: + { + name = "keepalived-${if useNftables then "nftables" else "iptables"}"; + meta.maintainers = [ lib.maintainers.raitobezarius ]; + + nodes = { + node1 = + { pkgs, ... }: + { + networking.nftables.enable = useNftables; + services.keepalived.enable = true; + services.keepalived.openFirewall = true; + services.keepalived.vrrpInstances.test = { + interface = "eth1"; + state = "MASTER"; + priority = 50; + virtualIps = [ { addr = "192.168.1.200"; } ]; + virtualRouterId = 1; + }; + environment.systemPackages = [ pkgs.tcpdump ]; + }; + node2 = + { pkgs, ... }: + { + networking.nftables.enable = useNftables; + services.keepalived.enable = true; + services.keepalived.openFirewall = true; + services.keepalived.vrrpInstances.test = { + interface = "eth1"; + state = "MASTER"; + priority = 100; + virtualIps = [ { addr = "192.168.1.200"; } ]; + virtualRouterId = 1; + }; + environment.systemPackages = [ pkgs.tcpdump ]; + }; + }; + + testScript = '' + # wait for boot time delay to pass + for node in [node1, node2]: + node.wait_until_succeeds( + "systemctl show -p LastTriggerUSecMonotonic keepalived-boot-delay.timer | grep -vq 'LastTriggerUSecMonotonic=0'" + ) + node.wait_for_unit("keepalived") + node2.wait_until_succeeds("ip addr show dev eth1 | grep -q 192.168.1.200") + node1.fail("ip addr show dev eth1 | grep -q 192.168.1.200") + node1.succeed("ping -c1 192.168.1.200") + ''; + } + ); +in { - name = "keepalived"; - meta.maintainers = [ lib.maintainers.raitobezarius ]; - - nodes = { - node1 = - { pkgs, ... }: - { - services.keepalived.enable = true; - services.keepalived.openFirewall = true; - services.keepalived.vrrpInstances.test = { - interface = "eth1"; - state = "MASTER"; - priority = 50; - virtualIps = [ { addr = "192.168.1.200"; } ]; - virtualRouterId = 1; - }; - environment.systemPackages = [ pkgs.tcpdump ]; - }; - node2 = - { pkgs, ... }: - { - services.keepalived.enable = true; - services.keepalived.openFirewall = true; - services.keepalived.vrrpInstances.test = { - interface = "eth1"; - state = "MASTER"; - priority = 100; - virtualIps = [ { addr = "192.168.1.200"; } ]; - virtualRouterId = 1; - }; - environment.systemPackages = [ pkgs.tcpdump ]; - }; - }; - - testScript = '' - # wait for boot time delay to pass - for node in [node1, node2]: - node.wait_until_succeeds( - "systemctl show -p LastTriggerUSecMonotonic keepalived-boot-delay.timer | grep -vq 'LastTriggerUSecMonotonic=0'" - ) - node.wait_for_unit("keepalived") - node2.wait_until_succeeds("ip addr show dev eth1 | grep -q 192.168.1.200") - node1.fail("ip addr show dev eth1 | grep -q 192.168.1.200") - node1.succeed("ping -c1 192.168.1.200") - ''; + nftables = mkTest { useNftables = true; }; + iptables = mkTest { useNftables = false; }; } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8803e9335f17..3f970303d764 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3650,6 +3650,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + cole-nvim = buildVimPlugin { + pname = "cole.nvim"; + version = "0-unstable-2026-05-29"; + src = fetchFromGitHub { + owner = "thekylehuang"; + repo = "cole.nvim"; + rev = "1920cfa31c717e1f73a5a6e5a2c02a44b5faeb5c"; + hash = "sha256-k153XzTkkBm1qF6iKK8fzmAHIPnoIbXEAxAOQIoAPo0="; + }; + meta.homepage = "https://github.com/thekylehuang/cole.nvim/"; + meta.license = getLicenseFromSpdxId "MIT"; + meta.hydraPlatforms = [ ]; + }; + colibri-vim = buildVimPlugin { pname = "colibri.vim"; version = "0-unstable-2019-06-15"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c06733b9ec40..4f9d4e52d760 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -259,6 +259,7 @@ https://github.com/mrjones2014/codesettings.nvim/,, https://github.com/gorbit99/codewindow.nvim/,, https://github.com/johnseth97/codex.nvim/,, https://github.com/metakirby5/codi.vim/,, +https://github.com/thekylehuang/cole.nvim/,, https://github.com/archseer/colibri.vim/,, https://github.com/tjdevries/colorbuddy.nvim/,, https://github.com/xzbdmw/colorful-menu.nvim/,, 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 794db4af5815..1e8c18ecb051 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-/ns84fHAyTY7sSvhUNzq1XQYq2Xy303zs2BxJY8DBVA="; + hash = "sha256-bsb0OLDPKWnNnZ4tFedYFiFKmTih81oZnaV/BH4p6o4="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-U69X5lpeJaeNVL4WWzCUpI6IfbKSJXGpl30AYnx1fBQ="; + hash = "sha256-PZBjzxg/kQbCiosd79YFDor1MvBHAdk167PmNIA8ANw="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-DHE09NtGNOjB0HdBqTKRtDsZXpxb651kiVGhRwO1tBU="; + hash = "sha256-z4OekFyKQsbva5mlBPR6z8g6Is0fwL+xZg/fjKf42cI="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-5YIZVBMsoF0bWP27sVEVHAaAiqvmoSUgdbc8wsqUCLA="; + hash = "sha256-gLFoIhxXKunB6ftLEq5p+rfjs8QM5PTOXElu3OtbeIo="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.187"; + version = "2.1.191"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e6145f602e5b..b1757ac4c2f2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4833,8 +4833,8 @@ let mktplcRef = { name = "emacs-mcx"; publisher = "tuttieee"; - version = "0.110.9"; - hash = "sha256-xHu8GvBoZKMag7BdHddXyjm2IReMujs9cggOn4h32t8="; + version = "0.110.11"; + hash = "sha256-LiiZI0Ze5F5w7OtiqY7wMpzdtyof/ynUH57wRfQnxFs="; }; meta = { changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md"; diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index 45b11b86e835..c86912e97cb3 100644 --- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "0-unstable-2026-06-16"; + version = "0-unstable-2026-06-26"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "5ec3ccfb4313d452c3b3faccea97443ba3d9db4d"; - hash = "sha256-GFPh2z31vnACo8EEe83YRd7SVcPsSIe/vnPivaE2JYg="; + rev = "424f2dfd6d08c587020857421b89a5d9acda4beb"; + hash = "sha256-QkHgLWW+gk106wNeF5bKYsA4e6IKPiXakWb92AImRQc="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix index af55857f56dc..e2c485bc5ad5 100644 --- a/pkgs/applications/emulators/libretro/cores/fceumm.nix +++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fceumm"; - version = "0-unstable-2026-06-15"; + version = "0-unstable-2026-06-23"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-fceumm"; - rev = "c0c52ad0eb36cdbfc66e9bdb72efc83103e85e22"; - hash = "sha256-e81kpVUTz3l9wqCwN9Zf4LrnskPRW7Ewy78/1BApZlg="; + rev = "f87bc875bd68262211e2e01ffbaf3662626a3e4f"; + hash = "sha256-TUrhDbRArO/RISZawu5p9FIZlFf8pPlBrD9WRrdSRPk="; }; meta = { diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index bf2bd624c1ea..fc3ece2ce796 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -823,7 +823,7 @@ } }, "ungoogled-chromium": { - "version": "149.0.7827.155", + "version": "149.0.7827.196", "deps": { "depot_tools": { "rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90", @@ -835,16 +835,16 @@ "hash": "sha256-oFs7fZAZEs/gQ7X1A4uigo9+Y+iEN9sMMQYwAjEuD04=" }, "ungoogled-patches": { - "rev": "149.0.7827.155-1", - "hash": "sha256-+DviTrU7mdY3YQIIUzFh0DbFKUokQI8+lmQslUZdNSU=" + "rev": "149.0.7827.196-1", + "hash": "sha256-nRcMTP+su+mFP/JkyLBIDrG+dKYhvPANFw0Y8qVWzrA=" }, "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "07b52360cc15066f987c910ab34dfbcd4a8778d2", - "hash": "sha256-D9RKH0kzEfaMsCDnFFIGCGLyfhghnGMOLA0XmOa9MtI=", + "rev": "43eb30368c6ca3d14d540487954abb2780aeae3a", + "hash": "sha256-pwSfASgR4SiQTJBERhOVyR8mANYJk67f+u2pmCCW6ko=", "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": "591ee1999d950f2bc54be89651eb62c8d7925314", - "hash": "sha256-crooDCkJ6voJyDBIUvtjmXnA4xOx7YmGltuf2ulTLIk=" + "rev": "355cc61af2aadd8f0494800325b2bf9908138108", + "hash": "sha256-fgaCyO0oaz90aTaWMHH8ocySA0hXDHsPEl6vtMj4BY0=" }, "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": "5f4c5ef509c5ffa65822302341cf9b2ccad471f9", - "hash": "sha256-h+0Gep+RWTTEVoRrXCRDCtHdbYlSYdNK1botahtqUX0=" + "rev": "54b4153cfef88e048f365f99b962478f0087dfe8", + "hash": "sha256-Bv30zz/pCNVzUl+mKCpusWc94poytv9ZFelZIcs+2B8=" }, "src/third_party/dawn/third_party/glfw3/src": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -1639,8 +1639,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "6511f6cfab1f24c360d0fb737d205c27da48a623", - "hash": "sha256-Dpe0Z/zjdPlOlqi85c9QSr7rLs7dww+a/BY68B2MTCw=" + "rev": "933ce636c562cd54d68e7f7c93ab5cdffd685fca", + "hash": "sha256-zYArO6QS9nDIVWPINRVaDN1uX8X/wchBDeZHPZnwHYk=" } } } diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index d43e65372887..485dc46f3aa5 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "kubernetes-helm"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${finalAttrs.version}"; - hash = "sha256-k2lZXdWYnewNiZdLNQrC5j9A3JkvYCwMY486QxjCpaw="; + hash = "sha256-khyxnEeyxpgEO7rWKsEPqPLNSDZmFGqAZBrfb0TY8BU="; }; vendorHash = "sha256-XIKQF9PWgxKJUt66wQ/mPhWVfJnra0vV9ZuyclgQ21U="; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index b26be178e0d4..47332670d014 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -16,12 +16,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.4.8"; + version = "2.5.0"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-pQ437Du++L6KhBCqkHpiYCoT713RAB+rnoGCXr5M0S4="; + sha256 = "sha256-vicHneEZZHTraffUek77QDZdv/xZGzN102nbr1Bkfzo="; rev = "v${version}"; }; diff --git a/pkgs/by-name/an/anytype-cli/package.nix b/pkgs/by-name/an/anytype-cli/package.nix index b8eacca1f8e7..271bdc067508 100644 --- a/pkgs/by-name/an/anytype-cli/package.nix +++ b/pkgs/by-name/an/anytype-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { __structuredAttrs = true; pname = "anytype-cli"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "anyproto"; repo = "anytype-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-+GVV5HiOB/589IKRs+uJaK8X29MCg5cv0C8u6spb7Jg="; + hash = "sha256-T/mdF+pzApm15Cg2g1ybgU7pEHLsTC4jD7WuXzNqM2M="; }; - vendorHash = "sha256-uxKDO55CQYn50XpnlP5tv5Rcl6+fq7nsOD7/2foRZX8="; + vendorHash = "sha256-S6Xb2XYAn/cTC++1WK5cmXcC6QCZpPoYMRrjk/IPKas="; proxyVendor = true; env.CGO_ENABLED = 1; diff --git a/pkgs/by-name/au/authentik/client-go-config.patch b/pkgs/by-name/au/authentik/client-go-config.patch deleted file mode 100644 index 8398b16160c7..000000000000 --- a/pkgs/by-name/au/authentik/client-go-config.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/config.yaml b/config.yaml -index 2f07ea7..0f90432 100644 ---- a/config.yaml -+++ b/config.yaml -@@ -4,3 +4,4 @@ additionalProperties: - packageName: api - enumClassPrefix: true - useOneOfDiscriminatorLookup: true -+ disallowAdditionalPropertiesIfNotPresent: false diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index ff63e72475e2..fef159aa3c62 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -3,14 +3,19 @@ stdenvNoCC, callPackages, cacert, + clangStdenv, + cmake, fetchFromGitHub, buildGoModule, + buildNpmPackage, bash, chromedriver, nodejs_24, - python3, + python314, makeWrapper, openapi-generator-cli, + perl, + rustPlatform, go, typescript, makeSetupHook, @@ -20,13 +25,18 @@ let nodejs = nodejs_24; - version = "2025.12.6"; + version = "2026.5.3"; + + cargoPackageFlags = [ + "--package" + "authentik" + ]; src = fetchFromGitHub { owner = "goauthentik"; repo = "authentik"; tag = "version/${version}"; - hash = "sha256-uIg47z4LaCawF/5ir4mKE6DpDnEpQ8DuObCNaq6TcYk="; + hash = "sha256-nmAX8nwZpdDcFAPvC9hAEp0x43RnFtGLUTAm7NcvNZo="; }; meta = { @@ -46,24 +56,9 @@ let client-go = stdenvNoCC.mkDerivation { pname = "authentik-client-go"; - version = "3.${version}"; - inherit meta; + inherit version src meta; - src = fetchFromGitHub { - owner = "goauthentik"; - repo = "client-go"; - tag = "v3.2025.12.4"; - hash = "sha256-+/CfOE2HkBU+ZddvdXGenB/z8xNFk8cujpZpMXyh3cY="; - }; - - patches = [ - ./client-go-config.patch - ]; - - postPatch = '' - substituteInPlace ./config.yaml \ - --replace-fail '/local' "$(pwd)" - ''; + sourceRoot = "${src.name}/packages/client-go"; nativeBuildInputs = [ openapi-generator-cli @@ -86,10 +81,9 @@ let installPhase = '' runHook preInstall - cp go.mod go.sum $out - cd $out rm -rf test + rm -f go.mod go.sum rm -f .travis.yml git_push.sh runHook postInstall @@ -101,8 +95,8 @@ let inherit version src meta; postPatch = '' - substituteInPlace ./scripts/api/ts-config.yaml \ - --replace-fail '/local' "$(pwd)" + substituteInPlace ./packages/client-ts/config.yaml \ + --replace-fail '/local' "$(pwd)/packages/client-ts" ''; nativeBuildInputs = [ @@ -117,7 +111,7 @@ let openapi-generator-cli generate \ -i ./schema.yml -o $out \ -g typescript-fetch \ - -c ./scripts/api/ts-config.yaml \ + -c ./packages/client-ts/config.yaml \ --additional-properties=npmVersion=${version} \ --git-repo-id authentik --git-user-id goauthentik @@ -128,32 +122,19 @@ let ''; }; - # prefetch-npm-deps does not save all dependencies even though the lockfile is fine - website-deps = stdenvNoCC.mkDerivation { + website-deps = buildNpmPackage { pname = "authentik-website-deps"; inherit src version meta; sourceRoot = "${src.name}/website"; - outputHash = - { - "aarch64-linux" = "sha256-EbLneRDCyLLLBOZ2DUDpf2TbZoTL8QMXP4WlAZEzS90="; - "x86_64-linux" = "sha256-yDjwN/+lX2i9WYDXq4yWwf9o8nA4342iHDDQH4Jt7eQ="; - } - .${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform"); - - outputHashMode = "recursive"; - - nativeBuildInputs = [ - nodejs - cacert - ]; - - buildPhase = '' - npm ci --cache ./cache - - rm -r ./cache node_modules/.package-lock.json - ''; + inherit nodejs; + npmDepsHash = "sha256-SkIZF+wQPgoZOGJc0YR8Ot07KCsAdA1985SLQaoibfA="; + npmDepsFetcherVersion = 2; + makeCacheWritable = true; + npmInstallFlags = [ "--legacy-peer-deps" ]; + npmRebuildFlags = [ "--ignore-scripts" ]; + dontNpmBuild = true; # dependencies of workspace projects are installed into separate node_modules folders with # symlinks between them, so we have to copy all of them @@ -208,8 +189,8 @@ let outputHash = { - "aarch64-linux" = "sha256-J9wGQe7iMfKznNk3woqi0VNVNA/dE6TGi2f44DOlG1c="; - "x86_64-linux" = "sha256-9Q590Rw0mk3q5osxOKGWU7+XtKwkTyA+CLC2LxAA/3g="; + "aarch64-linux" = "sha256-41xZEfLul92vJATZqyVnd7Pp++NzLL/u8NeJJPHpXrw="; + "x86_64-linux" = "sha256-FpfOl6wNCgXLg86+vbjnYkcOnpaOZBCNxJiFDRT5W3s="; } .${stdenvNoCC.hostPlatform.system} or (throw "authentik-webui-deps: unsupported host platform"); outputHashMode = "recursive"; @@ -220,6 +201,7 @@ let ]; buildPhase = '' + chmod -R +w . ../packages/client-ts npm ci --cache ./cache --ignore-scripts rm -r ./cache node_modules/.package-lock.json @@ -295,7 +277,7 @@ let ]; }; - python = python3.override { + python = python314.override { self = python; packageOverrides = final: prev: { # https://github.com/goauthentik/authentik/pull/16324 @@ -376,62 +358,6 @@ let ]; }; - # Running authentik currently requires a custom version. - # Look in `pyproject.toml` for changes to the rev in the `[tool.uv.sources]` section. - # See https://github.com/goauthentik/authentik/pull/14057 for latest version bump. - djangorestframework = final.buildPythonPackage { - pname = "djangorestframework"; - version = "3.16.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "authentik-community"; - repo = "django-rest-framework"; - rev = "896722bab969fabc74a08b827da59409cf9f1a4e"; - hash = "sha256-YrEDEU3qtw/iyQM3CoB8wYx57zuPNXiJx6ZjrIwnCNU="; - }; - - propagatedBuildInputs = with final; [ - django - pytz - ]; - - nativeCheckInputs = with final; [ - pytest-django - pytest7CheckHook - - # optional tests - coreapi - django-guardian - inflection - pyyaml - uritemplate - ]; - - disabledTests = [ - "test_ignore_validation_for_unchanged_fields" - "test_invalid_inputs" - "test_shell_code_example_rendering" - "test_unique_together_condition" - "test_unique_together_with_source" - ]; - - pythonImportsCheck = [ "rest_framework" ]; - }; - - # authentik is currently not compatible with v1.18 and fails with the following error: - # > AttributeError: 'Namespace' object has no attribute 'worker_fork_timeout'. Did you mean: 'worker_shutdown_timeout'? - dramatiq = prev.dramatiq.overrideAttrs (_: rec { - version = "1.17.1"; - - src = fetchFromGitHub { - owner = "Bogdanp"; - repo = "dramatiq"; - tag = "v${version}"; - hash = "sha256-NeUGhG+H6r+JGd2qnJxRUbQ61G7n+3tsuDugTin3iJ4="; - }; - }); - authentik-django = final.buildPythonPackage { pname = "authentik-django"; inherit version src meta; @@ -548,7 +474,32 @@ let inherit (python.pkgs) authentik-django; - # Provide a setup-hook to configure the Go vendor directory with up-to-date API bindings. + worker = (rustPlatform.buildRustPackage.override { stdenv = clangStdenv; }) { + pname = "authentik-worker"; + inherit version src meta; + + cargoHash = "sha256-KExlNyT9G3R5rnt99beT2pYrWxezMLhGw+Q9T1X2kj4="; + + nativeBuildInputs = [ + cmake + go + perl + ]; + + buildInputs = [ python ]; + + env = { + PYO3_PYTHON = lib.getExe python; + RUSTFLAGS = "--cfg tokio_unstable"; + }; + + cargoBuildFlags = cargoPackageFlags; + + # Upstream currently has no Rust tests in this package. + doCheck = false; + }; + + # Provide a setup-hook to configure the Go source tree with up-to-date API bindings. # This is done to avoid the `vendorHash` depending on anything in the `client-go` build (e.g. # openapi-generator-cli version updates changing the produced content) and invalidating the hash. apiGoVendorHook = @@ -559,9 +510,10 @@ let ( writeShellScript "authentik-api-go-vendor-hook" '' authentikApiGoVendorHook() { - chmod -R +w vendor/goauthentik.io/api - rm -rf vendor/goauthentik.io/api/v3 - cp -r ${client-go} vendor/goauthentik.io/api/v3 + chmod -R +w packages/client-go + rm -rf packages/client-go + cp -r ${client-go} packages/client-go + chmod -R +w packages/client-go echo "Finished authentikApiGoVendorHook" } @@ -593,10 +545,11 @@ let # calculate the vendorHash without other dependencies, so it is only based on the `go.sum` file overrideModAttrs.postPatch = ""; - vendorHash = "sha256-pdQg02f1K4nOhsnadoplQYOhEybqZxn+yDQRN5RNygM="; + vendorHash = "sha256-EVDOZ4USaJoIBDB8mM4ZSBfsSc1d/NOm1Qv/hUJ+8f4="; postInstall = '' - mv $out/bin/server $out/bin/authentik + mv $out/bin/server $out/bin/authentik-server + ln -s authentik-server $out/bin/authentik ''; subPackages = [ "cmd/server" ]; @@ -612,11 +565,6 @@ stdenvNoCC.mkDerivation { postPatch = '' rm Makefile patchShebangs lifecycle/ak - - # This causes issues in systemd services - substituteInPlace lifecycle/ak \ - --replace-fail 'printf' '>&2 printf' \ - --replace-fail '>/dev/stderr' "" ''; installPhase = '' @@ -627,8 +575,9 @@ stdenvNoCC.mkDerivation { wrapProgram $out/bin/ak \ --prefix PATH : ${ lib.makeBinPath [ - (python.withPackages (ps: [ ps.authentik-django ])) + worker proxy + (python.withPackages (ps: [ ps.authentik-django ])) ] } \ --set TMPDIR /dev/shm \ @@ -638,7 +587,7 @@ stdenvNoCC.mkDerivation { ''; passthru = { - inherit proxy apiGoVendorHook; + inherit proxy worker apiGoVendorHook; outposts = callPackages ./outposts.nix { inherit (proxy) vendorHash; inherit apiGoVendorHook; diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index d92c820fce8a..6e8719125f25 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,47 @@ { - "version": "2.1.187", - "commit": "6a53320fad5541a68d79e4b6c53677df77b98e33", - "buildDate": "2026-06-23T17:07:42Z", + "version": "2.1.191", + "commit": "397db5e73d569118815b8037ca9ff2483a06bbfe", + "buildDate": "2026-06-24T11:32:23Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "a59a16ba4922adab7a145728f215d042184d349f5f7e72cddb7fc114250a4ce3", - "size": 215994048 + "checksum": "99fdfb552a5260e649aedd06c024d0a4105b09cefec0bf67d558e017ee66c400", + "size": 219856224 }, "darwin-x64": { "binary": "claude", - "checksum": "7f57b6935b4246d03cb7acee90dc22153083483a267da589c5c920dd04744c36", - "size": 224795776 + "checksum": "6e83aad5fc4fd459fd74539cda06d2279105eac2befc603d2fba6494974cb2a4", + "size": 229178416 }, "linux-arm64": { "binary": "claude", - "checksum": "b49be8a5e565bf2d45b50d2de62017b25462131acc9425d2fdb98b8f29c9dce2", - "size": 232240864 + "checksum": "1a31a7cbcfd784f8c073bfc8a0a1583fb6e93e60ef70b76d7fcf663ffed8949b", + "size": 236305136 }, "linux-x64": { "binary": "claude", - "checksum": "bb02fcb33626f8c599d10d8bee38585d4cf8d4225c3b497869dee7454e7bf361", - "size": 234874664 + "checksum": "1038dba88bdf1b80941dc3e383e93b088325b00497329ac50da460c8786d5bee", + "size": 239438648 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "972fc2e0bc8104edb593ce7723d4414c0ed8e4df6d90ad26ae48097b1d910478", - "size": 225620168 + "checksum": "7e5d3ac86e28dbd224f84d9349372b74bed39ad6392408df63356fd8a810c96e", + "size": 229553336 }, "linux-x64-musl": { "binary": "claude", - "checksum": "c5a783d13aac71d42324f2e9dcd395c266bd5774951faf0d94855c737024bee3", - "size": 229858704 + "checksum": "b80e0066fb208cbd50fe539ed9c03dadd24fcc058bb67774fd36a316bca396ad", + "size": 234123648 }, "win32-x64": { "binary": "claude.exe", - "checksum": "24964d08c5100bac6071352e5837101b333de1c1afefd2b8b0e7a60db6c0ef5c", - "size": 226329760 + "checksum": "83397a6a029c7da663fb1ce27211e05174a3546d8b151e42451bf4590b8343d7", + "size": 230281888 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "04124c0ba09ece85a856de652e84386094c372f002ff767a94d4a43ecf776f96", - "size": 220992160 + "checksum": "ec8c342e835ee8891ef2c6d0eb9ac460f2d5e6a668788c8a03faa3451748c275", + "size": 224756384 } } } diff --git a/pkgs/by-name/co/cockpit-files/package.nix b/pkgs/by-name/co/cockpit-files/package.nix index 8239d5dbf066..60ad181b1230 100644 --- a/pkgs/by-name/co/cockpit-files/package.nix +++ b/pkgs/by-name/co/cockpit-files/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-files"; - version = "41"; + version = "42"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-files"; tag = finalAttrs.version; - hash = "sha256-qS9L0REWN8exXiy5ogYQNbuwaxuh8CiKaCUJHdkfSqQ="; + hash = "sha256-NfI6y60O5ctsPbwPcXgkwxpNYuZkF/2YXZOIcRZUc5c="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; diff --git a/pkgs/by-name/co/cockpit-machines/package.nix b/pkgs/by-name/co/cockpit-machines/package.nix index d16e56df2a18..b58acdbcee30 100644 --- a/pkgs/by-name/co/cockpit-machines/package.nix +++ b/pkgs/by-name/co/cockpit-machines/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-machines"; - version = "353"; + version = "354"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-machines"; tag = finalAttrs.version; - hash = "sha256-K4p2HDg1Wh1ORw3S2BeY0Kbpy+CEGyiCM623/6M4LpU="; + hash = "sha256-r5gvs6/clRDV0VZKU1r6fjJSwHLuf9Pnhi0c60/9qkE="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; diff --git a/pkgs/by-name/co/cockpit-podman/package.nix b/pkgs/by-name/co/cockpit-podman/package.nix index e14de81eaf25..7a5278395eed 100644 --- a/pkgs/by-name/co/cockpit-podman/package.nix +++ b/pkgs/by-name/co/cockpit-podman/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-podman"; - version = "127"; + version = "128"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-podman"; tag = finalAttrs.version; - hash = "sha256-dYwiHvpyzu03ceinPeEuTpnRx4OOmA9/UuIKJNxb1eY="; + hash = "sha256-GlnIZGV5nk7o28EUs4H/IdZkgtHG0a9uwCTCS4rCP6c="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; diff --git a/pkgs/by-name/co/colmena/package.nix b/pkgs/by-name/co/colmena/package.nix index f95c311db6e7..fdf643e76301 100644 --- a/pkgs/by-name/co/colmena/package.nix +++ b/pkgs/by-name/co/colmena/package.nix @@ -8,19 +8,20 @@ makeBinaryWrapper, nix-eval-jobs, nix, - colmena, - testers, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "colmena"; version = "0.4.0"; + __structuredAttrs = true; + src = fetchFromGitHub { - owner = "zhaofengli"; + owner = "nix-community"; repo = "colmena"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ="; }; cargoHash = "sha256-2OLApLD/04etEeTxv03p0cx8O4O51iGiBQTIG/iOIkU="; @@ -35,10 +36,10 @@ rustPlatform.buildRustPackage (finalAttrs: { env.NIX_EVAL_JOBS = "${nix-eval-jobs}/bin/nix-eval-jobs"; patches = [ - # Fixes nix 2.24 compat: https://github.com/zhaofengli/colmena/pull/236 + # Fixes nix 2.24 compat: https://github.com/zhaofengli/colmena/pull/233 (fetchpatch { - url = "https://github.com/zhaofengli/colmena/commit/36382ee2bef95983848435065f7422500c7923a8.patch"; - sha256 = "sha256-5cQ2u3eTzhzjPN+rc6xWIskHNtheVXXvlSeJ1G/lz+E="; + url = "https://github.com/nix-community/colmena/commit/00fd486d49170b1304c67381b3096e55d4cdc76f.patch"; + hash = "sha256-uwL3u0gO708bzV2NV8sTt10WHaCL3HykJNqSZNp9EtA="; }) ]; @@ -52,19 +53,22 @@ rustPlatform.buildRustPackage (finalAttrs: { --prefix PATH ":" "${lib.makeBinPath [ nix ]}" ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + # Recursive Nix is not stable yet doCheck = false; passthru = { # We guarantee CLI and Nix API stability for the same minor version apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion finalAttrs.version)); - - tests.version = testers.testVersion { package = colmena; }; }; meta = { description = "Simple, stateless NixOS deployment tool"; homepage = "https://colmena.cli.rs/${finalAttrs.passthru.apiVersion}"; + downloadPage = "https://github.com/nix-community/colmena/"; + changelog = "https://github.com/nix-community/colmena/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ zhaofengli ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/co/cosmic-applets/dedup-cosmic-settings-daemon.patch b/pkgs/by-name/co/cosmic-applets/dedup-cosmic-settings-daemon.patch new file mode 100644 index 000000000000..d800685e4c23 --- /dev/null +++ b/pkgs/by-name/co/cosmic-applets/dedup-cosmic-settings-daemon.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index bdd37740..c1adcfad 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1514,7 +1514,7 @@ dependencies = [ + [[package]] + name = "cosmic-settings-config" + version = "0.1.0" +-source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47" ++source = "git+https://github.com/pop-os/cosmic-settings-daemon#e7936f0d4f01c8c5a436908c7ee9f6ad43e6a7d8" + dependencies = [ + "cosmic-config", + "ron 0.11.0", diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index 03ac8e1bb998..3bf2a2fbc3e2 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -20,17 +20,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applets"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applets"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-o+rEO+IA337fhpq6TsH+UZEN7kb/PqydlKo77NyCRcM="; + hash = "sha256-A8Qk9u3Q83Q4AjzTrdptfS9UNoyKq39YihC4d/dNBYc="; }; - cargoHash = "sha256-tbGuyqdDTsKYpKxeAuachwbPHTPhmb9Sg3qzxHYosjo="; + cargoPatches = [ + # A different reference to the `cosmic-settings-daemon` crate was added + # Remove this patch once upstream fixes their lockfile. + ./dedup-cosmic-settings-daemon.patch + ]; + + cargoHash = "sha256-81BFu13QmqOq43iN+ORQuktisEFYRrK+wd6diFfSufs="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index 19c352f99649..87e9e75cb8cb 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applibrary"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applibrary"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-mzHSLZK6HienbPRPetSj+XbPWCnpihEvMx9W9lJWpbA="; + hash = "sha256-TZncRQer4lXunUwdQ2xDP3DmF5B7UmfhSQvEwVodc98="; }; cargoHash = "sha256-qGx/3w78mgIMqRo1wJA+ULFHWdNW2LKe2Sej4f9KbVs="; diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index e18cef8f3a4f..6a27f2f4a9dc 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-bg"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-bg"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-E4OWxoGyRNFcMl7ni7PB6PE0Yl7dE+Wd4JGDMHO94Yw="; + hash = "sha256-bczUWa91l52P6Q46/lkX1j9eKasM154D82fBaLFHF1M="; }; postPatch = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg" ''; - cargoHash = "sha256-xXq8Dckg3YOf2AT9uOZqVfq00FhZp/X5UU8hLmAln1U="; + cargoHash = "sha256-UDhXKg4lO6op/lfi3aZ4iclzUqcf5xQI85UWAHVTWig="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index b57bf910e0ca..69552fdea6ad 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-comp"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-3WPZk/o+cfq3wwKEuYejMh+pn2o823m98OO3crFaNX4="; + hash = "sha256-fUuw7qwfojAmu/mkWMkWBhpcSgZNTIzdXmInjyKrZBI="; }; cargoHash = "sha256-ki+unf58rXBCpj5PCpBcg/6FWo16+MdPQWae+w1YkJ8="; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index ac6085d05627..c6148a0cf930 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-edit"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-almnWrJSV5xZoBDEuk0pfMZ/c00e0xpDNTTbcq+NCYM="; + hash = "sha256-5DsnhaiJgmTakn+q9o2Q7IeuakAC/j0Ck3F3pfFx/EA="; }; - cargoHash = "sha256-/qcpAR2nvC/MYa5QuCLiZFQgos5SlYtspZsNuMLJFHk="; + cargoHash = "sha256-2E+98uWtahyQufoZTzdUtkwbuISsUHwlqOmMSpyi1O8="; separateDebugInfo = true; diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index 149956ff852f..cc0d584fd744 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-files"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-files"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-2vrk1hYL7E/vVWiLcOYY3O0cmYZyFG4bdkNDFuyA+cA="; + hash = "sha256-cRwZrmm/zOIV6VCyz2dTH+qn8h6LOnaOiHU5nENTK6o="; }; - cargoHash = "sha256-QPFGsn1J0lp5K4gLdar/Z5MmZg+VOoCZd1U8LUuLXqM="; + cargoHash = "sha256-+21DCCTkNrbdxgxQi0YyuAxpl1IvwUz3ccUE+E0sZ4Y="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index 12e59cf25258..c9f04a86339b 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -19,14 +19,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-greeter"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-greeter"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-+6VOv6z61k48hURq4yRRMIFIE8ZrjYGapO5FybWKQTE="; + hash = "sha256-oxXCAvBISkZu76VpvQ9AliFRJ8r5Ay7mjWf4sEwV0Xs="; }; cargoHash = "sha256-mfY2hsMxBooRjmTB2jgUIKyKHBpGfZ9Qslwv+2aEQyg="; diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 6009c0bcfc18..6e680b83e8fa 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -9,14 +9,14 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-icons"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-icons"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-3owl4M4vRyzjR4v74clyAxpNDu77rieSpYAVYfADHzY="; + hash = "sha256-QUTAYIQ6qAhjZK/9BZjJzTViECLUwO/MyaOqiRb1Ans="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index ca17faa2ce2b..05c0e99f8ff1 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-idle"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix index 9006fa7e152d..cf7d5a6b55f1 100644 --- a/pkgs/by-name/co/cosmic-initial-setup/package.nix +++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix @@ -14,14 +14,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-initial-setup"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-initial-setup"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-3nGPBWYDqPJN99WtzsAVERucwiVAFynuUk2gezZ/RJU="; + hash = "sha256-UABqbmbwW2ZBOO7mq16/h0s55VCWRF2yyf/1TaubC88="; }; cargoHash = "sha256-DESnl5NjakU4++Ep6CHxDZzHn+o0Gi0eREpXk5BN5iY="; diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index 8b3b14881b5e..2f790b30098d 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-launcher"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-launcher"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-ZivzjufT2UlPi/En1AjGS8TfeFNdJDfDUd9cb2Begb8="; + hash = "sha256-9U64nSeI47bkc8BQU9ilXBlHQRGS2zC/FcBKc7Z17RY="; }; cargoHash = "sha256-WnZAPQR8hGGNC5S7hPmcGSMs9HrOw4/wqJR151eIgHY="; diff --git a/pkgs/by-name/co/cosmic-monitor/package.nix b/pkgs/by-name/co/cosmic-monitor/package.nix new file mode 100644 index 000000000000..9b1bdd228583 --- /dev/null +++ b/pkgs/by-name/co/cosmic-monitor/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + just, + libcosmicAppHook, + nixosTests, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cosmic-monitor"; + version = "1.1.0"; + + # nixpkgs-update: no auto update + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-monitor"; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-CiJ9LeNcdOyC8yn0c7hCz0QEecxYK95KGvs1SWr9360="; + }; + + cargoHash = "sha256-OMhLPQ3GkV/wdeb9F7lsKY1Uzzg8+UlhOeakGZo6mYk="; + + separateDebugInfo = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + just + libcosmicAppHook + rustPlatform.bindgenHook + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" + ]; + + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "epoch-(.*)" + ]; + }; + }; + + meta = { + homepage = "https://github.com/pop-os/cosmic-monitor"; + description = "COSMIC System Monitor"; + mainProgram = "cosmic-monitor"; + license = lib.licenses.gpl3Only; + teams = [ lib.teams.cosmic ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index f0ae84bd4110..401eb262ebe7 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-notifications"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-osd/deduplicate-cosmic-settings-crate.patch b/pkgs/by-name/co/cosmic-osd/deduplicate-cosmic-settings-crate.patch deleted file mode 100644 index 9872e8d69f5f..000000000000 --- a/pkgs/by-name/co/cosmic-osd/deduplicate-cosmic-settings-crate.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 8b6704e..64c1691 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1104,7 +1104,7 @@ dependencies = [ - [[package]] - name = "cosmic-settings-airplane-mode-subscription" - version = "1.0.7" --source = "git+https://github.com/pop-os/cosmic-settings#78644a32e3741f8f80e9b8ce65c3550c85f9c1f8" -+source = "git+https://github.com/pop-os/cosmic-settings#81912bed6cdebe2719e29e6bd1453e7b977acb0e" - dependencies = [ - "futures", - "iced_futures", -@@ -1150,7 +1150,7 @@ dependencies = [ - [[package]] - name = "cosmic-settings-pulse-subscription" - version = "0.1.0" --source = "git+https://github.com/pop-os/cosmic-settings#78644a32e3741f8f80e9b8ce65c3550c85f9c1f8" -+source = "git+https://github.com/pop-os/cosmic-settings#81912bed6cdebe2719e29e6bd1453e7b977acb0e" - dependencies = [ - "futures", - "iced_futures", -@@ -1162,7 +1162,7 @@ dependencies = [ - [[package]] - name = "cosmic-settings-upower-subscription" - version = "1.0.7" --source = "git+https://github.com/pop-os/cosmic-settings#78644a32e3741f8f80e9b8ce65c3550c85f9c1f8" -+source = "git+https://github.com/pop-os/cosmic-settings#81912bed6cdebe2719e29e6bd1453e7b977acb0e" - dependencies = [ - "futures", - "iced_futures", diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 407e63972011..c3bdf6376f10 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -15,24 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-osd"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-jv28hxhQUcUDLnOwU3xQJwCU+s52pwDNs8Gf4I5Hp9k="; + hash = "sha256-veqkYF2CSwnc1nGIFeZXpfannCQ0RuacvqPVxVsiVDc="; }; - cargoHash = "sha256-YwZXlhggrUddxour+/S1mSL3Fq1mzvFaOHArLSnfPvc="; - - cargoPatches = [ - # A different reference to the `cargo-settings` crate was added in: - # - # Remove this patch once upstream fixes their lockfile. - ./deduplicate-cosmic-settings-crate.patch - ]; + cargoHash = "sha256-aweq4E2bwqRpetakpR0OqTsIsoJK6h4eRzMdBhGuIoU="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index b003608effc0..08fbe6eaf82d 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-MNOS7HMlyvU4zCZVINthgZgBsUn+LI1hUAEcwSq+zaE="; + hash = "sha256-DKwmZnTxsYCWAkLb9AXoHBa8m6Z5Gi1Jb7AuxZqq7RA="; }; cargoHash = "sha256-6E+bAi1f6gOZh64wyvLMKZiZNlMexPV+ZzS3riOx9xM="; diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index 549cdb52346d..b12ec673f447 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-player"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-player"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-iDEyR+P+iXShH0YFtqxvPbbs9kgtYvAsuKchB6plnKI="; + hash = "sha256-aHQbwpNr8tsfUR0Dm4WTzz6XNXjgdqZ9/2AQRPPbnog="; }; - cargoHash = "sha256-YzT16Ej+AyLLj8uHuHxZvHWujcW8jLjVg/4MmPyorH4="; + cargoHash = "sha256-KVaKTMrWijResBqzH62j/YqBR4TQ77x2sK/kN40UWjw="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index 4679dec4c858..f632be043c9b 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-randr"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index b5aa22076ca3..a335b3e56fed 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-screenshot"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-screenshot"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-DngKZDKfgVdSZLZAsPq+7p4r/go2Y6141LrCNGoxD1E="; + hash = "sha256-RYvc/3FoRnNkuYBVfCG75Bmfb8JWW1H4GKXyhq7CxaQ="; }; cargoHash = "sha256-q0RJST1yeqPBjU5MseNZIrZw+brfDtQLKiw7wyViflE="; diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index b5507b5bd6af..cf4406a3cb21 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-session"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 00c546752bc5..84aaa17fdf48 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -7,6 +7,7 @@ adw-gtk3, pkg-config, libpulseaudio, + pipewire, libinput, udev, openssl, @@ -16,14 +17,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings-daemon"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings-daemon"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-A+nOAadFWU+KRW54dP2WW6P6fabIs4z1AqC37LSZjUI="; + hash = "sha256-6MLZpGGvE1EnUlRv2T6+iXy8B0aqBTNNrqDtBbeABYs="; }; postPatch = '' @@ -33,18 +34,22 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3' ''; - cargoHash = "sha256-bz+JasI3WE30sKKgjofVO/42Ml4YY9Dw3JxnZmZVQk4="; + cargoHash = "sha256-rpyMdwmcddsrXuIOI5T6Kh9+cB28DdUxotiqpeGqvCc="; separateDebugInfo = true; __structuredAttrs = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; buildInputs = [ libinput libpulseaudio openssl udev + pipewire ]; makeFlags = [ diff --git a/pkgs/by-name/co/cosmic-settings/dedup-libcosmic.patch b/pkgs/by-name/co/cosmic-settings/dedup-libcosmic.patch new file mode 100644 index 000000000000..00d00905de3b --- /dev/null +++ b/pkgs/by-name/co/cosmic-settings/dedup-libcosmic.patch @@ -0,0 +1,112 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 46d491a..ea60cd9 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1774,7 +1774,7 @@ dependencies = [ + [[package]] + name = "cosmic-theme" + version = "1.0.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "almost", + "configparser", +@@ -3158,7 +3158,7 @@ dependencies = [ + [[package]] + name = "iced" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "dnd", + "iced_accessibility", +@@ -3214,7 +3214,7 @@ dependencies = [ + [[package]] + name = "iced_debug" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "iced_core", + "iced_futures", +@@ -3238,7 +3238,7 @@ dependencies = [ + [[package]] + name = "iced_graphics" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "bitflags 2.12.1", + "bytemuck", +@@ -3259,7 +3259,7 @@ dependencies = [ + [[package]] + name = "iced_program" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "iced_graphics", + "iced_runtime", +@@ -3268,7 +3268,7 @@ dependencies = [ + [[package]] + name = "iced_renderer" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "iced_graphics", + "iced_tiny_skia", +@@ -3280,7 +3280,7 @@ dependencies = [ + [[package]] + name = "iced_runtime" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "bytes", + "cosmic-client-toolkit", +@@ -3296,7 +3296,7 @@ dependencies = [ + [[package]] + name = "iced_tiny_skia" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "bytemuck", + "cosmic-text", +@@ -3313,7 +3313,7 @@ dependencies = [ + [[package]] + name = "iced_wgpu" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "as-raw-xcb-connection", + "bitflags 2.12.1", +@@ -3344,7 +3344,7 @@ dependencies = [ + [[package]] + name = "iced_widget" + version = "0.14.2" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "cosmic-client-toolkit", + "dnd", +@@ -3364,7 +3364,7 @@ dependencies = [ + [[package]] + name = "iced_winit" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "cosmic-client-toolkit", + "cursor-icon", +@@ -4455,7 +4455,7 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" + [[package]] + name = "libcosmic" + version = "1.0.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "apply", + "ashpd 0.12.3", diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 513089a3af67..5320de71ee47 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -27,17 +27,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-knA3qpFeRRlUMV91+LleaWxb1fexX2IJlMRD81fl7l4="; + hash = "sha256-LfhFza0G85+fIuACMdwV50Okh5/46z8tLoJ9IvLqTgw="; }; - cargoHash = "sha256-2ZHuOmtBzXQ/KSBMKus9LbojfByYzzCjIkbGY8C85bU="; + cargoPatches = [ + # A different reference to the `libcosmic` crate was added + # Remove this patch once upstream fixes their lockfile. + ./dedup-libcosmic.patch + ]; + + cargoHash = "sha256-rYjizOCcLJ4aq3UB5xEwWq5+KvrSi5PCUTIwUM/wegM="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index 25c9ad72ac4a..d29231e0e70d 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-store"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-store"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-JE8LcFlhG4e3QqobzUNfCw3Eg10+FrlVuQu+J+96/es="; + hash = "sha256-pePtfOgeQtaD15dfWzrMQmXcINf/V5ovKWAG8kOPf+c="; }; - cargoHash = "sha256-+lOt+mSTKKsSm3UzGXq43ZjbktiCCV8dnHdvnnx2vqA="; + cargoHash = "sha256-jECZ/6hxaDfz2pOOqLkbq5HfF3YnCVK2geFAC+n286A="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 168b9b41beeb..b99fcc991196 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-term"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-nDTDGtaGRW0JM48/tbWO/NK1WhGkPwlsqfWrDGvFE9A="; + hash = "sha256-ocOPssCxm2p2HoAIHIAoAMh66cGcGXuGWDuAEtHFoPQ="; }; - cargoHash = "sha256-0W1TU1NIcV9fx/vgKpPLqLO1fcdtbZX5Ds1uQWGJ2C8="; + cargoHash = "sha256-ezFCpU4ZNfANYRVTMrvPMC79j55XGUwYMMKeihekYds="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index e7763090dc3c..a0ddd6e66db8 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index 24e5785fc668..92fa4090d020 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-workspaces-epoch"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-workspaces-epoch"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-u4p22qpxZPdBogzrJXGomqGGxgkpD0hdXf+3YNg2VIo="; + hash = "sha256-riiveHFtRF3rtOhbbUtfYRoAlqc7TCRr8aer0dgBY7g="; }; cargoHash = "sha256-Z5dC3W8QoDBZWBjHwRj9MC8EScDjQwUiUcOPTRDToDA="; diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index da3e2f90d51c..9a69084ffd7a 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -33,14 +33,14 @@ let in python.pkgs.buildPythonApplication (finalAttrs: { pname = "esphome"; - version = "2026.5.3"; + version = "2026.6.2"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = finalAttrs.version; - hash = "sha256-laz+XNszkayfmEyrtFr3BHUWVV9eFhj130o4l99XElY="; + hash = "sha256-h7aMPSXmIUutCGMoZlE3Z1wX2xNxdmZsHfBllcFHBHc="; }; patches = [ @@ -96,6 +96,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { pillow platformio puremagic + py7zr pyparsing pyserial pyyaml @@ -151,6 +152,10 @@ python.pkgs.buildPythonApplication (finalAttrs: { disabledTestPaths = [ # platformio builds; requires networking for dependency resolution "tests/integration" + + # tries to dynamically patch platformio module + "tests/unit_tests/test_writer.py" + "tests/unit_tests/test_espidf_component.py" ]; preCheck = '' diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix index 490442c52191..ca41bc3ee420 100644 --- a/pkgs/by-name/fa/faas-cli/package.nix +++ b/pkgs/by-name/fa/faas-cli/package.nix @@ -24,13 +24,13 @@ let in buildGoModule (finalAttrs: { pname = "faas-cli"; - version = "0.18.9"; + version = "0.18.10"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = finalAttrs.version; - sha256 = "sha256-QiRO7oJk/zjUOWr1giW29/QJY/YiKkLzROB6OxN8kIc="; + sha256 = "sha256-MctMhuaXJpm25VKqlhaAPG2QzSDQ//Ei8B1lRCKdz68="; }; vendorHash = null; diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix index 7f674be42123..9b0d66660ca5 100644 --- a/pkgs/by-name/go/gotosocial/package.nix +++ b/pkgs/by-name/go/gotosocial/package.nix @@ -11,13 +11,13 @@ }: buildGo125Module (finalAttrs: { pname = "gotosocial"; - version = "0.21.2"; + version = "0.21.3"; src = fetchFromCodeberg { owner = "superseriousbusiness"; repo = "gotosocial"; tag = "v${finalAttrs.version}"; - hash = "sha256-Z3j5/pXnNTHgBmPEfFgjOJuL03LsPtvAwbuoL9wb5bk="; + hash = "sha256-gemi9t4wTjmCHEXfdXz1X9Q4gcvj/3LMtlrO5UpQ19M="; }; vendorHash = null; diff --git a/pkgs/by-name/is/ispc/package.nix b/pkgs/by-name/is/ispc/package.nix index a268f04696ed..e08668ded3f6 100644 --- a/pkgs/by-name/is/ispc/package.nix +++ b/pkgs/by-name/is/ispc/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ispc"; - version = "1.30.0"; + version = "1.31.0"; src = fetchFromGitHub { owner = "ispc"; repo = "ispc"; tag = "v${finalAttrs.version}"; - hash = "sha256-CzyK38c8fCG7QiVHE0rSzxmyTXNr4sg1WtChbi75Wmw="; + hash = "sha256-n1zWokIuZEDJZN/KH3jxnIhgUo8iKDfZwiQnXZdxhL8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix index fe374d91274a..78605d13c195 100644 --- a/pkgs/by-name/is/istioctl/package.nix +++ b/pkgs/by-name/is/istioctl/package.nix @@ -7,15 +7,15 @@ buildGoModule (finalAttrs: { pname = "istioctl"; - version = "1.30.1"; + version = "1.30.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = finalAttrs.version; - hash = "sha256-jW0L/86D0YgAoUYAZfwHMGes5x0P5QLelP79XuG3riU="; + hash = "sha256-Ejt6MjBmkWnYWHp9TiWYO6e1VV/+TN6cVZXYK3+B5Fc="; }; - vendorHash = "sha256-dOPrYZxOeP1ZahSaPS6U6tJDbTx/5BbwHFcNKS+2Lqc="; + vendorHash = "sha256-cHW8FSYuZpl1GuWKsJLnAxCMOLvuaRwN1oL+xjwYspI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ke/keepalived/package.nix b/pkgs/by-name/ke/keepalived/package.nix index d08c856293f9..bb7406288ab2 100644 --- a/pkgs/by-name/ke/keepalived/package.nix +++ b/pkgs/by-name/ke/keepalived/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - passthru.tests.keepalived = nixosTests.keepalived; + passthru.tests = nixosTests.keepalived; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/la/layerx/package.nix b/pkgs/by-name/la/layerx/package.nix new file mode 100644 index 000000000000..0de8d58b7059 --- /dev/null +++ b/pkgs/by-name/la/layerx/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "layerx"; + version = "1.5.0"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "deveshctl"; + repo = "layerx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Bkz0ETQEdy0GOlyGFmP8y80NdmNgRvLV0xRf/zd91ZY="; + }; + + vendorHash = "sha256-7wbyz6fKB3HMFhKJVIWrOIczLfqF4yInyszdh2Ky8WU="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${finalAttrs.version}" + "-X=main.commit=${finalAttrs.src.rev}" + "-X=main.date=1970-01-01T00:00:00Z" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion \ + --cmd layerx \ + --bash <($out/bin/layerx completion bash) \ + --fish <($out/bin/layerx completion fish) \ + --zsh <($out/bin/layerx completion zsh) + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = [ "version" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal-based Docker image layer inspector"; + homepage = "https://github.com/deveshctl/layerx"; + changelog = "https://github.com/deveshctl/layerx/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kpbaks ]; + mainProgram = "layerx"; + }; +}) diff --git a/pkgs/by-name/li/libtsm/package.nix b/pkgs/by-name/li/libtsm/package.nix index 5cca1ae05a7b..fd960021e34b 100644 --- a/pkgs/by-name/li/libtsm/package.nix +++ b/pkgs/by-name/li/libtsm/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtsm"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "kmscon"; repo = "libtsm"; tag = "v${finalAttrs.version}"; - hash = "sha256-5Lv/Hb0FGWARk3Wv3IuAbtCDII7qOMmcZSmKTkgTEsc="; + hash = "sha256-CN5ktki8fbvmiGiyDvDf4ayRKakpWRI51SdhRbFqNVM="; }; strictDeps = true; diff --git a/pkgs/by-name/lo/lowfi/package.nix b/pkgs/by-name/lo/lowfi/package.nix index 9a7dc2462388..d019856b6578 100644 --- a/pkgs/by-name/lo/lowfi/package.nix +++ b/pkgs/by-name/lo/lowfi/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lowfi"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "talwat"; repo = "lowfi"; tag = finalAttrs.version; - hash = "sha256-t61R68cuAEAjyY5cR2rpTa+pSE3DDDct9G4p/aeTgsQ="; + hash = "sha256-/GU1e01AjeS4AVBvQUi/GZKeQ0X+hnmt+kyW3gp0jgg="; }; - cargoHash = "sha256-ogoQWcS6htU515xjJW7jQYqpfHAQ48a8QaaBPvkGrXg="; + cargoHash = "sha256-iuC0YBhzK8mATJekTgBDMiXATRdThem35p5AyDXQNGo="; buildFeatures = [ "scrape" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "mpris" ]; diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index 0b484d162cd3..ee4b554fd3a2 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -8,16 +8,17 @@ buildGoModule (finalAttrs: { pname = "matrix-alertmanager-receiver"; - version = "2026.6.10"; + version = "2026.6.17"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = finalAttrs.version; - hash = "sha256-eZCFNKO3m3mm/nMMZXkfoQrsHwBekSJuKS0uQLhz4wY="; + hash = "sha256-vwmLSl09tzpn4hc8+d5l00D93QBsX/y0/403kuNg/SQ="; }; - vendorHash = "sha256-ocwFtgSXiBa9e+hZyX3p/Y/Jndq1N64hKfyQtjrGaoY="; + vendorHash = "sha256-Umn+V+yqAUf0dmUW8p1Luh+hcVTqOTA0rmQyE0KmBZA="; env.CGO_ENABLED = "0"; diff --git a/pkgs/by-name/me/memtier-benchmark/package.nix b/pkgs/by-name/me/memtier-benchmark/package.nix index f1c67bfb0d54..ce04d0ecae9c 100644 --- a/pkgs/by-name/me/memtier-benchmark/package.nix +++ b/pkgs/by-name/me/memtier-benchmark/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "memtier-benchmark"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "redis"; repo = "memtier_benchmark"; tag = finalAttrs.version; - hash = "sha256-0whioOhzs5aLu/fjRJvybZ8UYE5Lv1VnQDmgikC3tEA="; + hash = "sha256-k2xhY4EsPVZIEGfdkDc/Mr3oJomNu2bhbn3MzCfOaDg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix index 63312e79cf25..c20fd10fea90 100644 --- a/pkgs/by-name/mi/mimir/package.nix +++ b/pkgs/by-name/mi/mimir/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "mimir"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { rev = "mimir-${finalAttrs.version}"; owner = "grafana"; repo = "mimir"; - hash = "sha256-Gp4+eVL6HUFlhtAZmDJyHYr/QP0+JQIcDXJfCk2IpCg="; + hash = "sha256-8GvpmCanVlsObH1mwPA/TsHzNp3f0hzF7fURIDHy/DU="; }; vendorHash = null; diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index 734c46038057..7923d622bb88 100644 --- a/pkgs/by-name/mi/mistral-vibe/package.nix +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, # tests + gitMinimal, uv, versionCheckHook, writableTmpDirAsHomeHook, @@ -39,7 +40,7 @@ let in python3Packages.buildPythonApplication (finalAttrs: { pname = "mistral-vibe"; - version = "2.17.1"; + version = "2.18.0"; pyproject = true; __structuredAttrs = true; @@ -47,7 +48,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-JrUepzbJupeyHiNz9gbX+C3kc2tJaNkxCldMELKeXcU="; + hash = "sha256-2eDu2Fqd6K/ZxWSl/pXSN284z7UquNb+zwkHYe9ZWBw="; }; build-system = with python3Packages; [ @@ -159,6 +160,8 @@ python3Packages.buildPythonApplication (finalAttrs: { pythonImportsCheck = [ "vibe" ]; nativeCheckInputs = [ + # vibe.core.agent_loop.TeleportError: Teleport requires git to be installed. + gitMinimal python3Packages.pytest-asyncio python3Packages.pytest-textual-snapshot python3Packages.pytest-xdist diff --git a/pkgs/by-name/mo/mo-viewer/package.nix b/pkgs/by-name/mo/mo-viewer/package.nix index 6538afbfad93..f4891b308b43 100644 --- a/pkgs/by-name/mo/mo-viewer/package.nix +++ b/pkgs/by-name/mo/mo-viewer/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "mo-viewer"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "k1LoW"; repo = "mo"; tag = "v${finalAttrs.version}"; - hash = "sha256-/PiMYllj0l3XwIkqT/sc7U/vGXdNmTD8RowZWe9ZDR8="; + hash = "sha256-/dUAz55hsDYV+1rgNN52rdO798SCRyIyHXrL/ZGTwmY="; }; frontend = stdenvNoCC.mkDerivation (finalFrontendAttrs: { diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix index 2de15aec8add..a0a788a05ca5 100644 --- a/pkgs/by-name/mt/mtail/package.nix +++ b/pkgs/by-name/mt/mtail/package.nix @@ -8,17 +8,17 @@ buildGoModule (finalAttrs: { pname = "mtail"; - version = "3.3.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "jaqx0r"; repo = "mtail"; rev = "v${finalAttrs.version}"; - hash = "sha256-Cn6Ssj5ik0G/MORbx+YwY7ekheXim64zUx7oKH5JXD0="; + hash = "sha256-iNTj8bXtJl1H0rNiFGITgIxD9oAZ7zKUAoyDaxvcR6o="; }; proxyVendor = true; - vendorHash = "sha256-v00wX7uz3z/ldwppQd9aJLN/bnhoN/wweY3nbO/fu2I="; + vendorHash = "sha256-NKNCpTCfc2U5fqdhXu30w7QlUjCwSX0l+t5ivWtEgdU="; nativeBuildInputs = [ gotools # goyacc diff --git a/pkgs/by-name/ne/newelle/package.nix b/pkgs/by-name/ne/newelle/package.nix index cb118e03f15f..a63aee43c276 100644 --- a/pkgs/by-name/ne/newelle/package.nix +++ b/pkgs/by-name/ne/newelle/package.nix @@ -104,6 +104,8 @@ python3Packages.buildPythonApplication { mainProgram = "newelle"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + michaelAllen + ]; }; } diff --git a/pkgs/by-name/ni/nix-search-tv/package.nix b/pkgs/by-name/ni/nix-search-tv/package.nix index 4535ad698c38..e6e647eed359 100644 --- a/pkgs/by-name/ni/nix-search-tv/package.nix +++ b/pkgs/by-name/ni/nix-search-tv/package.nix @@ -7,13 +7,14 @@ buildGoModule (finalAttrs: { pname = "nix-search-tv"; - version = "2.2.7"; + version = "2.2.8"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "3timeslazy"; repo = "nix-search-tv"; tag = "v${finalAttrs.version}"; - hash = "sha256-vWKMGj2fBUbsAvwoYjgT+L4hH0A96u4rDOaT0wnj7iw="; + hash = "sha256-TbNpfJOL0IM+ElXYXherSeUT+qswxH8eY/tvCZyKAZg="; }; vendorHash = "sha256-SSKDo4A8Nhvylghrw6d7CdHpZ7jObEr5V3r0Y9cH80Y="; @@ -33,7 +34,7 @@ buildGoModule (finalAttrs: { meta = { description = "Fuzzy search for Nix packages"; homepage = "https://github.com/3timeslazy/nix-search-tv"; - changelog = "https://github.com/3timeslazy/nix-search-tv/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/3timeslazy/nix-search-tv/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "nix-search-tv"; diff --git a/pkgs/by-name/oy/oyui/package.nix b/pkgs/by-name/oy/oyui/package.nix new file mode 100644 index 000000000000..1cb665f30ebc --- /dev/null +++ b/pkgs/by-name/oy/oyui/package.nix @@ -0,0 +1,34 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + __structuredAttrs = true; + + pname = "oyui"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "emilien-jegou"; + repo = "oyui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Z69mBOZFHqslZLC2WutvkhcydxAmO9pppapJSTeHtiA="; + }; + + cargoHash = "sha256-3XzTbrEDFzCf2rsvJu/foiDYEoO4lLMsr+4t9nDYv34="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Modern TUI merge tool and interactive diff editor for Jujutsu (jj) and Git"; + homepage = "https://github.com/emilien-jegou/oyui"; + changelog = "https://github.com/emilien-jegou/oyui/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + adda + ]; + mainProgram = "oyui"; + }; +}) diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix index 15c328fd5a3b..ca5771180a2d 100644 --- a/pkgs/by-name/pd/pdns/package.nix +++ b/pkgs/by-name/pd/pdns/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-CJN5Vc5ES7sKq/32pfGNSD3ViT12FTmBG+F6m2zzO2o="; + hash = "sha256-aFWWelSte13on5EPBeNI4xey7YOetJj5bDjBr3oerzg="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; diff --git a/pkgs/by-name/pi/pinchflat/package.nix b/pkgs/by-name/pi/pinchflat/package.nix index 15d42ce350d7..832c86480641 100644 --- a/pkgs/by-name/pi/pinchflat/package.nix +++ b/pkgs/by-name/pi/pinchflat/package.nix @@ -58,10 +58,13 @@ beamPackages.mixRelease rec { patchShebangs ~/assets/node_modules # phoenixframework expects platform-specific tailwind/esbuild binaries in a specific location: - # https://github.com/phoenixframework/tailwind/blob/194ab0f979782e4ccf2fe796042bf8e20967df93/lib/tailwind.ex#L243-L251 - targets="linux-x64 linux-arm64 macos-x64 macos-arm64" - for target in $targets; do + # tailwind: https://github.com/phoenixframework/tailwind/blob/194ab0f979782e4ccf2fe796042bf8e20967df93/lib/tailwind.ex#L243-L251 + for target in linux-x64 linux-arm64 macos-x64 macos-arm64; do ln -s "${tailwindcss}/bin/tailwindcss" "_build/tailwind-$target" + done + + # esbuild: https://github.com/phoenixframework/esbuild/blob/v0.10.0/lib/esbuild.ex#L270-L300 + for target in linux-x64 linux-arm64 darwin-x64 darwin-arm64; do ln -s "${esbuild}/bin/esbuild" "_build/esbuild-$target" done diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 092a1e01d824..a830390a9ad2 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -54,14 +54,14 @@ let in pythonPackages.buildPythonApplication (finalAttrs: { pname = "pretix"; - version = "2026.5.1"; + version = "2026.5.2"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; tag = "v${finalAttrs.version}"; - hash = "sha256-p4ZZzfoR4Wg65xeqk9JyCdZ+S7RqBVd1drWpHjj8oqc="; + hash = "sha256-lamvhcch/EajS8/b1tocAKjCgW0WqFD0wsm4e5o25nM="; }; patches = [ diff --git a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix index a48afd06166b..b17d5d52a534 100644 --- a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix +++ b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pretix-mollie"; - version = "2.5.5"; + version = "2.5.6"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-mollie"; tag = "v${version}"; - hash = "sha256-EqitdAoTm6mpXp8g2HftvxRbg+6gXxR7xUsC+aYfv8U="; + hash = "sha256-XInwUecuC3sEcRpuS+xa7Gb2Isb18SexbZ2+CcUF7/E="; }; build-system = [ diff --git a/pkgs/by-name/pr/pretix/plugins/pages/package.nix b/pkgs/by-name/pr/pretix/plugins/pages/package.nix index 3b2f61e8e84e..37c32fa5b20c 100644 --- a/pkgs/by-name/pr/pretix/plugins/pages/package.nix +++ b/pkgs/by-name/pr/pretix/plugins/pages/package.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pretix-pages"; - version = "1.6.3"; + version = "1.6.4"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-pages"; rev = "v${version}"; - hash = "sha256-ZM38zHlFB5013PvoJwm7YC5/wHg2GZWmrhvreXuqNc8="; + hash = "sha256-whpO8aE0VUSrByf3P0JaIoruYbJi8wj4nZo/2tx+XLU="; }; build-system = [ diff --git a/pkgs/by-name/pr/procs/package.nix b/pkgs/by-name/pr/procs/package.nix index 5aaa3c33c8bc..8ce2bd6ea6dd 100644 --- a/pkgs/by-name/pr/procs/package.nix +++ b/pkgs/by-name/pr/procs/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "procs"; - version = "0.14.11"; + version = "0.14.12"; src = fetchFromGitHub { owner = "dalance"; repo = "procs"; rev = "v${finalAttrs.version}"; - hash = "sha256-BAWsONWDqYJfEnUwYBEhY2hJcna+komUKEaHyNYUr3w="; + hash = "sha256-FvBxBleOGWkjV+3uydSESYXybOYrwnBgXwacGftu7Ec="; }; - cargoHash = "sha256-VfeQDlmUriZe9ze5L3C0yFoKiyjlZpcesHccO7T15i8="; + cargoHash = "sha256-e+ShskUeBIe0PWyzqxAv+XRoEbDyh45SUM4WL3CsiD4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix index aaee329e24ef..929287eea012 100644 --- a/pkgs/by-name/pr/protonplus/package.nix +++ b/pkgs/by-name/pr/protonplus/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "protonplus"; - version = "0.5.20"; + version = "0.5.21"; src = fetchFromGitHub { owner = "Vysp3r"; repo = "protonplus"; tag = "v${finalAttrs.version}"; - hash = "sha256-XLA5dEG3gshvklk1te3VF1lqJmeeclNCWn2R/35pq/E="; + hash = "sha256-elc2hDAiMT15bAZW4z55K9EsTRmHeU3YBccTx2GMTIE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index ddc780c80ae3..24599bb1db28 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "prow"; - version = "0-unstable-2026-06-15"; - rev = "351e8cfd58915657bd36a50e7e86bbe972bc0739"; + version = "0-unstable-2026-06-24"; + rev = "2b5fea27a177c767160452ba75dba978a88d8d63"; src = fetchFromGitHub { inherit rev; owner = "kubernetes-sigs"; repo = "prow"; - hash = "sha256-TvEAgi2uj1B513o2YWuONiCmCzQvA9S7XPL7MF1VZK4="; + hash = "sha256-QKxalLV+UwFs+WspXgnqS3QFRTzDkh/NKHZr/+UPUNg="; }; - vendorHash = "sha256-PmvEW80vYTHfcgMOf1AwF9Xb3U9Uj85IJzBpRDxJzhM="; + vendorHash = "sha256-iLJ2atYyHNMvflyuETpPnuhKD293k25vfZQU68Y7oN8="; # doCheck = false; diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index 16efd1892f08..56b3eb1b04cc 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -7,7 +7,7 @@ rainfrog, }: let - version = "0.3.18"; + version = "0.3.19"; in rustPlatform.buildRustPackage { inherit version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; tag = "v${version}"; - hash = "sha256-MraqApmj0FFGBbzG+XXjoDHPgJPG8yAMdXyoCZTMpFk="; + hash = "sha256-tVnz2AMcFBbeH7jv1FGJlSA6+rDmvgG1X7Xc1gUc/TQ="; }; - cargoHash = "sha256-pPVJgemV7Esg1vYGxCPv8gv0I5DQwA1VtWhcgm5VLFE="; + cargoHash = "sha256-wXNuh3eJPiFb49yOFw7srihc6IiNx0rWB/waYrrKKPU="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/re/redumper/package.nix b/pkgs/by-name/re/redumper/package.nix index 82b9027435f6..5643f4910637 100644 --- a/pkgs/by-name/re/redumper/package.nix +++ b/pkgs/by-name/re/redumper/package.nix @@ -13,13 +13,13 @@ # redumper is using C++ modules, this requires latest C++20 compiler and build tools llvmPackages.libcxxStdenv.mkDerivation (finalAttrs: { pname = "redumper"; - version = "724"; + version = "726"; src = fetchFromGitHub { owner = "superg"; repo = "redumper"; tag = "b${finalAttrs.version}"; - hash = "sha256-EOQEEQKxdAGGZr72/lfJv1KOz7bQglzxwpwblrTPtls="; + hash = "sha256-887r4SatrybmG4tSJRLpOQNcxwvMVF0iTZoWWNQ4m8A="; }; patches = [ diff --git a/pkgs/by-name/re/reticulated/package.nix b/pkgs/by-name/re/reticulated/package.nix new file mode 100644 index 000000000000..798e02fca3c6 --- /dev/null +++ b/pkgs/by-name/re/reticulated/package.nix @@ -0,0 +1,65 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + nix-update-script, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "reticulated"; + version = "1.0.2"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "RFnexus"; + repo = "reticulated"; + tag = finalAttrs.version; + hash = "sha256-55eK9AObUw8JLn4sNC5O8dNrfscwTwQpkVQAR+O9Lcw="; + }; + + postPatch = '' + substituteInPlace sim/config.py \ + --replace-fail 'os.path.join(BASE_DIR, "web")' '"${placeholder "out"}/share/web"' + ''; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + fastapi + lxmf + rns + uvicorn + websockets + ]; + + postInstall = '' + mkdir -p "$out/share" + cp -r web "$out/share/" + ''; + + postFixup = '' + wrapProgram $out/bin/reticulated \ + --set PYTHONPATH $PYTHONPATH \ + --set SIM_DATA_DIR "/tmp" + ''; + + pythonImportsCheck = [ "sim" ]; + + # No --version flag and no Python tests + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/RFnexus/reticulated/releases/tag/${finalAttrs.src.tag}"; + description = "Reticulum Network Stack Simulator"; + homepage = "https://github.com/RFnexus/reticulated"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "reticulated"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ru/rucola/package.nix b/pkgs/by-name/ru/rucola/package.nix index a26e38012596..2c5a0b227266 100644 --- a/pkgs/by-name/ru/rucola/package.nix +++ b/pkgs/by-name/ru/rucola/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rucola"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Linus-Mussmaecher"; repo = "rucola"; tag = "v${finalAttrs.version}"; - hash = "sha256-gBX7ivLiCpdVE77O+Qy2fVGjvh/qG9FxX4jNxsTL03s="; + hash = "sha256-dE2XlO+CwC78GblNoyv7oA5d/GezzuiuOwcQjsm7Pns="; }; - cargoHash = "sha256-9QBZEZS1LFfjlKVTM5vAbm+8tFlZVyWDLEKvpsDIu5E="; + cargoHash = "sha256-yhBY/6NLn1aIRZLLpHrEsMo/yzSnKzsvrIiJFCRcYMc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ru/rusthound-ce/package.nix b/pkgs/by-name/ru/rusthound-ce/package.nix index 840e58b5792b..621b17356718 100644 --- a/pkgs/by-name/ru/rusthound-ce/package.nix +++ b/pkgs/by-name/ru/rusthound-ce/package.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rusthound-ce"; - version = "2.4.7"; + version = "2.4.9"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-GxkrTXlCVPEZvsu6wck1BbXinFSdnTmnWHy9LH1ymdQ="; + hash = "sha256-FG63LZX62MiSquI56WnQc9oRdzvQAaf/wGPDjSmhvow="; }; - cargoHash = "sha256-mvsGi5M4Ut0BnX2204AX2nBIdZ8Gtap8wf9pWc6RlpU="; + cargoHash = "sha256-tN7sHqEC18NQs3PrLdY71JdbL31MBh2tuaBtTN/T9vE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sb/sbom-utility/package.nix b/pkgs/by-name/sb/sbom-utility/package.nix index 6fff931f6a49..766d1c4e5143 100644 --- a/pkgs/by-name/sb/sbom-utility/package.nix +++ b/pkgs/by-name/sb/sbom-utility/package.nix @@ -9,7 +9,7 @@ }: let - version = "0.19.1"; + version = "0.19.2"; in buildGoModule { pname = "sbom-utility"; @@ -19,7 +19,7 @@ buildGoModule { owner = "CycloneDX"; repo = "sbom-utility"; tag = "v${version}"; - hash = "sha256-AEy29ZL2KfWuHzVohUF5xWI34QgvtIDQfH6AlVfFkAY="; + hash = "sha256-xjANZxjPQmaBZPt+yF2UTJ1QL7QN0wSFxNMZ2oF6p7s="; }; vendorHash = "sha256-vyYSir5u6d5nv+2ScrHpasQGER4VFSoLb1FDUDIrtDM="; diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index 1dc10fc3c775..659112af119e 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -69,13 +69,13 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "servo"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; tag = "v${finalAttrs.version}"; - hash = "sha256-zZitnAiexoroKx3TMu3sB0KDvIsBcT7Krwa6lJqY4yw="; + hash = "sha256-DfUjByBtDcOShExuBBLSHmgP9CPMSdkovw9QeGRDYaA="; # Breaks reproducibility depending on whether the picked commit # has other ref-names or not, which may change over time, i.e. with # "ref-names: HEAD -> main" as long this commit is the branch HEAD @@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-hZBI3Vte/FvN7qJy2VGF0LVQIFSWa931BFFbaUfN814="; + cargoHash = "sha256-N0MUtL0HslJHEQUCB0iMbXGdD9hA6GRqcmdSjjhsu8E="; # set `HOME` to a temp dir for write access # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index 9f8d4eec4e87..30453fd03a3c 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "sing-box"; - version = "1.13.13"; + version = "1.13.14"; src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-box"; tag = "v${finalAttrs.version}"; - hash = "sha256-RsiBxPQOE4rE3cFRjl81x1uIG2A4/smSBUg+G0vm7uQ="; + hash = "sha256-ODQ1i2lOuQLb3LDq6ONqHJQ7sT7dXICCJoyW/I9zF38="; }; - vendorHash = "sha256-FUzGQx0TIJdWWYtF6781BSXLViFrXbPEdLKjuvtuleM="; + vendorHash = "sha256-Znk4bsm9TUseEuCQszs9rvVx8TDu+cwEVfVOhw7exYA="; tags = [ "with_gvisor" diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix index 86c8e7ca336c..b95b16b079dd 100644 --- a/pkgs/by-name/sk/skills/package.nix +++ b/pkgs/by-name/sk/skills/package.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "skills"; - version = "1.5.11"; + version = "1.5.13"; src = fetchFromGitHub { owner = "vercel-labs"; repo = "skills"; tag = "v${finalAttrs.version}"; - hash = "sha256-IAbkeN1ZP8z5xTaZafRLMhAlhXBDw+fkfTvjZBoGeqw="; + hash = "sha256-NfjEt37jfA/d0v6gXRjlvsUj0xf8h+NquVUZEKaMFL4="; }; pnpmDeps = fetchPnpmDeps { diff --git a/pkgs/by-name/sm/smtprelay/package.nix b/pkgs/by-name/sm/smtprelay/package.nix index db4906615ad3..a3f7f7c05123 100644 --- a/pkgs/by-name/sm/smtprelay/package.nix +++ b/pkgs/by-name/sm/smtprelay/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "smtprelay"; - version = "1.13.3"; + version = "1.14.0"; src = fetchFromGitHub { owner = "decke"; repo = "smtprelay"; tag = "v${finalAttrs.version}"; - hash = "sha256-o4nB1j2NmqeQeTpJoY8mKUv60L8dTLQxjNtfCIZ2u0M="; + hash = "sha256-tvmspqXzsBTEmW8b87FtqGgF4pMWpssN0AH5OoeQR44="; }; - vendorHash = "sha256-d+NSghVEdEiHIUGR6MIj7d3dHYGtAeLbdJ7zwhHxOPo="; + vendorHash = "sha256-QowoS+qQy/AhhyW8F6OWYaMQ4BubszIPom1wt3Tzdxc="; subPackages = [ "." diff --git a/pkgs/by-name/sp/spedread/package.nix b/pkgs/by-name/sp/spedread/package.nix index c65b45dd863f..be956139a30c 100644 --- a/pkgs/by-name/sp/spedread/package.nix +++ b/pkgs/by-name/sp/spedread/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spedread"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "Darazaki"; repo = "Spedread"; tag = "v${finalAttrs.version}"; - hash = "sha256-IZhvKZ4kllL6ItUn47+EnUwVPKXC0mz2Mvsg/7CT5Qw="; + hash = "sha256-+1fNQT3UXGPgVKvHBlU4Om70ePCKJUXg1NLic/l+Guk="; }; postPatch = '' diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index c77cf5cc28c3..6da4571b4574 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.89"; + version = "3.16.91"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-HRk8pd3FAj5P3KObzO91NF2BrYV8Wo7hDA8xWYsbTm4="; + hash = "sha256-ZW1sbLqlGv7DlbJ1BnkyGbPtCKtlmZWvxNS9NWxmle8="; }; outputs = [ diff --git a/pkgs/by-name/su/sumo/package.nix b/pkgs/by-name/su/sumo/package.nix index 24ffb06f0232..631ab932a842 100644 --- a/pkgs/by-name/su/sumo/package.nix +++ b/pkgs/by-name/su/sumo/package.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sumo"; - version = "1.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "eclipse-sumo"; repo = "sumo"; tag = "v${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-fi/36vgnxRezqkEEPRNxz/PBjg2hvwI9XpaN6IT7298="; + hash = "sha256-8yYm6HIVTmDoHrlMw5cUjxh6QtN5p8G+fGA/XTl/UnI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/su/sus-compiler/Cargo.lock b/pkgs/by-name/su/sus-compiler/Cargo.lock index 198767e6994c..c1e23a94ca5c 100644 --- a/pkgs/by-name/su/sus-compiler/Cargo.lock +++ b/pkgs/by-name/su/sus-compiler/Cargo.lock @@ -76,12 +76,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "anyhow" -version = "1.0.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" - [[package]] name = "ariadne" version = "0.6.0" @@ -94,9 +88,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "bitflags" @@ -106,21 +100,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" +checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" [[package]] name = "bumpalo" -version = "3.20.2" +version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "cc" -version = "1.2.58" +version = "1.2.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1" +checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96" dependencies = [ "find-msvc-tools", "shlex", @@ -145,9 +139,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.44" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" dependencies = [ "iana-time-zone", "js-sys", @@ -164,9 +158,9 @@ checksum = "14c638459986b83c2b885179bd4ea6a2cbb05697b001501a56adb3a3d230803b" [[package]] name = "clap" -version = "4.6.0" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" +checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" dependencies = [ "clap_builder", "clap_derive", @@ -187,9 +181,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.0" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" +checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -328,10 +322,28 @@ dependencies = [ ] [[package]] -name = "foldhash" -version = "0.1.5" +name = "futures-core" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" + +[[package]] +name = "futures-task" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" + +[[package]] +name = "futures-util" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" +dependencies = [ + "futures-core", + "futures-task", + "pin-project-lite", + "slab", +] [[package]] name = "getrandom" @@ -346,32 +358,21 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "libc", "r-efi", "rand_core", - "wasip2", - "wasip3", ] [[package]] name = "hashbrown" -version = "0.15.5" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash", -] - -[[package]] -name = "hashbrown" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" [[package]] name = "heck" @@ -419,22 +420,14 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "indexmap" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.16.1", - "serde", - "serde_core", + "hashbrown", ] [[package]] @@ -451,31 +444,26 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "js-sys" -version = "0.3.92" +version = "0.3.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4c90f45aa2e6eacbe8645f77fdea542ac97a494bcd117a67df9ff4d611f995" +checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31" dependencies = [ - "once_cell", + "cfg-if", + "futures-util", "wasm-bindgen", ] -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - [[package]] name = "libc" -version = "0.2.183" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libredox" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08" +checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3" dependencies = [ "libc", ] @@ -488,9 +476,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "log" -version = "0.4.29" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "lsp-server" @@ -520,9 +508,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" [[package]] name = "num-traits" @@ -585,14 +573,10 @@ dependencies = [ ] [[package]] -name = "prettyplease" -version = "0.2.37" +name = "pin-project-lite" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "proc-macro2" @@ -617,10 +601,28 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.45" +name = "pulldown-cmark" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "e9f068eba8e7071c5f9511831b44f32c740d5adf574e990f946ddb53db2f314e" +dependencies = [ + "bitflags 2.13.0", + "memchr", + "pulldown-cmark-escape", + "unicase", +] + +[[package]] +name = "pulldown-cmark-escape" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" + +[[package]] +name = "quote" +version = "1.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" dependencies = [ "proc-macro2", ] @@ -633,20 +635,20 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" +checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" dependencies = [ "chacha20", - "getrandom 0.4.2", + "getrandom 0.4.3", "rand_core", ] [[package]] name = "rand_core" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "redox_users" @@ -661,9 +663,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.12.3" +version = "1.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" +checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" dependencies = [ "aho-corasick", "memchr", @@ -684,9 +686,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "replace_with" @@ -700,7 +702,7 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.11.0", + "bitflags 2.13.0", "errno", "libc", "linux-raw-sys", @@ -722,12 +724,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "semver" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" - [[package]] name = "serde" version = "1.0.228" @@ -760,9 +756,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "indexmap", "itoa", @@ -785,9 +781,15 @@ dependencies = [ [[package]] name = "shlex" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" + +[[package]] +name = "slab" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "static_assertions" @@ -809,7 +811,7 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "sus-proc-macro" -version = "0.3.10" +version = "0.4.0" dependencies = [ "quote", "regex", @@ -820,7 +822,7 @@ dependencies = [ [[package]] name = "sus_compiler" -version = "0.3.10" +version = "0.4.0" dependencies = [ "ariadne", "chrono", @@ -837,6 +839,7 @@ dependencies = [ "lsp-types", "ordered-float", "ouroboros", + "pulldown-cmark", "rand", "replace_with", "same-file", @@ -851,9 +854,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.117" +version = "2.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" dependencies = [ "proc-macro2", "quote", @@ -892,9 +895,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.26.7" +version = "0.26.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a6592b1aec0109df37b6bafea77eb4e61466e37b0a5a98bef4f89bfb81b7a2" +checksum = "4dab76d0b724ba557954125188cf0633a1ca43199ced82d95c7b9c32cc3de1f3" dependencies = [ "cc", "regex", @@ -912,7 +915,7 @@ checksum = "009994f150cc0cd50ff54917d5bc8bffe8cad10ca10d81c34da2ec421ae61782" [[package]] name = "tree-sitter-sus" -version = "0.3.10" +version = "0.4.0" dependencies = [ "cc", "tree-sitter", @@ -930,6 +933,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" +[[package]] +name = "unicase" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" + [[package]] name = "unicode-ident" version = "1.0.24" @@ -942,12 +951,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "utf8parse" version = "0.2.2" @@ -966,29 +969,11 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" -[[package]] -name = "wasip2" -version = "1.0.2+wasi-0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" -dependencies = [ - "wit-bindgen", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen", -] - [[package]] name = "wasm-bindgen" -version = "0.2.115" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6523d69017b7633e396a89c5efab138161ed5aafcbc8d3e5c5a42ae38f50495a" +checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a" dependencies = [ "cfg-if", "once_cell", @@ -999,9 +984,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.115" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3a6c758eb2f701ed3d052ff5737f5bfe6614326ea7f3bbac7156192dc32e67" +checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1009,9 +994,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.115" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921de2737904886b52bcbb237301552d05969a6f9c40d261eb0533c8b055fedf" +checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd" dependencies = [ "bumpalo", "proc-macro2", @@ -1022,47 +1007,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.115" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a93e946af942b58934c604527337bad9ae33ba1d5c6900bbb41c2c07c2364a93" +checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f" dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder", - "wasmparser", -] - -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags 2.11.0", - "hashbrown 0.15.5", - "indexmap", - "semver", -] - [[package]] name = "winapi-util" version = "0.1.11" @@ -1140,94 +1091,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck 0.5.0", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck 0.5.0", - "indexmap", - "prettyplease", - "syn", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags 2.11.0", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - [[package]] name = "yansi" version = "1.0.1" diff --git a/pkgs/by-name/su/sus-compiler/package.nix b/pkgs/by-name/su/sus-compiler/package.nix index 70e4bc82bad5..d78f6187c6a3 100644 --- a/pkgs/by-name/su/sus-compiler/package.nix +++ b/pkgs/by-name/su/sus-compiler/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sus-compiler"; - version = "0.3.10"; + version = "0.4.0"; src = fetchFromGitHub { owner = "pc2"; repo = "sus-compiler"; rev = "v${finalAttrs.version}"; - hash = "sha256-gU0PiMZNMYmroNQXD0LGutsr9aYPNI2BGeKB+9Brhqg="; + hash = "sha256-RbZRKb5o6ojbpcLNq3v25YhRuDbVyHoEzA2Mr77LTPA="; fetchSubmodules = true; leaveDotGit = true; diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix index 2ba97b627ce9..6f0fa60f1532 100644 --- a/pkgs/by-name/ta/tabiew/package.nix +++ b/pkgs/by-name/ta/tabiew/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "tabiew"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "shshemi"; repo = "tabiew"; tag = "v${finalAttrs.version}"; - hash = "sha256-bJ2XxGXnN4++9P7Tb5Vky5DGOHq+/VpFsrbLOboLpZs="; + hash = "sha256-gZIPeN7DSOyKf5RGo5ZP+dR4ke8NabVdT0ekQl9DvUM="; }; - cargoHash = "sha256-cOxFyY59BOIK8ln6o0pkHpfB16ZlvkY4eX9nwbjB52w="; + cargoHash = "sha256-GEAKJECs98WUxJHD5FDmVafplPl7Yj7NGBL0zNRLhak="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix index a7e3338db5f9..6b271a3c69aa 100644 --- a/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix +++ b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tmux-mem-cpu-load"; - version = "3.8.2"; + version = "3.8.3"; src = fetchFromGitHub { owner = "thewtex"; repo = "tmux-mem-cpu-load"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-g++6n6OD9FAw8CtXArKBgNwFf+3v+SBCHmbma7RpMBA="; + sha256 = "sha256-nvnfhMS5XjX81ErR8iH8sieuRjRod6PXeuqUrtaKcsA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/tu/tuicr/package.nix b/pkgs/by-name/tu/tuicr/package.nix new file mode 100644 index 000000000000..2727432f4a1b --- /dev/null +++ b/pkgs/by-name/tu/tuicr/package.nix @@ -0,0 +1,44 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + openssl, + git, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "tuicr"; + version = "0.18.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "agavra"; + repo = "tuicr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-cMIUVBEtyS+AB9QqqRSu+Rd+9dyMzw+EmHSIzY2UmiQ="; + }; + + cargoHash = "sha256-ErEpUo9RPOHMHlmlPH2S6jHvnVhi4DKO7EnoMToj5t0="; + + strictDeps = true; + + nativeCheckInputs = [ git ]; + + checkFlags = [ + # expects to be run inside the upstream git repository + "--skip=should_return_no_changes_for_clean_repo" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Review AI-generated diffs like a GitHub pull request, right from your terminal"; + homepage = "https://tuicr.dev"; + changelog = "https://github.com/agavra/tuicr/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + mainProgram = "tuicr"; + }; +}) diff --git a/pkgs/by-name/ve/vex-tui/package.nix b/pkgs/by-name/ve/vex-tui/package.nix index 73b5f8afe0bc..fe7615b1ecd2 100644 --- a/pkgs/by-name/ve/vex-tui/package.nix +++ b/pkgs/by-name/ve/vex-tui/package.nix @@ -30,6 +30,7 @@ buildGoModule (finalAttrs: { description = "Beautiful, fast, and feature-rich terminal-based Excel and CSV viewer built with Go"; homepage = "https://github.com/CodeOne45/vex-tui"; license = lib.licenses.mit; + mainProgram = "vex"; maintainers = with lib.maintainers; [ Inarizxc ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index 78c5edf0a4fa..711d80f4136d 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -17,14 +17,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xdg-desktop-portal-cosmic"; - version = "1.0.16"; + version = "1.1.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "xdg-desktop-portal-cosmic"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-LwZqF3Yg4DMis21wtu1XMAoPTjJ39GPrf07K9Yc2YAg="; + hash = "sha256-yN7dUhB8eMW/CK9HTeuK/CAYFjvWvCLApQ7mb71VLps="; }; cargoHash = "sha256-wSwXzaU872KqcRgAIKRuQFvG9f/q4z0OysysLyYMwdg="; diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 5792b1f0e712..52b9619c9ea7 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -6,11 +6,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "yamlscript"; - version = "0.2.20"; + version = "0.2.23"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${finalAttrs.version}/yamlscript.cli-${finalAttrs.version}-standalone.jar"; - hash = "sha256-RzMIzwq7L5H40DkVJaIyoa6yK36DphfwW24x0Bbe+Xk="; + hash = "sha256-2r/rD521qaIOrWjyABtfeEdOkT9GcvDfRc7Taa85C5c="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/by-name/za/zapret2/package.nix b/pkgs/by-name/za/zapret2/package.nix index b9a945235b5d..722346667f8e 100644 --- a/pkgs/by-name/za/zapret2/package.nix +++ b/pkgs/by-name/za/zapret2/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zapret2"; - version = "1.0.1"; + version = "1.0.2"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "bol-van"; repo = "zapret2"; tag = "v${finalAttrs.version}"; - hash = "sha256-hV9MVkDVkGGGdHCUGRscm9rIKORDEi+xWtfITQE22mw="; + hash = "sha256-pcAIvB/MfFJZFl5kPZjRZZOXgamfQm8hD4UGYC3jbro="; leaveDotGit = true; postFetch = '' cd "$out" diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index bfd005e9a55d..a0d7e8ee07f7 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.21"; + version = "3.22"; pyproject = true; src = fetchFromGitHub { owner = "fox-it"; repo = "acquire"; tag = version; - hash = "sha256-CVwPMMQFGqvyxm5tK7JMEX8/dgiF25wwRNaLNfLLWto="; + hash = "sha256-CtzVHnQALqA5D0wJQ74lAw9HunVFZEkKvij6RQaQrBE="; }; build-system = [ diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 6638dade8bda..737eb12c8fd8 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,13 +7,13 @@ buildPythonPackage (finalAttrs: { pname = "adafruit-platformdetect"; - version = "3.88.0"; + version = "3.89.1"; pyproject = true; src = fetchPypi { pname = "adafruit_platformdetect"; inherit (finalAttrs) version; - hash = "sha256-3CGI3bNIv9KgKpUzJjKUzA8XYr2fazsghmVH2YggzXE="; + hash = "sha256-dFUtGvz3eahMpjUnoerumZXEKf9CLbFUkrrQw1mcq0s="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/apiflask/default.nix b/pkgs/development/python-modules/apiflask/default.nix index ff9d06f2fdbc..d7267c718f00 100644 --- a/pkgs/development/python-modules/apiflask/default.nix +++ b/pkgs/development/python-modules/apiflask/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "apiflask"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; src = fetchFromGitHub { owner = "apiflask"; repo = "apiflask"; tag = finalAttrs.version; - hash = "sha256-T1U+RI49GExjCSdKANsJWV1GSv8yjq1avK+fvskSeLk="; + hash = "sha256-iW7OCWJlJXg9zVslYgdk13LyLHl2nLJkNZViHrJ9bOE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/atproto/default.nix b/pkgs/development/python-modules/atproto/default.nix index 6692891b1546..e38ef268aefd 100644 --- a/pkgs/development/python-modules/atproto/default.nix +++ b/pkgs/development/python-modules/atproto/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "atproto"; - version = "0.0.68"; + version = "0.0.69"; pyproject = true; # use GitHub, pypi does not include tests @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "MarshalX"; repo = "atproto"; tag = "v${version}"; - hash = "sha256-z5/CLC2pxp2cFNZQsnQT96g8y2CFjNmiEatu8yEmYHw="; + hash = "sha256-BA8gnGVR+vgfwgKHBgq+EDcmycYAVBGu/WWDVMI7gkw="; }; env.POETRY_DYNAMIC_VERSIONING_BYPASS = version; diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix index a0fbb96a7399..de46a1951442 100644 --- a/pkgs/development/python-modules/checkdmarc/default.nix +++ b/pkgs/development/python-modules/checkdmarc/default.nix @@ -19,14 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "checkdmarc"; - version = "5.17.1"; + version = "5.17.3"; pyproject = true; src = fetchFromGitHub { owner = "domainaware"; repo = "checkdmarc"; tag = finalAttrs.version; - hash = "sha256-IF+3Og67PrW3HuSnkarrjGl9RFHLrNEBo0CqmKliH1M="; + hash = "sha256-OI96936+4Jcx3VuPmHI2tcIssPxC7ofmLwWcvZxMw7E="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 27255ab899cd..74cd18a20174 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.8.20"; + version = "1.8.21"; pyproject = true; src = fetchFromGitHub { @@ -42,7 +42,7 @@ buildPythonPackage rec { sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' "$out/src/debugpy/_version.py" ''; - hash = "sha256-0h2VQU5eYb0heXSFmKnwAFW0jcWc+bYllhwxfdzkGWc="; + hash = "sha256-7XM476tfL6QLCHB1kwlbN/dmlgnjuTE+ulQ9yOHfgEE="; }; patches = [ @@ -121,11 +121,7 @@ buildPythonPackage rec { typing-extensions ]; - preCheck = '' - export DEBUGPY_PROCESS_SPAWN_TIMEOUT=0 - export DEBUGPY_PROCESS_EXIT_TIMEOUT=0 - '' - + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' + preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; ''; @@ -134,9 +130,6 @@ buildPythonPackage rec { unset no_proxy ''; - # Override default arguments in pytest.ini - pytestFlags = [ "--timeout=0" ]; - disabledTests = [ # hanging test (flaky) "test_systemexit" diff --git a/pkgs/development/python-modules/fastgit/default.nix b/pkgs/development/python-modules/fastgit/default.nix index e39471a6bba9..e14571efeb63 100644 --- a/pkgs/development/python-modules/fastgit/default.nix +++ b/pkgs/development/python-modules/fastgit/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "fastgit"; - version = "0.0.4"; + version = "0.0.5"; pyproject = true; src = fetchFromGitHub { owner = "AnswerDotAI"; repo = "fastgit"; tag = finalAttrs.version; - hash = "sha256-d/CGvKe+8FqTOyDsLmEHQZCWgsFvynmxwOY1VC1DtGE="; + hash = "sha256-rECQZAhtD6MsDwoED7K8I3HtYdbR8DqCZqP2AqNHroY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix index 711891bdf92f..54c58c43304f 100644 --- a/pkgs/development/python-modules/frida-python/default.nix +++ b/pkgs/development/python-modules/frida-python/default.nix @@ -5,7 +5,7 @@ buildPythonPackage, }: let - version = "17.9.11"; + version = "17.15.3"; format = "wheel"; inherit (stdenvNoCC.hostPlatform) system; @@ -13,19 +13,19 @@ let pypiMeta = { x86_64-linux = { - hash = "sha256-ovITi0zxPqJECChrx8cAeIw7m7NjGHa+cl1NomYL718="; + hash = "sha256-q8E4uhzfFyZV7P/Bft+UviaKX78z49TkXBM7p0oQ/HY="; platform = "manylinux1_x86_64"; }; aarch64-linux = { - hash = "sha256-kDSBWC+G2m3pZ6YWhMjkvtXfR6HMVq5zxsxZUmBprrM="; + hash = "sha256-00gr7AWA0ynXmZrvNWphPWkkpeDOOqWIZMKe+jbeAFA="; platform = "manylinux2014_aarch64"; }; x86_64-darwin = { - hash = "sha256-op8QM6f5LKCoozKawTi8hYZRO5VJ1kzWjSk62urGJLQ="; + hash = "sha256-7d7jWTT5yueVBfIYSZoxCDHXcxjom9JP9nfzBJqxd8I="; platform = "macosx_10_13_x86_64"; }; aarch64-darwin = { - hash = "sha256-9JmPcE4CxzHiNLg6jMpSt/CC0eGk0VyKr1uzUTyQRqI="; + hash = "sha256-AmTFwqjE2huyFwabx6gWdRnymy+pPVqBvlJWzQQb3H4="; platform = "macosx_11_0_arm64"; }; } diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index c69c1d4dc228..bddc9bbcf35c 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "frigidaire"; - version = "0.18.46"; + version = "0.18.47"; pyproject = true; src = fetchFromGitHub { owner = "bm1549"; repo = "frigidaire"; tag = finalAttrs.version; - hash = "sha256-UyzVeJ+D9gFyru1DjwCoVTQQK26jP4rxFfiTpBdo36g="; + hash = "sha256-KiWMzx22YNJNkhkfSFVdCC6amTGjtwpd/a040vQh8c4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 3f74f8e0efce..a7d2fc90a01e 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -14,13 +14,13 @@ buildPythonPackage (finalAttrs: { pname = "google-cloud-iam-logging"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_iam_logging"; inherit (finalAttrs) version; - hash = "sha256-p0PEXDzdq+DX88rW7mN9FBK7Nkhi01xubH+qeECr1d4="; + hash = "sha256-SOugq2vFHefdkFsc4haDahmOjioWSZtL4iUfQlgqwCg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 7e982fda738b..cacee6049bda 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.26.0"; + version = "3.27.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_translate"; inherit version; - hash = "sha256-dMTDAupwXaodfdoJUoj9c2u2FvlDSA2zQxTNDNUsyd0="; + hash = "sha256-KueO8aqNu17JdnoI6rzjT9p7tFoHumeubg6tjP1flfc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 5ec1b9321f34..b49c67e1b64a 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -13,13 +13,13 @@ buildPythonPackage (finalAttrs: { pname = "google-cloud-vision"; - version = "3.14.0"; + version = "3.15.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_vision"; inherit (finalAttrs) version; - hash = "sha256-Ga9pIYkjNYdmrP1lWtY/RQ0WaxSe6O7KrrOg05DEZ0k="; + hash = "sha256-7St5ygWlipKewRIlmpyqaYUJ9jSHYqjs7TMQ5lcqbHA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix index 68692799c173..6897c2d64d07 100644 --- a/pkgs/development/python-modules/google-cloud-workstations/default.nix +++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix @@ -15,13 +15,13 @@ buildPythonPackage (finalAttrs: { pname = "google-cloud-workstations"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; src = fetchPypi { pname = "google_cloud_workstations"; inherit (finalAttrs) version; - hash = "sha256-wuFFlOxCyTK0n39LB3XGwvoQ7FCSjUDJa3n6uElvSEQ="; + hash = "sha256-UqFrc09BCap+10CJximc6cymUl8diSW9gxqZbPfn0UY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix index 8d85fd7f72d4..8546a62c4da6 100644 --- a/pkgs/development/python-modules/groq/default.nix +++ b/pkgs/development/python-modules/groq/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "groq"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "groq"; repo = "groq-python"; tag = "v${version}"; - hash = "sha256-U6548+2dpRV2e0cnFCoGmvXiQgp7LuMUhMKZKoHJlzo="; + hash = "sha256-WtibHngPubo4p+xtdvqqDTvRFMk+dSBmxjoQxVPyXQM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lookyloo-models/default.nix b/pkgs/development/python-modules/lookyloo-models/default.nix index b10725b11edb..3feca2a3dfd4 100644 --- a/pkgs/development/python-modules/lookyloo-models/default.nix +++ b/pkgs/development/python-modules/lookyloo-models/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "lookyloo-models"; - version = "0.2.8"; + version = "0.2.9"; pyproject = true; src = fetchFromGitHub { owner = "Lookyloo"; repo = "lookyloo-models"; tag = "v${finalAttrs.version}"; - hash = "sha256-LvGKzwi6zz+lvYoe3ybf8EARAXG/SX71jMl4b5hpUn8="; + hash = "sha256-jqbG8wYUePYnQqqJEek9zFnuuGLarJvwzri19lvRUbY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mlflow-skinny/default.nix b/pkgs/development/python-modules/mlflow-skinny/default.nix index 9f5a818c7a82..1dd062ab67ac 100644 --- a/pkgs/development/python-modules/mlflow-skinny/default.nix +++ b/pkgs/development/python-modules/mlflow-skinny/default.nix @@ -40,7 +40,7 @@ buildPythonPackage (finalAttrs: { owner = "mlflow"; repo = "mlflow"; rev = "v${finalAttrs.version}"; - hash = "sha256-OxhM+KCem0sb9cwtyzrUD/MGfoiiCfgU47qipYRDaFk="; + hash = "sha256-e11ZncpvThb1Nt6OH+O6Do74N3dphxBiK/HIeLQMxAw="; }; sourceRoot = "${finalAttrs.src.name}/libs/skinny"; diff --git a/pkgs/development/python-modules/mlflow-tracing/default.nix b/pkgs/development/python-modules/mlflow-tracing/default.nix index 9f78d2dcaa32..f819fae05c66 100644 --- a/pkgs/development/python-modules/mlflow-tracing/default.nix +++ b/pkgs/development/python-modules/mlflow-tracing/default.nix @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { owner = "mlflow"; repo = "mlflow"; rev = "v${finalAttrs.version}"; - hash = "sha256-OxhM+KCem0sb9cwtyzrUD/MGfoiiCfgU47qipYRDaFk="; + hash = "sha256-e11ZncpvThb1Nt6OH+O6Do74N3dphxBiK/HIeLQMxAw="; }; sourceRoot = "${finalAttrs.src.name}/libs/tracing"; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 65baefc85c0f..45725a423f68 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { pname = "mlflow"; - version = "3.12.0"; + version = "3.14.0"; format = "wheel"; __structuredAttrs = true; @@ -39,7 +39,7 @@ buildPythonPackage (finalAttrs: { format = "wheel"; dist = "py3"; python = "py3"; - hash = "sha256-4cKO1MSFV8xSx2bxfxylgmdT3fJB1D8w+ZxF9+prPOA="; + hash = "sha256-2/d/fNtbXA7Fm0ZxxhcwsbkUtN/3ookuJnpUfLVFT1Y="; }; # Nix-wrapped python populates sys.path via NIX_PYTHONPATH/site hooks, diff --git a/pkgs/development/python-modules/mlflow/subprocess-pythonpath.patch b/pkgs/development/python-modules/mlflow/subprocess-pythonpath.patch index 9e97218fdf92..5d13a57dffa0 100644 --- a/pkgs/development/python-modules/mlflow/subprocess-pythonpath.patch +++ b/pkgs/development/python-modules/mlflow/subprocess-pythonpath.patch @@ -1,6 +1,6 @@ --- a/mlflow/server/__init__.py +++ b/mlflow/server/__init__.py -@@ -471,6 +471,11 @@ +@@ -474,6 +474,11 @@ else tempfile.mkdtemp() ) + # In Nix-packaged environments sys.path is populated by wrappers but diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix index b2dbd44709e5..375efd81d47f 100644 --- a/pkgs/development/python-modules/mmengine/default.nix +++ b/pkgs/development/python-modules/mmengine/default.nix @@ -109,6 +109,11 @@ buildPythonPackage (finalAttrs: { ''; disabledTestPaths = [ + # MlflowVisBackend uses the deprecated mlflow filesystem store, which is + # throws an error since mlflow 3.13. See upstream issue: + # https://github.com/open-mmlab/mmengine/issues/1687 + "tests/test_visualizer/test_vis_backend.py::TestMLflowVisBackend" + # Require unpackaged aim "tests/test_visualizer/test_vis_backend.py::TestAimVisBackend" diff --git a/pkgs/development/python-modules/pyairtable/default.nix b/pkgs/development/python-modules/pyairtable/default.nix index 07c312d832e1..fcd4d58105b5 100644 --- a/pkgs/development/python-modules/pyairtable/default.nix +++ b/pkgs/development/python-modules/pyairtable/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "pyairtable"; - version = "3.3.0"; + version = "3.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1tO3f2/regKoR3nCI103pGYF82AwzyDtmbCLq3MQiow="; + hash = "sha256-umABkxSJSMEACenkRJSRkJp9qLqUvIv6r4ZGsO6MA8o="; }; build-system = [ diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 077fbcb14973..dc6012d54806 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -15,16 +15,16 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydrawise"; - version = "2026.4.0"; + version = "2026.6.0"; pyproject = true; src = fetchFromGitHub { owner = "dknowles2"; repo = "pydrawise"; - tag = version; - hash = "sha256-+V0x8caTqrfaNZ2tSmqzkJs8B0X405NnR3HIms1ocS8="; + tag = finalAttrs.version; + hash = "sha256-j1ovfQGi5DpDPWVwUA0mDIDztjVKkB7wFuK2HunXc3c="; }; build-system = [ @@ -52,8 +52,8 @@ buildPythonPackage rec { meta = { description = "Library for interacting with Hydrawise sprinkler controllers through the GraphQL API"; homepage = "https://github.com/dknowles2/pydrawise"; - changelog = "https://github.com/dknowles2/pydrawise/releases/tag/${src.tag}"; + changelog = "https://github.com/dknowles2/pydrawise/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 4d5c6847dcd2..4a243013c878 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.20.0"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "astropy"; repo = "reproject"; tag = "v${version}"; - hash = "sha256-eeMgkjYIZPGsxwRDPtTzjnlusCxu6vPSZiaDekxobs4="; + hash = "sha256-IuGVipAb4x63U2k9tNHhps5Gbk+3Hi/1ZkeMTZ/vaiU="; }; build-system = [ diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix index 3611c1a0bd8c..bdd78cd75874 100644 --- a/pkgs/development/python-modules/requirements-parser/default.nix +++ b/pkgs/development/python-modules/requirements-parser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "requirements-parser"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; src = fetchFromGitHub { owner = "madpah"; repo = "requirements-parser"; tag = "v${version}"; - hash = "sha256-AwsLcHjPfP+cYpKCQVgIcyzUhnqeIBJ92QLR48E6EtI="; + hash = "sha256-Hti1r/OLYHue+c7/TDDRzBgKxJazobZG+aFxK2ok70g="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix index 5d6ca8cd696e..4fefdabb3627 100644 --- a/pkgs/development/python-modules/rucio/default.nix +++ b/pkgs/development/python-modules/rucio/default.nix @@ -40,13 +40,13 @@ }: let - version = "40.3.0"; + version = "40.4.0"; src = fetchFromGitHub { owner = "rucio"; repo = "rucio"; tag = version; - hash = "sha256-HJE4isk+1eOyfIzjVKg888CxW/JuKFGtTbjZNEfodt4="; + hash = "sha256-aeLVMcC6ca3ZgWMSZJhhD1vW9oqxUKls0yF6gQFwfqU="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/scikit-base/default.nix b/pkgs/development/python-modules/scikit-base/default.nix index 52850d2e5785..5d3e4d6a4698 100644 --- a/pkgs/development/python-modules/scikit-base/default.nix +++ b/pkgs/development/python-modules/scikit-base/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "scikit-base"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "sktime"; repo = "skbase"; tag = "v${version}"; - hash = "sha256-XqmmKU9+QeUKVXUX6Xa3LkmZqDP3mRzxi1TA/6wRxTI="; + hash = "sha256-OxsaBzdT8Tv6eVGd4jyfmmdjp4+5jdfEh34rkyWgZpA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index b232c95613a3..7686fe4e8e5d 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.6.5"; + version = "0.6.7"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "scikit-hep-testdata"; tag = "v${version}"; - hash = "sha256-OGLb5WT/UFHZVo02hEssVVa9XiVvw4EBjUpVaBg8Yv0="; + hash = "sha256-rBZWD3lzJwVQkibBLScfnYL3ChRsFDeDtheqqNjepEc="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/torchtune/default.nix b/pkgs/development/python-modules/torchtune/default.nix index 75f169d0c78d..04e344e4195a 100644 --- a/pkgs/development/python-modules/torchtune/default.nix +++ b/pkgs/development/python-modules/torchtune/default.nix @@ -133,6 +133,10 @@ buildPythonPackage (finalAttrs: { ]; disabledTestPaths = [ + # MLFlowLogger uses the deprecated mlflow filesystem store, which throws an + # error since mlflow 3.13. See https://github.com/NixOS/nixpkgs/pull/532943 + "tests/torchtune/training/test_metric_logging.py::TestMLFlowLogger" + # TypeError: HfHubHTTPError.__init__() missing 1 required keyword-only argument: 'response' "tests/torchtune/_cli/test_download.py::TestTuneDownloadCommand::test_download_calls_snapshot" "tests/torchtune/_cli/test_download.py::TestTuneDownloadCommand::test_gated_repo_error_no_token" diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix index 0893fad77893..757b77f9d928 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix @@ -2,12 +2,12 @@ grafanaPlugin { pname = "grafana-googlesheets-datasource"; - version = "2.5.0"; + version = "2.5.1"; zipHash = { - x86_64-linux = "sha256-X4kPz/9o63giMRyVztix0OPO9Ip6sn/bH1Y2V1u/6qw="; - aarch64-linux = "sha256-o2OQsGX8pcKUxnJw1+6rnrXTkDYXCuVhnfFYzmGBVYU="; - x86_64-darwin = "sha256-n+BTCyzQo6FxeUX9VE8Kf9DNTgEYq+BaAUwo9vh7XSo="; - aarch64-darwin = "sha256-UKYtxzXeI547fxmTkfHxR7vEHwkPIGUd6AB4ZBa9DSY="; + x86_64-linux = "sha256-Y6UvMLw+bAg0HTKsc2FdpY+S4Zf7gpgIVdZDFgr+mog="; + aarch64-linux = "sha256-feBfv07DrKdeJbeD0gnYoOhg1LG636cghVu1x8n9rCQ="; + x86_64-darwin = "sha256-nVbhhlfSkJwZ1PXzhYSz9pXxbcRyO32RoOPlV7OGAOk="; + aarch64-darwin = "sha256-0iv1oUj6bLw7kUOwkW69rs+4NIetp+uEgJ7YULkKYLE="; }; meta = { description = "Integrate JSON data into Grafana"; diff --git a/pkgs/shells/fish/plugins/hydro.nix b/pkgs/shells/fish/plugins/hydro.nix index d9fbc2fec351..955fd3ce6c3c 100644 --- a/pkgs/shells/fish/plugins/hydro.nix +++ b/pkgs/shells/fish/plugins/hydro.nix @@ -2,6 +2,7 @@ lib, buildFishPlugin, fetchFromGitHub, + unstableGitUpdater, }: buildFishPlugin { @@ -15,10 +16,12 @@ buildFishPlugin { hash = "sha256-8ixve1ws80q5jNdKoooL25Lk7qopVitCMVTucW490fU="; }; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Ultra-pure, lag-free prompt with async Git status"; homepage = "https://github.com/jorgebucaran/hydro"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ higherorderlogic ]; }; }