diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 0e2ee629a4f6..f9f8be6d6cee 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -36,6 +36,8 @@ - `uhttpmock` providing 0.0 ABI was removed. `uhttpmock_1_0` providing 1.0 ABI was renamed to `uhttpmock` and `uhttpmock_1_0` was kept as an alias. +- `nix-serve-ng` (and `haskellPackages.nix-serve-ng`) is now built against Lix instead of CppNix, following upstream which has switched to Lix as its supported Nix implementation. + - Linux kernel configuration has been moved out of the `linux-kernel` field of the platform structure into the kernel builders: - `linux-kernel.name` has been removed. - `linux-kernel.target` is available as the `target` parameter and passthru attribute on the kernel builders. diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 54d62f87b3d5..280c88cee66b 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -9,7 +9,6 @@ pkgsBB ? pkgs.pkgsBuildBuild, nix ? pkgs-nixVersions.stable, nixVersions ? [ - pkgs-nixVersions.nix_2_28 nix pkgs-nixVersions.latest ], diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index b1901f4c40ec..8668d1a02ecd 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -410,6 +410,18 @@ }, "name": "GNOME" }, + "gnome-circle": { + "description": "Maintain GNOME Circle applications.", + "id": 18234720, + "maintainers": { + "Aleksanaa": 42209822, + "Hythera": 87016780, + "getchoo": 48872998, + "michaelgrahamevans": 5932424 + }, + "members": {}, + "name": "GNOME Circle" + }, "golang": { "description": "Maintain Golang compilers", "id": 4020424, @@ -937,8 +949,7 @@ "description": "Reviews changes to core packages for Nixpkgs security vulnerabilities: https://github.com/NixOS/nixpkgs/issues/494349", "id": 16430758, "maintainers": { - "balsoft": 18467667, - "infinisil": 20525370 + "balsoft": 18467667 }, "members": { "andir": 638836, diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 115673728d0b..cde90b19938c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14649,6 +14649,12 @@ github = "kmicklas"; githubId = 929096; }; + kmjayadeep = { + email = "kmjayadeep@gmail.com"; + name = "Jayadeep KM"; + github = "kmjayadeep"; + githubId = 6793260; + }; kmogged = { name = "Kevin"; github = "kmogged"; diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 6f486e80a65e..0076f3aaf1e5 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -90,3 +90,5 @@ This option was previously removed with NixOS 25.05 due to an upstream Plausible change making declarative admin creation more difficult, but this change re-implements the admin creation directly. - The `newuidmap` and `newgidmap` security wrappers are now installed with `cap_setuid`/`cap_setgid` file capabilities instead of the setuid-root bit, matching shadow's `--with-fcaps` install mode and other major distributions. Rootless containers (podman, docker-rootless, unprivileged user namespaces) are unaffected. The only behavioural change is that mapping host uid 0 via `/etc/subuid` (which NixOS never configures by default) additionally requires `cap_setfcap`; users who explicitly grant uid 0 in a subuid range can restore the previous behaviour with `security.wrappers.newuidmap.capabilities = lib.mkForce "cap_setuid,cap_setfcap+ep";`. + +- `zoneminder` has been updated to 1.38.x release. See [upstream release note](https://github.com/ZoneMinder/zoneminder/releases/tag/1.38.0). While database migration should happen automatically, it's recommended that you make a backup of the database before upgrading your system. diff --git a/nixos/modules/programs/foot/bashrc b/nixos/modules/programs/foot/bashrc index e35bc29f117b..d3fb0ffcb4bf 100644 --- a/nixos/modules/programs/foot/bashrc +++ b/nixos/modules/programs/foot/bashrc @@ -1,3 +1,8 @@ +case "$TERM" in + foot*) : ;; + *) return 0 ;; +esac + osc7_cwd() { local strlen=${#PWD} local encoded="" diff --git a/nixos/modules/programs/foot/config.fish b/nixos/modules/programs/foot/config.fish index c7d45211327f..92f614421268 100644 --- a/nixos/modules/programs/foot/config.fish +++ b/nixos/modules/programs/foot/config.fish @@ -1,3 +1,7 @@ +if ! string match -q "foot*" "$TERM" + return 0 +end + function update_cwd_osc --on-variable PWD --description 'Notify terminals when $PWD changes' if status --is-command-substitution || set -q INSIDE_EMACS return diff --git a/nixos/modules/programs/foot/zshrc b/nixos/modules/programs/foot/zshrc index 186f21c987e5..935dd49aaed5 100644 --- a/nixos/modules/programs/foot/zshrc +++ b/nixos/modules/programs/foot/zshrc @@ -1,3 +1,8 @@ +case "$TERM" in + foot*) : ;; + *) return 0 ;; +esac + function osc7-pwd() { emulate -L zsh # also sets localoptions for us setopt extendedglob diff --git a/nixos/modules/services/web-apps/lemmy.md b/nixos/modules/services/web-apps/lemmy.md index a3924448ceb5..02696d4601f1 100644 --- a/nixos/modules/services/web-apps/lemmy.md +++ b/nixos/modules/services/web-apps/lemmy.md @@ -1,26 +1,24 @@ # Lemmy {#module-services-lemmy} -Lemmy is a federated alternative to reddit in rust. +Lemmy is a federated alternative to Reddit in Rust. ## Quickstart {#module-services-lemmy-quickstart} -The minimum to start lemmy is +The minimum to start Lemmy is ```nix { services.lemmy = { enable = true; - settings = { - hostname = "lemmy.union.rocks"; - database.createLocally = true; - }; + settings.hostname = "lemmy.union.rocks"; + database.createLocally = true; caddy.enable = true; }; } ``` This will start the backend on port 8536 and the frontend on port 1234. -It will expose your instance with a caddy reverse proxy to the hostname you've provided. +It will expose your instance with a Caddy reverse proxy to the hostname you've provided. Postgres will be initialized on that same instance automatically. ## Usage {#module-services-lemmy-usage} @@ -29,5 +27,4 @@ On first connection you will be asked to define an admin user. ## Missing {#module-services-lemmy-missing} -- Exposing with nginx is not implemented yet. -- This has been tested using a local database with a unix socket connection. Using different database settings will likely require modifications +- This has been tested using a local database with a Unix socket connection. Using different database settings will likely require modifications. diff --git a/nixos/tests/dep-scan.nix b/nixos/tests/dep-scan.nix index 8d7bdde8578e..05298c004285 100644 --- a/nixos/tests/dep-scan.nix +++ b/nixos/tests/dep-scan.nix @@ -14,7 +14,7 @@ ] ++ teams.ngi.members; - nodes.machine = { + containers.machine = { environment.systemPackages = with pkgs; [ dep-scan jq diff --git a/nixos/tests/owi.nix b/nixos/tests/owi.nix index 74e9d2d394fd..68945f721582 100644 --- a/nixos/tests/owi.nix +++ b/nixos/tests/owi.nix @@ -8,7 +8,7 @@ meta.maintainers = with lib.maintainers; [ ethancedwards8 ]; - nodes.machine = { + containers.machine = { environment.systemPackages = with pkgs; [ owi ]; environment.etc."owipass.rs".source = pkgs.writeText "owi.rs" '' diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3d39aa388834..ad23a58c6115 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3513,8 +3513,8 @@ let mktplcRef = { name = "veriloghdl"; publisher = "mshr-h"; - version = "1.25.0"; - hash = "sha256-7DN0lYxwLL+Z0mIKApRHGHT7HiJZ0nfDMdojQm7XGAM="; + version = "1.27.1"; + hash = "sha256-rCUIqxhR4AYteLKUGcpPuCV/NqV+tzjYU/TrPOcECdg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog"; @@ -3903,8 +3903,8 @@ let mktplcRef = { publisher = "redhat"; name = "java"; - version = "1.54.0"; - hash = "sha256-G1L8fSRXj4rmyGFyvPuz7zoQ367Lc5PoyVOZnHPHcu0="; + version = "1.55.0"; + hash = "sha256-ARY5w+40e5WRiVv8d9jPKPg2wFPQpJrkqD7+ncRzpgM="; }; buildInputs = [ jdk ]; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index d970f3c554b9..4629920fa872 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "1.4.3"; - hash = "sha256-gJvnVxj6fdS+1O9CrILgi/R+OLjaAKwdgAPdjcxkOeA="; + version = "1.6.1"; + hash = "sha256-9q3rK/7Q7XiaH9DZN8Yvar/WTdYdEdRXH02WK1tfk5k="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix index eb839eb32919..31cf7febe817 100644 --- a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix +++ b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix @@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "5.35.0"; - hash = "sha256-u4c5KTSsdsR92Nm0a+eK17pnOpfHxXkgsr8RExcX6NE="; + version = "5.36.1"; + hash = "sha256-1yxTjIsyj8o97VlvDlWqPCNIxd6XgbjpqF5qNbVtEwg="; }; meta = { description = "Material Design Icons for Visual Studio Code"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix b/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix index dc0edc71f8f3..e4648cbd06ec 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-saturn"; - version = "0-unstable-2026-05-28"; + version = "0-unstable-2026-06-29"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-saturn-libretro"; - rev = "8f0d69a4938edd84ef5b308b6013ed4b17b5b7dd"; - hash = "sha256-hDiUcmkAyFbuMdK3LCshC2vMMU4TbJQAyqzkye/Sb5U="; + rev = "8299b65134eded90db3fe5edb6aaa98e02bd9cae"; + hash = "sha256-E83T6TUzy2envOh25xZ/y6kKb+lk67nOHp1dJXK4UK4="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6922818f2bc9..e8e205c8c5ce 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "bpg_proxmox": { - "hash": "sha256-F6aSXitmu3FOVpRoFyAVPCZA7dHgRbBySda+uS1BDTY=", + "hash": "sha256-Hi37jOpSfBO13BrBSQCrTaYhcyIuL4PAIV9ow7f4eOU=", "homepage": "https://registry.terraform.io/providers/bpg/proxmox", "owner": "bpg", "repo": "terraform-provider-proxmox", - "rev": "v0.110.0", + "rev": "v0.111.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-X4sWLYi9DKp3ex1XBwv2qiVliytOjs7Asy+rigKF/AE=" + "vendorHash": "sha256-kvHI8cd/rl9kVKKzSwjrC0+Qikz3w2P9jgLvYa+T2DE=" }, "brightbox_brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", @@ -1184,13 +1184,13 @@ "vendorHash": "sha256-w/AmSHydCeyp/EURgPY2c/E2LjqAXXCORI53X1hEdxY=" }, "scaleway_scaleway": { - "hash": "sha256-nBx7zmNiQHL+VomJJ4/tyd0gujc2BNQfVA8zG3hT0wc=", + "hash": "sha256-9fmNBTOG+A1X+em1nphvwmMUrM/kaR64HlI/e2QeWlA=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.76.0", + "rev": "v2.77.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-X5OVBa1vKsPA2gfXDZWJIcncor9V4NFmWILarqbIBiw=" + "vendorHash": "sha256-nqDob9nyw21LwSj8lDrA/5kGxe4KwwnHy0+FedIJr3k=" }, "scottwinkler_shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 25aed76f8a18..f704a6d06aea 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -40,7 +40,7 @@ extraPythonPackages ? ps: [ ], }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "gajim"; version = "2.4.7"; @@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { domain = "dev.gajim.org"; owner = "gajim"; repo = "gajim"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tZ1+DRVCzwaWeur9mwc/zE34H2xdqk96upqWfqNTl3g="; }; @@ -141,14 +141,16 @@ python3.pkgs.buildPythonApplication rec { meta = { homepage = "http://gajim.org/"; description = "Jabber client written in PyGTK"; + changelog = "https://dev.gajim.org/gajim/gajim/-/blob/${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin hlad vbgl + haansn08 ]; downloadPage = "http://gajim.org/download/"; platforms = lib.platforms.linux; mainProgram = "gajim"; }; -} +}) diff --git a/pkgs/build-support/fetchsourcehut/default.nix b/pkgs/build-support/fetchsourcehut/default.nix index 2433238aa698..3291cfc9bef6 100644 --- a/pkgs/build-support/fetchsourcehut/default.nix +++ b/pkgs/build-support/fetchsourcehut/default.nix @@ -90,6 +90,7 @@ makeOverridable ( in cases.${fetcher}.fetch cases.${fetcher}.arguments // { + inherit tag; rev = rev'; meta.homepage = "${baseUrl}"; } diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index fbcd408e3ae3..2918f02a8278 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aiken"; - version = "1.1.22"; + version = "1.1.23"; src = fetchFromGitHub { owner = "aiken-lang"; repo = "aiken"; tag = "v${finalAttrs.version}"; - hash = "sha256-mq/NwfSjqykYwyKq63jDs7u21uWxzAtwDKbZ9Fn3i90="; + hash = "sha256-9CPwIqUoOih4711vSEeV3AX1T1GGQ/AeYj7HnWI5UO8="; }; - cargoHash = "sha256-WzaprYYTFLaM6TKzUG6JadQNLBHjgoM3FwRUfMTmiHA="; + cargoHash = "sha256-98oyeVo3z49DGikhSBMB7QSiz6+I7GkvqJIpOusuEz4="; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index 7a6d5a4b1048..83b64727a5f8 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2479"; + version = "2.0.2487"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-qaqqzlAV1l43CKZq3mDEwzG1MSrrvdtI8xjo+pe8cMQ="; + hash = "sha256-PFD7xUMkKqR18VHqeAczX/05T4sgsbMleo66gRpww3w="; }; - npmDepsHash = "sha256-QjOHebjiF1R24NVM/2u+UHEplzlyQdjzJKQbzltHTkM="; + npmDepsHash = "sha256-PmcM88pOewKiRc4LBYitB17lltyY+PmAcT0vSt7xCbw="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/aw/aws-cdk-cli/package.nix b/pkgs/by-name/aw/aws-cdk-cli/package.nix index 3c6c407e32f8..72977f74fe57 100644 --- a/pkgs/by-name/aw/aws-cdk-cli/package.nix +++ b/pkgs/by-name/aw/aws-cdk-cli/package.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "aws-cdk-cli"; - version = "2.1127.0"; + version = "2.1128.1"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cdk-cli"; tag = "cdk@v${finalAttrs.version}"; - hash = "sha256-d55JNmWi4oTNorunkDwpdfcxHE9UC2fufKDahKgoLvk="; + hash = "sha256-F5dlS2xIwVxpgc6v+bP+vI0lP+nttvKamzWz4UEphzc="; }; missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-eGj2Gx46lyypNz5e0U1AD1dVwOgJK4hkwXp03lR+6sc="; + hash = "sha256-ykFox4QTo0f0urzh1e/65Jh0H3x0wOngmEzWFekCma8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix index b46784154509..a43c97fcd594 100644 --- a/pkgs/by-name/ba/backgroundremover/package.nix +++ b/pkgs/by-name/ba/backgroundremover/package.nix @@ -12,7 +12,7 @@ let p = python3.pkgs; self = p.buildPythonApplication rec { pname = "backgroundremover"; - version = "0.3.4"; + version = "0.4.4"; pyproject = true; build-system = [ @@ -23,7 +23,7 @@ let owner = "nadermx"; repo = "backgroundremover"; tag = "v${version}"; - hash = "sha256-7C31wlokX3M4csZ4ZbOqxowQvh8DMQJJcENKgQWNTa8="; + hash = "sha256-S6irFkNw+5HHr3ziMRxaeg3QoXWe1qqf10CGTTHKpb4="; }; models = runCommand "background-remover-models" { } '' @@ -51,12 +51,14 @@ let p.ffmpeg-python p.filelock p.filetype + p.flask p.hsh p.idna p.more-itertools p.moviepy p.numpy p.pillow + p.pillow-heif p.pymatting p.pysocks p.requests diff --git a/pkgs/by-name/bl/blink1-tool/package.nix b/pkgs/by-name/bl/blink1-tool/package.nix index a039cb325f3f..2894ddac25e3 100644 --- a/pkgs/by-name/bl/blink1-tool/package.nix +++ b/pkgs/by-name/bl/blink1-tool/package.nix @@ -8,23 +8,30 @@ stdenv.mkDerivation (finalAttrs: { pname = "blink1"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "todbot"; repo = "blink1-tool"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-9kbWZ0vq+A3y8IeqvK1HnWWgxXaieu1eU8l+om5F2/w="; + hash = "sha256-i3DtDPAKvJ53HTgNnnf2iSGmayxg/++Kk3/4cEnD+Sk="; }; postPatch = '' substituteInPlace Makefile \ --replace "@git submodule update --init" "true" + substituteInPlace Makefile \ + --replace-fail "INSTALL = install''\n" "INSTALL = install -D''\n" + '' + # Drop the hardcoded universal-binary flags so we build a single-arch. + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace Makefile \ + --replace-fail "-arch x86_64 -arch arm64" "" ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ]; makeFlags = [ "GIT_TAG_RAW=v${finalAttrs.version}" @@ -42,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://blink1.thingm.com/"; license = with lib.licenses; [ cc-by-sa-40 ]; maintainers = with lib.maintainers; [ cransom ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "blink1-tool"; }; }) diff --git a/pkgs/by-name/bo/bobgen/package.nix b/pkgs/by-name/bo/bobgen/package.nix index b746d56e85d6..76cb9d6e61a4 100644 --- a/pkgs/by-name/bo/bobgen/package.nix +++ b/pkgs/by-name/bo/bobgen/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "bobgen"; - version = "0.46.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "stephenafamo"; repo = "bob"; tag = "v${finalAttrs.version}"; - hash = "sha256-pWuX6TDwf8JcOamDImx/0knN1lx4lkovouRmEA2fTWA="; + hash = "sha256-iD9GPYBt1s6xx4vNRlArERmv5AyBR6Q4mLLDNDWy1qY="; }; - vendorHash = "sha256-WzSUUgfWGz5XXq3iQrtpF91yOEr0QypTWq1rOJMntGQ="; + vendorHash = "sha256-tL6f8XkAsBL76idEVxlAAcdYyzo9Rh9fEHy6ysfZWG8="; subPackages = [ "gen/bobgen-sql" diff --git a/pkgs/by-name/bu/buildbox/package.nix b/pkgs/by-name/bu/buildbox/package.nix index 8443e73169ed..0982ad28adbd 100644 --- a/pkgs/by-name/bu/buildbox/package.nix +++ b/pkgs/by-name/bu/buildbox/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "buildbox"; - version = "1.4.10"; + version = "1.4.11"; src = fetchFromGitLab { owner = "BuildGrid"; repo = "buildbox/buildbox"; tag = finalAttrs.version; - hash = "sha256-WWvaOPOckqyZ1ehEbPLcsP8qET9cq/3PkG0ep37ypn0="; + hash = "sha256-8Et5wgiugoDLtW2C2nsth5iPXPGQ7wkPDSc6hrBgeG8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/calendar-cli/package.nix b/pkgs/by-name/ca/calendar-cli/package.nix index 78399f5cfd44..6da8f19570e0 100644 --- a/pkgs/by-name/ca/calendar-cli/package.nix +++ b/pkgs/by-name/ca/calendar-cli/package.nix @@ -12,29 +12,25 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "calendar-cli"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "pycalendar"; repo = "calendar-cli"; - # https://github.com/pycalendar/calendar-cli/pull/113#issuecomment-3977892432 - tag = "v0.15.0"; - hash = "sha256-P6ClvX6C5VargAvudgSvBwObIUouTRg7SQ62KxhcKiE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-5qPBHwOPW/HsmO/jBMyq6ROb23JYfJ/XLWmHwgb5kPY="; }; postPatch = '' - substituteInPlace calendar_cli/metadata.py \ - --replace-fail '"version": "1.0.1"' '"version": "${finalAttrs.version}"' - patchShebangs tests substituteInPlace tests/test_calendar-cli.sh \ - --replace-fail "../bin/calendar-cli.py" "$out/bin/calendar-cli" \ - --replace-fail "../bin/calendar-cli" "$out/bin/calendar-cli" + --replace-fail "../bin/calendar-cli.py" "$out/bin/calendar-cli" ''; build-system = with python3.pkgs; [ - setuptools + hatch-vcs + hatchling ]; dependencies = with python3.pkgs; [ @@ -45,7 +41,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { tzlocal click six - urllib3 vobject ]; diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix index 2ea8cc258a94..ad3048c15ee6 100644 --- a/pkgs/by-name/ca/capnproto-rust/package.nix +++ b/pkgs/by-name/ca/capnproto-rust/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "capnproto-rust"; - version = "0.25.3"; + version = "0.26.0"; src = fetchCrate { crateName = "capnpc"; inherit (finalAttrs) version; - hash = "sha256-jDdsGy/T41R4duclyMpPmPZeflXg+Zp7wdBxbR527ZM="; + hash = "sha256-zMaOGwbCnczEY9V2xh3pXuDPYtr91sRblDwSjH/2f0s="; }; - cargoHash = "sha256-egb4Jpwzkj3PSVStqCX5ZLKgrH7nGHgZUCIleZcWIeI="; + cargoHash = "sha256-PgMj+sEvvkkySkL25sgfKzZiKYQX+U0Pt8gJOkZwRzA="; postInstall = '' mkdir -p $out/include/capnp diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 4373d311deda..af2ab9087fed 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tauri"; - version = "2.11.3"; + version = "2.11.4"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${finalAttrs.version}"; - hash = "sha256-PPzAN+qWwtcZj6amK/TIz+OZrE3URtptvHe87NpplzA="; + hash = "sha256-bYkooyO8msGlewK4zU8NSgGQwAKzc5xfboMakugukBc="; }; - cargoHash = "sha256-r/CzW2tpnjzksmuzL9EBa7dMuIYD4pvZdX2XCnNcOYE="; + cargoHash = "sha256-S1t4GsBQ4/ktSvLitb8FufnXwZfwVc9r8z9tCLRDy8Y="; nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ pkg-config diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index b09d09b28d4b..78d4a6e64bf7 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -22,7 +22,7 @@ let hash = "sha256-2X2QlWo12qM7RT0wjf1Xlmh3We2wZR/kJnSxIxVst9Y="; }; - pnpm-hash = "sha256-JvY7olf1OOQ+j/z7hFEcmum24WlPggrur3K8cTEgc7g="; + pnpm-hash = "sha256-Z0ToQUPyttebDOjpdisAtjIKM026x9ZtIVPOeq4163A="; vendor-hash = "sha256-nF9d1OWpn3rf4EPhD4vqQbKEp/J5pc7J7XJDgAjd0DA="; service = callPackage ./service.nix { diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 7acef8fcb848..2a8bd0e7760c 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -13,7 +13,7 @@ moreutils, nodejs, pkg-config, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, @@ -37,8 +37,8 @@ rustPlatform.buildRustPackage { version src ; - pnpm = pnpm_9; - fetcherVersion = 3; + pnpm = pnpm_10; + fetcherVersion = 4; hash = pnpm-hash; }; @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage { nodejs pkg-config pnpmConfigHook - pnpm_9 + pnpm_10 ]; buildInputs = [ diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix index db51922af028..385ff7aff0e8 100644 --- a/pkgs/by-name/cl/clusterctl/package.nix +++ b/pkgs/by-name/cl/clusterctl/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "clusterctl"; - version = "1.12.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${finalAttrs.version}"; - hash = "sha256-AaGJhdBTyCxUK+qm++McS6rFlgAdv/7SjQHvaNRn6YU="; + hash = "sha256-ValaeZiYlSXydMwmcGMcBXETWweu3d4XRb+fHnangp4="; }; - vendorHash = "sha256-3dh9Y8R4OeUayyqNyrvUcrnSi/4s9x6oMrAADXR5rnw="; + vendorHash = "sha256-GeZUJozumnxXGIJ4moXxuLDATeJDRbTeGDdscZIvjh0="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/by-name/cp/cpc/package.nix b/pkgs/by-name/cp/cpc/package.nix index a2521e11f594..3e33b00e435c 100644 --- a/pkgs/by-name/cp/cpc/package.nix +++ b/pkgs/by-name/cp/cpc/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cpc"; - version = "3.1.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "probablykasper"; repo = "cpc"; tag = "v${finalAttrs.version}"; - hash = "sha256-t9dAk0hIk8P/vt5wfQ5KvLU6f2DAllPy4BfB0q7F7CA="; + hash = "sha256-Gd2bFOyPERcwTGurJJDMNrRjFq7smtkgFMGUXxZVwaI="; }; - cargoHash = "sha256-Zb6rnJjhYruoQ7MxCfrx9doDr+hnhCDqhq23xWtdhUY="; + cargoHash = "sha256-visApJ3DgQ1ohaQ2IE63bzdf0RuQI4NnpQqspP8WKjg="; meta = { mainProgram = "cpc"; diff --git a/pkgs/by-name/cr/cri-o-unwrapped/package.nix b/pkgs/by-name/cr/cri-o-unwrapped/package.nix index f5e6e26b088a..793a620ccf05 100644 --- a/pkgs/by-name/cr/cri-o-unwrapped/package.nix +++ b/pkgs/by-name/cr/cri-o-unwrapped/package.nix @@ -17,13 +17,13 @@ buildGoModule (finalAttrs: { pname = "cri-o"; - version = "1.36.0"; + version = "1.36.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; tag = "v${finalAttrs.version}"; - hash = "sha256-I+oqb8TeI7dBX4ecmEEWNKM7EAdCfGWYv6dpz8emvuA="; + hash = "sha256-QHI90s2LOa0Jenz+Q++nNuyOAxCx3sOcClBaTKeIUbo="; }; vendorHash = null; diff --git a/pkgs/by-name/cr/croaring/package.nix b/pkgs/by-name/cr/croaring/package.nix index 61b744870831..54e1a5c51436 100644 --- a/pkgs/by-name/cr/croaring/package.nix +++ b/pkgs/by-name/cr/croaring/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "croaring"; - version = "4.7.1"; + version = "4.7.2"; src = fetchFromGitHub { owner = "RoaringBitmap"; repo = "CRoaring"; tag = "v${finalAttrs.version}"; - hash = "sha256-FZP+RTV4pcj9pzDq3G2+sWeJnkh9WnW3Atd0CC9zDCk="; + hash = "sha256-WSEMkXkR6diE5CV3gQ3tUAodLqNsWmBmrGyXOKg4CJA="; }; # roaring.pc.in cannot handle absolute CMAKE_INSTALL_*DIRs, nor diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 9c40cd6b4d9e..6ac073aeb8fb 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -10,17 +10,17 @@ buildGoModule (finalAttrs: { pname = "dae"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; tag = "v${finalAttrs.version}"; - hash = "sha256-RpbWZEoGrCq3Py0hu6YDie6ErDTLS3oabqScPzhCtm0="; + hash = "sha256-Kc51VQuqObxKXVXGv5CnDm4/3XYqjPvrpAQSVb2vxSM="; fetchSubmodules = true; }; - vendorHash = "sha256-u2DCHmX7vRNWIQ2Ir3UrxPGduggEqoUr1rnkDfwsT0I="; + vendorHash = "sha256-juxIsZt1T33epN8CbzDc02MmlW5PtYa4pcGxuX9OpH4="; proxyVendor = true; diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index 822b15d3f2ca..c954ded2f1f6 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + withAi ? false, # nativeBuildInputs cmake, @@ -34,6 +35,7 @@ lensfun, lerc, libaom, + libarchive, libavif, libdatrie, libepoxy, @@ -53,12 +55,14 @@ libwebp, libxml2, lua5_4, + onnxruntime, util-linux, openexr, openjpeg, osm-gps-map, pcre2, portmidi, + potrace, pugixml, sqlite, # Linux only @@ -81,12 +85,12 @@ let pugixml-shared = pugixml.override { shared = true; }; in stdenv.mkDerivation rec { - version = "5.4.1"; + version = "5.6.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - hash = "sha256-r9x8iKM4qM0vrDHIRQ0Hbtv3PpVuQwcmDIPrwZX4ReQ="; + hash = "sha256-FX1tOEevivyr54lERUeG9zqIbgilBLS9YRTCBl/gBuQ="; }; nativeBuildInputs = [ @@ -144,9 +148,14 @@ stdenv.mkDerivation rec { osm-gps-map pcre2 portmidi + potrace pugixml-shared sqlite ] + ++ lib.optionals withAi [ + libarchive + onnxruntime + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib colord @@ -166,6 +175,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_USERMANUAL=False" ] + ++ lib.optionals withAi [ + (lib.cmakeBool "USE_AI" true) + (lib.cmakeBool "ONNXRUNTIME_OFFLINE" true) + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DUSE_COLORD=OFF" "-DUSE_KWALLET=OFF" @@ -179,7 +192,9 @@ stdenv.mkDerivation rec { let libPathEnvVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; libPathPrefix = - "$out/lib/darktable" + lib.optionalString stdenv.hostPlatform.isLinux ":${ocl-icd}/lib"; + "$out/lib/darktable" + + lib.optionalString (withAi && stdenv.hostPlatform.isLinux) ":${lib.getLib onnxruntime}/lib" + + lib.optionalString stdenv.hostPlatform.isLinux ":${ocl-icd}/lib"; in '' for f in $out/share/darktable/kernels/*.cl; do diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix index dafa593efec1..aba4e08601d0 100644 --- a/pkgs/by-name/db/dbgate/package.nix +++ b/pkgs/by-name/db/dbgate/package.nix @@ -8,25 +8,25 @@ let pname = "dbgate"; - version = "6.6.9"; + version = "7.2.1"; src = fetchurl { aarch64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage"; - hash = "sha256-RS7fFP1ek59VvUv8Q7kjHSVUlH3r+ir3csotWHvyXaM="; + hash = "sha256-OkAyKMXOYxvZomVUB5xIpPKR+b4p3+US7TDMIYeCsoo="; }; x86_64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage"; - hash = "sha256-S+OSTa0g8//ORhRrsfrdRcIkk8EavTKjw4sYOdGXvfE="; + hash = "sha256-QR44QZ5QNz/q9Cfp/d5EYjlG84ZmCtBFe8a4aMFEhjQ="; }; x86_64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg"; - hash = "sha256-qu2We2ejeRP51DcG8CsMQ2GpfZZoA073dNUaBcStI90="; + hash = "sha256-pTE8Na078B2njCrpuN0xt75PkjwepXnuhphB8Qqcsls="; }; aarch64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg"; - hash = "sha256-fW2Cz2u9LM2KMhGjbhq7EI0Oc8ACkTxddE2hOxR8TNU="; + hash = "sha256-luk0vWRc4x3QMYAPquTWiSW9FqTe1IsBm9qOoOeHOps="; }; } .${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported."); diff --git a/pkgs/by-name/de/decasify/package.nix b/pkgs/by-name/de/decasify/package.nix index 23a8fe5f0883..acbb0ded69a9 100644 --- a/pkgs/by-name/de/decasify/package.nix +++ b/pkgs/by-name/de/decasify/package.nix @@ -14,18 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "decasify"; - version = "0.10.1"; + version = "0.11.3"; src = fetchurl { url = "https://github.com/alerque/decasify/releases/download/v${finalAttrs.version}/decasify-${finalAttrs.version}.tar.zst"; - hash = "sha256-XPl4HfhkwhHRkfc64BTafeHgLK1lB4UHKP6loLn5Ruc="; + hash = "sha256-JATJ8cFjtCkK65NpTTrUkYHAo4nDrqftarqyJInRTpM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-rbFacCK/HU2D7QbVfMgKr9VevfutBJJtbXbKodTmkrc="; + hash = "sha256-hXU9Yw9rGQDkNnwy63LYPIrreOO2P/f8jVaPnVOhrWI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/dockerfmt/package.nix b/pkgs/by-name/do/dockerfmt/package.nix index fc5c4eec4d9c..9718e4391224 100644 --- a/pkgs/by-name/do/dockerfmt/package.nix +++ b/pkgs/by-name/do/dockerfmt/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "dockerfmt"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "reteps"; repo = "dockerfmt"; tag = "v${finalAttrs.version}"; - hash = "sha256-WfwrFe3E+CzfZ0ITSjMD8h4yrG+mnC6y0L+7OSYjMsw="; + hash = "sha256-j6Y0L6tr7BSoC1RWPE0vzUrIND7CBg3RuGoHzuvJHXI="; }; vendorHash = "sha256-r8vmbZ4oyplqIU6R/6hhcyjoR3E/mOFrB69TrfPYxRI="; diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index 6016474be28d..674b0f078541 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-Tgsab1KzdEQ9C9gkh09M5gKpocrMrgxQ16pIJ4zcKsY="; + hash = "sha256-LqVJQkNjRafmC4OK2F3wZQwa0hofxmbMYWXQ6rPtHug="; }; # https://github.com/NixOS/nixpkgs/issues/318830 diff --git a/pkgs/by-name/do/dotnet-ef/package.nix b/pkgs/by-name/do/dotnet-ef/package.nix index 5429950bcf66..7459d02e341b 100644 --- a/pkgs/by-name/do/dotnet-ef/package.nix +++ b/pkgs/by-name/do/dotnet-ef/package.nix @@ -6,11 +6,11 @@ buildDotnetGlobalTool { pname = "dotnet-ef"; - version = "10.0.2"; + version = "10.0.9"; dotnet-sdk = dotnetCorePackages.sdk_10_0; - nugetHash = "sha256-lJjGamBGb4jSuPaFGlNBEGkV7vh4uxv37rYiE7X5Hkk="; + nugetHash = "sha256-RqYc9rMfGI88Xo/kNMYbqzbfv4iyTFTk/I/RFLIJ3XM="; meta = { description = "Tools to help with design-time development tasks"; diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index fee10265a306..98373690e108 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dua"; - version = "2.37.0"; + version = "2.37.1"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-vEc41MspD4Z8E8oFwPw52CiOguqgHQKUZ9Q8GooXPRA="; + hash = "sha256-FVkq+iLkVcug/SzQtzmupHc1nh+orqyOnqv0xr1Dg/Q="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-0ZdQ9ocl62SR74HlVqTYtGxAyf3HGUFCZinPbLBPPbw="; + cargoHash = "sha256-8lRpN3KcrK9x446buGVnHl0CcHVoLWl0slB7CAw37G8="; checkFlags = [ # Skip interactive tests diff --git a/pkgs/by-name/ea/eas-cli/missing-hashes.json b/pkgs/by-name/ea/eas-cli/missing-hashes.json index ddc72dbc5b9f..6417aaf75412 100644 --- a/pkgs/by-name/ea/eas-cli/missing-hashes.json +++ b/pkgs/by-name/ea/eas-cli/missing-hashes.json @@ -1,4 +1,17 @@ { + "@ngrok/ngrok-android-arm64@npm:1.7.0": "90bd438c4a1f68d72ded57d6117989365ab2a05108ab0cea1f9d65aba9a94a8281bdd04ed1000cb28d28c5fa8e2346aefa0fd7af9aebf8cf88ac60f44d3c7601", + "@ngrok/ngrok-darwin-arm64@npm:1.7.0": "503e467c1cab54271ecdfc4bd7e2eb49366b56cd231898b8d8c4bbd5ac50d8aa85455d98bfa66383ea3369d7294dcf3ba59d865487c12145c18c38e73da31c28", + "@ngrok/ngrok-darwin-universal@npm:1.7.0": "9cde026e63251b406f99b6bb8189e3f51a2fef9a3d9391f7aef4fc54305d17b7404861694d8e703c9a880fe4580f7d4fcf312978337150876343fb1c25592e8f", + "@ngrok/ngrok-darwin-x64@npm:1.7.0": "6164fbe5ac5f78a9250f9b210d8b183905c1745e5c1e7b93ee3c9748c8096b32df5c2f6b20a59ebe77d79ed95e6f8ec40b14a8e41e98bde6a54a5b72b3395069", + "@ngrok/ngrok-freebsd-x64@npm:1.7.0": "e6ab26453b8b060a1e042a192908ba9966c1fc400b43d7cf74950824851d434a3e073613b04079acb449ce75e788b50c7696f3a821258bd5879b4a95cf9c0a9f", + "@ngrok/ngrok-linux-arm-gnueabihf@npm:1.7.0": "9282159ab05dab3b511de8268afa709ea46bc9a2733ac155fdc9a19c2061093f180bbdfea174bfa3752c304b9af33e165dc293b25fec6d5a78aa773372c7a888", + "@ngrok/ngrok-linux-arm64-gnu@npm:1.7.0": "3e93ae9ddd9de6029b2a840df1688795699b7f04a400fc2c7970ac5a4fee4b0bb50ba3a2da566bc2392b79c121e7b8e4aefc84ad3a6b4dcaa9f07486ca0a374f", + "@ngrok/ngrok-linux-arm64-musl@npm:1.7.0": "b6637244d06a1bb57e2c8654b4b19eb2cfe2ebcc21f90bcdafeee53efe00c74989a658f0102e2bace6286978fa58614ee67b6f7785ec9a23f7996c887a1e0212", + "@ngrok/ngrok-linux-x64-gnu@npm:1.7.0": "09d36e6da68e7a5fe64773c37f7bf4b0d28281ba944313b01bf8346b237615a6006847624d38280a39ae3b55b4da241502b786e46c77bd05eedcf1dc259ded0a", + "@ngrok/ngrok-linux-x64-musl@npm:1.7.0": "95c6ab6550f297f05824cc8d935d8c28eb39c745743b3ef46e6f7216011154bde45de390ef62e49226106f32b8900bc88bc0f1adabb3b143f434f4cf8b0db66f", + "@ngrok/ngrok-win32-arm64-msvc@npm:1.7.0": "773963f485b47c702c5a7e020238e8c17808ea591b536bf25bae5c18335ceffaacdf39b1b18eaa285ce44b1a62a9b4c32b11cd7eafe8cd8771d7c80d6e63d410", + "@ngrok/ngrok-win32-ia32-msvc@npm:1.7.0": "456df61943a2cfa656d257fce73f9a28177ab7ce94170ccfcbb40fd44fe204113c3ba26153b9a8cb8d49b0128d4fec9fd37ba38f37fee3d0a9d27c85448763a8", + "@ngrok/ngrok-win32-x64-msvc@npm:1.7.0": "8c73289d1c0d38c191a8ea701104d748717df5b250ce133c2e3a1cf1ac68951592a7276f3b17c0ee09c0d607bd9b0908cacefbe0bb8735027e2a2fcb612c08fb", "@nx/nx-darwin-arm64@npm:22.4.1": "d1faed4c0f1e45398d7819c384f52dc8070990be07f7b337e87af37b891129f5b3d7a0f08287e71ce3a20902c9881bbf53ad763ff58bd3270a6a9bfd137161bd", "@nx/nx-darwin-x64@npm:22.4.1": "ebe3622f46f691fcda61b4a1e4143ff9a745f044eb6c2f8d3ab8e97582e50a80ebf510bdd39770d62e49f493a46f4d41fedd75ea0c76f4e8bb7db75cf2beea0d", "@nx/nx-freebsd-x64@npm:22.4.1": "76f86487736fa29f88543766512d8440ddc63275670a4b1dbc4010866d9b90dee8cf10b724b551132471985b6ae47ef002985126b62213fca79e01a524738354", diff --git a/pkgs/by-name/ea/eas-cli/package.nix b/pkgs/by-name/ea/eas-cli/package.nix index c9cc2e57df1e..567372a7f135 100644 --- a/pkgs/by-name/ea/eas-cli/package.nix +++ b/pkgs/by-name/ea/eas-cli/package.nix @@ -10,12 +10,12 @@ python3, }: let - version = "18.7.0"; + version = "20.4.0"; src = fetchFromGitHub { owner = "expo"; repo = "eas-cli"; rev = "v${version}"; - hash = "sha256-Z+PtS88Rv9Vv6FA15KxSBWCmOtwmTqO1etgCV7WaTXo="; + hash = "sha256-EMN54PR9lhrZcGMq2iNUsdyBP3wVk4G/isjsneIGslI="; }; missingHashes = ./missing-hashes.json; patches = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { yarnOfflineCache = yarn-berry_4.fetchYarnBerryDeps { inherit src missingHashes patches; - hash = "sha256-KtFLJc2bEBS0sgTqbF68574fFMxwSlaSKcR0RedVJ4k="; + hash = "sha256-dOx4T009+FMFEvTZtlyJpAUo2UYBm1O1hIyBnSbqIgw="; }; nativeBuildInputs = [ @@ -64,6 +64,14 @@ stdenv.mkDerivation (finalAttrs: { mv "$tmpfile" lerna.json ''; + buildPhase = '' + runHook preBuild + + yarn build + + runHook postBuild + ''; + # yarnInstallHook strips out build outputs within packages/eas-cli resulting in most commands missing from eas-cli. installPhase = '' runHook preInstall diff --git a/pkgs/by-name/er/ergo/package.nix b/pkgs/by-name/er/ergo/package.nix index d713be97b7b6..fbc41a573685 100644 --- a/pkgs/by-name/er/ergo/package.nix +++ b/pkgs/by-name/er/ergo/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ergo"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${finalAttrs.version}/ergo-${finalAttrs.version}.jar"; - sha256 = "sha256-9igU/BTWMbCM4Zzd1+HrjwYMZ8Os+k/fqokxtnCSO04="; + sha256 = "sha256-SALN41UGI+Y5pdCfRdJXki4BgVxbH+ZL2v0uvGnsZ8c="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fa/fa_1/package.nix b/pkgs/by-name/fa/fa_1/package.nix index 433225f080c0..77c9649a05b8 100644 --- a/pkgs/by-name/fa/fa_1/package.nix +++ b/pkgs/by-name/fa/fa_1/package.nix @@ -2,29 +2,20 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: -let - majorVersion = "0"; - minorVersion = "100"; -in -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "fa_1"; - version = "${majorVersion}.${minorVersion}"; + version = "0.100"; src = fetchzip { - url = "https://dotcolon.net/files/fonts/fa_1_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/files/fonts/fa_1_${lib.replaceString "." "" finalAttrs.version}.zip"; hash = "sha256-BPJ+wZMYXY/yg5oEgBc5YnswA6A7w6V0gdv+cac0qdc="; stripRoot = false; }; - installPhase = '' - runHook preInstall - - install -D -m444 -t $out/share/fonts/opentype $src/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://dotcolon.net/font/fa_1/"; @@ -33,4 +24,4 @@ stdenvNoCC.mkDerivation { maintainers = with lib.maintainers; [ minijackson ]; license = lib.licenses.ofl; }; -} +}) diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix index 2243b8917e38..5fba5bd99dad 100644 --- a/pkgs/by-name/fa/fastly/package.nix +++ b/pkgs/by-name/fa/fastly/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "fastly"; - version = "15.2.0"; + version = "15.3.1"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-q75cNedu+loAkntMykfPil7/gd7inrJx5RyWJPq0NE0="; + hash = "sha256-SjRs4ZJnjRTfMgoMBoDoHImD6M6FO6QRA0Vmth1GFbI="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { "cmd/fastly" ]; - vendorHash = "sha256-dTu+LFxKrLCXnbBH3QJ3PgbXEEtJ0NUIKfoKuCHWlgQ="; + vendorHash = "sha256-zQ+ZJ4LXV9NR2zwcMrTTc3eWpNxrbFlik2m2CpaE3eA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fc/fcitx5/package.nix b/pkgs/by-name/fc/fcitx5/package.nix index 6ac5d9b7b750..d2b0dd7b63e2 100644 --- a/pkgs/by-name/fc/fcitx5/package.nix +++ b/pkgs/by-name/fc/fcitx5/package.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.1.19"; + version = "5.1.21"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-ZsGRVuUpWIJnsSqcAQcerxvwWIRaGdAO2FM1k3D3g0M="; + hash = "sha256-IR5mKOsVJ/GPL2czdztLVXGJTNk1JXnWpzmqC/UIwuw="; fetchSubmodules = true; }; @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - kdePackages.extra-cmake-modules pkg-config wayland-scanner gettext ]; buildInputs = [ + kdePackages.plasma-wayland-protocols kdePackages.extra-cmake-modules expat isocodes diff --git a/pkgs/by-name/fe/fedistar/package.nix b/pkgs/by-name/fe/fedistar/package.nix index 23c2bdd8d00d..9fa5a85d025d 100644 --- a/pkgs/by-name/fe/fedistar/package.nix +++ b/pkgs/by-name/fe/fedistar/package.nix @@ -20,25 +20,25 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fedistar"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "h3poteto"; repo = "fedistar"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q2IfWeMV6yvmCmKBc/iufO28DyIIlj50wp9A7LbQcIY="; + hash = "sha256-MV2ItwIBzDEY2tKI8WrQj+rAzv6OTC2aZMiD46oLHFw="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = "src-tauri"; - cargoHash = "sha256-eYPvG07V0DKPQfs6g+oayDcF3Xn74Aq52ZA+psyoSnY="; + cargoHash = "sha256-Ac7u/u0kGlUwKF5/196Ss4+pUMyPhAbGqhlmtlYI2Us="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-GnVBCrBCnS0Tl9jZu3poIZZJO2SRdlS8jOYUE9G+BFM="; + hash = "sha256-JaFXAYHoSMyNgHjeNWgJXJ8ZeU9wUi47N58L3QEd0FE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index edfe32405653..2f10b41fbc30 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "flexget"; - version = "3.19.23"; + version = "3.19.25"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${finalAttrs.version}"; - hash = "sha256-r54vFE2FISNge84jaFKL5SGQ41LhEq1YVvoGcKOsi0I="; + hash = "sha256-Nvf0Whoc7KkPZc+TelGHH+q8LG6BorlMXxhhpUL/ox8="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/fl/flink/package.nix b/pkgs/by-name/fl/flink/package.nix index 32cd4d90dd35..ac711253363f 100644 --- a/pkgs/by-name/fl/flink/package.nix +++ b/pkgs/by-name/fl/flink/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz"; - sha256 = "sha256-WxL4DN/UbOIcUc7K+yNtzyCtN4D884qmEMa+hk/3EQs="; + sha256 = "sha256-tShksMQqNjitsIlbl1QqPKggoMPe/ameum5FwvjKSWo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix index 8947f5a0a755..e39c7a25ffb1 100644 --- a/pkgs/by-name/fl/flix/package.nix +++ b/pkgs/by-name/fl/flix/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.69.1"; + version = "0.73.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-UgYMaZ/v99dmfSUekU2xSOoJecrmvUoVfO5eYm9prZw="; + sha256 = "sha256-X2kiXS4qXAKau1qJswbJfi/gsty49RMW355+yYaBGUM="; }; dontUnpack = true; diff --git a/pkgs/by-name/fl/flux9s/package.nix b/pkgs/by-name/fl/flux9s/package.nix index 921d9db9075c..27002b1ed129 100644 --- a/pkgs/by-name/fl/flux9s/package.nix +++ b/pkgs/by-name/fl/flux9s/package.nix @@ -1,5 +1,5 @@ { - fetchCrate, + fetchFromGitHub, lib, openssl, pkg-config, @@ -11,9 +11,11 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "flux9s"; version = "0.10.2"; - src = fetchCrate { - inherit (finalAttrs) pname version; - hash = "sha256-a+kGFxhqeo8Na5T4IZkyhFyPqT6FvOLP3oiuJUuJIOY="; + src = fetchFromGitHub { + owner = "dgunzy"; + repo = "flux9s"; + tag = "v${finalAttrs.version}"; + hash = "sha256-pphw27LHz+TrU5QcUZZ7zS5k02AaFWBEEHsiV+I+05E="; }; cargoHash = "sha256-M2UCpSwKVFGXACcYkxJ8TzRHYgTLqt29RBMMdRvHZv8="; diff --git a/pkgs/by-name/fo/folo/package.nix b/pkgs/by-name/fo/folo/package.nix index c48cb706ac23..d5c96e11b5ac 100644 --- a/pkgs/by-name/fo/folo/package.nix +++ b/pkgs/by-name/fo/folo/package.nix @@ -1,47 +1,52 @@ { electron, fetchFromGitHub, + nix-update-script, imagemagick, lib, makeDesktopItem, makeWrapper, nodejs, - pnpm_10_29_2, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "folo"; - version = "0.6.3"; + version = "1.10.0"; src = fetchFromGitHub { owner = "RSSNext"; repo = "Folo"; - tag = "v${version}"; - hash = "sha256-huVk5KcsepDwtdWMm9pvn31GE1felbH1pR3mGqlSWRs="; + tag = "desktop/v${finalAttrs.version}"; + hash = "sha256-+k09Psuf6Bvjoc9Z1O0u2v44IIsaSQF1QbjJM6cWlUw="; }; nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_10_29_2 + pnpm_11 makeWrapper imagemagick ]; pnpmDeps = fetchPnpmDeps { - inherit + inherit (finalAttrs) pname version src + pnpmInstallFlags ; - pnpm = pnpm_10_29_2; + pnpm = pnpm_11; fetcherVersion = 3; - hash = "sha256-EP7bpbJUcKmHm7KMlKc0Fz2u0niQ3jC7YN/9pp7vucE="; + hash = "sha256-dF0nnBBpJaFq6MYCZVMMt4D85EWDv8zsGEbVnyhP0kE="; }; + __structuredAttrs = true; + strictDeps = true; + env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -67,6 +72,16 @@ stdenv.mkDerivation rec { dontCheckForBrokenSymlinks = true; + # Several build scripts import transitive dependencies directly (e.g. + # ast-kit from unplugin-ast). + pnpmInstallFlags = [ "--shamefully-hoist" ]; + + postPatch = '' + # pnpm 11 verifies node_modules before every `pnpm run` which conflicts + # with --shamefully-hoist + echo 'verifyDepsBeforeRun: false' >> pnpm-workspace.yaml + ''; + desktopItem = makeDesktopItem { name = "folo"; desktopName = "Folo"; @@ -77,7 +92,7 @@ stdenv.mkDerivation rec { mimeTypes = [ "x-scheme-handler/follow" ]; }; - icon = src + "/apps/desktop/resources/icon.png"; + icon = finalAttrs.src + "/apps/desktop/resources/icon.png"; buildPhase = '' runHook preBuild @@ -86,13 +101,13 @@ stdenv.mkDerivation rec { # Build desktop app. cd apps/desktop - pnpm --offline --no-inline-css build:electron-vite + pnpm run build:electron-vite cd ../.. # Remove dev dependencies. CI=true pnpm --ignore-scripts prune --prod # Clean up broken symlinks left behind by `pnpm prune` - find node_modules/.bin -xtype l -delete + [ -d node_modules/.bin ] && find node_modules/.bin -xtype l -delete runHook postBuild ''; @@ -109,24 +124,34 @@ stdenv.mkDerivation rec { --add-flags $out/share/follow/apps/desktop \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - install -m 444 -D "${desktopItem}/share/applications/"* \ + install -m 444 -D "${finalAttrs.desktopItem}/share/applications/"* \ -t $out/share/applications/ for size in 16 24 32 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -background none -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/follow.png + convert -background none -resize "$size"x"$size" ${finalAttrs.icon} $out/share/icons/hicolor/"$size"x"$size"/apps/follow.png done runHook postInstall ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^desktop/v([0-9]+\\.[0-9]+\\.[0-9]+)$" + ]; + }; + meta = { description = "Next generation information browser"; homepage = "https://github.com/RSSNext/Folo"; - changelog = "https://github.com/RSSNext/Folo/releases/tag/${src.tag}"; + changelog = "https://github.com/RSSNext/Folo/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ iosmanthus ]; + maintainers = with lib.maintainers; [ + amadejkastelic + iosmanthus + ]; platforms = [ "x86_64-linux" ]; mainProgram = "follow"; }; -} +}) diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix index 26b240c85534..dfc8737e78f1 100644 --- a/pkgs/by-name/fr/fresh-editor/package.nix +++ b/pkgs/by-name/fr/fresh-editor/package.nix @@ -7,21 +7,22 @@ pkg-config, openssl, gitMinimal, + python3, nix-update-script, versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "fresh"; - version = "0.3.10"; + version = "0.4.1"; src = fetchFromGitHub { owner = "sinelaw"; repo = "fresh"; tag = "v${finalAttrs.version}"; - hash = "sha256-5gMrQOhQVyIJuv5QAPOyiTFcY4RntmQV0Mtue1x8aAs="; + hash = "sha256-npblvNgrGcy4hScMXydDWoy6NnNVF/YIDwqKyZ6NFuc="; }; - cargoHash = "sha256-5QHNIt7PoB2IhQU6IyL5Ljax0/CzVMHvMcNDfM9st7U="; + cargoHash = "sha256-sYtOQYsZrrEHkW/PZqIejFu7vq/Z25otzFwJJ552j6A="; __structuredAttrs = true; @@ -32,6 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeCheckInputs = [ + python3 gitMinimal rustPlatform.bindgenHook ]; @@ -46,7 +48,8 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ - --add-flags "--no-upgrade-check" + --add-flags "--no-upgrade-check" \ + --prefix PATH : ${lib.makeBinPath [ python3 ]} rm -rf $out/bin/fresh.dSYM ''; diff --git a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix index 014ddae292ea..231eb7ee2f57 100644 --- a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix +++ b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "fzf-zsh-plugin"; - version = "1.0.0-unstable-2026-05-06"; + version = "1.0.0-unstable-2026-06-21"; src = fetchFromGitHub { owner = "unixorn"; repo = "fzf-zsh-plugin"; - rev = "87d14584a9fe82e316173fdade8761dd53e45a62"; - hash = "sha256-ne/xNgKcESsZKIBk/5TqiDDcOWUR/512DezCNVnAWzw="; + rev = "70e2ac8a12c137c1b097a6ecfdc0236e5ef51d1b"; + hash = "sha256-qwqezNXBRFKTWyMp+9Ss2hEAU9Bznc/DK0XNGZOfVOE="; }; strictDeps = true; diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix index 7fefe400072e..ed88f136f97f 100644 --- a/pkgs/by-name/ge/gelly/package.nix +++ b/pkgs/by-name/ge/gelly/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gelly"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Fingel"; repo = "gelly"; tag = "v${finalAttrs.version}"; - hash = "sha256-yAbItAKzvn2mxNPqg+iuiI5GvFAYXw1721DaVzS0axI="; + hash = "sha256-diezT6zEI7+ljDpzmJeIZDKbmdnsMfaabSuQ1/AvkFE="; }; - cargoHash = "sha256-nKWpawdvBdu57O/Fs+cumrfbYrPUouD3uL0YKWOZY+I="; + cargoHash = "sha256-XYnBMBhv/8wKV+cZ06Ks8gzi/ib1FH1AM1FrWr81ghg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gh/ghdl/package.nix b/pkgs/by-name/gh/ghdl/package.nix index b4f754b8e423..3f843bafb4da 100644 --- a/pkgs/by-name/gh/ghdl/package.nix +++ b/pkgs/by-name/gh/ghdl/package.nix @@ -13,11 +13,21 @@ libmpc, gnutar, makeWrapper, - backend ? "mcode", + backend ? if stdenv.hostPlatform.isAarch64 then "llvm-jit" else "mcode", }: -assert backend == "mcode" || backend == "llvm" || backend == "gcc"; +assert lib.asserts.assertOneOf "backend" backend [ + "mcode" + "llvm" + "llvm-jit" + "gcc" +]; +let + backendIsLLVM = backend == "llvm"; + backendIsLLVMJit = backend == "llvm-jit"; + backendIsGCC = backend == "gcc"; +in stdenv.mkDerivation (finalAttrs: { pname = "ghdl-${backend}"; version = "6.0.0"; @@ -37,17 +47,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gnat ] - ++ lib.optionals (backend == "llvm" || backend == "gcc") [ + ++ lib.optionals (backendIsLLVM || backendIsGCC) [ makeWrapper ] - ++ lib.optionals (backend == "gcc") [ + ++ lib.optionals backendIsGCC [ texinfo ]; buildInputs = [ zlib ] - ++ lib.optionals (backend == "gcc") [ + ++ lib.optionals backendIsGCC [ gmp mpfr libmpc @@ -57,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { # If llvm 7.0 works, 7.x releases should work too. sed -i 's/check_version 7.0/check_version 7/g' configure '' - + lib.optionalString (backend == "gcc") '' + + lib.optionalString backendIsGCC '' ${gnutar}/bin/tar -xf ${gcc13.cc.src} ''; @@ -66,14 +76,17 @@ stdenv.mkDerivation (finalAttrs: { "--disable-werror" "--enable-synth" ] - ++ lib.optionals (backend == "llvm") [ + ++ lib.optionals (backendIsLLVM || backendIsLLVMJit) [ "--with-llvm-config=${llvm.dev}/bin/llvm-config" ] - ++ lib.optionals (backend == "gcc") [ + ++ lib.optionals backendIsLLVMJit [ + "--with-llvm-jit" + ] + ++ lib.optionals backendIsGCC [ "--with-gcc=gcc-${gcc13.cc.version}" ]; - buildPhase = lib.optionalString (backend == "gcc") '' + buildPhase = lib.optionalString backendIsGCC '' make copy-sources mkdir gcc-objs cd gcc-objs @@ -93,14 +106,14 @@ stdenv.mkDerivation (finalAttrs: { --with-mpfr-include=${mpfr.dev}/include \ --with-mpfr-lib=${mpfr.out}/lib \ --with-mpc=${libmpc} \ - --enable-default-pie=${if stdenv.targetPlatform.hasSharedLibraries then "yes" else "no"} + --enable-default-pie=${lib.boolToYesNo stdenv.targetPlatform.hasSharedLibraries} make -j $NIX_BUILD_CORES make install cd ../ make -j $NIX_BUILD_CORES ghdllib ''; - postFixup = lib.optionalString (backend == "llvm" || backend == "gcc") '' + postFixup = lib.optionalString (backendIsLLVM || backendIsGCC) '' wrapProgram $out/bin/ghdl \ --set LIBRARY_PATH ${lib.makeLibraryPath [ zlib ]} \ --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} @@ -108,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ ] - ++ lib.optionals (backend == "gcc") [ + ++ lib.optionals backendIsGCC [ # GCC compilation fails with format errors "format" ]; @@ -135,7 +148,11 @@ stdenv.mkDerivation (finalAttrs: { thoughtpolice sempiternal-aurora ]; - platforms = - lib.platforms.linux ++ lib.optionals (backend == "mcode" || backend == "llvm") [ "x86_64-darwin" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ] + ++ lib.optionals (backendIsLLVM || backendIsLLVMJit || backendIsGCC) [ "aarch64-linux" ] + ++ lib.optionals (backendIsLLVM || backendIsLLVMJit) [ "aarch64-darwin" ]; }; }) diff --git a/pkgs/by-name/gh/ghdl/test-simple.nix b/pkgs/by-name/gh/ghdl/test-simple.nix index f83891172d28..341e141823fd 100644 --- a/pkgs/by-name/gh/ghdl/test-simple.nix +++ b/pkgs/by-name/gh/ghdl/test-simple.nix @@ -1,6 +1,7 @@ { - stdenv, + stdenvNoCC, ghdl-llvm, + ghdl-llvm-jit, ghdl-mcode, ghdl-gcc, backend, @@ -10,12 +11,14 @@ let ghdl = if backend == "llvm" then ghdl-llvm + else if backend == "llvm-jit" then + ghdl-llvm-jit else if backend == "gcc" then ghdl-gcc else ghdl-mcode; in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "ghdl-test-simple"; meta.timeout = 300; nativeBuildInputs = [ ghdl ]; diff --git a/pkgs/by-name/go/go-swagger/package.nix b/pkgs/by-name/go/go-swagger/package.nix index e91136ee95c2..8b8beb5bf475 100644 --- a/pkgs/by-name/go/go-swagger/package.nix +++ b/pkgs/by-name/go/go-swagger/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "go-swagger"; - version = "0.34.1"; + version = "0.35.0"; src = fetchFromGitHub { owner = "go-swagger"; repo = "go-swagger"; tag = "v${finalAttrs.version}"; - hash = "sha256-2kPB/E8/qr4j/2rJS6fbgH2CKTZE43L/7ERr2BzOESk="; + hash = "sha256-+08mPU3R8IF8vooNkHDLeS2q1VakPKIce3WY+sTjDm4="; }; - vendorHash = "sha256-FILITZAcRHcZs3sICuWVmLA53/zhegQcZTAua6m4HVI="; + vendorHash = "sha256-K2Ca9s2FV+KYuJhO6BA/5gCXb7nXK68RO8+QwcKgpAM="; doCheck = false; diff --git a/pkgs/by-name/gr/graphlan/package.nix b/pkgs/by-name/gr/graphlan/package.nix index 1a09c13a91ce..3d4dcd726ef2 100644 --- a/pkgs/by-name/gr/graphlan/package.nix +++ b/pkgs/by-name/gr/graphlan/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication { pname = "graphlan"; - version = "0-unstable-2024-08-07"; + version = "1.1.3-unstable-2024-08-07"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/by-name/gu/gui-for-singbox/frontend-runtime-path.patch b/pkgs/by-name/gu/gui-for-singbox/frontend-runtime-path.patch index e4909b9aa0cf..66cc8a421dc6 100644 --- a/pkgs/by-name/gu/gui-for-singbox/frontend-runtime-path.patch +++ b/pkgs/by-name/gu/gui-for-singbox/frontend-runtime-path.patch @@ -27,31 +27,33 @@ diff -ruN a/src/stores/env.ts b/src/stores/env.ts diff -ruN a/src/stores/kernelApi.ts b/src/stores/kernelApi.ts --- a/src/stores/kernelApi.ts +++ b/src/stores/kernelApi.ts -@@ -248,8 +248,12 @@ - const runCoreProcess = (isAlpha: boolean) => { - return new Promise((resolve, reject) => { - let output: string -+ const coreWorkingDirectory = -+ envStore.env.os === 'linux' && envStore.env.configPath -+ ? `${envStore.env.configPath}/${CoreWorkingDirectory}` -+ : CoreWorkingDirectory - const pid = ExecBackground( -- CoreWorkingDirectory + '/' + getKernelFileName(isAlpha), -+ coreWorkingDirectory + '/' + getKernelFileName(isAlpha), - getKernelRuntimeArgs(isAlpha), - (out) => { - output = out -@@ -263,8 +267,9 @@ - reject(output) - }, - { -- PidFile: CorePidFilePath, -+ PidFile: coreWorkingDirectory + '/pid.txt', - StopOutputKeyword: CoreStopOutputKeyword, -+ WorkingDirectory: envStore.env.configPath || envStore.env.basePath, - Env: getKernelRuntimeEnv(isAlpha), - }, - ).catch((e) => reject(e)) +@@ -271,19 +271,24 @@ + const runCoreProcess = async (isAlpha: boolean) => { + let stopped = false ++ const coreWorkingDirectory = ++ envStore.env.os === 'linux' && envStore.env.configPath ++ ? `${envStore.env.configPath}/${CoreWorkingDirectory}` ++ : CoreWorkingDirectory + const pid = await ExecBackground( +- CoreWorkingDirectory + '/' + getKernelFileName(isAlpha), ++ coreWorkingDirectory + '/' + getKernelFileName(isAlpha), + getKernelRuntimeArgs(isAlpha), + undefined, + async (end) => { + stopped = true + const logs = await ReadFile(CoreLogFilePath, { Range: '-4096' }).catch((err) => String(err)) + logs.split('\n').forEach((line) => line && logsStore.recordKernelLog(line)) + end && logsStore.recordKernelLog(end) + onCoreStopped() + }, + { +- PidFile: CorePidFilePath, + LogFile: CoreLogFilePath, ++ PidFile: coreWorkingDirectory + '/pid.txt', ++ WorkingDirectory: envStore.env.configPath || envStore.env.basePath, + Env: getKernelRuntimeEnv(isAlpha), + }, + ) diff -ruN a/src/types/app.d.ts b/src/types/app.d.ts --- a/src/types/app.d.ts +++ b/src/types/app.d.ts @@ -63,6 +65,30 @@ diff -ruN a/src/types/app.d.ts b/src/types/app.d.ts appPath: string os: OS arch: string +diff -ruN a/src/views/PluginsView/index.vue b/src/views/PluginsView/index.vue +--- a/src/views/PluginsView/index.vue ++++ b/src/views/PluginsView/index.vue +@@ -37,7 +37,7 @@ + label: 'common.openFile', + handler: async (id: string) => { + const plugin = pluginsStore.getPluginById(id) +- await OpenURI(envStore.env.basePath + '/' + plugin!.path) ++ await OpenURI(`${envStore.env.configPath || envStore.env.basePath}/${plugin!.path}`) + }, + }, + ] +diff -ruN a/src/views/RulesetsView/index.vue b/src/views/RulesetsView/index.vue +--- a/src/views/RulesetsView/index.vue ++++ b/src/views/RulesetsView/index.vue +@@ -27,7 +27,7 @@ + label: 'common.openFile', + handler: async (id: string) => { + const ruleset = rulesetsStore.getRulesetById(id) +- await OpenURI(envStore.env.basePath + '/' + ruleset!.path) ++ await OpenURI(`${envStore.env.configPath || envStore.env.basePath}/${ruleset!.path}`) + }, + }, + { diff -ruN a/src/utils/helper.ts b/src/utils/helper.ts --- a/src/utils/helper.ts +++ b/src/utils/helper.ts diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index e259f199abde..11b2ef7cf184 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -20,13 +20,13 @@ let pname = "gui-for-singbox"; - version = "1.23.2"; + version = "1.25.4"; src = fetchFromGitHub { owner = "GUI-for-Cores"; repo = "GUI.for.SingBox"; tag = "v${version}"; - hash = "sha256-CEJ0yzF2smBlLgZ4EH5UWV4Pc4vA2ZH80TjoudUKWZM="; + hash = "sha256-+2MdFF1iufbPJvf5XGrM9t9vaY7BNdIu/vSWgAKcbvQ="; }; metaCommon = { @@ -58,7 +58,7 @@ let ; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-m9Rmc9Ww4jb2aQ+RXOwF71daZ6puspdMM/xidnk/YHs="; + hash = "sha256-BrDO9xdMuMnhXPAd9QvtU4R1W1WacnsVcGde+WFjvGA="; }; buildPhase = '' @@ -89,7 +89,7 @@ buildGo126Module { patches = [ ./xdg-path-and-restart-patch.patch ]; - vendorHash = "sha256-9uWrctbQ+vujb1Q8zT7Bv7rVyNY1rCM577c9caOKRNo="; + vendorHash = "sha256-Xi/EgMLex25p2tmRHEldCv6hgUKIpLJTmrMpHPGLY5M="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/gu/gui-for-singbox/xdg-path-and-restart-patch.patch b/pkgs/by-name/gu/gui-for-singbox/xdg-path-and-restart-patch.patch index f2cdd3b28229..dc1bfe5bfa32 100644 --- a/pkgs/by-name/gu/gui-for-singbox/xdg-path-and-restart-patch.patch +++ b/pkgs/by-name/gu/gui-for-singbox/xdg-path-and-restart-patch.patch @@ -1,7 +1,7 @@ diff -ruN a/bridge/bridge.go b/bridge/bridge.go --- a/bridge/bridge.go +++ b/bridge/bridge.go -@@ -50,6 +50,7 @@ +@@ -51,6 +51,7 @@ Env.BasePath = filepath.ToSlash(filepath.Dir(exePath)) Env.AppName = filepath.Base(exePath) @@ -13,7 +13,7 @@ diff -ruN a/bridge/bridge.go b/bridge/bridge.go func (a *App) RestartApp() FlagResult { log.Printf("RestartApp") -- exePath := Env.BasePath + "/" + Env.AppName +- exePath := resolvePath(Env.AppName) + exePath, err := os.Executable() + if err != nil { + exePath = filepath.Join(Env.BasePath, Env.AppName) @@ -29,15 +29,6 @@ diff -ruN a/bridge/bridge.go b/bridge/bridge.go OS: Env.OS, ARCH: Env.ARCH, IsPrivileged: Env.IsPrivileged, -@@ -258,7 +263,7 @@ - } - - func loadConfig() { -- b, err := os.ReadFile(Env.BasePath + "/data/user.yaml") -+ b, err := os.ReadFile(GetPath("data/user.yaml")) - if err == nil { - yaml.Unmarshal(b, &Config) - } diff -ruN a/bridge/types.go b/bridge/types.go --- a/bridge/types.go +++ b/bridge/types.go @@ -52,9 +43,8 @@ diff -ruN a/bridge/types.go b/bridge/types.go diff -ruN a/bridge/utils.go b/bridge/utils.go --- a/bridge/utils.go +++ b/bridge/utils.go -@@ -13,7 +13,29 @@ - "golang.org/x/text/encoding/simplifiedchinese" - ) +@@ -23,7 +23,29 @@ + var requestTransportCache sync.Map +func GetConfigPath() string { + if Env.OS == "linux" { @@ -69,7 +59,7 @@ diff -ruN a/bridge/utils.go b/bridge/utils.go + return Env.BasePath +} + - func GetPath(path string) string { + func resolvePath(path string) string { + if Env.OS == "linux" && !filepath.IsAbs(path) { + cleanPath := filepath.ToSlash(filepath.Clean(path)) + if cleanPath == "data" { @@ -82,3 +72,4 @@ diff -ruN a/bridge/utils.go b/bridge/utils.go if !filepath.IsAbs(path) { path = filepath.Join(Env.BasePath, path) } + return filepath.ToSlash(filepath.Clean(path)) diff --git a/pkgs/by-name/ho/honggfuzz/package.nix b/pkgs/by-name/ho/honggfuzz/package.nix index 72f7330a77a6..7de83d8baf72 100644 --- a/pkgs/by-name/ho/honggfuzz/package.nix +++ b/pkgs/by-name/ho/honggfuzz/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "honggfuzz"; - version = "2.6-unstable-2026-04-13"; + version = "2.6-unstable-2026-06-19"; src = fetchFromGitHub { owner = "google"; repo = "honggfuzz"; - rev = "48790f7b18f30ba4a95272ea290b720662ed56c9"; - hash = "sha256-RHNOZF5ttqdh3daGGVRHkvL9g2aZFDGDmmW056ohI6w="; + rev = "cf8b66a4d09f4d4d786d96e3c46d9141fb4e98e2"; + hash = "sha256-cu7VLQvdmgYIbWhAiZjG5wkO/b5+FoBmXp/SlYmykF0="; }; postPatch = '' diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index 15505b3a49a6..d7e8268a481b 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -10,6 +10,7 @@ jellyfin-web, sqlite, versionCheckHook, + jq, }: buildDotnetModule (finalAttrs: { @@ -23,6 +24,10 @@ buildDotnetModule (finalAttrs: { hash = "sha256-HCs4ZsutVoVH+bBZANjpPeMyV8e63Yemjg9DSr0R9zg="; }; + nativeBuildInputs = [ + jq + ]; + propagatedBuildInputs = [ sqlite ]; projectFile = "Jellyfin.Server/Jellyfin.Server.csproj"; @@ -44,6 +49,17 @@ buildDotnetModule (finalAttrs: { "--webdir=${jellyfin-web}/share/jellyfin-web" ]; + # Impurity with time. Injects the build date into this file + postFixup = '' + timestamp="$(TZ=GMT date -d "@$SOURCE_DATE_EPOCH" '+%a, %d %b %Y %X GMT')" + + cat "$out/lib/jellyfin/jellyfin.staticwebassets.endpoints.json" \ + | jq --arg timestamp "$timestamp" '.Endpoints[].ResponseHeaders[] |= if (.Name == "Last-Modified") then .Value = $timestamp else . end' \ + > jellyfin.staticwebassets.endpoints.json.new + + mv "jellyfin.staticwebassets.endpoints.json.new" "$out/lib/jellyfin/jellyfin.staticwebassets.endpoints.json" + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ko/ko/package.nix b/pkgs/by-name/ko/ko/package.nix index 2f5b5bacf38b..d7559bda4207 100644 --- a/pkgs/by-name/ko/ko/package.nix +++ b/pkgs/by-name/ko/ko/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "ko"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "ko-build"; repo = "ko"; tag = "v${finalAttrs.version}"; - hash = "sha256-o/Hin6GDFki1ynZ/rDQOhcNUTtQVvXZTAApxAaerRCU="; + hash = "sha256-bt3YjEpHE7h27rl4PeACN3AnRE2NNHd4dSJxbqPqS8U="; }; - vendorHash = "sha256-gYDYKNLTmJT0JvQ4wi/5p/3YmaaS4Re/wFqZxRbRVpg="; + vendorHash = "sha256-TR4k9kwLIfh9RZd4Tt1cw2Z9UpMB+pgal2OXkhtCY8I="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index 3908d86b2586..17e81f3c471d 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -24,14 +24,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "komikku"; - version = "50.4.0"; + version = "50.8.0"; pyproject = false; src = fetchFromCodeberg { owner = "valos"; repo = "Komikku"; tag = "v${finalAttrs.version}"; - hash = "sha256-u/OyWZJIntpeuVoJQmLrdsva3+xvwRX28N89aVZYc2o="; + hash = "sha256-u10O0+Ty73ad4vB8BgQPsV1W8NJYvzU3wyAhqHtW9v0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libmodsecurity/package.nix b/pkgs/by-name/li/libmodsecurity/package.nix index 0725a6a29569..5224f7f6e81b 100644 --- a/pkgs/by-name/li/libmodsecurity/package.nix +++ b/pkgs/by-name/li/libmodsecurity/package.nix @@ -12,7 +12,6 @@ libxml2, lmdb, lua, - pcre, pcre2, ssdeep, yajl, @@ -37,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { flex pkg-config ]; + buildInputs = [ curl geoip @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { libxml2 lmdb lua - pcre pcre2 ssdeep yajl @@ -58,34 +57,15 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--enable-parser-generation" "--disable-doxygen-doc" - "--with-curl=${curl.dev}" - "--with-libxml=${libxml2.dev}" - "--with-lmdb=${lmdb.out}" - "--with-maxmind=${libmaxminddb}" - "--with-pcre=${pcre.dev}" - "--with-pcre2=${pcre2.out}" + "--disable-examples" + "--with-lmdb=${lmdb}" "--with-ssdeep=${ssdeep}" ]; postPatch = '' - substituteInPlace build/lmdb.m4 \ - --replace "\''${path}/include/lmdb.h" "${lmdb.dev}/include/lmdb.h" \ - --replace "lmdb_inc_path=\"\''${path}/include\"" "lmdb_inc_path=\"${lmdb.dev}/include\"" - substituteInPlace build/pcre2.m4 \ - --replace "/usr/local/pcre2" "${pcre2.out}/lib" \ - --replace "\''${path}/include/pcre2.h" "${pcre2.dev}/include/pcre2.h" \ - --replace "pcre2_inc_path=\"\''${path}/include\"" "pcre2_inc_path=\"${pcre2.dev}/include\"" - substituteInPlace build/ssdeep.m4 \ - --replace "/usr/local/libfuzzy" "${ssdeep}/lib" \ - --replace "\''${path}/include/fuzzy.h" "${ssdeep}/include/fuzzy.h" \ - --replace "ssdeep_inc_path=\"\''${path}/include\"" "ssdeep_inc_path=\"${ssdeep}/include\"" - substituteInPlace modsecurity.conf-recommended \ - --replace "SecUnicodeMapFile unicode.mapping 20127" "SecUnicodeMapFile $out/share/modsecurity/unicode.mapping 20127" - # https://github.com/owasp-modsecurity/ModSecurity/blob/v3.0.15/build.sh#L6-L25 - cd src - echo "noinst_HEADERS = \\" > headers.mk - ls -1 \ + echo "noinst_HEADERS = \\" > ./src/headers.mk + ls -1 ./src/ \ actions/*.h \ actions/ctl/*.h \ actions/data/*.h \ @@ -100,8 +80,10 @@ stdenv.mkDerivation (finalAttrs: { utils/*.h \ variables/*.h \ engine/*.h \ - *.h | tr "\012" " " >> headers.mk - cd ../ + *.h | tr "\012" " " >> ./src/headers.mk + + substituteInPlace modsecurity.conf-recommended \ + --replace-fail "SecUnicodeMapFile unicode.mapping 20127" "SecUnicodeMapFile $out/share/modsecurity/unicode.mapping 20127" ''; postInstall = '' diff --git a/pkgs/by-name/lt/ltex-ls-plus/package.nix b/pkgs/by-name/lt/ltex-ls-plus/package.nix index 39ee4352f089..49f095779428 100644 --- a/pkgs/by-name/lt/ltex-ls-plus/package.nix +++ b/pkgs/by-name/lt/ltex-ls-plus/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "ltex-ls-plus"; - version = "18.6.1"; + version = "18.7.0"; src = fetchurl { url = "https://github.com/ltex-plus/ltex-ls-plus/releases/download/${version}/ltex-ls-plus-${version}.tar.gz"; - sha256 = "sha256-YhuT1ZKpecysA4DuMrgko77L0t0Ve9VanXWHbX8p3qo="; + sha256 = "sha256-z15a7ilSVw43QMB4YO8qQ8mS6GkxQkaZhdMrIYh6xlg="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/lu/lubelogger/deps.json b/pkgs/by-name/lu/lubelogger/deps.json index 20ecb61e9364..c14ba5ba99f4 100644 --- a/pkgs/by-name/lu/lubelogger/deps.json +++ b/pkgs/by-name/lu/lubelogger/deps.json @@ -19,25 +19,30 @@ "version": "4.17.0", "hash": "sha256-LGruedMrHrI0AXHcXOFxsYP2awwPbrC9Q41AeQk4+9U=" }, + { + "pname": "Microsoft.Bcl.Cryptography", + "version": "10.0.2", + "hash": "sha256-+OYtcWsd1qZcEXadYeA4t6+pyADg1APQCxpKUtP002M=" + }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.18.0", - "hash": "sha256-mkguJA4aXIVVQvSJ9Duq9mivbGXAIkLQp3a8PKy223A=" + "version": "8.19.1", + "hash": "sha256-7Y4j3WTI5fIXnt5h7WNygm8jCWHTK4JbREumCc3SfnM=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.18.0", - "hash": "sha256-MdqY9CGRs+fTLb3HYYcSfuzqDFo4Dpho4McFWWferjA=" + "version": "8.19.1", + "hash": "sha256-HQYkEF4YAqSxOBBXzSB++frSxvjwLUgpI4AuQsbFY4g=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "8.18.0", - "hash": "sha256-09WyYskyL8gjjVDzoZBQAGXgsPmyagWftALSBCdt4gg=" + "version": "8.19.1", + "hash": "sha256-zp+JxFS4feqSum93vDuckx/2P8ZhxWjtSryTGWudRc8=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.18.0", - "hash": "sha256-sFhonZW9G6H4ooQ6N/78fkZvADZ2Hf5WAS3FKd/ue1E=" + "version": "8.19.1", + "hash": "sha256-kzZPJ0XvHCnKvxgxqhy5O4iJd2SbZPTXdA1czY/LNBc=" }, { "pname": "MimeKit", diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index bd6410c6d828..9acfee56e99d 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "lubelogger"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "hargata"; repo = "lubelog"; rev = "v${version}"; - hash = "sha256-goj9xGHZaX6XMYqlvOpabTXTT3/GcuvcRjr6GwVTFA4="; + hash = "sha256-ePzR6TmByUBWGuOEg8WKMpvQT7qHGkZuBF8CkTwMtuY="; }; projectFile = "CarCareTracker.sln"; diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index d96f127310ae..ee3333f7f84b 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matugen"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "InioX"; repo = "matugen"; tag = "v${finalAttrs.version}"; - hash = "sha256-2jcqAU8QutF8AE15LYwd8cy7KjayGxUGHxvWnqAiS5M="; + hash = "sha256-xzwMDWb6pF3oStVoS8enNhpYptxdnB1NSIO7dUH6/qk="; }; - cargoHash = "sha256-RlzY0eaYrEVkO7ozzgfLHxKB2jy4nSYda9Z0jrqiUVA="; + cargoHash = "sha256-bfvlPiTlPQeedo+ikHXSI8NqdA5R5M7gCsgx7srYsMQ="; meta = { description = "Material you color generation tool"; diff --git a/pkgs/by-name/md/mdfried/package.nix b/pkgs/by-name/md/mdfried/package.nix index 276656a43e77..c6ff3e1ca665 100644 --- a/pkgs/by-name/md/mdfried/package.nix +++ b/pkgs/by-name/md/mdfried/package.nix @@ -1,35 +1,67 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, pkg-config, chafa, + fontconfig, glib, + gnumake, + gperf, + libiconv, + python3, + unzip, + writeShellScriptBin, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "mdfried"; - version = "0.22.2"; + version = "0.22.4"; src = fetchFromGitHub { owner = "benjajaja"; repo = "mdfried"; tag = "v${finalAttrs.version}"; - hash = "sha256-HRtuqnD6erRC1Xx+3NSbaFgqRHzurj1xbOJNGykGIpU="; + hash = "sha256-Zcn1C8mXwljJ3HtYgYBPyU9cVHvoNBUn7qjqx45wMhE="; }; - cargoHash = "sha256-jnByeBBL13DavExG2pVN7vNRr+UXGkxRY0a4MkwzRe0="; + cargoHash = "sha256-Nt+oBl2HX/H/7j62VjaHrY29gpd2vouevBJO0W3AYAk="; + + buildFeatures = [ "pdf" ]; + + # Prevent updateAutotoolsGnuConfigScripts from modifying mupdf's vendored + # autotools files — doing so invalidates cargo's fingerprint for mupdf-sys + # and causes a rebuild that fails on read-only cargoArtifacts files. + updateAutotoolsGnuConfigScriptsPhase = "true"; nativeBuildInputs = [ pkg-config + rustPlatform.bindgenHook # for mupdf-sys bindgen + gperf # for mupdf vendored Makefile + python3 # for mupdf vendored Makefile + unzip # for mupdf vendored docx_template build + # mupdf-sys cp_r copies files from the read-only Nix store, preserving + # mode 444. make then fails to regenerate headers. Wrap make to chmod first. + (writeShellScriptBin "make" '' + chmod -R u+w . 2>/dev/null || true + exec ${lib.getExe gnumake} "$@" + '') ]; buildInputs = [ chafa - glib + fontconfig.dev # for font-kit (mupdf dep) + glib.dev # for glib-2.0.pc (mupdf needs glib.dev, chafa could do with just glib) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv ]; + CFLAGS_aarch64_apple_darwin = lib.optionalString stdenv.hostPlatform.isDarwin "-UTARGET_OS_MAC"; + CXXFLAGS_aarch64_apple_darwin = lib.optionalString stdenv.hostPlatform.isDarwin "-UTARGET_OS_MAC"; + doCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/me/metal-cli/package.nix b/pkgs/by-name/me/metal-cli/package.nix index 81d1daf470b3..159e413645af 100644 --- a/pkgs/by-name/me/metal-cli/package.nix +++ b/pkgs/by-name/me/metal-cli/package.nix @@ -48,9 +48,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/equinix/metal-cli/"; changelog = "https://github.com/equinix/metal-cli/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - teutat3s - ]; + maintainers = [ ]; mainProgram = "metal"; }; }) diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix index fae3e2e2bfe5..1986a4057ccc 100644 --- a/pkgs/by-name/mi/miniflux/package.nix +++ b/pkgs/by-name/mi/miniflux/package.nix @@ -9,16 +9,16 @@ buildGo126Module (finalAttrs: { pname = "miniflux"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; tag = finalAttrs.version; - hash = "sha256-cUCekYGFzvqdLql2Z0YoJ4Ug1bOYFMpvhBinD3sOaB0="; + hash = "sha256-gfudc11dJKzRtsT2gEazzgGFoUVaZNqgzdIATuGH29U="; }; - vendorHash = "sha256-aTRc1SspNET3nki7dji0EKIBwSbplsNkKZWud8XJTNA="; + vendorHash = "sha256-JjZfZJyml6/ANilLNAKaounUJ35TWhj/wVWWiGEhxps="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index d22b1e8268cb..30d62e16dfb9 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mise"; - version = "2026.6.11"; + version = "2026.6.13"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; tag = "v${finalAttrs.version}"; - hash = "sha256-8sC/gSgpP2A6rh8j0aZeMq8pLwbBvcSUAxhehQlTLJg="; + hash = "sha256-/HE/2bHUz1gPpyLZnKZO5ZqT5oxOn+SZ0J4vyj67Ohs="; }; - cargoHash = "sha256-yya9rtEki0o0MfBeWK2/Mo16/I1Mg6aCZOQOP8aWJi0="; + cargoHash = "sha256-p7PCqwS0bI7kXvGYZm4bWpYhz1kkqILDCPGlEq32Cqo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mi/mist-cli/package.nix b/pkgs/by-name/mi/mist-cli/package.nix index 48b5bf6d5584..a071fe60c927 100644 --- a/pkgs/by-name/mi/mist-cli/package.nix +++ b/pkgs/by-name/mi/mist-cli/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mist-cli"; - version = "2.2"; + version = "2.3"; src = fetchurl { url = "https://github.com/ninxsoft/mist-cli/releases/download/v${finalAttrs.version}/mist-cli.${finalAttrs.version}.pkg"; - hash = "sha256-d+tm37X6JC5r23D8WTsxIkL0RU4U58pJmLermwjOgCE="; + hash = "sha256-rUIA40JTXndE7W2wQiayhAP9RPTQMeJV8d6NUy/Immk="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index e7af069352ad..4784439df727 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, writeShellScript, dash, + gitMinimal, php, phpCfg ? null, withPostgreSQL ? true, # “strongly recommended” according to docs @@ -44,13 +45,13 @@ let in php.buildComposerProject2 (finalAttrs: { pname = "movim"; - version = "0.34"; + version = "0.34.1"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; tag = "v${finalAttrs.version}"; - hash = "sha256-E2n0YxNCaNEseGjLLhFDBdvrGg/XfzxU+T/rw/6Y/qY="; + hash = "sha256-2RWTx/mhMAi13v7BUfJmGvkPc4iqKdVR0B5rCbD5YaQ="; }; php = php.buildEnv ( @@ -88,7 +89,26 @@ php.buildComposerProject2 (finalAttrs: { ++ lib.optional minify.style.enable lightningcss ++ lib.optional minify.svg.enable scour; - vendorHash = "sha256-Vs98gZAthDuYCdZiKSwmh+en4admfXSbDeoZXdbt8hQ="; + # Composer ≥2.8 defaults preferred-install to + # dist only (not auto), which prevents fallback + # to git clone when dist downloads fail (such as + # MS GitHub’s codeload.* in the build sandbox). + composerVendor = php.mkComposerVendor { + inherit (finalAttrs) + pname + src + version + vendorHash + php + ; + + postPatch = '' + composer config preferred-install auto + ''; + nativeBuildInputs = [ gitMinimal ]; + }; + + vendorHash = "sha256-hSXi1jKilsfhe5P7ElGydxu6uxOpYNeRhHlZGzgkUXw="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; diff --git a/pkgs/by-name/ne/newlib/package.nix b/pkgs/by-name/ne/newlib/package.nix index c7b3ccbe8a85..71f98d63ed6e 100644 --- a/pkgs/by-name/ne/newlib/package.nix +++ b/pkgs/by-name/ne/newlib/package.nix @@ -13,26 +13,14 @@ stdenvNoLibc.mkDerivation (finalAttrs: { pname = "newlib"; - version = "4.5.0.20241231"; + version = "4.6.0.20260123"; src = fetchurl { url = "ftp://sourceware.org/pub/newlib/newlib-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-M/EmBeAFSWWZbCXBOCs+RjsK+ReZAB9buMBjDy7IyFI="; + sha256 = "sha256-b/J+O/AiZm9D94AiVb5oDu/3IqwYGxcl0h4ugxhgTuM="; }; - patches = [ - (fetchpatch { - name = "0001-newlib-Fix-mips-libgloss-support.patch"; - url = "https://sourceware.org/git/?p=newlib-cygwin.git;a=patch;h=8a8fb570d7c5310a03a34b3dd6f9f8bb35ee9f40"; - hash = "sha256-hWS/X0jf/ZFXIR39NvNDVhkR8F81k9UWpsqDhZFxO5o="; - }) - (fetchpatch { - name = "0002-newlib-Fix-i386-libgloss-support.patch"; - url = "https://sourceware.org/git/?p=newlib-cygwin.git;a=patch;h=351842d55ee50fab672818b72f2c6bf3be1772bd;hp=4a1144dc540423b422dbec27eb433bc7dc725ae8"; - hash = "sha256-GMx9nQKJEnXbA5HFczp3xjrrU94j1oXq4lIjEf0um9Y="; - }) - ] - ++ lib.optionals nanoizeNewlib [ + patches = lib.optionals nanoizeNewlib [ # https://bugs.gentoo.org/723756 (fetchpatch { name = "newlib-3.3.0-no-nano-cxx.patch"; @@ -114,6 +102,8 @@ stdenvNoLibc.mkDerivation (finalAttrs: { ); enableParallelBuilding = true; + # install: cannot create regular file '.../powerpc-none-eabi/lib/crt0.o': File exists + enableParallelInstalling = false; dontDisableStatic = true; # apply necessary nano changes from https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/manifest/copy_nano_libraries.sh?rev=4c50be6ccb9c4205a5262a3925317073&hash=1375A7B0A1CD0DB9B9EB0D2B574ADF66 diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index becfec74d3fd..e0f52def68a3 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; buildInputs = lib.optionals enableNixImport [ - nixVersions.nix_2_28 + nixVersions.nix_2_31 boost ]; @@ -70,6 +70,12 @@ rustPlatform.buildRustPackage (finalAttrs: { "--exclude=py-nickel" ]; + checkFlags = lib.optionals enableNixImport [ + # libnixmain from Nix >= 2.31 tries to create /nix/var/nix/profiles on + # initialisation, which is rejected by the build sandbox. + "--skip=stdin_format::evaluates_nix_from_stdin" + ]; + postInstall = '' mkdir -p $nls/bin mv $out/bin/nls $nls/bin/nls diff --git a/pkgs/by-name/ni/nitter/lock.json b/pkgs/by-name/ni/nitter/lock.json index 6d33994b513b..7a5340b86800 100644 --- a/pkgs/by-name/ni/nitter/lock.json +++ b/pkgs/by-name/ni/nitter/lock.json @@ -3,36 +3,157 @@ { "method": "fetchzip", "packages": [ - "asynctools" + "jester" ], - "path": "/nix/store/ahig7j046p8mc01jgidvvvba0afccilr-source", - "rev": "pr_fix_compilation", - "sha256": "0lip4qzc49ffa9byx65n7pmsy020a589vhnly373xrfhk2zw9jmd", + "path": "/nix/store/4dxbw27sjzks7j13gdbprhskmdjylscg-source", + "ref": "v0.6.0", + "rev": "2dfac077170c62cd6ffc73e3dcfa29d29c641dcf", + "sha256": "0d35mbx1bgjfmrv8j1qph56law74wzjp3qvr2d0qj9x9d1cddz0p", "srcDir": "", - "url": "https://github.com/timotheecour/asynctools/archive/pr_fix_compilation.tar.gz" + "url": "https://github.com/dom96/jester/archive/2dfac077170c62cd6ffc73e3dcfa29d29c641dcf.tar.gz" }, { "method": "fetchzip", "packages": [ - "dotenv" + "karax" ], - "path": "/nix/store/jkf2p6sp0506crd1awpq2x98m527v4mb-source", - "ref": "2.0.2", - "rev": "19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1", - "sha256": "0dk0ixgpxmaz2kf12a3fvzdaknn38qnwgdhp7yag0m5fbhhz2kjc", + "path": "/nix/store/7wwwlplx2r1pra2yci8ld4kg6s4ckyhm-source", + "ref": "1.5.0", + "rev": "a1eaaa87af756c21db4524c38cad4a004218f740", + "sha256": "1xy3cq1z93x8hpf8c5xarg53vhhscgs4d7aq5x2j3c7hnlcr7kak", + "srcDir": "", + "url": "https://github.com/karaxnim/karax/archive/a1eaaa87af756c21db4524c38cad4a004218f740.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "sass" + ], + "path": "/nix/store/d2yidyfsqd850ijxkf3yisp0x61a0crw-source", + "ref": "v0.2.0", + "rev": "70af832b6eb37b148b0dbbc51085a73163c20041", + "sha256": "1xkjygniwpbpqzy2w5w9773jv40dklpwhcc003hbf2rn2ghpvgqw", "srcDir": "src", - "url": "https://github.com/euantorano/dotenv.nim/archive/19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1.tar.gz" + "url": "https://github.com/dom96/sass/archive/70af832b6eb37b148b0dbbc51085a73163c20041.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "nimcrypto" + ], + "path": "/nix/store/f2xp1v0vnplwfjnk8nqsi7gd9pnb9gcv-source", + "ref": "v0.7.3^{}", + "rev": "b3dbc9c4d08e58c5b7bfad6dc7ef2ee52f2f4c08", + "sha256": "1v4rz42lwcazs6isi3kmjylkisr84mh0kgmlqycx4i885dn3g0l4", + "srcDir": "", + "url": "https://github.com/cheatfate/nimcrypto/archive/b3dbc9c4d08e58c5b7bfad6dc7ef2ee52f2f4c08.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "markdown" + ], + "path": "/nix/store/3ha9jx6zafxb338r5xi1bydxnjsjppl5-source", + "ref": "v0.8.8", + "rev": "5a7a7bafd1da23b25332316a7b888e6586f4177a", + "sha256": "10b3jmq9dhyfkj3r0jwk9zigrn048jb7xwh7vkbqar5wgfgmqljr", + "srcDir": "src", + "url": "https://github.com/soasme/nim-markdown/archive/5a7a7bafd1da23b25332316a7b888e6586f4177a.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "packedjson" + ], + "path": "/nix/store/c6wn9azj0kyvl818a40hzqzis0im8gnb-source", + "rev": "9e6fbb6", + "sha256": "09yxshkfpacgl6x8f77snjcwz37r519vh7rrnqrnh5npvgk3h24j", + "srcDir": "", + "url": "https://github.com/Araq/packedjson/archive/9e6fbb6.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "supersnappy" + ], + "path": "/nix/store/v2i65kqvcgcqmlqllx8gb9ipmaqvwisr-source", + "ref": "2.1.4", + "rev": "4fed6553d539cbbfb17ab5fea16a58b4f1916e7d", + "sha256": "1a55c0v2zy4hgzckaj1bb1q9a5vgxrclrr7zqgbrlg78c7il5inf", + "srcDir": "src", + "url": "https://github.com/guzba/supersnappy/archive/4fed6553d539cbbfb17ab5fea16a58b4f1916e7d.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "redpool" + ], + "path": "/nix/store/gwh94rsq3viiy85rzk00xiyfg671ig5d-source", + "ref": "v0.2.2", + "rev": "fc7869f83d168e6ca1413fe97873140fd5805183", + "sha256": "1nvcicdkxpixmzx68bf8f7abjz3n3p5rs3lzf0qh4ggr1y4w7sfm", + "srcDir": "src", + "url": "https://github.com/zedeus/redpool/archive/fc7869f83d168e6ca1413fe97873140fd5805183.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "redis" + ], + "path": "/nix/store/d2ccdhm958z9rzampbi2din88753sbia-source", + "ref": "v0.4.1", + "rev": "a533ab242510e893f75cd8a7c9fac24a6243ec3d", + "sha256": "1d0aqfzbsl164lhh3fgk8kzmzz6sg96szzlhgqdaazmyzhg7mhz7", + "srcDir": "src", + "url": "https://github.com/zedeus/redis/archive/a533ab242510e893f75cd8a7c9fac24a6243ec3d.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "zippy" + ], + "path": "/nix/store/y7jw44rcmvhwbwd02qh6d6mnrg4xk00v-source", + "ref": "0.10.19", + "rev": "bcb8c1e1be6abb0a0e35a3c6040cdd9391cc993f", + "sha256": "0vk10ap93jqrmzxjjnwm1w45x7fvbihxjqc92nb1ic2y9x33i5v3", + "srcDir": "src", + "url": "https://github.com/guzba/zippy/archive/bcb8c1e1be6abb0a0e35a3c6040cdd9391cc993f.tar.gz" }, { "method": "fetchzip", "packages": [ "flatty" ], - "path": "/nix/store/21380smf8kyxzc4zf0qjsjx0dp5lv5rj-source", - "rev": "e668085", - "sha256": "0886lk20rg1pq56jsz1jjd8vrdz46lgdaxvp97az06mcawhbabbz", + "path": "/nix/store/8lxcz0fmm6myip77ka4sn3fms3m502gd-source", + "ref": "0.4.0", + "rev": "c7091b096bcf275f47b666ef74bce73eda187ee3", + "sha256": "1j56hhf4g5b2sm6190lxlr0qih0mdszk0d39ii79hpyzk787a6dy", "srcDir": "src", - "url": "https://github.com/treeform/flatty/archive/e668085.tar.gz" + "url": "https://github.com/treeform/flatty/archive/c7091b096bcf275f47b666ef74bce73eda187ee3.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "jsony" + ], + "path": "/nix/store/p34ky5dizbgjilm7g4yfqggz45pdgf2n-source", + "ref": "1.1.6", + "rev": "bb647e1ca21af25ffdc423bcb96feeeeae963ca2", + "sha256": "0f7mp9hf673y14dj84ysdw5xbciqkwx0mn9c12zn105mcmn1f8mm", + "srcDir": "src", + "url": "https://github.com/treeform/jsony/archive/bb647e1ca21af25ffdc423bcb96feeeeae963ca2.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "oauth" + ], + "path": "/nix/store/bqfq4db6nwycmkdrql9igsbrayqsw3g2-source", + "ref": "v0.11", + "rev": "ec2e058fc46f04deaf3cb55eca32b3b83c614953", + "sha256": "1wv8v4xid64z0wbb814n31gf3c6dzlqr3b83b5ls0kqby73krlsm", + "srcDir": "src", + "url": "https://github.com/CORDEA/oauth/archive/ec2e058fc46f04deaf3cb55eca32b3b83c614953.tar.gz" }, { "method": "fetchzip", @@ -49,123 +170,26 @@ { "method": "fetchzip", "packages": [ - "jester" + "ws" ], - "path": "/nix/store/jz86cks97is931hwsq5wf35kjwfypp6x-source", - "rev": "baca3f", - "sha256": "0i8rxsbp5yd9dasis650vqppika43mzfsls4fc7cz8k5j8xpd6zc", - "srcDir": "", - "url": "https://github.com/dom96/jester/archive/baca3f.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "jsony" - ], - "path": "/nix/store/l84av0wdc0s4r4alsvkaxcxhpd6j4bzg-source", - "rev": "1de1f08", - "sha256": "0rj205cs3v6g80h8ys9flbdq4wyd1csmkwdxv0lz21972zcsrcfh", + "path": "/nix/store/h214k8m5qdw6ajh45f2wjzld856qcvc6-source", + "ref": "0.6.0", + "rev": "c9c0c7b51e2e83cc9305a895a0b144a297b4bea8", + "sha256": "0x1jahhx0wcfay79v0xqddyadf5ckcilhv25cq1g6rarshcg1zvd", "srcDir": "src", - "url": "https://github.com/treeform/jsony/archive/1de1f08.tar.gz" + "url": "https://github.com/treeform/ws/archive/c9c0c7b51e2e83cc9305a895a0b144a297b4bea8.tar.gz" }, { "method": "fetchzip", "packages": [ - "karax" + "dotenv" ], - "path": "/nix/store/5vghbi3cfpf7zvbkn0mk9chrf0rsx4yf-source", - "rev": "5cf360c", - "sha256": "1fh0jcjlw0vfqmr5dmhk436g569qvcpml9f981x28wmvm1511z2c", - "srcDir": "", - "url": "https://github.com/karaxnim/karax/archive/5cf360c.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "markdown" - ], - "path": "/nix/store/6jpq2dp02mhjl8pkxzs0a1sjvgyg5h1r-source", - "rev": "158efe3", - "sha256": "1701q0i8yd9rrjraf5fzgcvilwnwgw3wyzzfwpr2drmn3x9pd8fj", + "path": "/nix/store/jkf2p6sp0506crd1awpq2x98m527v4mb-source", + "ref": "2.0.2", + "rev": "19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1", + "sha256": "0dk0ixgpxmaz2kf12a3fvzdaknn38qnwgdhp7yag0m5fbhhz2kjc", "srcDir": "src", - "url": "https://github.com/soasme/nim-markdown/archive/158efe3.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "nimcrypto" - ], - "path": "/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source", - "rev": "a079df9", - "sha256": "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65", - "srcDir": "", - "url": "https://github.com/cheatfate/nimcrypto/archive/a079df9.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "oauth" - ], - "path": "/nix/store/bwmrrzs6xpwizmww35461x3lqpgd0942-source", - "rev": "b8c163b", - "sha256": "0k5slyzjngbdr6g0b0dykhqmaf8r8n2klbkg2gpid4ckm8hg62v5", - "srcDir": "src", - "url": "https://github.com/CORDEA/oauth/archive/b8c163b.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "packedjson" - ], - "path": "/nix/store/c6wn9azj0kyvl818a40hzqzis0im8gnb-source", - "rev": "9e6fbb6", - "sha256": "09yxshkfpacgl6x8f77snjcwz37r519vh7rrnqrnh5npvgk3h24j", - "srcDir": "", - "url": "https://github.com/Araq/packedjson/archive/9e6fbb6.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "redis" - ], - "path": "/nix/store/x6l3kz5950fb3d0pr5hmldh0xqkqrl62-source", - "rev": "d0a0e6f", - "sha256": "166kzflb3wgwvqnv9flyynp8b35xby617lxmk0yas8i4m6vjl00f", - "srcDir": "src", - "url": "https://github.com/zedeus/redis/archive/d0a0e6f.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "redis" - ], - "path": "/nix/store/x6l3kz5950fb3d0pr5hmldh0xqkqrl62-source", - "rev": "d0a0e6f", - "sha256": "166kzflb3wgwvqnv9flyynp8b35xby617lxmk0yas8i4m6vjl00f", - "srcDir": "src", - "url": "https://github.com/zedeus/redis/archive/d0a0e6f.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "redpool" - ], - "path": "/nix/store/pkwc61k47vzvxfdhsckbyx52rrbav0gz-source", - "rev": "8b7c1db", - "sha256": "10xh5fhwnahnq1nf6j69vvnbi55kixa0ari630gr6cdx80arvbs6", - "srcDir": "src", - "url": "https://github.com/zedeus/redpool/archive/8b7c1db.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "sass" - ], - "path": "/nix/store/2nk90ab1k14px5zi8jwa30x8b8sfnbnm-source", - "rev": "7dfdd03", - "sha256": "19d78787k97l5cis81800hxa9qjr0yzjshlzdp727gh6pn8kc8fj", - "srcDir": "src", - "url": "https://github.com/dom96/sass/archive/7dfdd03.tar.gz" + "url": "https://github.com/euantorano/dotenv.nim/archive/19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1.tar.gz" }, { "method": "fetchzip", @@ -182,36 +206,13 @@ { "method": "fetchzip", "packages": [ - "supersnappy" + "asynctools" ], - "path": "/nix/store/kibhdjpd3mvn9adsp67amj35a7zrnk6y-source", - "rev": "6c94198", - "sha256": "0gxy7ijm4d2i4dkb64wwq51gns0i2d3d3rrd9cra7fyiahaph4xi", - "srcDir": "src", - "url": "https://github.com/guzba/supersnappy/archive/6c94198.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "ws" - ], - "path": "/nix/store/zd51j4dphs6h1hyhdbzdv840c8813ai8-source", - "ref": "0.5.0", - "rev": "9536bf99ddf5948db221ccb7bb3663aa238a8e21", - "sha256": "0j8z9jlvzb1h60v7rryvh2wx6vg99lra6i62whf3fknc53l641fz", - "srcDir": "src", - "url": "https://github.com/treeform/ws/archive/9536bf99ddf5948db221ccb7bb3663aa238a8e21.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "zippy" - ], - "path": "/nix/store/lhkc989wrk27wwglrxs0ahhxp2c650y5-source", - "rev": "ca5989a", - "sha256": "0rk31ispck48ilvzs0lxpp7z6y238a7d7dh7lmlfwi5i7hx13la6", - "srcDir": "src", - "url": "https://github.com/guzba/zippy/archive/ca5989a.tar.gz" + "path": "/nix/store/qdiiihi53gmbwbj06qa16p8qpks9lvw7-source", + "rev": "0e6bdc3ed5bae8c7cc9", + "sha256": "111dzyvqlg1r1jngcz3d9px8kfbxpcdi8phs26bxkmbxzjkwrmmv", + "srcDir": "", + "url": "https://github.com/cheatfate/asynctools/archive/0e6bdc3ed5bae8c7cc9.tar.gz" } ] } diff --git a/pkgs/by-name/ni/nitter/package.nix b/pkgs/by-name/ni/nitter/package.nix index 91fb44d61a3e..07f8a4888d06 100644 --- a/pkgs/by-name/ni/nitter/package.nix +++ b/pkgs/by-name/ni/nitter/package.nix @@ -10,13 +10,13 @@ buildNimPackage ( finalAttrs: prevAttrs: { pname = "nitter"; - version = "0-unstable-2026-01-29"; + version = "0-unstable-2026-06-16"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "a45227b8835719dfb443600052d69374db8b515c"; - hash = "sha256-e6u+CBdOoxLnxC4L1vE7XFr7YlXQ379Ow+khohSXNpg="; + rev = "35882ed88d422b1355b66a1ff8c1144bffdc7bdf"; + hash = "sha256-U3FDhTZIcTDNKbSjrb0F9+Y5Q6GHLmGnmwXoZ5XfATc="; }; lockFile = ./lock.json; diff --git a/pkgs/by-name/ni/nix-inspect/package.nix b/pkgs/by-name/ni/nix-inspect/package.nix index 838cdda8bec7..f1563fca7d59 100644 --- a/pkgs/by-name/ni/nix-inspect/package.nix +++ b/pkgs/by-name/ni/nix-inspect/package.nix @@ -12,7 +12,7 @@ fetchpatch2, }: let - nixComponents = nixVersions.nixComponents_2_30; + nixComponents = nixVersions.nixComponents_2_31; src = fetchFromGitHub { owner = "bluskript"; repo = "nix-inspect"; diff --git a/pkgs/by-name/ni/nix-plugins/package.nix b/pkgs/by-name/ni/nix-plugins/package.nix index c889a9cbd29b..adf934991061 100644 --- a/pkgs/by-name/ni/nix-plugins/package.nix +++ b/pkgs/by-name/ni/nix-plugins/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nixVersions, - nixComponents ? nixVersions.nixComponents_2_30, + nixComponents ? nixVersions.nixComponents_2_31, cmake, pkg-config, boost, diff --git a/pkgs/by-name/nn/nng/package.nix b/pkgs/by-name/nn/nng/package.nix index 66175b6a527f..87e980c0e29d 100644 --- a/pkgs/by-name/nn/nng/package.nix +++ b/pkgs/by-name/nn/nng/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nng"; - version = "1.11"; + version = "1.12.0"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${finalAttrs.version}"; - hash = "sha256-yH/iK/DuVff2qby/wk6jJ9Tsmxrl9eMrb9bOxCzvmdA="; + hash = "sha256-czfZYx4d8El6QOcvLhpBd82UpC4cDYI/HfYS2QOUezY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/node-manta/package.nix b/pkgs/by-name/no/node-manta/package.nix index 60edd7e1d6ea..53ca6cba9b16 100644 --- a/pkgs/by-name/no/node-manta/package.nix +++ b/pkgs/by-name/no/node-manta/package.nix @@ -53,7 +53,7 @@ buildNpmPackage rec { homepage = "https://github.com/TritonDataCenter/node-manta"; changelog = "https://github.com/TritonDataCenter/node-manta/blob/v${version}/CHANGES.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ teutat3s ]; + maintainers = [ ]; mainProgram = "mls"; }; } diff --git a/pkgs/by-name/nt/ntfy-sh/package.nix b/pkgs/by-name/nt/ntfy-sh/package.nix index bb26ca2f89d2..822dc79b6e3d 100644 --- a/pkgs/by-name/nt/ntfy-sh/package.nix +++ b/pkgs/by-name/nt/ntfy-sh/package.nix @@ -18,7 +18,7 @@ buildGoModule ( ui = buildNpmPackage { inherit (finalAttrs) src version; pname = "ntfy-sh-ui"; - npmDepsHash = "sha256-ASh88vfDrR+uf4IFOjj/SK2Hb+gwSNuKQwTGYBTogXo="; + npmDepsHash = "sha256-d+/p9ytSqZyYDBBFgnK7skM17GJbHesJsVk4sZxTcBA="; prePatch = '' cd web/ @@ -38,16 +38,16 @@ buildGoModule ( in { pname = "ntfy-sh"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; tag = "v${finalAttrs.version}"; - hash = "sha256-ca04r8kMSAqWiEN6F36n75hy46Alb21UUtQ1/mwpQcY="; + hash = "sha256-R0trtATgI+AWXlN2UWEeChMhgX9pLdcNuRLkF4P4opM="; }; - vendorHash = "sha256-9xrqa/eDpyzeLBMM31Q8CsRhdATB2DYkOoE/CxycgzY="; + vendorHash = "sha256-sfMKr5IprwjVo7GwIYojcaixlRlkHOhoqec2PcK8UUU="; doCheck = false; diff --git a/pkgs/by-name/nu/nushell-plugin-bson/package.nix b/pkgs/by-name/nu/nushell-plugin-bson/package.nix index df0ab8b9d969..2b2b89d144e1 100644 --- a/pkgs/by-name/nu/nushell-plugin-bson/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-bson/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_bson"; - version = "26.1100.0"; + version = "26.1130.0"; src = fetchFromGitHub { owner = "Kissaki"; repo = "nu_plugin_bson"; tag = "v${finalAttrs.version}"; - hash = "sha256-3Uu2YF5fnNvRP4+9GpLYjzZt7lg0kCbBl4bk4l5rEuY="; + hash = "sha256-H+pgAckWFW/jPnIL6i90BBothX5zT3/hbcDhmdvdZmY="; }; - cargoHash = "sha256-iORPlIP9kDLlJkm09SZn2lO3bWcj/Q/g+dBd2CPWiOg="; + cargoHash = "sha256-aGUlItPfrr3Uz/t1XEXBtGM285up3A5Wva1QMKwBrg0="; nativeBuildInputs = [ llvmPackages.libclang diff --git a/pkgs/by-name/nv/nvs/package.nix b/pkgs/by-name/nv/nvs/package.nix index 7aec23ac6959..c6b507222363 100644 --- a/pkgs/by-name/nv/nvs/package.nix +++ b/pkgs/by-name/nv/nvs/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "nvs"; - version = "1.12.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "y3owk1n"; repo = "nvs"; tag = "v${finalAttrs.version}"; - hash = "sha256-n0YUHNGgTpfQXGgGBur4H/VRvXbWPwUr5zKMqKCsatQ="; + hash = "sha256-cQTcaFEu94BYfJ4vbensbbEpOFWEQXfwIbajSnp9+0A="; }; - vendorHash = "sha256-l2FdnXA+vKVRekcIKt1R+MxppraTsmo0b/B7RNqnxjA="; + vendorHash = "sha256-KQVszK0LLMvi+5aWUVmTTGdUsqJrTWRLe2meb2qV2G0="; ldflags = [ "-s" diff --git a/pkgs/by-name/op/open62541/package.nix b/pkgs/by-name/op/open62541/package.nix index b55a0516c8c1..838318ed3521 100644 --- a/pkgs/by-name/op/open62541/package.nix +++ b/pkgs/by-name/op/open62541/package.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "open62541"; - version = "1.4.16"; + version = "1.4.17"; src = fetchFromGitHub { owner = "open62541"; repo = "open62541"; rev = "v${finalAttrs.version}"; - hash = "sha256-PSY1GhaCaBkp1msjynOwHz0SzzoHliM5z5AWghG2ZU4="; + hash = "sha256-EUQ/wXv1dON7MzOKmnyNUY0mTC64qUEF1++YzPC2xIo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/op/open62541pp/package.nix b/pkgs/by-name/op/open62541pp/package.nix index 2da4c9641eba..9cc530c19763 100644 --- a/pkgs/by-name/op/open62541pp/package.nix +++ b/pkgs/by-name/op/open62541pp/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "open62541pp"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "open62541pp"; repo = "open62541pp"; tag = "v${finalAttrs.version}"; - hash = "sha256-BYRPHkRG2b/k1vVyOIRK1UH7MRxEpui5YTPfdO3Wx+Y="; + hash = "sha256-zi707TD40XH/W5kJ7WXeFOX14aVJovo5WsHKsTQjt3w="; }; cmakeFlags = [ diff --git a/pkgs/by-name/op/operator-sdk/package.nix b/pkgs/by-name/op/operator-sdk/package.nix index b3414f4006d2..3569d85fad39 100644 --- a/pkgs/by-name/op/operator-sdk/package.nix +++ b/pkgs/by-name/op/operator-sdk/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "operator-sdk"; - version = "1.42.2"; + version = "1.42.3"; src = fetchFromGitHub { owner = "operator-framework"; repo = "operator-sdk"; tag = "v${finalAttrs.version}"; - hash = "sha256-jBSHrSqeUVePQ6ZOF2cooHImoplsMgxgpXdvQ/3zxrA="; + hash = "sha256-DuNgesrqZvMoGHsi9wnVPHYvvSSEYi9FxAsSEhmlTZM="; }; - vendorHash = "sha256-0cggdw8UC7iTgYXEgxcIp+Xyvu4FDUhg/tTGwx7kqxI="; + vendorHash = "sha256-FbLi+HoDsPIRoslSgMTJbb8bQ3F8pGMgOAnrSr0mGLQ="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/or/ory-talos/package.nix b/pkgs/by-name/or/ory-talos/package.nix new file mode 100644 index 000000000000..e758c88bbde9 --- /dev/null +++ b/pkgs/by-name/or/ory-talos/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + installShellFiles, +}: +buildGoModule (finalAttrs: { + pname = "talos"; + version = "26.2.0"; + src = fetchFromGitHub { + owner = "ory"; + repo = "talos"; + tag = "v${finalAttrs.version}"; + hash = "sha256-MgjKOfiwU0b3ha2rXewl5c4lGO2En7AgE2y5KtSIhPk="; + }; + vendorHash = "sha256-uSJHR/GDdCRh8sgw7GEUYUEnkwc9UAA4Qeyc+Ww4z1Q="; + __structuredAttrs = true; + env = { + CGO_ENABLED = 0; + }; + # equivalent to `go (build|test) ./...` + subPackages = [ "..." ]; + ldflags = [ + "-s" + "-X github.com/ory/talos/internal/version.Version=${finalAttrs.src.tag}" + "-X github.com/ory/talos/internal/version.Commit=${finalAttrs.src.rev}" + ]; + nativeBuildInputs = [ installShellFiles ]; + __darwinAllowLocalNetworking = true; + checkFlags = + let + skippedTests = [ + # --- FAIL: TestConfigSchemaKeysMatchConstants (0.00s) + # schema_keys_test.go:25: + # Error Trace: github.com/ory/talos/internal/configschema/schema_keys_test.go:125 + # github.com/ory/talos/internal/configschema/schema_keys_test.go:25 + # Error: Received unexpected error: + # open github.com/ory/talos/internal/config/keys.go: no such file or directory + # Test: TestConfigSchemaKeysMatchConstants + "TestConfigSchemaKeysMatchConstants" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd talos \ + --bash <($out/bin/talos completion bash) \ + --fish <($out/bin/talos completion fish) \ + --zsh <($out/bin/talos completion zsh) + ''; + meta = { + description = "Server for issuing, verifying, and managing API keys"; + longDescription = '' + It follows [cloud architecture best practices](https://www.ory.com/docs/ecosystem/software-architecture-philosophy) and focuses on: + + - Issuing, verifying, and revoking API keys at scale + - Importing externally-issued API keys for unified verification + - Deriving short-lived JWT and macaroon tokens from long-lived keys + - Side-car deployment for fast API key verification + - Low-latency verification with caching and eventual revocation + - Predictable operations through structured logging, metrics, and tracing + ''; + homepage = "https://github.com/ory/talos"; + changelog = "https://github.com/ory/talos/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + sourceProvenance = [ + lib.sourceTypes.fromSource + ]; + maintainers = with lib.maintainers; [ + debtquity + ]; + mainProgram = "talos"; + }; +}) diff --git a/pkgs/by-name/ou/oui/package.nix b/pkgs/by-name/ou/oui/package.nix index 7e7506a684c8..1c247adbe871 100644 --- a/pkgs/by-name/ou/oui/package.nix +++ b/pkgs/by-name/ou/oui/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "oui"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "thatmattlove"; repo = "oui"; rev = "v${finalAttrs.version}"; - hash = "sha256-fNG20pryfs6bDjeexpf8UlevHatY6zdvGCHSFrfz8io="; + hash = "sha256-lwjDFd2rxMh7kHOuwgIeA2/gnzHoNkGKTQGd/xqshZY="; }; vendorHash = "sha256-EOu9imj0YwYhHX7ZzE9BzhkoDitC5AHjlwoWmQs0Rj4="; diff --git a/pkgs/by-name/pk/pkgit/0001-main-handle-version-help-before-loading-the-Lua-config.patch b/pkgs/by-name/pk/pkgit/0001-main-handle-version-help-before-loading-the-Lua-config.patch new file mode 100644 index 000000000000..c62480fac27d --- /dev/null +++ b/pkgs/by-name/pk/pkgit/0001-main-handle-version-help-before-loading-the-Lua-config.patch @@ -0,0 +1,45 @@ +From 366607d5e2bc8a7e067105f1c0d0e6c2c235c131 Mon Sep 17 00:00:00 2001 +From: Philip Taron +Date: Mon, 29 Jun 2026 10:04:36 -0700 +Subject: [PATCH] main: handle --version/--help before loading the Lua config + +main() loads the Lua configuration before parsing arguments, and the +loader exits when no config file exists. That makes `pkgit --version` +and `pkgit --help` fail on a fresh install. Answer those informational +flags first so they work without a config. +--- + src/main.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/src/main.c b/src/main.c +index 9010d3e..4c45b8a 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -1,4 +1,5 @@ + #include ++#include + + #include "cla_parse.h" + #include "lua_state.h" +@@ -7,6 +8,18 @@ + + int main(int argc, char *argv[]) { + init_vars(); ++ ++ /* Respond to informational flags before loading the Lua config, which aborts ++ when no config file (~/.config/pkgit/init.lua) exists. This keeps ++ `pkgit --version` and `pkgit --help` usable on a fresh install. */ ++ for (int i = 1; i < argc; i++) { ++ if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version") || ++ !strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) { ++ cla_parse(argc, argv); ++ return 0; ++ } ++ } ++ + init_lua_state(); + setup_pkgit(); + cache_repos(); +-- +2.54.0 + diff --git a/pkgs/by-name/pk/pkgit/package.nix b/pkgs/by-name/pk/pkgit/package.nix new file mode 100644 index 000000000000..33fb6ac9254e --- /dev/null +++ b/pkgs/by-name/pk/pkgit/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchgit, + pkg-config, + luajit, + git, + makeWrapper, + nix-update-script, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pkgit"; + version = "1.1.3"; + + src = fetchgit { + url = "https://git.symlinx.net/pkgit"; + tag = finalAttrs.version; + hash = "sha256-xGrhkVA5H/expArfUbfJ8p1odUAeJiL/vbsPedd92EE="; + }; + + __structuredAttrs = true; + + patches = [ + # main() loads the Lua config (which requires ~/.config/pkgit/init.lua) + # before parsing arguments, so `pkgit --version` and `--help` abort without + # a config. Answer those informational flags first so they work standalone + # and can be used by versionCheckHook. + ./0001-main-handle-version-help-before-loading-the-Lua-config.patch + ]; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ luajit ]; + + # The Makefile defaults CC to clang via `?=`; stdenv exports CC, which wins. + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + enableParallelBuilding = true; + + # pkgit shells out to git at runtime (src/fetch_git.c execvp's "git"). + postInstall = '' + wrapProgram $out/bin/pkgit \ + --prefix PATH : ${lib.makeBinPath [ git ]} + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Unconventional package manager that compiles and installs packages directly from Git repositories"; + homepage = "https://git.symlinx.net/pkgit"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ Ra77a3l3-jar ]; + mainProgram = "pkgit"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 5d36dc85b1cd..e55e471db672 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "pkgsite"; - version = "0.2.0-unstable-2026-06-18"; + version = "0.2.0-unstable-2026-06-24"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "78ee7d155e76c298e91b46983873b8dff09e8bb6"; - hash = "sha256-0cPo7MrRNT8W0E6hyLy6WzB0hfv7OqDhz92UtJPLY34="; + rev = "60f10bf3d57b68dccf4e1dfd573a72ec8db114d5"; + hash = "sha256-9jS1eXl1Mg/YwCVSZmpePHcwRKuiGXYOiDmNALRLmyY="; }; vendorHash = "sha256-pamVUaMpkNVGY9tWPHsIiqflthzwELFOxgn90ncor/U="; diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index f8314ebeefcf..b660bb611ae8 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -204,6 +204,6 @@ buildGoModule (finalAttrs: { license = lib.licenses.asl20; teams = [ lib.teams.podman ]; mainProgram = "podman"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/po/pothos/cstring.patch b/pkgs/by-name/po/pothos/cstring.patch deleted file mode 100644 index 4e8957c3f122..000000000000 --- a/pkgs/by-name/po/pothos/cstring.patch +++ /dev/null @@ -1,50 +0,0 @@ -Submodule blocks contains modified content -diff --git a/blocks/file/BinaryFileSink.cpp b/blocks/file/BinaryFileSink.cpp -index 31c9a41..0083b0d 100644 ---- a/blocks/file/BinaryFileSink.cpp -+++ b/blocks/file/BinaryFileSink.cpp -@@ -13,6 +13,7 @@ - #endif //_MSC_VER - #include - #include -+#include - - #ifndef O_BINARY - #define O_BINARY 0 -diff --git a/blocks/file/BinaryFileSource.cpp b/blocks/file/BinaryFileSource.cpp -index 0151231..379d383 100644 ---- a/blocks/file/BinaryFileSource.cpp -+++ b/blocks/file/BinaryFileSource.cpp -@@ -13,6 +13,7 @@ - #endif //_MSC_VER - #include - #include -+#include - - #ifndef O_BINARY - #define O_BINARY 0 -diff --git a/blocks/file/TextFileSink.cpp b/blocks/file/TextFileSink.cpp -index b4b2f08..2be66e2 100644 ---- a/blocks/file/TextFileSink.cpp -+++ b/blocks/file/TextFileSink.cpp -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - - /*********************************************************************** - * |PothosDoc Text File Sink -Submodule soapy contains modified content -diff --git a/soapy/DemoController.cpp b/soapy/DemoController.cpp -index 4ce8ead..9a4e742 100644 ---- a/soapy/DemoController.cpp -+++ b/soapy/DemoController.cpp -@@ -6,6 +6,7 @@ - #include - #include - #include //min/max -+#include - - /*********************************************************************** - * |PothosDoc SDR Demo Controller diff --git a/pkgs/by-name/po/pothos/package.nix b/pkgs/by-name/po/pothos/package.nix deleted file mode 100644 index f4a275e28d32..000000000000 --- a/pkgs/by-name/po/pothos/package.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - doxygen, - pcre, - poco, - libsForQt5, - nlohmann_json, - soapysdr-with-plugins, - portaudio, - alsa-lib, - muparserx, - python3, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pothos"; - version = "0.7.1"; - - src = fetchFromGitHub { - owner = "pothosware"; - repo = "PothosCore"; - rev = "pothos-${finalAttrs.version}"; - sha256 = "038c3ipvf4sgj0zhm3vcj07ymsva4ds6v89y43f5d3p4n8zc2rsg"; - fetchSubmodules = true; - }; - - patches = [ - # spuce's CMakeLists.txt uses QT5_USE_Modules, which does not seem to work on Nix - ./spuce.patch - # Poco had some breaking API changes in 1.12 - (fetchpatch { - name = "poco-1.12-compat.patch"; - url = "https://github.com/pothosware/PothosCore/commit/092d1209b0fd0aa8a1733706c994fa95e66fd017.patch"; - hash = "sha256-bZXG8kD4+1LgDV8viZrJ/DMjg8UvW7b5keJQDXurfkA="; - }) - # various source files are missing imports of - # https://github.com/pothosware/PothosBlocks/issues/80 - ./cstring.patch - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)" - substituteInPlace spuce/{,spuce}/CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" - - substituteInPlace spuce/qt_{fir,iir,other,window}/CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" - - substituteInPlace {audio,blocks,comms,flow,plotters,python,soapy,widgets}/CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)" - - ''; - - # poco 1.14 requires c++17 - env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu++17" ]; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - pcre - poco - libsForQt5.qtbase - libsForQt5.qtsvg - libsForQt5.qwt6_1 - nlohmann_json - soapysdr-with-plugins - portaudio - alsa-lib - muparserx - python3 - ]; - - postInstall = '' - install -Dm644 $out/share/Pothos/Desktop/pothos-flow.desktop $out/share/applications/pothos-flow.desktop - install -Dm644 $out/share/Pothos/Desktop/pothos-flow-16.png $out/share/icons/hicolor/16x16/apps/pothos-flow.png - install -Dm644 $out/share/Pothos/Desktop/pothos-flow-22.png $out/share/icons/hicolor/22x22/apps/pothos-flow.png - install -Dm644 $out/share/Pothos/Desktop/pothos-flow-32.png $out/share/icons/hicolor/32x32/apps/pothos-flow.png - install -Dm644 $out/share/Pothos/Desktop/pothos-flow-48.png $out/share/icons/hicolor/48x48/apps/pothos-flow.png - install -Dm644 $out/share/Pothos/Desktop/pothos-flow-64.png $out/share/icons/hicolor/64x64/apps/pothos-flow.png - install -Dm644 $out/share/Pothos/Desktop/pothos-flow-128.png $out/share/icons/hicolor/128x128/apps/pothos-flow.png - install -Dm644 $out/share/Pothos/Desktop/pothos-flow.xml $out/share/mime/application/pothos-flow.xml - rm -r $out/share/Pothos/Desktop - ''; - - dontWrapQtApps = true; - preFixup = '' - # PothosUtil does not need to be wrapped - wrapQtApp $out/bin/PothosFlow - wrapQtApp $out/bin/spuce_fir_plot - wrapQtApp $out/bin/spuce_iir_plot - wrapQtApp $out/bin/spuce_other_plot - wrapQtApp $out/bin/spuce_window_plot - ''; - - meta = { - description = "Pothos data-flow framework"; - homepage = "https://github.com/pothosware/PothosCore/wiki"; - license = lib.licenses.boost; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -}) diff --git a/pkgs/by-name/po/pothos/spuce.patch b/pkgs/by-name/po/pothos/spuce.patch deleted file mode 100644 index ed0377540a8a..000000000000 --- a/pkgs/by-name/po/pothos/spuce.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/spuce/qt_fir/CMakeLists.txt b/spuce/qt_fir/CMakeLists.txt -index fa2e580..e32113c 100644 ---- a/spuce/qt_fir/CMakeLists.txt -+++ b/spuce/qt_fir/CMakeLists.txt -@@ -6,7 +6,7 @@ Message("Project spuce fir_plot") - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) - --FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) -+FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) - - set(SOURCES - make_filter.cpp -@@ -27,11 +27,7 @@ set_property(TARGET spuce_fir PROPERTY POSITION_INDEPENDENT_CODE TRUE) - set_property(TARGET spuce_fir_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) - set_property(TARGET spuce_fir_plot PROPERTY CXX_STANDARD 11) - --TARGET_LINK_LIBRARIES(spuce_fir_plot spuce_fir ${QT_LIBRARIES} spuce) --QT5_USE_Modules(spuce_fir_plot Gui) --QT5_USE_Modules(spuce_fir_plot Core) --QT5_USE_Modules(spuce_fir_plot Widgets) --QT5_USE_Modules(spuce_fir_plot PrintSupport) -+TARGET_LINK_LIBRARIES(spuce_fir_plot spuce_fir ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) - - INSTALL(TARGETS spuce_fir_plot DESTINATION bin) - -diff --git a/spuce/qt_iir/CMakeLists.txt b/spuce/qt_iir/CMakeLists.txt -index 4717226..debb5f9 100644 ---- a/spuce/qt_iir/CMakeLists.txt -+++ b/spuce/qt_iir/CMakeLists.txt -@@ -6,7 +6,7 @@ Message("Project spuce iir_plot") - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) - --FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) -+FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) - - set(SOURCES - make_filter.cpp -@@ -27,10 +27,6 @@ set_property(TARGET spuce_iir PROPERTY POSITION_INDEPENDENT_CODE TRUE) - set_property(TARGET spuce_iir_plot PROPERTY CXX_STANDARD 11) - set_property(TARGET spuce_iir_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) - --TARGET_LINK_LIBRARIES(spuce_iir_plot spuce_iir ${QT_LIBRARIES} spuce) --QT5_USE_Modules(spuce_iir_plot Gui) --QT5_USE_Modules(spuce_iir_plot Core) --QT5_USE_Modules(spuce_iir_plot Widgets) --QT5_USE_Modules(spuce_iir_plot PrintSupport) -+TARGET_LINK_LIBRARIES(spuce_iir_plot spuce_iir ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) - - INSTALL(TARGETS spuce_iir_plot DESTINATION bin) -diff --git a/spuce/qt_other/CMakeLists.txt b/spuce/qt_other/CMakeLists.txt -index 29c270d..e1ed778 100644 ---- a/spuce/qt_other/CMakeLists.txt -+++ b/spuce/qt_other/CMakeLists.txt -@@ -6,7 +6,7 @@ Message("Project spuce window_plot") - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) - --FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) -+FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) - - set(SOURCES make_filter.cpp) - ADD_LIBRARY(spuce_other STATIC ${SOURCES}) -@@ -23,10 +23,6 @@ ADD_EXECUTABLE(spuce_other_plot ${other_plot_SOURCES} ${other_plot_HEADERS_MOC}) - set_property(TARGET spuce_other_plot PROPERTY CXX_STANDARD 11) - set_property(TARGET spuce_other_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) - --TARGET_LINK_LIBRARIES(spuce_other_plot spuce_other ${QT_LIBRARIES} spuce) --QT5_USE_Modules(spuce_other_plot Gui) --QT5_USE_Modules(spuce_other_plot Core) --QT5_USE_Modules(spuce_other_plot Widgets) --QT5_USE_Modules(spuce_other_plot PrintSupport) -+TARGET_LINK_LIBRARIES(spuce_other_plot spuce_other ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) - - INSTALL(TARGETS spuce_other_plot DESTINATION bin) -diff --git a/spuce/qt_window/CMakeLists.txt b/spuce/qt_window/CMakeLists.txt -index e95c85b..4a77ab8 100644 ---- a/spuce/qt_window/CMakeLists.txt -+++ b/spuce/qt_window/CMakeLists.txt -@@ -6,7 +6,7 @@ Message("Project spuce window_plot") - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) - --FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) -+FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) - - set(SOURCES make_filter.cpp) - -@@ -25,10 +25,6 @@ set_property(TARGET spuce_window_plot PROPERTY CXX_STANDARD 11) - set_property(TARGET spuce_win PROPERTY POSITION_INDEPENDENT_CODE TRUE) - set_property(TARGET spuce_window_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) - --TARGET_LINK_LIBRARIES(spuce_window_plot spuce_win ${QT_LIBRARIES} spuce) --QT5_USE_Modules(spuce_window_plot Gui) --QT5_USE_Modules(spuce_window_plot Core) --QT5_USE_Modules(spuce_window_plot Widgets) --QT5_USE_Modules(spuce_window_plot PrintSupport) -+TARGET_LINK_LIBRARIES(spuce_window_plot spuce_win ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) - - INSTALL(TARGETS spuce_window_plot DESTINATION bin) diff --git a/pkgs/by-name/pr/prometheus-postgres-exporter/package.nix b/pkgs/by-name/pr/prometheus-postgres-exporter/package.nix index 7cd4e38584a2..0b0f4df1c1db 100644 --- a/pkgs/by-name/pr/prometheus-postgres-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-postgres-exporter/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-ZxUVLYb0MdCjnqFczXMCc0VVFFBoaWJhEMkxX3x5coM="; + sha256 = "sha256-YzMQd52esY51/kDYdA75tQcaDPHyJeJf2WRftsSOKwk="; }; - vendorHash = "sha256-2WJsNSKhyxObrNWDFUh5zcJwNQeEZl9rY30yspE2NQ8="; + vendorHash = "sha256-ip19YaioInP2MsFwPVnmde3kX/SYLPqsdbS96hPJG2w="; ldflags = let diff --git a/pkgs/by-name/qb/qbit-manage/package.nix b/pkgs/by-name/qb/qbit-manage/package.nix index fabd8b5bd30e..3ff0c4ba373c 100644 --- a/pkgs/by-name/qb/qbit-manage/package.nix +++ b/pkgs/by-name/qb/qbit-manage/package.nix @@ -7,13 +7,13 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "qbit-manage"; - version = "4.8.1"; + version = "4.9.1"; src = fetchFromGitHub { owner = "StuffAnThings"; repo = "qbit_manage"; tag = "v${finalAttrs.version}"; - hash = "sha256-53G0iXFJHTHRo+cNLpJAXdAYJTyceDpZCpyeZLGyY88="; + hash = "sha256-iS6DiyPqRQo/NVczumZx06VYrWgCv+w9OK4jHDKE8PQ="; }; pyproject = true; diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix index 25cbccf8d890..a7b21472bb5c 100644 --- a/pkgs/by-name/ra/rapidraw/package.nix +++ b/pkgs/by-name/ra/rapidraw/package.nix @@ -42,16 +42,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rapidraw"; - version = "1.5.6"; + version = "1.5.8"; src = fetchFromGitHub { owner = "CyberTimon"; repo = "RapidRAW"; tag = "v${finalAttrs.version}"; - hash = "sha256-pfOdq2Q7GLGbzcgFkrRiczMWnS5TImbayYE1VWenYuo="; + hash = "sha256-LbAEQwZeFeiKV6lVt8vh+mZpqlJ02RSHs0rZEMeMRc4="; }; - cargoHash = "sha256-liWOY+Jq8Yqo0QsntKjq2ntMAacfFyHCm6yhQM+KwRA="; + cargoHash = "sha256-vx4+5aMxML5Cp1s7HKHSOYS4d4HaAGO2l6jMZuFPUsQ="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; diff --git a/pkgs/by-name/rc/rcon-cli/package.nix b/pkgs/by-name/rc/rcon-cli/package.nix index 5d96d1256067..bc21c7ac7a8b 100644 --- a/pkgs/by-name/rc/rcon-cli/package.nix +++ b/pkgs/by-name/rc/rcon-cli/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "rcon-cli"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "itzg"; repo = "rcon-cli"; tag = finalAttrs.version; - hash = "sha256-GNojgZ416OheIL/b4hV4TBr7PKnEGxPSom3F1mo52hg="; + hash = "sha256-HuvRakiOlFeUbS0QVtHimhxCNaj1ppmluJbGcfR4Weg="; }; vendorHash = "sha256-MxIofF5Jj+w7gxsO+F48ymtgB3bgSutmC5Jh3GcKCnA="; diff --git a/pkgs/by-name/re/regclient/package.nix b/pkgs/by-name/re/regclient/package.nix index a0ef20843e8a..cb5ad5dbda68 100644 --- a/pkgs/by-name/re/regclient/package.nix +++ b/pkgs/by-name/re/regclient/package.nix @@ -19,15 +19,15 @@ in buildGoModule (finalAttrs: { pname = "regclient"; - version = "0.11.3"; + version = "0.11.5"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-/gKvjyFOzyTsgMuqCqZaWl2yun7f+eboQ0iLuXHh4lI="; + sha256 = "sha256-tJBnNtuN9BIlGvHekrvziyBu5gFPzbID/09eAoM5VUc="; }; - vendorHash = "sha256-P9ayAWvQY4WgmFTWzk2ZLQ5uwMvIsSfL73C99ROmze8="; + vendorHash = "sha256-jpXy3ZWj+JoDKU2r7FanKR8nQGIQPAL9GW4g//e5xZs="; outputs = [ "out" ] ++ bins; @@ -66,10 +66,22 @@ buildGoModule (finalAttrs: { '' ) bins; - checkFlags = [ - # touches network - "-skip=^ExampleNew$" - ]; + checkFlags = + let + skip = [ + # touch network + "^ExampleNew$" + "^TestIsLocal/regclient\\.org$" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # The Nix sandbox does not have the /etc/nsswitch.conf file (`hosts: files dns`), + # so Go defaults to a DNS lookup instead of using the /etc/hosts file. + "^TestIsLocal/localhost\\.$" + ]; + in + [ + "-skip=${builtins.concatStringsSep "|" skip}" + ]; passthru.tests = lib.mergeAttrsList ( map (bin: { diff --git a/pkgs/by-name/ru/runn/package.nix b/pkgs/by-name/ru/runn/package.nix index 99c9ce1a04f9..8c647922d557 100644 --- a/pkgs/by-name/ru/runn/package.nix +++ b/pkgs/by-name/ru/runn/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "runn"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "k1LoW"; repo = "runn"; tag = "v${finalAttrs.version}"; - hash = "sha256-/xSREjj9joTIEQ8L0FbaMOO8Auj/KaBmavRothcjx5c="; + hash = "sha256-BlKgr4GLW21MDKrFXTFcNCSpbQWCyflCwpj0QYKewk0="; }; - vendorHash = "sha256-bRWESZe/9Cz+I0IX6TlZP6v6/XJ+q0c61r9RWq41tfQ="; + vendorHash = "sha256-ZL1CChylgL+zIVG2QSVWC7wXUebj5ILQyhfENo3B0DA="; subPackages = [ "cmd/runn" ]; diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix index e65d78e9765f..94697b2996ad 100644 --- a/pkgs/by-name/se/secretspec/package.nix +++ b/pkgs/by-name/se/secretspec/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "secretspec"; - version = "0.12.0"; + version = "0.12.2"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-gPavr9V/mtr7mfdmgaVkE6GwIfal44JUOPR/SW1ZPqY="; + hash = "sha256-Oj1CaiL0uGhlyrJK+xfKLH3f9wYDQTIiDTxop3BTnNs="; }; - cargoHash = "sha256-ZO+vwclanqZ8z8mXTP3ytwMqsKauMceR/soPC3vXNmo="; + cargoHash = "sha256-5VKiagAQnUIL1i36hQ+zUgScfBkg0uwKG3FMQdrlIq4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/se/semantic-release/package.nix b/pkgs/by-name/se/semantic-release/package.nix index 16d07edb37e3..5d14366f595d 100644 --- a/pkgs/by-name/se/semantic-release/package.nix +++ b/pkgs/by-name/se/semantic-release/package.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "semantic-release"; - version = "25.0.2"; + version = "25.0.5"; src = fetchFromGitHub { owner = "semantic-release"; repo = "semantic-release"; rev = "v${version}"; - hash = "sha256-iucXpzB9Rd7HuAxg7ZYLuY8j7zRCYxjly5zhyFOmDak="; + hash = "sha256-D1UIRAbLJBJ9IpIgq90fYh1B5295gUaDP4TKwNUoldI="; }; - npmDepsHash = "sha256-FrwwER5/QNBV7Ppby7bJMBV8bfgTCWjeORPv9/KjeNo="; + npmDepsHash = "sha256-WADHFSDyZ9jCYERaux/0BV31l24Dh4vdwDUC98Jx754="; dontNpmBuild = true; diff --git a/pkgs/by-name/se/servarr-ffmpeg/package.nix b/pkgs/by-name/se/servarr-ffmpeg/package.nix index 0692c8a38bc2..023bfab478a0 100644 --- a/pkgs/by-name/se/servarr-ffmpeg/package.nix +++ b/pkgs/by-name/se/servarr-ffmpeg/package.nix @@ -38,6 +38,8 @@ in withCudaLLVM = false; withCuvid = false; withDrm = false; + withGmp = false; + withNetwork = false; withNvcodec = false; withFontconfig = false; withFreetype = false; diff --git a/pkgs/by-name/sf/sftpgo/package.nix b/pkgs/by-name/sf/sftpgo/package.nix index dddc8bd970f8..a8bc349e2d1c 100644 --- a/pkgs/by-name/sf/sftpgo/package.nix +++ b/pkgs/by-name/sf/sftpgo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; tag = "v${version}"; - hash = "sha256-6VCm9rbC63UE5yUaY0JVe+Mf3thK+ZDhSOzzIvI1vzA="; + hash = "sha256-sCmy+UVKmO3mEHJ8mgND5DrvfRxMG2JlBgN508tzmmI="; }; - vendorHash = "sha256-EB5Vyn08yZGl9HVaLAhgkJw/iuY07scd689my9aEimY="; + vendorHash = "sha256-wbkkcPAnCMQile52pDr7L7T//gd0Tkrivh7v8igKlEs="; ldflags = [ "-s" diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index 601a08a1703c..a3cfaba6c73d 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shader-slang"; - version = "2026.11"; + version = "2026.12"; src = fetchFromGitHub { owner = "shader-slang"; repo = "slang"; tag = "v${finalAttrs.version}"; - hash = "sha256-PnqnTd6ccOK6WWCEdan0l6NFy/0Iv0nIbfk3oywTQZU="; + hash = "sha256-TG7jb6zECiUU6T4LALw6mZaANtI38MtxANn67vyCgZ0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix index 1ccc339a2409..cd229d837413 100644 --- a/pkgs/by-name/sl/slack/package.nix +++ b/pkgs/by-name/sl/slack/package.nix @@ -24,7 +24,6 @@ let maintainers = with lib.maintainers; [ mmahut prince213 - teutat3s ]; platforms = [ "x86_64-darwin" diff --git a/pkgs/by-name/so/sonar-scanner-cli/package.nix b/pkgs/by-name/so/sonar-scanner-cli/package.nix index 1f400aa4e543..fca39725419e 100644 --- a/pkgs/by-name/so/sonar-scanner-cli/package.nix +++ b/pkgs/by-name/so/sonar-scanner-cli/package.nix @@ -11,16 +11,16 @@ maven.buildMavenPackage rec { pname = "sonar-scanner-cli"; - version = "7.3.0.5189"; + version = "8.1.0.6389"; src = fetchFromGitHub { owner = "SonarSource"; repo = "sonar-scanner-cli"; tag = version; - hash = "sha256-Vbd+vQKFQo/wzGF4ekcCiEczlyuTD41Liz+nePR9lVA="; + hash = "sha256-CzoRuTi5GHp+Lfyh/h3PlFiVznZjPmuvZFUCmScpToY="; }; - mvnHash = "sha256-1SPpGu6uQ1Xa0U/DUjfZAXi6SQN/8LImU6THv4e9CSo="; + mvnHash = "sha256-Arznu7llonwfIOMtHbqzv55D8uy1IEoF4JfIX8W1bVk="; mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"; @@ -74,6 +74,7 @@ maven.buildMavenPackage rec { description = "Scanner CLI for SonarQube and SonarCloud"; homepage = "https://github.com/SonarSource/sonar-scanner-cli"; license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ kmjayadeep ]; mainProgram = "sonar-scanner"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/sp/splayer/electron-builder-26.8.2.patch b/pkgs/by-name/sp/splayer/electron-builder-26.8.2.patch new file mode 100644 index 000000000000..85e673554f59 --- /dev/null +++ b/pkgs/by-name/sp/splayer/electron-builder-26.8.2.patch @@ -0,0 +1,433 @@ +--- a/package.json 2026-06-29 23:54:36.363539465 +0800 ++++ b/package.json 2026-06-29 23:51:54.726132777 +0800 +@@ -104,7 +104,7 @@ + "ajv": "^8.20.0", + "crypto-js": "^4.2.0", + "electron": "^41.7.1", +- "electron-builder": "^26.8.1", ++ "electron-builder": "^26.8.2", + "electron-log": "^5.4.4", + "electron-vite": "^5.0.0", + "eslint": "^9.39.4", +--- a/pnpm-lock.yaml 2026-06-29 23:54:36.384329555 +0800 ++++ b/pnpm-lock.yaml 2026-06-29 23:51:45.849109557 +0800 +@@ -197,8 +197,8 @@ + specifier: ^41.7.1 + version: 41.7.1 + electron-builder: +- specifier: ^26.8.1 +- version: 26.8.1(electron-builder-squirrel-windows@26.0.12) ++ specifier: ^26.8.2 ++ version: 26.8.2(electron-builder-squirrel-windows@26.0.12) + electron-log: + specifier: ^5.4.4 + version: 5.4.4 +@@ -567,8 +567,8 @@ + engines: {node: '>=12.13.0'} + hasBin: true + +- '@electron/rebuild@4.0.4': +- resolution: {integrity: sha512-Rzc39XPdk/+/wBG8MfwAHohXflep0ITUfulb6Rgz3R0NeSB1noE+E9/M/cb8ftCAiyDD9PPhLuuWgE1GaInbKg==} ++ '@electron/rebuild@4.0.6': ++ resolution: {integrity: sha512-323ygp5Lz4DP2nVu54NLCx4n0TKsQ3OMDG3PPeOFjOTMDtSxGbCi7mQfWBc5C80pp+9awEsiHx9HR9DfAM/IEQ==} + engines: {node: '>=22.12.0'} + hasBin: true + +@@ -2700,8 +2700,8 @@ + dmg-builder: 26.0.12 + electron-builder-squirrel-windows: 26.0.12 + +- app-builder-lib@26.8.1: +- resolution: {integrity: sha512-p0Im/Dx5C4tmz8QEE1Yn4MkuPC8PrnlRneMhWJj7BBXQfNTJUshM/bp3lusdEsDbvvfJZpXWnYesgSLvwtM2Zw==} ++ app-builder-lib@26.8.2: ++ resolution: {integrity: sha512-z3ptLzJwNl35fyR0wxv4qWOfZuU36VysYHnbs8PDtf8S0QzIl2OWimdDFVmCxYMkIV1k/RT9CeTgcP7oUznFOw==} + engines: {node: '>=14.0.0'} + peerDependencies: + dmg-builder: 26.0.12 +@@ -3346,8 +3347,8 @@ + electron-builder-squirrel-windows@26.0.12: + resolution: {integrity: sha512-kpwXM7c/ayRUbYVErQbsZ0nQZX4aLHQrPEG9C4h9vuJCXylwFH8a7Jgi2VpKIObzCXO7LKHiCw4KdioFLFOgqA==} + +- electron-builder@26.8.1: +- resolution: {integrity: sha512-uWhx1r74NGpCagG0ULs/P9Nqv2nsoo+7eo4fLUOB8L8MdWltq9odW/uuLXMFCDGnPafknYLZgjNX0ZIFRzOQAw==} ++ electron-builder@26.8.2: ++ resolution: {integrity: sha512-ieiiXPdgH3qrG6lcvy2mtnI5iEmAopmLuVRMSJ5j40weU0tgpNx0OAk9J5X5nnO0j9+KIkxHzwFZVUDk1U3aGw==} + engines: {node: '>=14.0.0'} + hasBin: true + +@@ -3748,6 +3749,10 @@ + resolution: {integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==} + engines: {node: '>= 6'} + ++ form-data@4.0.6: ++ resolution: {integrity: sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==} ++ engines: {node: '>= 6'} ++ + forwarded@0.2.0: + resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} + engines: {node: '>= 0.6'} +@@ -4185,6 +4190,10 @@ + resolution: {integrity: sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==} + hasBin: true + ++ js-yaml@4.3.0: ++ resolution: {integrity: sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==} ++ hasBin: true ++ + jsesc@3.1.0: + resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==} + engines: {node: '>=6'} +@@ -4635,8 +4644,8 @@ + resolution: {integrity: sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==} + engines: {node: '>= 6.13.0'} + +- node-gyp@12.3.0: +- resolution: {integrity: sha512-QNcUWM+HgJplcPzBvFBZ9VXacyGZ4+VTOb80PwWR+TlVzoHbRKULNEzpRsnaoxG3Wzr7Qh7BYxGDU3CbKib2Yg==} ++ node-gyp@12.4.0: ++ resolution: {integrity: sha512-OMcPNvqTCFUnNaBlmdgq+lfNqY7gTiSmNRDjY3uAXRyudeKZEZxu3CLtjMQrx4zZxCX2b/mpNqTtwuCJgXhHkw==} + engines: {node: ^20.17.0 || >=22.9.0} + hasBin: true + +@@ -5200,6 +5209,11 @@ + engines: {node: '>=10'} + hasBin: true + ++ semver@7.8.5: ++ resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==} ++ engines: {node: '>=10'} ++ hasBin: true ++ + send@0.19.2: + resolution: {integrity: sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==} + engines: {node: '>= 0.8.0'} +@@ -5449,8 +5463,8 @@ + resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} + engines: {node: '>=10'} + +- tar@7.5.16: +- resolution: {integrity: sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==} ++ tar@7.5.19: ++ resolution: {integrity: sha512-4LeEWl96twnS2Q7Bz4MGqgazLqO+hJN63GZxXoIqh1T3VweYD997gbU1ItNsQafqqXTXd5WFyFdReLtwvRBNiw==} + engines: {node: '>=18'} + + temp-file@3.4.0: +@@ -5586,8 +5600,8 @@ + undici-types@7.18.2: + resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==} + +- undici@6.26.0: +- resolution: {integrity: sha512-4yqz8a3n5HmGTlsbADNtr/dJlhkh/55Rq798G6ibiULcXbDtaLpTl1pvdqcbFfeoj3iSi52lePFM7h9H21cw/A==} ++ undici@6.27.0: ++ resolution: {integrity: sha512-YmfV3YnEDzXRC5lZ2jWtWWHKGUm1zIt8AhesR1tens+HTNv+YZlN/dp6G727LOvMJ8xjP9Be7Y2Sdr96LDm+pg==} + engines: {node: '>=18.17'} + + undici@7.27.1: +@@ -5995,8 +6009,8 @@ + resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==} + engines: {node: '>=8'} + +- yargs@17.7.2: +- resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} ++ yargs@17.7.3: ++ resolution: {integrity: sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==} + engines: {node: '>=12'} + + yargs@18.0.0: +@@ -6348,7 +6362,7 @@ + make-fetch-happen: 10.2.1 + nopt: 6.0.0 + proc-log: 2.0.1 +- semver: 7.8.2 ++ semver: 7.8.5 + tar: 6.2.1 + which: 2.0.2 + transitivePeerDependencies: +@@ -6398,20 +6412,20 @@ + node-api-version: 0.2.1 + ora: 5.4.1 + read-binary-file-arch: 1.0.6 +- semver: 7.8.2 ++ semver: 7.8.5 + tar: 6.2.1 +- yargs: 17.7.2 ++ yargs: 17.7.3 + transitivePeerDependencies: + - bluebird + - supports-color + +- '@electron/rebuild@4.0.4': ++ '@electron/rebuild@4.0.6': + dependencies: + '@malept/cross-spawn-promise': 2.0.0 + debug: 4.4.3 + node-abi: 4.31.0 + node-api-version: 0.2.1 +- node-gyp: 12.3.0 ++ node-gyp: 12.4.0 + read-binary-file-arch: 1.0.6 + transitivePeerDependencies: + - supports-color +@@ -7410,7 +7424,7 @@ + '@npmcli/fs@2.1.2': + dependencies: + '@gar/promisify': 1.1.3 +- semver: 7.8.2 ++ semver: 7.8.5 + + '@npmcli/move-file@2.0.1': + dependencies: +@@ -7931,7 +7945,7 @@ + '@typescript-eslint/visitor-keys': 8.60.1 + debug: 4.4.3 + minimatch: 10.2.5 +- semver: 7.8.2 ++ semver: 7.8.5 + tinyglobby: 0.2.17 + ts-api-utils: 2.5.0(typescript@6.0.3) + typescript: 6.0.3 +@@ -8260,13 +8274,13 @@ + hosted-git-info: 4.1.0 + is-ci: 3.0.1 + isbinaryfile: 5.0.7 +- js-yaml: 4.2.0 ++ js-yaml: 4.3.0 + json5: 2.2.3 + lazy-val: 1.0.5 + minimatch: 10.2.5 + plist: 3.1.0 + resedit: 1.7.2 +- semver: 7.8.2 ++ semver: 7.8.5 + tar: 6.2.1 + temp-file: 3.4.0 + tiny-async-pool: 1.3.0 +@@ -8274,7 +8288,7 @@ + - bluebird + - supports-color + +- app-builder-lib@26.8.1(dmg-builder@26.0.12)(electron-builder-squirrel-windows@26.0.12): ++ app-builder-lib@26.8.2(dmg-builder@26.0.12)(electron-builder-squirrel-windows@26.0.12): + dependencies: + '@develar/schema-utils': 2.6.5 + '@electron/asar': 3.4.1 +@@ -8282,7 +8296,7 @@ + '@electron/get': 3.1.0 + '@electron/notarize': 2.5.0 + '@electron/osx-sign': 1.3.3 +- '@electron/rebuild': 4.0.4 ++ '@electron/rebuild': 4.0.6 + '@electron/universal': 2.0.3 + '@malept/flatpak-bundler': 0.4.0 + '@types/fs-extra': 9.0.13 +@@ -8302,7 +8316,7 @@ + hosted-git-info: 4.1.0 + isbinaryfile: 5.0.7 + jiti: 2.7.0 +- js-yaml: 4.2.0 ++ js-yaml: 4.3.0 + json5: 2.2.3 + lazy-val: 1.0.5 + minimatch: 10.2.5 +@@ -8310,7 +8324,7 @@ + proper-lockfile: 4.1.2 + resedit: 1.7.2 + semver: 7.7.4 +- tar: 7.5.16 ++ tar: 7.5.19 + temp-file: 3.4.0 + tiny-async-pool: 1.3.0 + which: 5.0.0 +@@ -8530,7 +8544,7 @@ + http-proxy-agent: 7.0.2 + https-proxy-agent: 7.0.6 + is-ci: 3.0.1 +- js-yaml: 4.2.0 ++ js-yaml: 4.3.0 + sanitize-filename: 1.6.4 + source-map-support: 0.5.21 + stat-mode: 1.0.0 +@@ -8551,7 +8565,7 @@ + fs-extra: 10.1.0 + http-proxy-agent: 7.0.2 + https-proxy-agent: 7.0.6 +- js-yaml: 4.2.0 ++ js-yaml: 4.3.0 + sanitize-filename: 1.6.4 + source-map-support: 0.5.21 + stat-mode: 1.0.0 +@@ -8951,7 +8965,7 @@ + builder-util-runtime: 9.3.1 + fs-extra: 10.1.0 + iconv-lite: 0.6.3 +- js-yaml: 4.2.0 ++ js-yaml: 4.3.0 + optionalDependencies: + dmg-license: 1.0.11 + transitivePeerDependencies: +@@ -9016,9 +9030,9 @@ + - dmg-builder + - supports-color + +- electron-builder@26.8.1(electron-builder-squirrel-windows@26.0.12): ++ electron-builder@26.8.2(electron-builder-squirrel-windows@26.0.12): + dependencies: +- app-builder-lib: 26.8.1(dmg-builder@26.0.12)(electron-builder-squirrel-windows@26.0.12) ++ app-builder-lib: 26.8.2(dmg-builder@26.0.12)(electron-builder-squirrel-windows@26.0.12) + builder-util: 26.8.1 + builder-util-runtime: 9.5.1 + chalk: 4.1.2 +@@ -9027,7 +9041,7 @@ + fs-extra: 10.1.0 + lazy-val: 1.0.5 + simple-update-notifier: 2.0.0 +- yargs: 17.7.2 ++ yargs: 17.7.3 + transitivePeerDependencies: + - bluebird + - electron-builder-squirrel-windows +@@ -9041,7 +9055,7 @@ + builder-util: 26.0.11 + builder-util-runtime: 9.3.1 + chalk: 4.1.2 +- form-data: 4.0.5 ++ form-data: 4.0.6 + fs-extra: 10.1.0 + lazy-val: 1.0.5 + mime: 2.6.0 +@@ -9054,7 +9068,7 @@ + builder-util: 26.8.1 + builder-util-runtime: 9.5.1 + chalk: 4.1.2 +- form-data: 4.0.5 ++ form-data: 4.0.6 + fs-extra: 10.1.0 + lazy-val: 1.0.5 + mime: 2.6.0 +@@ -9635,6 +9649,14 @@ + hasown: 2.0.4 + mime-types: 2.1.35 + ++ form-data@4.0.6: ++ dependencies: ++ asynckit: 0.4.0 ++ combined-stream: 1.0.8 ++ es-set-tostringtag: 2.1.0 ++ hasown: 2.0.4 ++ mime-types: 2.1.35 ++ + forwarded@0.2.0: {} + + fresh@0.5.2: {} +@@ -10067,6 +10089,10 @@ + dependencies: + argparse: 2.0.1 + ++ js-yaml@4.3.0: ++ dependencies: ++ argparse: 2.0.1 ++ + jsesc@3.1.0: {} + + json-buffer@3.0.1: {} +@@ -10545,7 +10571,7 @@ + + node-abi@3.92.0: + dependencies: +- semver: 7.8.2 ++ semver: 7.8.5 + + node-abi@4.31.0: + dependencies: +@@ -10563,7 +10589,7 @@ + + node-forge@1.4.0: {} + +- node-gyp@12.3.0: ++ node-gyp@12.4.0: + dependencies: + env-paths: 2.2.1 + exponential-backoff: 3.1.3 +@@ -10571,9 +10597,9 @@ + nopt: 9.0.0 + proc-log: 6.1.0 + semver: 7.7.4 +- tar: 7.5.16 ++ tar: 7.5.19 + tinyglobby: 0.2.17 +- undici: 6.26.0 ++ undici: 6.27.0 + which: 6.0.1 + + node-releases@2.0.47: {} +@@ -10581,7 +10607,7 @@ + node-windows@1.0.0-beta.8: + dependencies: + xml: 1.0.1 +- yargs: 17.7.2 ++ yargs: 17.7.3 + + nopt@6.0.0: + dependencies: +@@ -11156,6 +11182,8 @@ + + semver@7.8.2: {} + ++ semver@7.8.5: {} ++ + send@0.19.2: + dependencies: + debug: 2.6.9 +@@ -11223,7 +11251,7 @@ + dependencies: + color: 4.2.3 + detect-libc: 2.1.2 +- semver: 7.8.2 ++ semver: 7.8.5 + optionalDependencies: + '@img/sharp-darwin-arm64': 0.33.5 + '@img/sharp-darwin-x64': 0.33.5 +@@ -11308,7 +11336,7 @@ + + simple-update-notifier@2.0.0: + dependencies: +- semver: 7.8.2 ++ semver: 7.8.5 + + sirv@3.0.2: + dependencies: +@@ -11496,7 +11524,7 @@ + mkdirp: 1.0.4 + yallist: 4.0.0 + +- tar@7.5.16: ++ tar@7.5.19: + dependencies: + '@isaacs/fs-minipass': 4.0.1 + chownr: 3.0.0 +@@ -11622,7 +11650,7 @@ + + undici-types@7.18.2: {} + +- undici@6.26.0: {} ++ undici@6.27.0: {} + + undici@7.27.1: {} + +@@ -12028,7 +12056,7 @@ + dependencies: + ansi-styles: 6.2.3 + string-width: 7.2.0 +- strip-ansi: 7.1.2 ++ strip-ansi: 7.2.0 + + wrappy@1.0.2: {} + +@@ -12087,7 +12115,7 @@ + y18n: 4.0.3 + yargs-parser: 18.1.3 + +- yargs@17.7.2: ++ yargs@17.7.3: + dependencies: + cliui: 8.0.1 + escalade: 3.2.0 diff --git a/pkgs/by-name/sp/splayer/package.nix b/pkgs/by-name/sp/splayer/package.nix index d250fc2376f6..61f647b49e41 100644 --- a/pkgs/by-name/sp/splayer/package.nix +++ b/pkgs/by-name/sp/splayer/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - pnpm_10_29_2, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -21,7 +21,7 @@ }: let electron = electron_41; - pnpm = pnpm_10_29_2; + pnpm = pnpm_10; in stdenv.mkDerivation (finalAttrs: { pname = "splayer"; @@ -40,12 +40,16 @@ stdenv.mkDerivation (finalAttrs: { pname version src + patches ; inherit pnpm; fetcherVersion = 3; - hash = "sha256-zmLc+ExrZg/y2PEI5rH+no9WenE6I+2bLkdXcA/nOic="; + hash = "sha256-HCSuCtJXaRMLCCZIKQ4ElDkrlYXFUIsHfK1H3pUSQX4="; }; + # When pnpm >= 10.29.3 and electron-builder < 26.8.2, it causes the package to fail at runtime; this patch will be removed once the upstream releases a version that includes the new version of electron-builder. + patches = [ ./electron-builder-26.8.2.patch ]; + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname diff --git a/pkgs/by-name/st/stellar-core/package.nix b/pkgs/by-name/st/stellar-core/package.nix index e35e8dadd02f..db357501e549 100644 --- a/pkgs/by-name/st/stellar-core/package.nix +++ b/pkgs/by-name/st/stellar-core/package.nix @@ -48,13 +48,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "stellar-core"; - version = "27.0.0"; + version = "27.1.0"; src = fetchFromGitHub { owner = "stellar"; repo = "stellar-core"; tag = "v${finalAttrs.version}"; - hash = "sha256-ikTkp/r24xTJ+RDMlu5q8PmFvGUeLz/sejeIjOSmd5M="; + hash = "sha256-EXtfkjNOl3Loml7GXWYE8hh/IqItqA677YEh0Ve6dOI="; fetchSubmodules = true; }; @@ -69,16 +69,11 @@ stdenv.mkDerivation (finalAttrs: { p26 = "sha256-OxkiWTzNtmYxB64OtLUwghAkcT//SnMZVfUXynFg2Bg="; p27 = "sha256-KcsyPBJLUOwRAtp95IYFiZZNMi1xWmYW7XXG+bMucmY="; }; - in - symlinkJoin { - name = "stellar-core-${finalAttrs.version}-cargo-vendor-dir"; - paths = [ - (rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - hash = "sha256-e7WGYm5RLmg9vjcMjy98RBW0QqjGTd8cPPeilhYbZ2I="; - }) - ] - ++ lib.mapAttrsToList ( + mainCargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + hash = "sha256-8seehYc2W0lvW9WPewPHC3cLR9Lgj2qCib/EXK0gwVA="; + }; + sorobanCargoDeps = lib.mapAttrs ( protocol: hash: rustPlatform.fetchCargoVendor { pname = "stellar-core-${protocol}"; @@ -87,6 +82,13 @@ stdenv.mkDerivation (finalAttrs: { inherit hash; } ) sorobanProtocolHashes; + in + symlinkJoin { + name = "stellar-core-${finalAttrs.version}-cargo-vendor-dir"; + paths = [ mainCargoDeps ] ++ lib.attrValues sorobanCargoDeps; + passthru = { + inherit sorobanProtocolHashes mainCargoDeps sorobanCargoDeps; + }; postBuild = '' # `soroban-synth-wasm` resolves this path relative to the vendored git # source root, but cargo vendors the workspace crates with versioned @@ -160,6 +162,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; + passthru = { + updateScript = ./update.sh; + }; + meta = { description = "Reference peer-to-peer agent that manages the Stellar network"; longDescription = '' diff --git a/pkgs/by-name/st/stellar-core/update.sh b/pkgs/by-name/st/stellar-core/update.sh new file mode 100755 index 000000000000..4a242c8d4fb0 --- /dev/null +++ b/pkgs/by-name/st/stellar-core/update.sh @@ -0,0 +1,80 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash common-updater-scripts coreutils curl jq nix perl + +set -euo pipefail + +script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" +nixpkgs="$(cd "$script_dir/../../../.." >/dev/null 2>&1 && pwd)" +nix_file="$script_dir/package.nix" +attr="stellar-core" +github_repo="stellar/stellar-core" + +cd "$nixpkgs" + +old_version="$(nix-instantiate --eval --raw -A "$attr.version")" +latest_tag="$(curl -fsS ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/$github_repo/releases/latest" | jq -r '.tag_name')" +latest_version="${latest_tag#v}" +fake_hash="$(nix-instantiate --eval --raw -A lib.fakeHash)" + +soroban_revs() { + local version_tag="$1" + + curl -fsS ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/$github_repo/git/trees/$version_tag?recursive=1" \ + | jq ' + reduce ( + .tree[] + | select(.mode == "160000" and (.path | test("^src/rust/soroban/p[0-9]+$"))) + ) as $submodule ({}; + .[$submodule.path | sub("^src/rust/soroban/"; "")] = $submodule.sha + ) + ' +} + +current_soroban_hashes="$(nix-instantiate --eval --json -A "$attr.cargoDeps.sorobanProtocolHashes")" +old_soroban_revs="{}" +new_soroban_revs="$(soroban_revs "$latest_tag")" + +if [[ "$(jq length <<< "$new_soroban_revs")" -eq 0 ]]; then + echo "Could not find Soroban protocol submodules in $latest_tag" >&2 + exit 1 +fi + +if [[ "$old_version" != "$latest_version" ]]; then + old_soroban_revs="$(soroban_revs "v$old_version")" +fi + +protocols="$( + jq --compact-output \ + --arg fake_hash "$fake_hash" \ + --argjson hashes "$current_soroban_hashes" \ + --argjson old "$old_soroban_revs" \ + ' + . as $new + | keys + | sort_by(ltrimstr("p") | tonumber) + | map({ + protocol: ., + hash: ($hashes[.] // $fake_hash), + needsUpdate: ($hashes[.] == null or ($old[.] != null and $old[.] != $new[.])) + }) + ' <<< "$new_soroban_revs" +)" +soroban_hash_lines="$(jq -r '.[] | " \(.protocol) = \"\(.hash)\";"' <<< "$protocols")" +mapfile -t soroban_protocols_to_update < <(jq -r '.[] | select(.needsUpdate).protocol' <<< "$protocols") + +update-source-version "$attr" "$latest_version" + +SOROBAN_HASH_LINES="$soroban_hash_lines" \ +perl -0pi -e ' + s/(sorobanProtocolHashes = \{\n).*?(\n[[:space:]]+\};)/$1$ENV{SOROBAN_HASH_LINES}$2/s; +' "$nix_file" + +update-source-version "$attr" \ + --ignore-same-version \ + --source-key=cargoDeps.mainCargoDeps.vendorStaging + +for protocol in "${soroban_protocols_to_update[@]}"; do + update-source-version "$attr" \ + --ignore-same-version \ + --source-key="cargoDeps.sorobanCargoDeps.$protocol.vendorStaging" +done diff --git a/pkgs/by-name/st/stellarium/package.nix b/pkgs/by-name/st/stellarium/package.nix index 39d0af1b216b..eb4467640c1e 100644 --- a/pkgs/by-name/st/stellarium/package.nix +++ b/pkgs/by-name/st/stellarium/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stellarium"; - version = "26.1"; + version = "26.2"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; - rev = "v${finalAttrs.version}"; - hash = "sha256-U7aiHkkIjUOxOU39u2yjFk5BDHvtKs8J3K1vz8Q2gxU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-mNm79atM7G3p6jHmoK9Ix1+el1jP8ZNJHRaXcbObbdg="; }; patches = [ diff --git a/pkgs/by-name/st/stremio-linux-shell/allow-local-network-access.patch b/pkgs/by-name/st/stremio-linux-shell/allow-local-network-access.patch deleted file mode 100644 index 524d20502b3b..000000000000 --- a/pkgs/by-name/st/stremio-linux-shell/allow-local-network-access.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/webview/app/mod.rs b/src/webview/app/mod.rs -index 2c6125e..26ab73f 100644 ---- a/src/webview/app/mod.rs -+++ b/src/webview/app/mod.rs -@@ -23,6 +23,10 @@ cef_impl!( - CMD_SWITCHES.iter().for_each(|switch| { - line.append_switch(Some(&CefString::from(switch.to_owned()))); - }); -+ line.append_switch_with_value( -+ Some(&CefString::from("disable-features")), -+ Some(&CefString::from("LocalNetworkAccessChecks")), -+ ); - } - } - diff --git a/pkgs/by-name/st/stremio-linux-shell/better-server-path.patch b/pkgs/by-name/st/stremio-linux-shell/better-server-path.patch deleted file mode 100644 index 8e7cb8d1370b..000000000000 --- a/pkgs/by-name/st/stremio-linux-shell/better-server-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/config.rs b/src/config.rs -index 4eda395..679699f 100644 ---- a/src/config.rs -+++ b/src/config.rs -@@ -70,7 +70,7 @@ pub struct ServerConfig { - - impl ServerConfig { - pub fn new(current_dir: &Path) -> Self { -- let file = current_dir.join(SERVER_FILE); -+ let file = Path::new("@serverjs@").to_path_buf(); - - Self { file } - } diff --git a/pkgs/by-name/st/stremio-linux-shell/fix-getshaderinfolog-call.patch b/pkgs/by-name/st/stremio-linux-shell/fix-getshaderinfolog-call.patch deleted file mode 100644 index 6a0af3cb1953..000000000000 --- a/pkgs/by-name/st/stremio-linux-shell/fix-getshaderinfolog-call.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/shared/renderer/utils.rs b/src/shared/renderer/utils.rs -index be4a65d..1b944ad 100644 ---- a/src/shared/renderer/utils.rs -+++ b/src/shared/renderer/utils.rs -@@ -1,6 +1,6 @@ - use std::{mem, ptr}; - --use gl::types::{GLenum, GLfloat, GLint, GLsizei, GLsizeiptr, GLuint}; -+use gl::types::{GLchar, GLenum, GLfloat, GLint, GLsizei, GLsizeiptr, GLuint}; - - use super::constants::BYTES_PER_PIXEL; - -@@ -139,7 +139,7 @@ pub fn compile_shader(kind: GLenum, src: &str) -> GLuint { - gl::GetShaderiv(shader, gl::INFO_LOG_LENGTH, &mut len); - - let mut buffer = vec![0u8; len as usize]; -- gl::GetShaderInfoLog(shader, len, ptr::null_mut(), buffer.as_mut_ptr() as *mut i8); -+ gl::GetShaderInfoLog(shader, len, ptr::null_mut(), buffer.as_mut_ptr() as *mut GLchar); - - panic!( - "Shader compile error: {}", diff --git a/pkgs/by-name/st/stremio-linux-shell/package.nix b/pkgs/by-name/st/stremio-linux-shell/package.nix index 4a3f62c23a55..c93dffdd91e9 100644 --- a/pkgs/by-name/st/stremio-linux-shell/package.nix +++ b/pkgs/by-name/st/stremio-linux-shell/package.nix @@ -1,124 +1,91 @@ { lib, - symlinkJoin, rustPlatform, fetchFromGitHub, versionCheckHook, gitUpdater, - # buildInputs - atk, - cef-binary, - gtk3, - libayatana-appindicator, - libxkbcommon, - mpv, - openssl, - # nativeBuildInputs - makeBinaryWrapper, pkg-config, wrapGAppsHook4, + # buildInputs + bashNonInteractive, + glib-networking, + gtk4, + libadwaita, + libepoxy, + libsoup_3, + mpv, + webkitgtk_6_0, + # Wrapper addDriverRunpath, - libGL, nodejs, }: -let - # Stremio expects CEF files in a specific layout - cef = symlinkJoin { - name = "stremio-linux-shell-cef"; - paths = [ - "${cef-binary}/Resources" - "${cef-binary}/Release" - ]; - }; -in rustPlatform.buildRustPackage (finalAttrs: { pname = "stremio-linux-shell"; - version = "1.0.0-beta.13"; + version = "1.0.2"; + + strictDeps = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "Stremio"; repo = "stremio-linux-shell"; tag = "v${finalAttrs.version}"; - hash = "sha256-1f9IBNo5gxpSqTSIf8QuQOlf+sfRhohOmQTLRbX/OU8="; + hash = "sha256-NbzUAv/L8xzdepqn677nlROumjlliZIHzPXIToHHeTU="; }; - cargoHash = "sha256-wx5oF4uF9UMtKzfGxZKsy6mVjYaRD40dLuvaRtz8yE4="; - - patches = [ - # Chromium 142 stopped allowing local network access by default, which - # breaks the app's ability to communicate with the Stremio server. - ./allow-local-network-access.patch - - # GLchar is u8 on aarch64 - # Upstream PR: https://github.com/Stremio/stremio-linux-shell/pull/40 - ./fix-getshaderinfolog-call.patch - - # Patch server.js path so that we don't have to install it in $out/bin - ./better-server-path.patch - ]; + cargoHash = "sha256-yafkD7D0E+lbFV7MlLwQM4iWC8Glo/Tn2F+TFff6GoM="; postPatch = '' - substituteInPlace src/config.rs \ - --replace-fail "@serverjs@" "${placeholder "out"}/share/stremio/server.js" + substituteInPlace data/com.stremio.Stremio.service \ + --replace-fail "Exec=/app/bin/stremio" "Exec=$out/bin/stremio" - substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \ - --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" - substituteInPlace $cargoDepsCopy/*/xkbcommon-dl-*/src/lib.rs \ - --replace-fail "libxkbcommon.so.0" "${libxkbcommon}/lib/libxkbcommon.so.0" - substituteInPlace $cargoDepsCopy/*/xkbcommon-dl-*/src/x11.rs \ - --replace-fail "libxkbcommon-x11.so.0" "${libxkbcommon}/lib/libxkbcommon-x11.so.0" + substituteInPlace data/stremio.sh \ + --replace-fail "/app/libexec/stremio/stremio" "$out/libexec/stremio/stremio" ''; - # Don't download CEF during build - buildFeatures = [ "offline-build" ]; - - buildInputs = [ - atk - cef - gtk3 - libayatana-appindicator - libxkbcommon - mpv - openssl - ]; - nativeBuildInputs = [ - makeBinaryWrapper pkg-config wrapGAppsHook4 ]; - env.CEF_PATH = "${cef}"; - - strictDeps = true; - __structuredAttrs = true; + buildInputs = [ + bashNonInteractive + glib-networking + gtk4 + libadwaita + libepoxy + libsoup_3 + mpv + webkitgtk_6_0 + ]; postInstall = '' - mkdir -p $out/share/applications - cp data/com.stremio.Stremio.desktop $out/share/applications/com.stremio.Stremio.desktop + install -Dm644 data/icons/com.stremio.Stremio.svg $out/share/icons/hicolor/scalable/apps/com.stremio.Stremio.svg + install -Dm644 data/com.stremio.Stremio.desktop $out/share/applications/com.stremio.Stremio.desktop + install -Dm644 data/com.stremio.Stremio.service $out/share/dbus-1/services/com.stremio.Stremio.service + install -Dm644 data/server.js $out/libexec/stremio/server.js + install -Dm755 data/stremio.sh $out/bin/stremio - mkdir -p $out/share/icons/hicolor/scalable/apps - cp data/icons/com.stremio.Stremio.svg $out/share/icons/hicolor/scalable/apps/com.stremio.Stremio.svg - - mkdir -p $out/share/stremio - cp data/server.js $out/share/stremio/server.js - - mv $out/bin/stremio-linux-shell $out/bin/stremio + mv $out/bin/stremio-linux-shell $out/libexec/stremio/stremio ''; + # Avoid also wrapping `$out/libexec/stremio/stremio` + dontWrapGApps = true; + # Node.js is required to run `server.js` - # Add to `gappsWrapperArgs` to avoid two layers of wrapping. + # Add to `wrapGApp` arguments to avoid two layers of wrapping. preFixup = '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${addDriverRunpath.driverLink}/lib" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ - --prefix PATH : "${lib.makeBinPath [ nodejs ]}" - ) + wrapGApp $out/bin/stremio \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ addDriverRunpath.driverLink ]}" \ + --prefix PATH : "${lib.makeBinPath [ nodejs ]}" \ + --prefix ANV_DEBUG : "video-decode,video-encode" \ + --prefix LC_NUMERIC : "C" \ + --prefix SERVER_PATH : "$out/libexec/stremio/server.js" ''; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -126,13 +93,14 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; passthru = { - inherit cef; updateScript = gitUpdater { rev-prefix = "v"; }; }; meta = { - description = "Modern media center that gives you the freedom to watch everything you want"; + description = "Client for Stremio on Linux"; homepage = "https://www.stremio.com/"; + downloadPage = "https://github.com/Stremio/stremio-linux-shell"; + changelog = "https://github.com/Stremio/stremio-linux-shell/releases/tag/${finalAttrs.src.tag}"; license = with lib.licenses; AND [ diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index 5b4e66a1a2a1..6b0915107681 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { pname = "stripe-cli"; - version = "1.42.14"; + version = "1.43.2"; # required for tests __darwinAllowLocalNetworking = true; @@ -21,9 +21,9 @@ buildGoModule (finalAttrs: { owner = "stripe"; repo = "stripe-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-rWsJVMphm2BRJ3wiGSGW3UVff/K0iBoPS/bueFqNsuI="; + hash = "sha256-FopjU7m6RbEJTekIFG2XppZ52U/TrFpipVUDWwngPJI="; }; - vendorHash = "sha256-uL87JR+s8Rf/nZhft4lT5Wba2dFqy78Wlxt6IM/o60E="; + vendorHash = "sha256-6z6jfRMmEll1703xUJYSc4WU7CN7tMMyidNtay6vo2M="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index 979df8fbdbce..e40006f9cc55 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -26,6 +26,7 @@ libdrm, luajit, openexr, + openjpeg, bash-completion, testers, nix-update-script, @@ -33,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "5.2"; + version = "5.4"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; tag = "v${finalAttrs.version}"; - hash = "sha256-aDZ7Ka8uKVLzEwxS2CT5fRFNDf9z/LO3bB0dCMz1Mf0="; + hash = "sha256-PB+EufDpz5Rc6hKO/ish7HdGaEZtxmrtYqnmR+ZpFDY="; }; strictDeps = true; @@ -81,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: { libdrm luajit openexr + openjpeg ]; passthru = { diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index f2a8b0c73612..aa06af6acefe 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "telegraf"; - version = "1.39.0"; + version = "1.39.1"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "influxdata"; repo = "telegraf"; rev = "v${finalAttrs.version}"; - hash = "sha256-pWf68000E6oSS8EWwWbfqFrPDTU6T6HkFpGljdQfyDw="; + hash = "sha256-B9Xy02oYSYcU0IBOZes9tof/04TLvLybOU/nLLaFORk="; }; - vendorHash = "sha256-0nvkV/MWq6eT1Pi0oD5LEHTRmAZljXC/wT3CwRoNgHQ="; + vendorHash = "sha256-9o0Tt6OZnoNO8iSLYmn1SMkQmZzC19uNmfHSkEqWzmA="; proxyVendor = true; ldflags = [ diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix index 55030e84351a..5b3728543295 100644 --- a/pkgs/by-name/te/termius/package.nix +++ b/pkgs/by-name/te/termius/package.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "9.36.2"; - revision = "253"; + version = "9.39.0"; + revision = "263"; src = fetchurl { # find the latest version with @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; - hash = "sha512-jthbZ8j2ek4eq7l13UAJPdFJScgTtb1FRRP7neGFQTxF2PuGZzkp4gEuXRPbrwDTG+7C/fw+k+sCoxu+uBGClQ=="; + hash = "sha512-DbSUzg84xHx8xnbvbILTXG1KV2v3GQqli732JofYQIma+M2bPfeCchUF50q8qXOSO0kG/UPD5QPJj0baWv9g8w=="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix index 3b3bc22c085e..4063d42962c2 100644 --- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix @@ -1712,7 +1712,7 @@ }; nginx = { - version = "0-unstable-2026-01-02"; + version = "1.0.1-unstable-2026-01-02"; url = "github:opa-oz/tree-sitter-nginx"; rev = "47ade644d754cce57974aac44d2c9450e823d4f4"; hash = "sha256-exbjYJouZYcxC3suV7byqSEwu2r8hHj/wehPpf5Aecc="; diff --git a/pkgs/by-name/tr/triton/package.nix b/pkgs/by-name/tr/triton/package.nix index a37e5fcc6ac9..c0bae11429aa 100644 --- a/pkgs/by-name/tr/triton/package.nix +++ b/pkgs/by-name/tr/triton/package.nix @@ -40,7 +40,7 @@ buildNpmPackage rec { description = "TritonDataCenter Client CLI and Node.js SDK"; homepage = "https://github.com/TritonDataCenter/node-triton"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ teutat3s ]; + maintainers = [ ]; mainProgram = "triton"; }; } diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index 5e374560e23d..89b622292c08 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "trufflehog"; - version = "3.95.6"; + version = "3.95.7"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${finalAttrs.version}"; - hash = "sha256-VGN8penYtwX0conIl6pjm6YhM0yYl3dpmKUT6YijXuI="; + hash = "sha256-vCn3V19UOIZg54ppPRnPGEJOtmHO4zkmy7vzu94gscc="; }; vendorHash = "sha256-KVocEbpKYN/PE1Dnx4KO4V8AGEfYoNMKWZsAtXhLXv4="; diff --git a/pkgs/by-name/tu/tuxbox/package.nix b/pkgs/by-name/tu/tuxbox/package.nix index 628b8b9e1625..53820ebee5df 100644 --- a/pkgs/by-name/tu/tuxbox/package.nix +++ b/pkgs/by-name/tu/tuxbox/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "tuxbox"; - version = "3.1.4"; + version = "3.1.5"; pyproject = true; src = fetchFromGitHub { owner = "AndyCappDev"; repo = "tuxbox"; tag = "v${finalAttrs.version}"; - hash = "sha256-p5nQLp+O0VKA3dr4Eeq7UnMwf7Xl/7zLHce4ZeoiMNU="; + hash = "sha256-5DpL9Mq/eXmk0Eh8vZY53TZXJxaJk1orS+luWnzYlrE="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix index b26af29538e6..c4a0e4387fba 100644 --- a/pkgs/by-name/un/unpoller/package.nix +++ b/pkgs/by-name/un/unpoller/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "unpoller"; - version = "2.39.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${finalAttrs.version}"; - hash = "sha256-9cA8SkAfuAOQpA61BzqXVTWoHdAR9JQ6aITNaju20vQ="; + hash = "sha256-MivEuI/XjRDlX+VjSAMLjRl0WlRVnhP18qVujbvwjeQ="; }; - vendorHash = "sha256-7IUdVnM97kuikuUz95Jsl9iSyhJyifaRTj1TonwFRVU="; + vendorHash = "sha256-3DBUrKTvwRqaNuYtBlP5DlF1SNmU+ZNeH7ATVQjgLsA="; ldflags = [ "-w" diff --git a/pkgs/by-name/vc/vcv-rack/fix-segfault-on-linux.patch b/pkgs/by-name/vc/vcv-rack/fix-segfault-on-linux.patch new file mode 100644 index 000000000000..09dbe3b94ff4 --- /dev/null +++ b/pkgs/by-name/vc/vcv-rack/fix-segfault-on-linux.patch @@ -0,0 +1,13 @@ +--- a/src/window/Window.cpp ++++ b/src/window/Window.cpp +@@ -819,6 +819,10 @@ + glfwInitHint(GLFW_COCOA_MENUBAR, GLFW_FALSE); + #endif + ++#if defined ARCH_LIN ++ glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11); ++#endif ++ + glfwSetErrorCallback(errorCallback); + err = glfwInit(); + if (err != GLFW_TRUE) { diff --git a/pkgs/by-name/vc/vcv-rack/package.nix b/pkgs/by-name/vc/vcv-rack/package.nix index 97f4e51cab15..3d0b35ea1b16 100644 --- a/pkgs/by-name/vc/vcv-rack/package.nix +++ b/pkgs/by-name/vc/vcv-rack/package.nix @@ -170,11 +170,9 @@ stdenv.mkDerivation (finalAttrs: { ./rack-minimize-vendoring.patch ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - (fetchpatch { - name = "fix-segfault-on-linux.patch"; - url = "https://github.com/VCVRack/Rack/pull/1944.patch"; - hash = "sha256-dlndyCfCznGDzlWNWrQTgh+FtmsrrL2DVuRE0xCxUck="; - }) + # https://github.com/VCVRack/Rack/pull/1944 + # https://github.com/VCVRack/Rack/commit/9f0eb9a0da8e9d6f1729f823555fdac2135214f0 + ./fix-segfault-on-linux.patch ]; prePatch = '' diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 710d39a63429..484d203349d1 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.145.0"; + version = "1.146.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-nKG2ei1Gn1mU5TtD5YLYUHaJrM4fSxm/uUdY4tIGeVE="; + hash = "sha256-EWRVbUeugyLsExP3NyPVLd7v2kwbRg5OjFg2WAY1FuM="; }; vendorHash = null; diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index a2aa7c871f36..0f1bbf22d5f6 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, stdenv, nodejs_24, - pnpm_10_29_2, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, buildGoModule, @@ -35,7 +35,7 @@ let src sourceRoot ; - pnpm = pnpm_10_29_2; + pnpm = pnpm_10; fetcherVersion = 3; hash = "sha256-cDGeIrCxZtcomu3YxikutjXpVe3EeUZ/L3+3y9yx67s="; }; @@ -44,7 +44,7 @@ let nodejs_24 dart-sass pnpmConfigHook - pnpm_10_29_2 + pnpm_10 ]; doCheck = true; diff --git a/pkgs/by-name/wi/wiki-go/package.nix b/pkgs/by-name/wi/wiki-go/package.nix index a7551094d394..2822a523759b 100644 --- a/pkgs/by-name/wi/wiki-go/package.nix +++ b/pkgs/by-name/wi/wiki-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "wiki-go"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "leomoon-studios"; repo = "wiki-go"; tag = "v${version}"; - hash = "sha256-98IwcW+an6y5vnGR0d70Q8e0lQOTzclgD9J0UCc6PG0="; + hash = "sha256-vyRggzizv78Cb5XpZ5M7eI0pvb/6ytRBZe00/NBe7KA="; }; vendorHash = null; diff --git a/pkgs/by-name/wl/wlc/package.nix b/pkgs/by-name/wl/wlc/package.nix index db5842680e5d..fb49acc45ad7 100644 --- a/pkgs/by-name/wl/wlc/package.nix +++ b/pkgs/by-name/wl/wlc/package.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonPackage rec { pname = "wlc"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vUmZVNPifouyEdLrm7WpHN1BIO2dX7jCcylv8i+X2CY="; + hash = "sha256-2g6TDcX5AXLjWKSlIGTt6J1RRuZvxmAUX9lSKCAwYnY="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/zo/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch b/pkgs/by-name/zo/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch index ca2792099bd1..a1d50c900b16 100644 --- a/pkgs/by-name/zo/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch +++ b/pkgs/by-name/zo/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch @@ -1,4 +1,4 @@ -From 8823e48b055b7e574c08069048ba21ffa4393699 Mon Sep 17 00:00:00 2001 +From f722b5f1c9d71542305f024c9769c9efb6793551 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 21 Feb 2020 21:52:00 -0500 Subject: [PATCH] Don't use file timestamp in cache filename @@ -9,23 +9,26 @@ This would mean that newer versions would use the existing symlink to an older version of the source file. We replace SRC_HASH in nix with a hash of the source used to build zoneminder to ensure this filename is unique. + +[peathot@hotmail.com: update for ZoneMinder 1.38.3] --- web/includes/functions.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/includes/functions.php b/web/includes/functions.php -index 89d2cc8ad..52cbb6f38 100644 +index 1b03a4ddd..5ba311691 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php -@@ -1941,7 +1941,8 @@ function cache_bust($file) { +@@ -1904,7 +1904,8 @@ function cache_bust($file) { $parts = pathinfo($file); global $css; $dirname = str_replace('/', '_', $parts['dirname']); - $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension']; + $srcHash = '@srcHash@'; + $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.$srcHash.'.'.$parts['extension']; - if ( file_exists(ZM_DIR_CACHE.'/'.$cacheFile) or symlink(ZM_PATH_WEB.'/'.$file, ZM_DIR_CACHE.'/'.$cacheFile) ) { - return 'cache/'.$cacheFile; - } else { + if ( + @symlink(ZM_PATH_WEB.'/'.$file, ZM_DIR_CACHE.'/'.$cacheFile) + or -- -2.32.0 +2.53.0 + diff --git a/pkgs/by-name/zo/zoneminder/package.nix b/pkgs/by-name/zo/zoneminder/package.nix index 1339d09f18f6..599891e9fecb 100644 --- a/pkgs/by-name/zo/zoneminder/package.nix +++ b/pkgs/by-name/zo/zoneminder/package.nix @@ -6,19 +6,23 @@ cmake, makeWrapper, pkg-config, + arp-scan, curl, ffmpeg, glib, + iproute2, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, + nlohmann_json, pcre2, perl, perlPackages, polkit, + systemd, util-linuxMinimal, x264, zlib, @@ -68,6 +72,7 @@ let addons = [ { + # XXX: not tested with 1.38.x. path = "scripts/ZoneMinder/lib/ZoneMinder/Control/Xiaomi.pm"; src = fetchurl { url = "https://gist.githubusercontent.com/joshstrange/73a2f24dfaf5cd5b470024096ce2680f/raw/e964270c5cdbf95e5b7f214f7f0fc6113791530e/Xiaomi.pm"; @@ -83,13 +88,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.36.38"; + version = "1.38.3"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; tag = version; - hash = "sha256-c/Q+h0ntJ4XUuvgrLSlWfue4GL4nGARgmXt0En334Y4="; + hash = "sha256-Hko5ViEevcKp0kiSFK9DBcSoYkZY3KttazhEexv4klI="; fetchSubmodules = true; }; @@ -107,22 +112,29 @@ stdenv.mkDerivation rec { '') addons )} - for d in scripts/ZoneMinder onvif/{modules,proxy} ; do + for d in scripts/ZoneMinder onvif/modules ; do substituteInPlace $d/CMakeLists.txt \ - --replace 'DESTDIR="''${CMAKE_CURRENT_BINARY_DIR}/output"' "PREFIX=$out INSTALLDIRS=site" + --replace-fail 'DESTDIR="''${CMAKE_CURRENT_BINARY_DIR}/output"' "PREFIX=$out INSTALLDIRS=site" + sed -i '/^install/d' $d/CMakeLists.txt + done + + # Slightly different quoting. + for d in onvif/proxy ; do + substituteInPlace $d/CMakeLists.txt \ + --replace-fail 'DESTDIR=''${CMAKE_CURRENT_BINARY_DIR}/output' "PREFIX=$out INSTALLDIRS=site" sed -i '/^install/d' $d/CMakeLists.txt done substituteInPlace misc/CMakeLists.txt \ - --replace '"''${PC_POLKIT_PREFIX}/''${CMAKE_INSTALL_DATAROOTDIR}' "\"$out/share" + --replace-fail '"''${PC_POLKIT_PREFIX}/''${CMAKE_INSTALL_DATAROOTDIR}' "\"$out/share" - for f in misc/*.policy.in \ - scripts/*.pl* \ + for f in scripts/*.pl* \ scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in ; do substituteInPlace $f \ - --replace '/usr/bin/perl' '${perlBin}' \ - --replace '/bin:/usr/bin' "$out/bin:${ + --replace-quiet '/usr/bin/perl' '${perlBin}' \ + --replace-quiet '/bin:/usr/bin' "$out/bin:${ lib.makeBinPath [ + arp-scan coreutils procps psmisc @@ -130,47 +142,52 @@ stdenv.mkDerivation rec { }" done + substituteInPlace misc/com.zoneminder.systemctl.policy.in \ + --replace-fail '/usr/bin/perl' '${perlBin}' + + substituteInPlace misc/com.zoneminder.dnsmasq.policy.in \ + --replace-fail '/bin/systemctl' '${systemd}/bin/systemctl' + + substituteInPlace misc/com.zoneminder.arp-scan.policy.in \ + --replace-fail '/usr/sbin/arp-scan' '${arp-scan}/bin/arp-scan' + substituteInPlace scripts/zmdbbackup.in \ - --replace /usr/bin/mysqldump ${mariadb.client}/bin/mysqldump + --replace-fail /usr/bin/mysqldump ${mariadb.client}/bin/mysqldump substituteInPlace scripts/zmupdate.pl.in \ - --replace "'mysql'" "'${mariadb.client}/bin/mysql'" \ - --replace "'mysqldump'" "'${mariadb.client}/bin/mysqldump'" + --replace-fail "'mysql'" "'${mariadb.client}/bin/mysql'" \ + --replace-fail "'mysqldump'" "'${mariadb.client}/bin/mysqldump'" for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \ scripts/zmupdate.pl.in \ src/zm_config_data.h.in \ web/api/app/Config/bootstrap.php.in \ web/includes/config.php.in ; do - substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder + substituteInPlace $f --replace-fail @ZM_CONFIG_SUBDIR@ /etc/zoneminder done - for f in includes/Event.php views/image.php ; do - substituteInPlace web/$f \ - --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg " - done - - for f in scripts/ZoneMinder/lib/ZoneMinder/Event.pm \ - scripts/ZoneMinder/lib/ZoneMinder/Storage.pm ; do - substituteInPlace $f \ - --replace '/bin/rm' "${coreutils}/bin/rm" - done + substituteInPlace scripts/ZoneMinder/lib/ZoneMinder/Storage.pm \ + --replace-fail '/bin/rm' "${coreutils}/bin/rm" substituteInPlace web/includes/functions.php \ - --replace "'date " "'${coreutils}/bin/date " \ + --replace-fail "'date " "'${coreutils}/bin/date " \ + --replace-fail "'rm " "'${coreutils}/bin/rm " \ --subst-var-by srcHash "`basename $out`" ''; buildInputs = [ + arp-scan curl ffmpeg glib + iproute2 libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb + nlohmann_json pcre2 perl polkit @@ -212,6 +229,7 @@ stdenv.mkDerivation rec { "-DZM_SOCKDIR=/run/${dirName}" "-DZM_TMPDIR=/tmp/${dirName}" "-DZM_CONFIG_DIR=${placeholder "out"}/etc/zoneminder" + "-DZM_PATH_SHUTDOWN=${systemd}/bin/shutdown" "-DZM_WEB_USER=${user}" "-DZM_WEB_GROUP=${user}" ]; @@ -238,13 +256,21 @@ stdenv.mkDerivation rec { done ln -s $out/share/zoneminder/www $out/share/zoneminder/www/zm + + # Combine configs under $out/etc/zoneminder/conf.d/ into + # $out/etc/zoneminder/zm.conf, because we patch so that we read from + # /etc/zoneminder/conf.d instead of $out/zoneminder/conf.d. + for f in $out/etc/zoneminder/conf.d/*.conf; do + cat $f >>$out/etc/zoneminder/zm.conf + rm $f + done ''; meta = { description = "Video surveillance software system"; homepage = "https://zoneminder.com"; license = lib.licenses.gpl3; - maintainers = [ ]; + maintainers = with lib.maintainers; [ peat-psuwit ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/desktops/lomiri/development/libusermetrics/default.nix b/pkgs/desktops/lomiri/development/libusermetrics/default.nix index a73b1198349d..bb526671b125 100644 --- a/pkgs/desktops/lomiri/development/libusermetrics/default.nix +++ b/pkgs/desktops/lomiri/development/libusermetrics/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libusermetrics"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/libusermetrics"; rev = finalAttrs.version; - hash = "sha256-NXwOdKII7Bvjnk2xUEYRCP7r7Woj7DOh8BOO8yuS9kk="; + hash = "sha256-WkQqMuPoDDzA2HwD+6YCS9ZigiGL8WGNRZ51ywGNm4s="; }; outputs = [ diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 05143c682196..9a5f9f257260 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -18,13 +18,13 @@ let self: stdenv.mkDerivation rec { pname = "hex"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "hexpm"; repo = "hex"; rev = "v${version}"; - sha256 = "sha256-+deoFCHs2paABaZInyknwdQJafJ/DO0EnqscPUiL6rY="; + sha256 = "sha256-Lt+dpIKtowvt96MhMcYkt3f6h2KN1uyJDkRxOUEIYY4="; }; setupHook = writeText "setupHook.sh" '' diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 601a7048781a..a7a440c32513 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -529,7 +529,9 @@ builtins.intersectAttrs super { # Add necessary reference to gtk3 package gi-dbusmenugtk3 = addPkgconfigDepend pkgs.gtk3 super.gi-dbusmenugtk3; - nix-serve-ng = lib.pipe (super.nix-serve-ng.override { nix = pkgs.nixVersions.nix_2_28; }) [ + # Upstream has switched to Lix as its supported Nix implementation. + nix-serve-ng = lib.pipe (super.nix-serve-ng.override { nix = pkgs.lix; }) [ + (enableCabalFlag "lix") # nix-serve-ng isn't regularly released to Hackage (overrideSrc { src = pkgs.fetchFromGitHub { diff --git a/pkgs/development/octave-modules/datatypes/default.nix b/pkgs/development/octave-modules/datatypes/default.nix index 2906491d48da..1be6a219be3e 100644 --- a/pkgs/development/octave-modules/datatypes/default.nix +++ b/pkgs/development/octave-modules/datatypes/default.nix @@ -7,13 +7,13 @@ buildOctavePackage rec { pname = "datatypes"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "pr0m1th3as"; repo = "datatypes"; tag = "release-${version}"; - sha256 = "sha256-cSfHE5IcAHebaGOp9f/+4E3l92b0DdiXfNvX5oeeHwY="; + sha256 = "sha256-e7xHit/EvsNCzWWA5tuqVMwoUvJo09gNma7RrDd2ib0="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=release-(.*)" ]; }; diff --git a/pkgs/development/python-modules/automower-ble/default.nix b/pkgs/development/python-modules/automower-ble/default.nix index 555f64574762..f8d1609b0bfe 100644 --- a/pkgs/development/python-modules/automower-ble/default.nix +++ b/pkgs/development/python-modules/automower-ble/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "automower-ble"; - version = "0.2.8"; + version = "0.2.9"; pyproject = true; src = fetchFromGitHub { owner = "alistair23"; repo = "AutoMower-BLE"; tag = finalAttrs.version; - hash = "sha256-GawjNtk2mEBo9Xe1k1z0tk1RWU0N0JddeC6NZbnLpxc="; + hash = "sha256-3Hiplg4PTu84H890JwTja7wopB7bSYteGXR7RQ/J++0="; }; build-system = [ setuptools ]; @@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: { description = "Module to connect to Husqvarna Automower Connect"; homepage = "https://github.com/alistair23/AutoMower-BLE"; changelog = "https://github.com/alistair23/AutoMower-BLE/releases/tag/${finalAttrs.src.tag}"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index 504834368922..8db5470a6c50 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { pname = "awslambdaric"; - version = "3.1.1"; + version = "4.0.1"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; tag = version; - sha256 = "sha256-gwbEDo/LewCb0wTtkw/bF3XSAiSu1ITYHAnuvpNsfs0="; + sha256 = "sha256-wlQTYFbC/5gmal4xx9XHAxpdzEhGaD9N28BrhDUKV5A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/beets-audible/default.nix b/pkgs/development/python-modules/beets-audible/default.nix index 954e76b284d9..0adf5bf1d0de 100644 --- a/pkgs/development/python-modules/beets-audible/default.nix +++ b/pkgs/development/python-modules/beets-audible/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "beets-audible"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "Neurrone"; repo = "beets-audible"; tag = "v${version}"; - hash = "sha256-UAg+0h4OA5di4QIkVXE4yyrD/R4TZs/zL+usMNNyyM0="; + hash = "sha256-u4EbUmUsaCs22QBGaKWzPjz0nzxH/zQBIQ8vsyVHBoE="; }; build-system = [ diff --git a/pkgs/development/python-modules/bittensor-drand/default.nix b/pkgs/development/python-modules/bittensor-drand/default.nix index c875e79df9dd..31423cd98558 100644 --- a/pkgs/development/python-modules/bittensor-drand/default.nix +++ b/pkgs/development/python-modules/bittensor-drand/default.nix @@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: { pname = "bittensor-drand"; - version = "1.3.0"; + version = "2.0.0"; pyproject = true; __structuredAttrs = true; @@ -17,12 +17,12 @@ buildPythonPackage (finalAttrs: { owner = "latent-to"; repo = "bittensor-drand"; tag = "v${finalAttrs.version}"; - hash = "sha256-0GizpmKGWbDjWCIAF1kPdz2sjn8B/e0qSIHmDqlDzZc="; + hash = "sha256-c1dAbHlVpQ9+x8ASmOO3zAwJLvyJBTzti1qEOfoKzxg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-JasDf3qXzB6ddp1NjC+xtozsggwyk2nQbRw/Lbt02Kg="; + hash = "sha256-XpAuoJfBpXNgI3MeMXuMOi9l91oJDb0qfbQ1acflM9s="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/comet-ml/default.nix b/pkgs/development/python-modules/comet-ml/default.nix index 63bd1bf22b8e..cd0e555deacb 100644 --- a/pkgs/development/python-modules/comet-ml/default.nix +++ b/pkgs/development/python-modules/comet-ml/default.nix @@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: { pname = "comet-ml"; - version = "3.58.1"; + version = "3.58.3"; pyproject = true; __structuredAttrs = true; @@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { pname = "comet_ml"; inherit (finalAttrs) version; - hash = "sha256-6DHmsd7CcFd1QU06G09CVMeVuHGAtn8Rxsr1++epdeU="; + hash = "sha256-fl+9ywbh3g1/mXRavW4V5aaLDyHcpUu+dMK4mQGVkEE="; }; build-system = [ diff --git a/pkgs/development/python-modules/data-grand-lyon-ha/default.nix b/pkgs/development/python-modules/data-grand-lyon-ha/default.nix index bfac2ea79d02..bf5d334b5b45 100644 --- a/pkgs/development/python-modules/data-grand-lyon-ha/default.nix +++ b/pkgs/development/python-modules/data-grand-lyon-ha/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "data-grand-lyon-ha"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; src = fetchFromCodeberg { owner = "Crocmagnon"; repo = "data_grand_lyon_ha"; tag = "v${finalAttrs.version}"; - hash = "sha256-Wpn3Ou8Cm+h5uyROw+6weDYyZHvLXLNpW3aIyKnUueE="; + hash = "sha256-cxyfvHeX59cHuxpQEy2kUhaObm7n0EF0MZTrGw17uik="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix index c24cd7022bf1..fb19b57c3b8b 100644 --- a/pkgs/development/python-modules/disposable-email-domains/default.nix +++ b/pkgs/development/python-modules/disposable-email-domains/default.nix @@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: { pname = "disposable-email-domains"; - version = "0.0.207"; + version = "0.0.212"; pyproject = true; __structuredAttrs = true; @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { pname = "disposable_email_domains"; inherit (finalAttrs) version; - hash = "sha256-5A7a3ubEDfBmr2opUjpz5C/kEwbvGwLIEl1tT+NORqo="; + hash = "sha256-ZML2EvIx2oLYFMBxOiPxe3GNuA8W50AEPWwT5NP3ISo="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index 39c2d7937937..8137ea09057f 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "6.3.0"; + version = "7.0.0"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-debug-toolbar"; tag = version; - hash = "sha256-myKtNT7xIqVdJTlVAbnohaAv/5Ioz5SlSmmuaXIQqZM="; + hash = "sha256-Xwl6LsNW3/VXJ59QaW4l6D+8VEbl45ysv5KaySbS4M4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/foundrytools/default.nix b/pkgs/development/python-modules/foundrytools/default.nix index 4966e9a45dba..94a3e5069eba 100644 --- a/pkgs/development/python-modules/foundrytools/default.nix +++ b/pkgs/development/python-modules/foundrytools/default.nix @@ -19,14 +19,14 @@ }: buildPythonPackage (finalAttrs: { pname = "foundrytools"; - version = "0.1.5"; + version = "0.1.6"; pyproject = true; src = fetchFromGitHub { owner = "ftCLI"; repo = "FoundryTools"; tag = "v${finalAttrs.version}"; - hash = "sha256-dmMu9FTr754ax6dSfz1cn/CgmMVbEECQgyZaW+66UrU="; + hash = "sha256-E0sJ/shudZTvkB8be5KsPJDmCoytv2notrrNT9nDF0I="; }; build-system = [ diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix index f3ccebb09c33..3f12120a89ac 100644 --- a/pkgs/development/python-modules/gdsfactory/default.nix +++ b/pkgs/development/python-modules/gdsfactory/default.nix @@ -48,14 +48,14 @@ }: buildPythonPackage (finalAttrs: { pname = "gdsfactory"; - version = "9.39.3"; + version = "9.44.0"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "gdsfactory"; tag = "v${finalAttrs.version}"; - hash = "sha256-WwZ0GikpRfg7wpr08QdqdTvZtsNBnwcC5pxiddfG6rM="; + hash = "sha256-5iP359Sy93Pr5gmsCEEcTK47d0qbFUy9eEpcFZ6AJp4="; }; build-system = [ diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix index c3068b56d12f..2f46529e05a3 100644 --- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix +++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix @@ -14,13 +14,13 @@ buildPythonPackage (finalAttrs: { pname = "google-cloud-network-connectivity"; - version = "2.15.0"; + version = "2.16.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) version; pname = "google_cloud_network_connectivity"; - hash = "sha256-PqkPw7HNOZUHjIPUp7tbFDlY0d7jDlGeqhIwMZVr1OY="; + hash = "sha256-7MHGRbCsZ86gESY5igxklf3Cr3D51fuGVxnaO9xz+TE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 8deb36bc6403..1724591a76f9 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -14,13 +14,13 @@ buildPythonPackage (finalAttrs: { pname = "google-cloud-resource-manager"; - version = "1.17.0"; + version = "1.18.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_resource_manager"; inherit (finalAttrs) version; - hash = "sha256-D0hrYuLFj/mSo6UPoPSpbu93UKpslxuzczmMy5GChmA="; + hash = "sha256-22ifgAoUxm0EEZan+7i7iq6NyH8owpKeEBpex2axVRI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 2983e4425d86..65b873d63b94 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.22.0"; + version = "2.23.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_tasks"; inherit version; - hash = "sha256-vJfYR/HfvxtgK2e5Kbe69XD+o13O2q2rta39+BameEE="; + hash = "sha256-ptosEUpNtaWVk+umSYekv2lzoPSLGjGj1Kz/tvTHvrk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 52df306d75b4..5d10f3739173 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.24.4"; + version = "3.25.0"; pyproject = true; src = fetchFromGitHub { owner = "IBM"; repo = "python-sdk-core"; tag = "v${version}"; - hash = "sha256-j16E4IDGuabxhHqI/b1yLLv5EdkWYsIJQ2CQzUodFsU="; + hash = "sha256-UA4xZ9doaz/4yYdbXJoevXrdzsrfuv/nhSd2+rkHAQ4="; }; pythonRelaxDeps = [ "requests" ]; diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 418342da74c9..08fd9da9ebc8 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - version = "7.1.2"; + version = "7.2.0"; pname = "icalendar"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "collective"; repo = "icalendar"; tag = "v${version}"; - hash = "sha256-y6t27/l2jnNr6/VlGuXlE2BcNDPOd0wscyCMpRY4+MM="; + hash = "sha256-0NKNbWigZ3BOfKBM8Q+XrOdoFBOF5Lu4XujJcYCMuMw="; }; patches = [ diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 3b71f3a8a428..8160d59263e3 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { pname = "kafka-python"; - version = "3.0.0"; + version = "3.0.6"; pyproject = true; __structuredAttrs = true; @@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: { owner = "dpkp"; repo = "kafka-python"; tag = finalAttrs.version; - hash = "sha256-eQGQWLXCtj9A5Gb7inyKPdVD+1Pxh8yPFdNEBkkk58c="; + hash = "sha256-Cw6Mm5xNoyZEAYxyjELlt5zlhjIt7PsdlN/RwtMkE4k="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index bbbc3ae4decc..ea7b7541b8d7 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: { pname = "langchain-aws"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; __structuredAttrs = true; @@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: { owner = "langchain-ai"; repo = "langchain-aws"; tag = "langchain-aws==${finalAttrs.version}"; - hash = "sha256-EZNzP4myJTwkdyAHcUS2RCGPtaUlzt3bgZ4Qsw2RgBs="; + hash = "sha256-gvp4iS5cU7QhFNpHuS+ytxGVh+vWSlcS4cPV9O6c+tw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index 782291c075cd..d78cac57ceac 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -41,7 +41,7 @@ }: buildPythonPackage (finalAttrs: { pname = "langgraph"; - version = "1.2.5"; + version = "1.2.6"; pyproject = true; __structuredAttrs = true; @@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: { owner = "langchain-ai"; repo = "langgraph"; tag = finalAttrs.version; - hash = "sha256-u4rRRvDg99uJpNd/Tqms4EUTmAaROelqQtyyoMsy9Qg="; + hash = "sha256-xYW+wPvkzWsCB4RES2athDjz/ymZq4tI65fWFIXAnn4="; }; postgresqlTestSetupPost = '' diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index f51db1e810d6..9958388f1e3d 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, pkgs, fetchFromGitHub, buildPythonPackage, @@ -100,6 +101,11 @@ buildPythonPackage (finalAttrs: { "nltk/test/unit/test_downloader.py" # Touches network ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # ModuleNotFoundError: No module named '_tkinter' + "test_chartparser_app_uses_pickle_load_not_pickle_load_standard" + ]; + pythonImportsCheck = [ "nltk" ]; passthru = { diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix index f48c56f9ff99..3fdd0a1d910a 100644 --- a/pkgs/development/python-modules/pyghmi/default.nix +++ b/pkgs/development/python-modules/pyghmi/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pyghmi"; - version = "1.6.17"; + version = "1.6.18"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+MkEYEzmT5744sVCEVQxb+cfAIed7m+nPndYpF5r/h0="; + hash = "sha256-lPDS72TvAALtI+D6YoT2rIvxj7J3FMSIw2t8SxZWslw="; }; build-system = [ diff --git a/pkgs/development/python-modules/pylette/default.nix b/pkgs/development/python-modules/pylette/default.nix index 6cf2063ea947..79568243021b 100644 --- a/pkgs/development/python-modules/pylette/default.nix +++ b/pkgs/development/python-modules/pylette/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { pname = "pylette"; - version = "5.1.2"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "qTipTip"; repo = "Pylette"; tag = version; - hash = "sha256-5zQJrdXUr2J/si8YPNR/5FvhTOFZRMwXjpakt3vJWs0="; + hash = "sha256-EpmMgbCVUJ86BlWq2LgPKLKjPsfwom7RhrlvqWq/rh8="; }; build-system = [ diff --git a/pkgs/development/python-modules/pylint-odoo/default.nix b/pkgs/development/python-modules/pylint-odoo/default.nix index 704a06c43323..91c5333074b8 100644 --- a/pkgs/development/python-modules/pylint-odoo/default.nix +++ b/pkgs/development/python-modules/pylint-odoo/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "pylint-odoo"; - version = "10.0.2"; + version = "10.0.4"; pyproject = true; src = fetchFromGitHub { owner = "OCA"; repo = "pylint-odoo"; tag = "v${version}"; - hash = "sha256-n89yO3bSYKrc9DCZGOxFQxtK0rzsE9wVJwhdIDedULk="; + hash = "sha256-OVltvmSEsL7F46LlTqJ8PH9BO4iYlFWKFTLv5AcmaVU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix index 36d4674830e7..e1980d8adcc7 100644 --- a/pkgs/development/python-modules/pyro5/default.nix +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "pyro5"; - version = "5.16"; + version = "5.17"; pyproject = true; src = fetchFromGitHub { owner = "irmen"; repo = "Pyro5"; tag = "v${finalAttrs.version}"; - hash = "sha256-8ORwfzPpcNQdGRNe1EnY0A/+9itmSY3ouvreOcc18u8="; + hash = "sha256-WVvUh/XPk+/1iRARAVD3fgmlJu60DZps7kRaZxuiwBo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pystiebeleltron/default.nix b/pkgs/development/python-modules/pystiebeleltron/default.nix index d7dfce119552..6583c95f29e9 100644 --- a/pkgs/development/python-modules/pystiebeleltron/default.nix +++ b/pkgs/development/python-modules/pystiebeleltron/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pystiebeleltron"; - version = "0.3.0"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "ThyMYthOS"; repo = "python-stiebel-eltron"; tag = "v${version}"; - hash = "sha256-lzOZQnBoERoXke61raMMZiy/ThIrycNinsIZiL3jNHE="; + hash = "sha256-ApFhqJsYC/Kym1ITq5dn0/OQ6++led6RbG97DGvno0k="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pysunspec2/default.nix b/pkgs/development/python-modules/pysunspec2/default.nix index 460ca4ea3f97..b47c311c0fe8 100644 --- a/pkgs/development/python-modules/pysunspec2/default.nix +++ b/pkgs/development/python-modules/pysunspec2/default.nix @@ -8,16 +8,16 @@ openpyxl, }: -buildPythonPackage rec { +buildPythonPackage (finalAtrs: { pname = "pysunspec2"; - version = "1.3.5"; + version = "1.3.6"; pyproject = true; src = fetchFromGitHub { owner = "sunspec"; repo = "pysunspec2"; - tag = "v${version}"; - hash = "sha256-5iexVb6qXHmVczLydjXu+blGm9zwKGqUBLDUwl8HBrs="; + tag = "v${finalAtrs.version}"; + hash = "sha256-9VZy0QwMh9JK0DpECRMhF279lo125Dq1AUaa6gtHuV0="; fetchSubmodules = true; }; @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Python library for interfacing with SunSpec devices"; homepage = "https://github.com/sunspec/pysunspec2"; - changelog = "https://github.com/sunspec/pysunspec2/releases/tag/${src.tag}"; + changelog = "https://github.com/sunspec/pysunspec2/releases/tag/${finalAtrs.src.tag}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.cheriimoya ]; }; -} +}) diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index f8f25cb29745..138a8285d44a 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -73,9 +73,9 @@ buildPythonPackage (finalAttrs: { pname = "ray"; - version = "2.55.1"; + version = "2.56.0"; format = "wheel"; - __structuredAttres = true; + __structuredAttrs = true; disabled = pythonAtLeast "3.15"; @@ -91,22 +91,22 @@ buildPythonPackage (finalAttrs: { # Results are in ./ray-hashes.nix hashes = { x86_64-linux = { - cp311 = "sha256-1TgtoYHAPuL1Au9Gzwrku8MBV7W9mmfXZR9qJyUoqFo="; - cp312 = "sha256-JjcF9rqynnYiqU+C2iX9f5zq12zfiaB6qyj3nN+PnZU="; - cp313 = "sha256-E4DgQ+tXzeabfpGZxvJVjO648PxByX0dXlDqBCEV8wI="; - cp314 = "sha256-FW7T5yrZW2RdIAbNcajd28yJtWv8AAJ/YiWt94vZy3Q="; + cp311 = "sha256-xb8aQ4TA4qpEIMlUdLc00GTKw1Sw8AdgvgLYhq/pbKQ="; + cp312 = "sha256-eO80pxODwfzzNeUx4OWQhnhX/OkGnwbtNRvmznpY/FA="; + cp313 = "sha256-VNJyX4tl2WFckz/sXsYuVKZ7jy4UKGAm+wFGBiU2cO8="; + cp314 = "sha256-c+22+1/QVIGx81isLopMf2oDHYn5uCPSWlh923UpBw8="; }; aarch64-linux = { - cp311 = "sha256-DqL2cKdyWDOtIzOoxGq2mGWtBsjl3p9laV4PjzUzHOw="; - cp312 = "sha256-JlQfabtVYH74M1uqx1su0S/yzgLVYxMhmyntoAMDkiE="; - cp313 = "sha256-tBXVkOBi8kiQfg/kKZSUPxFya3F4/PSxz1VGch+xpfg="; - cp314 = "sha256-TmGNYeGxS2/emlhhUfP9nUNbC4UEi5l7yqf0pTN0eys="; + cp311 = "sha256-rqZVgx0lCEyzQwAqjmene2qlUt23dqZUYdSfYohPCWo="; + cp312 = "sha256-4f0DxuzF/kwxRmVp5BzgpPryb7kweYydHx6x9AWmh8g="; + cp313 = "sha256-oOnP6SyIq3SryiOSPBWlkvSbx2F//dpBkNrKd4WnxPY="; + cp314 = "sha256-w6FtQ9dSg6PWT6HZBKOtrz9Sbz9Qj0R1Bbi7jccLrWw="; }; aarch64-darwin = { - cp311 = "sha256-AFP9W0APesViY6obvT1o+3k0Gwi43Gl8iHgtWsp7PtQ="; - cp312 = "sha256-E3+QBu7ijKq4JggDzKMU83u9o/yU/foxx3C10Bliatg="; - cp313 = "sha256-+YRKknLvLm61dxAlhmByz0I0z0x8waMeI1t95xEYZL4="; - cp314 = "sha256-sGIEXGTCvOOaUWYWJPcpLHu/MPKp2Hhieq4x1G2lcS0="; + cp311 = "sha256-qa1OJpQesvjb1JStB/nyInFDFkxhFBMrJrI61PILHG8="; + cp312 = "sha256-aEpCfFB0WYnpKjMjQ/CBLJO4UG9xx2i5Wx7vwRNJJpk="; + cp313 = "sha256-mSBH9QRztb/qdMj1KPmZlo4LS8c1ryOtR2oPTgR0Guo="; + cp314 = "sha256-844Dt3xT49lAka7bhLFO/n7ltYHYW30TklBmvNSMRKI="; }; }; in @@ -117,7 +117,7 @@ buildPythonPackage (finalAttrs: { python = pyShortVersion; abi = pyShortVersion; platform = platforms.${stdenv.hostPlatform.system} or { }; - sha256 = + hash = hashes.${stdenv.hostPlatform.system}.${pyShortVersion} or (throw "No hash specified for '${stdenv.hostPlatform.system}.${pyShortVersion}'"); }; diff --git a/pkgs/development/python-modules/scanpy/default.nix b/pkgs/development/python-modules/scanpy/default.nix index cad855c690a3..4a6d8a50678d 100644 --- a/pkgs/development/python-modules/scanpy/default.nix +++ b/pkgs/development/python-modules/scanpy/default.nix @@ -26,6 +26,7 @@ pynndescent, scikit-learn, scipy, + scverse-misc, seaborn, session-info2, statsmodels, @@ -63,14 +64,15 @@ buildPythonPackage (finalAttrs: { pname = "scanpy"; - version = "1.12.1"; + version = "1.12.2"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "scverse"; repo = "scanpy"; tag = finalAttrs.version; - hash = "sha256-r8kicjCFyEKLxQtFYuZg0NKK7gRBoaLSSFGWqcQtBqM="; + hash = "sha256-0CtFaj0+mCNDLG5h728vJkvYGcsa48SbDd3/Y8TXtQo="; }; # Otherwise, several tests fail to be collected: @@ -105,6 +107,7 @@ buildPythonPackage (finalAttrs: { pynndescent scikit-learn scipy + scverse-misc seaborn session-info2 statsmodels @@ -206,6 +209,7 @@ buildPythonPackage (finalAttrs: { "test_burczynski06" "test_clip" "test_doc_shape" + "test_download_atomic" "test_download_failure" "test_ebi_expression_atlas" "test_mean_var" diff --git a/pkgs/development/python-modules/scverse-misc/default.nix b/pkgs/development/python-modules/scverse-misc/default.nix new file mode 100644 index 000000000000..1ebdb5c30a37 --- /dev/null +++ b/pkgs/development/python-modules/scverse-misc/default.nix @@ -0,0 +1,87 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatch-vcs, + hatchling, + + # dependencies + session-info2, + typing-extensions, + + # optional-dependencies + # datasets: + anndata, + pooch, + pyyaml, + tqdm, + # settings: + pydantic-settings, + python-dotenv, + # sphinx: + sphinx, + + # tests + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "scverse-misc"; + version = "0.1.1"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "scverse"; + repo = "scverse-misc"; + tag = "v${finalAttrs.version}"; + hash = "sha256-PkvOaxGbZ1i10xgghdvGLCKiXcwg/eZzYvQ7Gp3K+JE="; + }; + + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ + session-info2 + typing-extensions + ]; + + optional-dependencies = { + datasets = [ + anndata + pooch + pyyaml + tqdm + ]; + settings = [ + pydantic-settings + python-dotenv + ]; + spatialdata = [ + # spatialdata (unpackaged) + ]; + sphinx = [ + # pydocstring-rs (unpackaged) + sphinx + ]; + }; + + pythonImportsCheck = [ "scverse_misc" ]; + + nativeCheckInputs = [ + pytestCheckHook + pyyaml + ]; + + meta = { + description = "Miscellaneous utility code used by scverse packages"; + homepage = "https://github.com/scverse/scverse-misc"; + changelog = "https://github.com/scverse/scverse-misc/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/streamcontroller-streamdeck/default.nix b/pkgs/development/python-modules/streamcontroller-streamdeck/default.nix index 0838aba51775..fdd2c81f76b9 100644 --- a/pkgs/development/python-modules/streamcontroller-streamdeck/default.nix +++ b/pkgs/development/python-modules/streamcontroller-streamdeck/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "streamcontroller-streamdeck"; - version = "0.1.5"; + version = "0.1.7"; pyproject = true; src = fetchPypi { inherit version; pname = "streamcontroller_streamdeck"; - hash = "sha256-JSDCg9PLDqxM1KdoCEnYzJip71re6rdS/mLn6fsGn9E="; + hash = "sha256-n8MYXsuWGSfOTnYrFItwkQaZlBQvPOwt1GdNP4MDjnY="; }; patches = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index b59352305d0a..c17e0d1cc9d4 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "stripe"; - version = "15.2.1"; + version = "15.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WCGoAqv3C+kA17G2u2CWl8wlyapSHrhkMOaLmU2sn3g="; + hash = "sha256-/wVSQlX1G/ffDlvEqZ29D3N6/QVYe3ZXyC4Nmcf8RaQ="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index 8e7223b45edc..ed5b3a13f555 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/pkgs/development/python-modules/succulent/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "succulent"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; src = fetchFromGitHub { owner = "firefly-cpp"; repo = "succulent"; tag = version; - hash = "sha256-UnsjmsOigScAW7qlbV3JCJljENrWvZd7gQRSCGSZn+8="; + hash = "sha256-hoGYpXIrJYT+EZa0iWPDTv+5D4Egdzw4IzCA6rntyvU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix index d51ed92be55d..d0db18b8fc67 100644 --- a/pkgs/development/python-modules/temporalio/default.nix +++ b/pkgs/development/python-modules/temporalio/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "temporalio"; - version = "1.28.0"; + version = "1.29.0"; pyproject = true; src = fetchFromGitHub { @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "sdk-python"; tag = version; fetchSubmodules = true; - hash = "sha256-1Lztl2e9aQgqJPZQqdMTO0mVaPaZDa8w7psiUGh5EbA="; + hash = "sha256-A92qKOnoOf8D3YO+NOo7s2UwjsFmOG+m7FyASPJtn4U="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -43,7 +43,7 @@ buildPythonPackage rec { src cargoRoot ; - hash = "sha256-HQrayXfpsyGfX9GSp+FukMic/UGTExsw2a0n1oymOac="; + hash = "sha256-ER3iSeBQp5N934VrZCe3J9IMJ53EByIfXOu6MJT2PY4="; }; cargoRoot = "temporalio/bridge"; diff --git a/pkgs/development/python-modules/trsfile/default.nix b/pkgs/development/python-modules/trsfile/default.nix index 156a21d63ad8..c33bbb3e1050 100644 --- a/pkgs/development/python-modules/trsfile/default.nix +++ b/pkgs/development/python-modules/trsfile/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage (finalAttrs: { pname = "trsfile"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "Keysight"; repo = "python-trsfile"; tag = finalAttrs.version; - hash = "sha256-mY4L1FFg2wDWAGVadOca7GDffA05O3v317SCqHxt4F0="; + hash = "sha256-c56DvBezOPOTBoNnnP0NnpeKv5Gmf6usGrLwI4Qm3As="; }; pyproject = true; diff --git a/pkgs/development/python-modules/tt-flash/default.nix b/pkgs/development/python-modules/tt-flash/default.nix index b21f1de69322..30a84d5d9ce7 100644 --- a/pkgs/development/python-modules/tt-flash/default.nix +++ b/pkgs/development/python-modules/tt-flash/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage (finalAttrs: { pname = "tt-flash"; - version = "3.9.0"; + version = "3.10.0"; pyproject = true; __structuredAttrs = true; @@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: { owner = "tenstorrent"; repo = "tt-flash"; tag = "v${finalAttrs.version}"; - hash = "sha256-YpkDBLkhN413wbJ2eLzRJGSG6Rn6eMNSkCBvy+G0wh4="; + hash = "sha256-wE8qDgoXiYeUbrcGY46JnPVT4neNGu3U5DTXlMuewjc="; }; build-system = [ diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 60704abf0bdb..04ba2a6c9823 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -37,14 +37,14 @@ buildPythonPackage (finalAttrs: { pname = "wagtail"; - version = "7.4.1"; + version = "7.4.2"; pyproject = true; src = fetchFromGitHub { owner = "wagtail"; repo = "wagtail"; tag = "v${finalAttrs.version}"; - hash = "sha256-+Ar8lg340rafaRNgcohEBuloU/dJC+ODTzAMmrPS/PU="; + hash = "sha256-6IttzQnASWMDq4fgyrpJj3KrQvO4zMq+0dLTfm8bLzs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xnatpy/default.nix b/pkgs/development/python-modules/xnatpy/default.nix index 9a73b35d35fa..05e5310a1ee0 100644 --- a/pkgs/development/python-modules/xnatpy/default.nix +++ b/pkgs/development/python-modules/xnatpy/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "xnatpy"; - version = "0.7.2"; + version = "0.8.1"; pyproject = true; src = fetchPypi { pname = "xnat"; inherit version; - hash = "sha256-YbZJl6lvhuhpmeC+0LikZghIEsR2OYe0Om6IRxZcBwg="; + hash = "sha256-2hU+fUu058G+z/ecncQJd1D1b3e+9KpbnCxEb+VPWa0="; }; build-system = [ diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index ce9f9554e35e..75486f4d0692 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.12.11"; + version = "1.12.13"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-X5cqedKlv48pFBp0w15oa7CGCmtuxneviS+Uz5sSRkU="; + hash = "sha256-gmcpLmAjXGDC0l6ho48lyS1uxHdY1SImNrjB7PCM1ec="; }; postPatch = '' diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 880c4d7f04e5..3ee51f489581 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -1209,13 +1209,13 @@ in t-smart-tmux-session-manager = mkTmuxPlugin rec { pluginName = "t-smart-tmux-session-manager"; - version = "2.8.0"; + version = "2.11.1"; rtpFilePath = "t-smart-tmux-session-manager.tmux"; src = pkgs.fetchFromGitHub { owner = "joshmedeski"; repo = "t-smart-tmux-session-manager"; rev = "v${version}"; - hash = "sha256-EMDEEIWJ+XFOk0WsQPAwj9BFBVDNwFUCyd1ScceqKpc="; + hash = "sha256-iEiTF4NPUCVDp+bIfrbRx8HE1NrTJtxd667fTk0EfEA="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index fb1c66c6d996..c738a1cf13a9 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xone"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "dlundqvist"; repo = "xone"; tag = "v${finalAttrs.version}"; - hash = "sha256-9bflLH4lPGM7Ziv6w0+HC56jMU0IchL/9udbIqTIMd8="; + hash = "sha256-ENk/SOUzXbzXYhwN3AdbO2u/tWjf/Mn+V22A2ce21XU="; }; setSourceRoot = '' diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix index d2c2ed7a6f23..b5c80ef7f339 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-lokiexplore-app"; - version = "2.1.3"; - zipHash = "sha256-P16yiN9iSch74A8Yo/EQW/E1OWzB69jRFxQBe0t5E3Y="; + version = "2.1.5"; + zipHash = "sha256-n5bZnLBgOUcUuZigVdYX9Fsp5NczFsAiHvxwfoz43f4="; meta = { description = "Browse Loki logs without the need for writing complex queries"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix index ae93321a4dec..68ae78bffda0 100644 --- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "victoriametrics-logs-datasource"; - version = "0.28.0"; - zipHash = "sha256-DDCe66GyC7UumcQgQwn1qKSfyKxO45QnmyvsI+q4HY0="; + version = "0.29.0"; + zipHash = "sha256-zTZRUCWGwJ02/hewJEPclfEWlTYQU0jUUDyxuRkyRHA="; meta = { description = "Grafana datasource for VictoriaLogs"; license = lib.licenses.asl20; diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 5fe8d22c6c89..8a8f1afb3b8e 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -46,7 +46,6 @@ let license = lib.licenses.mit; maintainers = with lib.maintainers; [ thefloweringash - teutat3s ]; }; }; diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix index 2516d6be2f48..3414c4a24218 100644 --- a/pkgs/tools/misc/opentelemetry-collector/builder.nix +++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "ocb"; # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix` # whenever that version changes. - version = "0.151.0"; + version = "0.155.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "cmd/builder/v${version}"; - hash = "sha256-X7Ke4X6t0HXKlf0hJb1CXE18T8Ov2GZwjX4HSGJ1gtw="; + hash = "sha256-EG//ddcXolvILucKYWZSoeqgFCE7u3/h8v/oX3pzafk="; }; sourceRoot = "${src.name}/cmd/builder"; - vendorHash = "sha256-rRrLHqwLQQAB5u2vbtAjInUjvj6sGMyKPjOKVnwvQSM="; + vendorHash = "sha256-SeLEg/xwSEr3uPZbjlLFny+OpfovcmKVD6BxCgoosz8="; env.CGO_ENABLED = 0; ldflags = [ diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix deleted file mode 100644 index 4a5b765a4131..000000000000 --- a/pkgs/tools/package-management/nix/common-meson.nix +++ /dev/null @@ -1,274 +0,0 @@ -{ - lib, - fetchFromGitHub, - version, - suffix ? "", - hash ? null, - src ? fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - rev = version; - inherit hash; - }, - patches ? [ ], - teams ? [ lib.teams.nix ], - self_attribute_name, -}@args: -assert (hash == null) -> (src != null); -{ - stdenv, - bison, - boehmgc, - boost, - brotli, - busybox-sandbox-shell, - bzip2, - callPackage, - cmake, - curl, - doxygen, - editline, - flex, - git, - gtest, - jq, - lib, - libarchive, - libblake3, - libcpuid, - libgit2, - libsodium, - lowdown, - lowdown-unsandboxed, - toml11, - man, - meson, - ninja, - mdbook, - nlohmann_json, - nixosTests, - openssl, - perl, - python3, - pkg-config, - rapidcheck, - rsync, - sqlite, - util-linuxMinimal, - xz, - enableDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, - enableStatic ? stdenv.hostPlatform.isStatic, - withAWS ? lib.meta.availableOn stdenv.hostPlatform aws-c-common, - aws-c-common, - aws-sdk-cpp, - withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, - libseccomp, - - confDir, - stateDir, - storeDir, - - # passthru tests - pkgsi686Linux, - pkgsStatic, - runCommand, - pkgs, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "nix"; - - version = "${version}${suffix}"; - VERSION_SUFFIX = suffix; - - inherit src patches; - - outputs = [ - "out" - "dev" - ] - ++ lib.optionals enableDocumentation [ - "man" - "doc" - ]; - - hardeningDisable = [ - "shadowstack" - ] - ++ lib.optional stdenv.hostPlatform.isMusl "fortify"; - - nativeCheckInputs = [ - git - man - ]; - - nativeBuildInputs = [ - bison - cmake - flex - jq - meson - ninja - pkg-config - rsync - ] - ++ lib.optionals enableDocumentation [ - (lib.getBin lowdown-unsandboxed) - mdbook - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - util-linuxMinimal - ] - ++ lib.optionals enableDocumentation [ - python3 - doxygen - ]; - - buildInputs = [ - boost - brotli - bzip2 - curl - editline - libgit2 - libsodium - lowdown - openssl - sqlite - toml11 - xz - ] - ++ lib.optionals (lib.versionAtLeast version "2.26") [ - libblake3 - ] - ++ lib.optionals stdenv.hostPlatform.isx86_64 [ - libcpuid - ] - ++ lib.optionals withLibseccomp [ - libseccomp - ] - ++ lib.optionals withAWS [ - aws-sdk-cpp - ]; - - propagatedBuildInputs = [ - boehmgc - nlohmann_json - libarchive - ]; - - checkInputs = [ - gtest - rapidcheck - ]; - - postPatch = '' - patchShebangs --build tests - ''; - - preConfigure = - # Copy libboost_context so we don't get all of Boost in our closure. - # https://github.com/NixOS/nixpkgs/issues/45462 - lib.optionalString (!enableStatic) '' - mkdir -p $out/lib - cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib - rm -f $out/lib/*.a - ${lib.optionalString stdenv.hostPlatform.isLinux '' - chmod u+w $out/lib/*.so.* - patchelf --set-rpath $out/lib:${lib.getLib stdenv.cc.cc}/lib $out/lib/libboost_thread.so.* - ''} - ''; - - dontUseCmakeConfigure = true; - - mesonFlags = [ - (lib.mesonBool "unit-tests" (stdenv.buildPlatform.canExecute stdenv.hostPlatform)) - (lib.mesonBool "bindings" false) - (lib.mesonOption "libstore:store-dir" storeDir) - (lib.mesonOption "libstore:localstatedir" stateDir) - (lib.mesonOption "libstore:sysconfdir" confDir) - (lib.mesonEnable "libutil:cpuid" stdenv.hostPlatform.isx86_64) - (lib.mesonEnable "libstore:seccomp-sandboxing" withLibseccomp) - (lib.mesonBool "libstore:embedded-sandbox-shell" ( - stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic - )) - (lib.mesonBool "doc-gen" enableDocumentation) - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - (lib.mesonOption "libstore:sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") - # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 - ] - ++ lib.optionals (stdenv.cc.isGNU && !enableStatic) [ - # TODO: do we still need this? - # "--enable-lto" - ]; - - doCheck = true; - - # socket path becomes too long otherwise - preInstallCheck = - lib.optionalString stdenv.hostPlatform.isDarwin '' - export TMPDIR=$NIX_BUILD_TOP - '' - # See https://github.com/NixOS/nix/issues/5687 - + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") '' - echo "exit 0" > tests/functional/flakes/show.sh - '' - + '' - # nixStatic otherwise does not find its man pages in tests. - export MANPATH=$man/share/man:$MANPATH - ''; - - separateDebugInfo = stdenv.hostPlatform.isLinux && !enableStatic; - - passthru = { - inherit aws-sdk-cpp boehmgc; - - # TODO: - perl-bindings = perl.pkgs.toPerlModule ( - callPackage ./nix-perl.nix { - nix = finalAttrs.finalPackage; - } - ); - - tests = import ./tests.nix { - inherit - runCommand - version - src - lib - stdenv - pkgs - pkgsi686Linux - pkgsStatic - nixosTests - self_attribute_name - ; - nix = finalAttrs.finalPackage; - }; - }; - - # point 'nix edit' and ofborg at the file that defines the attribute, - # not this common file. - pos = builtins.unsafeGetAttrPos "version" args; - meta = { - description = "Powerful package manager that makes package management reliable and reproducible"; - longDescription = '' - Nix is a powerful package manager for Linux and other Unix systems that - makes package management reliable and reproducible. It provides atomic - upgrades and rollbacks, side-by-side installation of multiple versions of - a package, multi-user package management and easy setup of build - environments. - ''; - homepage = "https://nixos.org/"; - license = lib.licenses.lgpl21Plus; - inherit teams; - platforms = lib.platforms.unix; - # Gets stuck in functional-tests in cross-trunk jobset and doesn't timeout - # https://hydra.nixos.org/build/298175022 - # probably https://github.com/NixOS/nix/issues/13042 - broken = stdenv.hostPlatform.system == "i686-linux" && stdenv.buildPlatform != stdenv.hostPlatform; - outputsToInstall = [ "out" ] ++ lib.optional enableDocumentation "man"; - mainProgram = "nix"; - }; -}) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 226bc4adaabd..8dfbd7f46bd2 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -10,24 +10,8 @@ pkgsi686Linux, pkgsStatic, nixosTests, - - storeDir ? "/nix/store", - stateDir ? "/nix/var", - confDir ? "/etc", }: let - # Called for Nix == 2.28. Transitional until we always use - # per-component packages. - commonMeson = - args: - nixDependencies.callPackage (import ./common-meson.nix ({ inherit lib fetchFromGitHub; } // args)) { - inherit - storeDir - stateDir - confDir - ; - }; - # Intentionally does not support overrideAttrs etc # Use only for tests that are about the package relation to `pkgs` and/or NixOS. addTestsShallowly = @@ -166,46 +150,11 @@ let test = "shebang.sh"; } ]; - - # Lowdown 3.0 compatibility patch for nix 2.28 and 2.30, which have a - # different markdown.cc layout (no LOWDOWN_TERM_NORELLINK branch) and - # never received an upstream backport. - lowdown30PatchOld = ./patches/lowdown-3.0-compat-2.28-2.30.patch; in lib.makeExtensible ( self: ( { - nix_2_28 = commonMeson { - version = "2.28.7"; - src = removeFunctionalTests commonDisabledTests (fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - rev = "2.28.7"; - hash = "sha256-Fq4+7uYz6bdE1HvPqn+qZcYX1rNilVKT7YAAPLA8170="; - }); - self_attribute_name = "nix_2_28"; - patches = [ - lowdown30PatchOld - ]; - }; - - nixComponents_2_30 = - (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.30.5"; - inherit teams; - otherSplices = generateSplicesForNixComponents "nixComponents_2_30"; - src = removeFunctionalTests commonDisabledTests (fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - tag = version; - hash = "sha256-tGiV71RxtCNcUNX86ZwmOIghG4pLwm5nlRKd89er7Gk="; - }); - }).appendPatches - [ lowdown30PatchOld ]; - - nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything; - nixComponents_2_31 = (nixDependencies.callPackage ./modular/packages.nix rec { version = "2.31.5"; @@ -275,13 +224,16 @@ lib.makeExtensible ( // { nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_2_31."; nixComponents_2_29 = throw "nixComponents_2_29 has been removed. use nixComponents_2_31."; + nixComponents_2_30 = throw "nixComponents_2_30 has been removed. use nixComponents_2_31."; nixComponents_2_32 = throw "nixComponents_2_32 has been removed. use nixComponents_2_34."; nixComponents_2_33 = throw "nixComponents_2_33 has been removed. use nixComponents_2_34."; nix_2_24 = throw "nix_2_24 has been removed. use nix_2_31."; nix_2_26 = throw "nix_2_26 has been removed. use nix_2_31."; nix_2_27 = throw "nix_2_27 has been removed. use nix_2_31."; nix_2_25 = throw "nix_2_25 has been removed. use nix_2_31."; + nix_2_28 = throw "nix_2_28 has been removed. use nix_2_31."; nix_2_29 = throw "nix_2_29 has been removed. use nix_2_31."; + nix_2_30 = throw "nix_2_30 has been removed. use nix_2_31."; nix_2_32 = throw "nix_2_32 has been removed. use nix_2_34."; nix_2_33 = throw "nix_2_33 has been removed. use nix_2_34."; diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix deleted file mode 100644 index 828255f5453a..000000000000 --- a/pkgs/tools/package-management/nix/nix-perl.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ - stdenv, - lib, - perl, - pkg-config, - curl, - nix, - libsodium, - boost, - autoreconfHook, - autoconf-archive, - xz, - meson, - ninja, - bzip2, - libarchive, -}: - -let - atLeast223 = lib.versionAtLeast nix.version "2.23"; - atLeast224 = lib.versionAtLeast nix.version "2.24"; - atLeast226 = lib.versionAtLeast nix.version "2.26"; - - mkConfigureOption = - { - mesonOption, - autoconfOption, - value, - }: - let - setFlagTo = - if atLeast223 then lib.mesonOption mesonOption else lib.withFeatureAs true autoconfOption; - in - setFlagTo value; -in -stdenv.mkDerivation (finalAttrs: { - pname = "nix-perl"; - inherit (nix) version src; - - postUnpack = "sourceRoot=$sourceRoot/${lib.optionalString atLeast224 "src"}/perl"; - - # TODO: Remove this once the nix build also uses meson - postPatch = lib.optionalString (atLeast224 && lib.versionOlder nix.version "2.27") '' - substituteInPlace lib/Nix/Store.xs \ - --replace-fail 'config-util.hh' 'nix/config.h' \ - --replace-fail 'config-store.hh' 'nix/config.h' - ''; - - buildInputs = [ - boost - bzip2 - curl - libsodium - nix - perl - xz - ] - ++ lib.optional atLeast226 libarchive; - - # Not cross-safe since Nix checks for curl/perl via - # NEED_PROG/find_program, but both seem to be needed at runtime - # as well. - nativeBuildInputs = [ - pkg-config - perl - curl - ] - ++ ( - if atLeast223 then - [ - meson - ninja - ] - else - [ - autoconf-archive - autoreconfHook - ] - ); - - # `perlPackages.Test2Harness` is marked broken for Darwin - doCheck = !stdenv.hostPlatform.isDarwin; - - nativeCheckInputs = [ - perl.pkgs.Test2Harness - ]; - - ${if atLeast223 then "mesonFlags" else "configureFlags"} = [ - (mkConfigureOption { - mesonOption = "dbi_path"; - autoconfOption = "dbi"; - value = "${perl.pkgs.DBI}/${perl.libPrefix}"; - }) - (mkConfigureOption { - mesonOption = "dbd_sqlite_path"; - autoconfOption = "dbd-sqlite"; - value = "${perl.pkgs.DBDSQLite}/${perl.libPrefix}"; - }) - ] - ++ lib.optionals atLeast223 [ - (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) - ]; - - preConfigure = "export NIX_STATE_DIR=$TMPDIR"; - - passthru = { inherit perl; }; -}) diff --git a/pkgs/tools/package-management/nix/patches/lowdown-3.0-compat-2.28-2.30.patch b/pkgs/tools/package-management/nix/patches/lowdown-3.0-compat-2.28-2.30.patch deleted file mode 100644 index dd527f7f1cd6..000000000000 --- a/pkgs/tools/package-management/nix/patches/lowdown-3.0-compat-2.28-2.30.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/src/libcmd/markdown.cc -+++ b/src/libcmd/markdown.cc -@@ -37,7 +37,13 @@ - .vmargin = 0, - # endif - .feat = LOWDOWN_COMMONMARK | LOWDOWN_FENCED | LOWDOWN_DEFLIST | LOWDOWN_TABLES, -- .oflags = LOWDOWN_TERM_NOLINK, -+ .oflags = -+# if HAVE_LOWDOWN_3 -+ LOWDOWN_NOLINK -+# else -+ LOWDOWN_TERM_NOLINK -+# endif -+ , - }; - - auto doc = lowdown_doc_new(&opts); ---- a/src/libcmd/meson.build -+++ b/src/libcmd/meson.build -@@ -36,6 +36,7 @@ - configdata.set('HAVE_LOWDOWN', lowdown.found().to_int()) - # The API changed slightly around terminal initialization. - configdata.set('HAVE_LOWDOWN_1_4', lowdown.version().version_compare('>= 1.4.0').to_int()) -+configdata.set('HAVE_LOWDOWN_3', lowdown.version().version_compare('>= 3.0.0').to_int()) - - readline_flavor = get_option('readline-flavor') - if readline_flavor == 'editline' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cb5c04222cd6..f50bc9fe7945 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1843,6 +1843,7 @@ mapAliases { postgresql_13_jit = throw "postgresql_13_jit has been removed since it reached its EOL upstream"; # Added 2025-11-17 postgresqlJitPackages = throw "'postgresqlJitPackages' has been renamed to/replaced by 'postgresqlPackages'"; # Converted to throw 2025-10-27 pot = throw "'pot' has been removed as it requires libsoup 2.4 which is EOL"; # Added 2025-10-09 + pothos = throw "'pothos' has been removed as it relies on pcre, and is unmaintained upstream"; # Added 2026-06-17 powerdns = throw "'powerdns' has been renamed to/replaced by 'pdns'"; # Converted to throw 2025-10-27 powwow = throw "'powwow' has been removed, since it's unmaintained since 2021 and doesn't build with glibc 2.42"; # Added 2025-09-28 pqos-wrapper = throw "'pqos-wrapper' has been removed, since it's unmaintained since 2022 and archived upstream"; # Added 2026-05-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd5f15a42713..faf87c8991a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3694,6 +3694,8 @@ with pkgs; ghdl-llvm = ghdl.override { backend = "llvm"; }; + ghdl-llvm-jit = ghdl.override { backend = "llvm-jit"; }; + gcc-arm-embedded = gcc-arm-embedded-15; # Haskell and GHC @@ -10799,12 +10801,7 @@ with pkgs; callPackage ../tools/package-management/nix/dependencies-scope.nix { } ); - nixVersions = recurseIntoAttrs ( - callPackage ../tools/package-management/nix { - storeDir = config.nix.storeDir or "/nix/store"; - stateDir = config.nix.stateDir or "/nix/var"; - } - ); + nixVersions = recurseIntoAttrs (callPackage ../tools/package-management/nix { }); nix = nixVersions.stable; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9b1c6175496..318c5bbe055e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17945,6 +17945,8 @@ self: super: with self; { scspell = callPackage ../development/python-modules/scspell { }; + scverse-misc = callPackage ../development/python-modules/scverse-misc { }; + sdbus = callPackage ../development/python-modules/sdbus { }; sdbus-networkmanager = callPackage ../development/python-modules/sdbus-networkmanager { };