diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index a38150e470b3..6621fd8ec8c8 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -19,7 +19,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2 + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} @@ -43,7 +43,7 @@ jobs: Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}. * [ ] Before merging, ensure that this backport is [acceptable for the release](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases). - * Even as a non-commiter, if you find that it is not acceptable, leave a comment. + * Even as a non-committer, if you find that it is not acceptable, leave a comment. - name: "Add 'has: port to stable' label" if: steps.backport.outputs.created_pull_numbers != '' diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index 831a58fdd74a..37e269c9c8bb 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -63,7 +63,7 @@ jobs: - name: Build codeowners validator run: nix-build base/ci -A codeownersValidator - - uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2 + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 id: app-token with: app-id: ${{ vars.OWNER_RO_APP_ID }} @@ -98,7 +98,7 @@ jobs: # This is intentional, because we need to request the review of owners as declared in the base branch. - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2 + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 id: app-token with: app-id: ${{ vars.OWNER_APP_ID }} diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index abed73db63e4..15dfedb1fb55 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -244,7 +244,7 @@ jobs: steps: # See ./codeowners-v2.yml, reuse the same App because we need the same permissions # Can't use the token received from permissions above, because it can't get enough permissions - - uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2 + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 id: app-token with: app-id: ${{ vars.OWNER_APP_ID }} diff --git a/.github/workflows/keep-sorted.yml b/.github/workflows/keep-sorted.yml index b23295a23af4..8c7688ad42e3 100644 --- a/.github/workflows/keep-sorted.yml +++ b/.github/workflows/keep-sorted.yml @@ -36,5 +36,6 @@ jobs: run: "nix-env -f '' -iAP keep-sorted jq" - name: Check that Nix files are sorted + shell: bash run: | git ls-files | xargs keep-sorted --mode lint | jq --raw-output '.[] | "Please make sure any new entries in \(.path) are sorted alphabetically."' diff --git a/.github/workflows/no-channel.yml b/.github/workflows/no-channel.yml index acaa937ad936..8a0d78114613 100644 --- a/.github/workflows/no-channel.yml +++ b/.github/workflows/no-channel.yml @@ -4,14 +4,14 @@ on: pull_request_target: # Re-run should be triggered when the base branch is updated, instead of silently failing types: [opened, synchronize, reopened, edited] - branches: - - 'nixos-**' - - 'nixpkgs-**' permissions: {} jobs: fail: + if: | + startsWith(github.event.pull_request.base.ref, 'nixos-') || + startsWith(github.event.pull_request.base.ref, 'nixpkgs-') name: "This PR is is targeting a channel branch" runs-on: ubuntu-24.04 steps: diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml index 4a083b050e22..7b0bb953da73 100644 --- a/.github/workflows/periodic-merge.yml +++ b/.github/workflows/periodic-merge.yml @@ -19,7 +19,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2 + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index a8ad8d57b37a..7806f7e9f9a2 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -16,8 +16,12 @@ rec { extraPostPatch = '' while read patch_name; do - echo "applying LibreWolf patch: $patch_name" - patch -p1 < ${source}/$patch_name + if [ "$patch_name" -neq "patches/macos-import-vector.patch"]; then + echo "applying LibreWolf patch: $patch_name" + patch -p1 < ${source}/$patch_name + else + echo "skipping LibreWolf patch: $patch" + fi done <${source}/assets/patches.txt cp -r ${source}/themes/browser . diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 37aadf891aa6..dac8db4bc863 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "137.0.2-1", + "packageVersion": "138.0.1-2", "source": { - "rev": "137.0.2-1", - "hash": "sha256-PZapXnpVGdQrTXWjlNuFj3idqelTKTpwapuwx+XuwW8=" + "rev": "138.0.1-2", + "hash": "sha256-H4GvKTrx0+GdUFOjW+E53VwZcZnrrBiXiMvR6aCEKDE=" }, "firefox": { - "version": "137.0.2", - "hash": "sha512-ghQMQyUjPqLi9XkIjOu5jA6NuISLQBjP+V1O1Cv4RwSe1lIPwFHZMO4melrLAIkIFwgl04FYnaDRCcoEph4cJA==" + "version": "138.0.1", + "hash": "sha512-vFqNZYFAxMPbKdURNMlxBaAiVWfVzhR1f2lZQGa/akShPgYmzr3it6B4usEooUaQ7gYIPQMG13id4qXp2DlLIw==" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json index 651e9a4ccdc1..1f7ace104885 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "aba20bf6082fdccafc36c1ba79ba2705b2ef6f159a3455585c98cf128e767986" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1c5efab645244d13cda7111a456aff796dfb4645c845df82266c4da56d3db2a7" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "658aa3c0672f2eb3305b262a7187d0fa7fa2759dccdca196612472a9fcc4fd48" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "df41354c497c8c2514b247c237415d721fb1381bb821c00af59526ba2ef1e8e8" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "f92a63c9f570afd4a9f33b69a441ce057ee4d31359026e9b699f519ae7b8a81a" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "041a626ab65e9f61bdc67e664649bc8dc434cc9f89da15611660967a1d156fa3" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-images.txt", - "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-images.txt", + "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index 23ce5c92fc2e..0b1653cd6653 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.30.11+k3s1"; - k3sCommit = "c2662fbee6d24b3917cf078cbf2ff69cae501340"; - k3sRepoSha256 = "0zsl5p2dmj3mkcjxbrhsa40r8bhgcrql8r8cxach4nv6y7fcyan5"; - k3sVendorHash = "sha256-G7RUyFzg3B4X0tdKmD1ep9a4cnVkUmFqBP5t1s8uFLc="; + k3sVersion = "1.30.12+k3s1"; + k3sCommit = "f9dbf16e17a6db90b64583316d9c321180e9c062"; + k3sRepoSha256 = "0d0kbbf6c6gv2s0w8m7br6vxcid48g8hirmszksd3g4brix3yxz2"; + k3sVendorHash = "sha256-FQu2Chk463c+/VYcOhfU8xIxm/ZNe1GumkEH/u2DIt0="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json index 2784691c211d..9c0007b99bda 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "2666c3880447979079b94babccf12296706167a5747a0f94962b257bda442449" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "b165c30ccff774f95019f70e200e59d3eea8a3b7fc63c64c07d839c1feb48357" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "6698d8bcfb029f1d16e0f2aa1d53be09d026995d26a0e4bfd92292f49c68538b" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "9adfe524ab0bb53d0753dc92759e7f2847e5ce75b88966544da16b5c37605da8" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "0c96ae243b40bb624f9cb34e2851c9cffc77e1ed0127b3e81a2e4a0ff56511a5" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "26ab12d269a619df5d21464e6b1fa539b7c7b2f039737f656683d59eb71f83ac" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-images.txt", - "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-images.txt", + "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix index a689a6065a33..495e9258de05 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.31.7+k3s1"; - k3sCommit = "e050ca66d129762a00599628e6f55cfdfab3a7ba"; - k3sRepoSha256 = "1q531x745ypc08wp43yf0mh0r90gpi6r8bqbmgpvx0nvv9gwn8sb"; - k3sVendorHash = "sha256-WQPXRwW50/6e1MPnuQCAICROVlrMfARUdHJAgJ7UwQQ="; + k3sVersion = "1.31.8+k3s1"; + k3sCommit = "33429f764d560f617c049e4ebb323c00963419c0"; + k3sRepoSha256 = "0dpp3gi2g4qqi0szz53j9z06bcgkdzh3c64651d8zjjj151rmhwv"; + k3sVendorHash = "sha256-vQQGJOFNO2rCJ/UWxWYgH617DctCmTF6eqH7Yq5T+2Q="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index eb4c2f7b1675..2e44311d130f 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -30,15 +30,21 @@ in }; # 1_29 can be built with the same builder as 1_30 - k3s_1_29 = common ( - (import ./1_29/versions.nix) - // { - updateScript = [ - ./update-script.sh - "29" - ]; - } - ) extraArgs; + k3s_1_29 = + (common ( + (import ./1_29/versions.nix) + // { + updateScript = [ + ./update-script.sh + "29" + ]; + } + ) extraArgs).overrideAttrs + { + meta.knownVulnerabilities = [ + "k3s_1_29 has reached end-of-life on 2025-02-28. See https://www.suse.com/lifecycle#k3s" + ]; + }; k3s_1_30 = common ( (import ./1_30/versions.nix) diff --git a/pkgs/by-name/bu/budgie-systemmonitor-applet/install-schemas-to-datadir.patch b/pkgs/by-name/bu/budgie-systemmonitor-applet/install-schemas-to-datadir.patch new file mode 100644 index 000000000000..292127b0db7f --- /dev/null +++ b/pkgs/by-name/bu/budgie-systemmonitor-applet/install-schemas-to-datadir.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index f63bdec..2de3778 100644 +--- a/meson.build ++++ b/meson.build +@@ -52,7 +52,7 @@ add_project_arguments( + LIB_INSTALL_DIR = join_paths(libdir, 'budgie-desktop', 'plugins', meson.project_name()) + + install_data('schema/com.prateekmedia.systemmonitor.gschema.xml', +- install_dir: '/usr/share/glib-2.0/schemas' ++ install_dir: join_paths(datadir, 'glib-2.0/schemas') + ) + + subdir('icons') diff --git a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix new file mode 100644 index 000000000000..b4bb9cb2ae23 --- /dev/null +++ b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + budgie-desktop, + fetchFromGitHub, + glib, + gtk3, + libgee, + libgtop, + libpeas, + meson, + ninja, + nix-update-script, + pkg-config, + vala, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "budgie-systemmonitor-applet"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "prateekmedia"; + repo = "budgie-systemmonitor-applet"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OWGy2LokpMOW4ZR3K+Bym7i88xQAJqWO43Pu7SjxRSw="; + }; + + # Remove if/when https://github.com/prateekmedia/budgie-systemmonitor-applet/pull/3 is merged + patches = [ ./install-schemas-to-datadir.patch ]; + + strictDeps = true; + + nativeBuildInputs = [ + glib # For `glib-compile-schemas` + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + budgie-desktop + glib + gtk3 + libgee + libgtop + libpeas + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Budgie applet to show cpu frequency, ram, swap, network and uptime"; + homepage = "https://github.com/prateekmedia/budgie-systemmonitor-applet"; + changelog = "https://github.com/prateekmedia/budgie-systemmonitor-applet/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.budgie.members; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/si/signal-desktop/copy-noto-emoji.py b/pkgs/by-name/si/signal-desktop/copy-noto-emoji.py index 393519e5c1f0..8acaebcb23d7 100644 --- a/pkgs/by-name/si/signal-desktop/copy-noto-emoji.py +++ b/pkgs/by-name/si/signal-desktop/copy-noto-emoji.py @@ -55,21 +55,6 @@ def emoji_to_noto_name(emoji: str) -> str: ) -def emoji_to_emoji_data_name(emoji: str) -> str: - r"""Return the npm emoji-data emoji name of an emoji. - - emoji-data emoji names are hyphen‐minus‐separated Unicode scalar - values, represented in lowercase big‐endian hex padded to at least - four digits. - - >>> emoji_to_emoji_data_name("😶‍🌫️") - '1f636-200d-1f32b-fe0f' - >>> emoji_to_emoji_data_name("\U0001f636\u200d\U0001f32b\ufe0f") - '1f636-200d-1f32b-fe0f' - """ - return "-".join(f"{ord(scalar_value):04x}" for scalar_value in emoji) - - def _main() -> None: noto_png_path, asar_root = (Path(arg) for arg in sys.argv[1:]) asar_root = asar_root.absolute() @@ -77,16 +62,6 @@ def _main() -> None: out_path = asar_root / "images" / "nixpkgs-emoji" out_path.mkdir(parents=True) - emoji_data_out_path = ( - asar_root - / "node_modules" - / "emoji-datasource-apple" - / "img" - / "apple" - / "64" - ) - emoji_data_out_path.mkdir(parents=True) - jumbomoji_json_path = asar_root / "build" / "jumbomoji.json" with jumbomoji_json_path.open() as jumbomoji_json_file: jumbomoji_packs = json.load(jumbomoji_json_file) @@ -107,10 +82,6 @@ def _main() -> None: ) continue - ( - emoji_data_out_path / f"{emoji_to_emoji_data_name(emoji)}.png" - ).symlink_to(out_path / emoji) - print(out_path.relative_to(asar_root)) diff --git a/pkgs/by-name/si/signal-desktop/generic.nix b/pkgs/by-name/si/signal-desktop/generic.nix index bf5f0fabccc3..d806e2a829ee 100644 --- a/pkgs/by-name/si/signal-desktop/generic.nix +++ b/pkgs/by-name/si/signal-desktop/generic.nix @@ -43,6 +43,7 @@ at-spi2-core, libappindicator-gtk3, mesa, + libwebp, # Runtime dependencies: systemd, libnotify, @@ -86,6 +87,15 @@ let runHook postInstall ''; }); + + noto-emoji-sheet-32 = fetchurl { + url = "https://raw.githubusercontent.com/iamcal/emoji-data/refs/tags/v15.1.2/sheet_google_32.png"; + hash = "sha256-S03NCTbvB5yeQl62WpLNjNGhjNErtgaOB6tAj/X8vPc="; + }; + noto-emoji-sheet-64 = fetchurl { + url = "https://raw.githubusercontent.com/iamcal/emoji-data/refs/tags/v15.1.2/sheet_google_64.png"; + hash = "sha256-kZYStR5xAuausSpOD6wJZRJZ1K6nPpweE3aYSgWntS4="; + }; in stdenv.mkDerivation rec { inherit pname version; @@ -124,7 +134,8 @@ stdenv.mkDerivation rec { asar extract "$out/${libdir}/resources/app.asar" $out/asar-contents rm -r \ "$out/${libdir}/resources/app.asar"{,.unpacked} \ - $out/asar-contents/node_modules/emoji-datasource-apple + $out/asar-contents/images/emoji-sheet-32.webp \ + $out/asar-contents/images/emoji-sheet-64.webp ''; }; @@ -136,6 +147,7 @@ stdenv.mkDerivation rec { # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) + libwebp ]; buildInputs = [ @@ -208,6 +220,10 @@ stdenv.mkDerivation rec { # Create required symlinks: ln -s libGLESv2.so "$out/lib/signal-desktop/libGLESv2.so.2" + # Compress the emoji sheets to webp, as signal expects webp images. The flags used are the same as those used upstream. + cwebp -progress -mt -preset icon -alpha_filter best -alpha_q 20 -pass 10 -q 75 ${noto-emoji-sheet-32} -o asar-contents/images/emoji-sheet-32.webp + cwebp -progress -mt -preset icon -alpha_filter best -alpha_q 20 -pass 10 -q 75 ${noto-emoji-sheet-64} -o asar-contents/images/emoji-sheet-64.webp + # Copy the Noto Color Emoji PNGs into the ASAR contents. See `src` # for the motivation, and the script for the technical details. emojiPrefix=$( @@ -270,6 +286,9 @@ stdenv.mkDerivation rec { # Various npm packages lib.licenses.free + + lib.licenses.asl20 # noto-emoji + lib.licenses.mit # emoji-data ]; maintainers = with lib.maintainers; [ mic92 diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix index 9280347b8965..127e1e44bb2e 100644 --- a/pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix @@ -1,7 +1,7 @@ { callPackage }: callPackage ./generic.nix { } { pname = "signal-desktop"; - version = "7.47.0-1"; + version = "7.52.0"; libdir = "usr/lib64/signal-desktop"; bindir = "usr/bin"; @@ -10,6 +10,6 @@ callPackage ./generic.nix { } { bsdtar -xf $downloadedFile -C "$out" ''; - url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/08795262-signal-desktop/signal-desktop-7.47.0-1.fc42.aarch64.rpm"; - hash = "sha256-CDj9OX6OfEzbP8kusqnWN+MCPPEi9u2Hj1LkpsCg3vI="; + url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/08956500-signal-desktop/signal-desktop-7.52.0-1.fc42.aarch64.rpm"; + hash = "sha256-kQbCkswCNRnz/K6KpZKJ55bCaM2YFL9wW+erVA+3Nok="; } diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix index b0ab336efd86..2f4d93c3def7 100644 --- a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "signal-desktop"; - version = "7.47.0"; + version = "7.52.0"; src = fetchurl { url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg"; - hash = "sha256-PP8D6D/DJiONJp0UNUSoy8zDwWGVWRRMsqfPTWQCgs8="; + hash = "sha256-GamsV4tWLEWbegUIrmZ4ZpAuRbfZzlxjnEy7FOo4q/E="; }; sourceRoot = "."; diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop.nix b/pkgs/by-name/si/signal-desktop/signal-desktop.nix index 3f64c17b254a..b1d5938c05bf 100644 --- a/pkgs/by-name/si/signal-desktop/signal-desktop.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop.nix @@ -1,12 +1,12 @@ { callPackage }: callPackage ./generic.nix { } rec { pname = "signal-desktop"; - version = "7.47.0"; + version = "7.52.0"; libdir = "opt/Signal"; bindir = libdir; extractPkg = "dpkg-deb -x $downloadedFile $out"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-rH1iuyVYoUNFvj2Z9DI5MXcX+sXjN2NSW2uaKafTO9M="; + hash = "sha256-SOe0BAEE5ljBb/OM3F7ejQQk8/KROFf7kfs/Gtp+bSY="; } diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix deleted file mode 100644 index 580538c121f4..000000000000 --- a/pkgs/by-name/sk/skypeforlinux/package.nix +++ /dev/null @@ -1,194 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - squashfsTools, - writeScript, - alsa-lib, - atk, - cairo, - cups, - curl, - dbus, - expat, - fontconfig, - freetype, - gdk-pixbuf, - glib, - glibc, - gnome-keyring, - gtk3, - libappindicator-gtk3, - libnotify, - libpulseaudio, - libsecret, - libv4l, - nspr, - nss, - pango, - systemd, - wrapGAppsHook3, - xorg, - at-spi2-atk, - libuuid, - at-spi2-core, - libdrm, - mesa, - libxkbcommon, - libxshmfence, -}: - -let - - # Please keep the version x.y.0.z and do not update to x.y.76.z because the - # source of the latter disappears much faster. - version = "8.138.0.213"; - revision = "392"; - - rpath = - lib.makeLibraryPath [ - alsa-lib - atk - at-spi2-atk - at-spi2-core - cairo - cups - curl - dbus - expat - fontconfig - freetype - glib - glibc - libsecret - libuuid - - gdk-pixbuf - gtk3 - libappindicator-gtk3 - - gnome-keyring - - libnotify - libpulseaudio - nspr - nss - pango - stdenv.cc.cc - systemd - - libv4l - libdrm - mesa - libxkbcommon - libxshmfence - xorg.libxkbfile - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libXScrnSaver - xorg.libxcb - ] - + ":${lib.getLib stdenv.cc.cc}/lib64"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - name = "skypeforlinux-${version}-${revision}.snap"; - url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap"; - hash = "sha512-ZLqmJMkIVlBvflHAXCStEt1T3eZgw/KMBlR754sR7mljIsr0liddGxFu2fjSijEBkx1mzoB+4ErOB/Il0KCXEA=="; - } - else - throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; - -in -stdenv.mkDerivation { - pname = "skypeforlinux"; - inherit version revision; - - system = "x86_64-linux"; - - inherit src; - - nativeBuildInputs = [ - wrapGAppsHook3 - glib # For setup hook populating GSETTINGS_SCHEMA_PATH - ]; - - buildInputs = [ squashfsTools ]; - - unpackPhase = '' - runHook preUnpack - - unsquashfs "$src" '/meta/gui/*.desktop' \ - /usr/share/{doc/skypeforlinux,'icons/hicolor/*/apps/skypeforlinux.png',kservices5,pixmaps,skypeforlinux} - sourceRoot=squashfs-root - - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/bin" - mv meta/gui usr/share/applications - mv usr/share "$out" - ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin" - - runHook postInstall - ''; - - postFixup = '' - for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* -or -name \*.node\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true - done - - # Fix the desktop link - substituteInPlace "$out/share/applications/"*.desktop \ - --replace-fail 'Exec=skype ' 'Exec=skypeforlinux ' \ - --replace-fail 'Icon=''${SNAP}/meta/gui/skypeforlinux.png' 'Icon=skypeforlinux' - substituteInPlace "$out/share/kservices5/ServiceMenus/skypeforlinux.desktop" \ - --replace-fail 'Exec=/usr/bin/skypeforlinux ' 'Exec=skypeforlinux ' - ''; - - passthru.updateScript = writeScript "update-skypeforlinux" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts curl jq - - set -eu -o pipefail - - data=$(curl -H 'X-Ubuntu-Series: 16' \ - 'https://api.snapcraft.io/api/v1/snaps/details/skype?channel=stable&fields=download_sha512,revision,version') - - version=$(jq -r .version <<<"$data") - - if [[ "x$UPDATE_NIX_OLD_VERSION" != "x$version" ]]; then - - revision=$(jq -r .revision <<<"$data") - hash=$(nix hash to-sri "sha512:$(jq -r .download_sha512 <<<"$data")") - - update-source-version "$UPDATE_NIX_ATTR_PATH" "$version" "$hash" - update-source-version --ignore-same-hash --version-key=revision "$UPDATE_NIX_ATTR_PATH" "$revision" "$hash" - - fi - ''; - - meta = { - description = "Linux client for Skype"; - homepage = "https://www.skype.com"; - changelog = "https://support.microsoft.com/en-us/skype/what-s-new-in-skype-for-windows-mac-linux-and-web-d32f674c-abb3-40a5-a0b7-ee269ca60831"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.mjoerg ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "skypeforlinux"; - }; -} diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json index b9206c222094..f2c5a94437d9 100644 --- a/pkgs/by-name/ve/velocity/deps.json +++ b/pkgs/by-name/ve/velocity/deps.json @@ -608,72 +608,102 @@ "io/netty#netty-bom/4.1.104.Final": { "pom": "sha256-WmXgahWdINO0gAYkpXDGRtvucQsrU5s0SaJoVYwonpw=" }, - "io/netty#netty-buffer/4.1.119.Final": { - "jar": "sha256-MiJiGNhUwuUdSTWn6+RmO3Lsua9NqIG4a/UY5hrtSNM=", - "pom": "sha256-ZxrAlb6wlY6qKsRVFJKWSVO3ZDD3VBbGa93g8++Qb0k=" + "io/netty#netty-buffer/4.2.0.Final": { + "jar": "sha256-wBkmAXvg2WcRhFhSomRt5L8AqSVCsC7ZFfW+5Ugi/g0=", + "pom": "sha256-bBjzQVX17TipgvzKvnFjpPtKyIJT+mXMUO2UW5wqihA=" }, - "io/netty#netty-codec-haproxy/4.1.119.Final": { - "jar": "sha256-37y7TkXFgwaVU57Z6L3+EHQKorLM0Df3xsJXny5wq/4=", - "pom": "sha256-igsZt4CSwJwqUaAhzhIyeBTtF/L77u1WjeprreJlelo=" + "io/netty#netty-codec-base/4.2.0.Final": { + "jar": "sha256-RrVqvXE66yfG9H1zo+SF6iHZbFUFQWJq0PYsoMrhGPQ=", + "pom": "sha256-NiGpDs4IdW0xajveLg3IBxhIc/j/CC92+klZeguCNbU=" }, - "io/netty#netty-codec-http/4.1.119.Final": { - "jar": "sha256-/0jbY+ROJz5neDLlLMKhziZw2nlvIq8SmovUw3hqLTQ=", - "pom": "sha256-vOiQ0Qr5A4IpExJ+naVAK73GZuDCUEOKeMkcwS4nKNA=" + "io/netty#netty-codec-compression/4.2.0.Final": { + "jar": "sha256-tl3evCEZwECx5W+bZkfs3vjc29zSAOkdY63atOsauRw=", + "pom": "sha256-cuWm+0uQbKqiQxZebFNiyuAU4OAIE+11Hb5Y0B3p+eA=" }, - "io/netty#netty-codec/4.1.119.Final": { - "jar": "sha256-xJeTSgV0RLEmqG4G8rUJGI5IymxaXhTBgqAvHoyNX9s=", - "pom": "sha256-ZJYD0FaxmxgvbbDAyUVlNHgLtLpXV8/lRAYsIiTBb44=" + "io/netty#netty-codec-haproxy/4.2.0.Final": { + "jar": "sha256-Cyah1KJ7DmzZGp6w21n71bBBmukrZdaSBGbIynWzSFo=", + "pom": "sha256-xlckSFjKcaOrz5xXjNN5eIl23x82aemjlo3U+TCggOg=" }, - "io/netty#netty-common/4.1.119.Final": { - "jar": "sha256-mRppsVlNytmSbiaOfpRTDP2qif7vQq8mkiowLT4ukhI=", - "pom": "sha256-PMa/2IxM0XguEknOg8O1TyruD8YVy32HoFU3i66XUyM=" + "io/netty#netty-codec-http/4.2.0.Final": { + "jar": "sha256-iG0GBiC164CipVNL5wpH/FFsYKvQVVcPDvNMr28dYeI=", + "pom": "sha256-rI0zA731xoXJfFQQEzLGEqbrIc2KYI3mhtjfz1TFoJs=" }, - "io/netty#netty-handler/4.1.119.Final": { - "jar": "sha256-m0m+mONrt5ogJf+1FZrsh9onIM+lRfVt45w7wQhYexs=", - "pom": "sha256-thDmZTNdjjhqUojfU4o1bv+tZCNR4ZoVgzXqDSoASUs=" + "io/netty#netty-codec-marshalling/4.2.0.Final": { + "jar": "sha256-vdBfpYoNkN4YJfHLFtUYuYNXGS3TA/f2u1QUFdCSi60=", + "pom": "sha256-7q2vroWVahx6stgVkzy22BudMpyo6O9u1ANne3Dt7hY=" }, - "io/netty#netty-parent/4.1.119.Final": { - "pom": "sha256-/zqMSVFYZZvdITF/YSVIv1jXFNswT87Gm4BJake2hgM=" + "io/netty#netty-codec-protobuf/4.2.0.Final": { + "jar": "sha256-1hkWVKT52MRAv4VqAQxb1RhuwQAMEB03dUNSAESHjmU=", + "pom": "sha256-KUWxLJErMIvF3X7Sdeaol/hsaMuDoi9adJ2HN04NKlo=" }, - "io/netty#netty-resolver/4.1.119.Final": { - "jar": "sha256-O2yfn282B0chPRVJcd7B/IhSgg3BqY0FX/CdCWdviDY=", - "pom": "sha256-NmDAaSSYZKymorltz1va46qqJv8G7zHGgy8fRbPcfXc=" + "io/netty#netty-codec/4.2.0.Final": { + "jar": "sha256-fbLwyPRKH7ZoZPPvqG0DqZigfNOB1s0Oh0YR9GSKkM0=", + "pom": "sha256-WhGKGtrJLpPpS63SMdxvMS0k2RkWEOo5O3X+1FDaYd8=" }, - "io/netty#netty-transport-classes-epoll/4.1.119.Final": { - "jar": "sha256-OO28600PPByHvI25+BLTFzQsnI6VpKBS+3lqL3itCY4=", - "pom": "sha256-b+EBjyF42dyvIbm0LVNPHT/2eLUS7Km+wORqr9KEGdU=" + "io/netty#netty-common/4.2.0.Final": { + "jar": "sha256-UjcLbBMfU2tgybHmQ+mptuf/7PeH1dNFOxaJr72JSIY=", + "pom": "sha256-PPsQLAvAFyLCB/prp3iMnGkxbssK7NpZneT/rEw1nnM=" }, - "io/netty#netty-transport-classes-kqueue/4.1.119.Final": { - "jar": "sha256-r4T3GgvN6eTKLY8ct79qbU0kmSOnms4UqG/qgYqPkPc=", - "pom": "sha256-UD3mbIm3UTYOnfZkk8ME617x8T3IdwhZZrHV4mqnMHw=" + "io/netty#netty-handler/4.2.0.Final": { + "jar": "sha256-ZBJAh4MnA68MxjSeCj442TkkrQj9X6RzB+r5qug5YdA=", + "pom": "sha256-VX4ITPkgVg6ZtVUKb8Vcy74jpTmtCURFdhVsAHmtSa8=" }, - "io/netty#netty-transport-native-epoll/4.1.119.Final": { - "jar": "sha256-lgYKW1oKODfqQmHpfPpCi9HXZFqIMsGFievNhokLXRg=", - "pom": "sha256-irxRuVvO8pFNK/HU9PpWny7DWG3qRT5wjJw0HtVe4ek=" + "io/netty#netty-parent/4.2.0.Final": { + "pom": "sha256-r7Or46M80QKlWTbO40FwE4txcozZWEY78FDKE375qxw=" }, - "io/netty#netty-transport-native-epoll/4.1.119.Final/linux-aarch_64": { - "jar": "sha256-IlrvlWIYlmLgPJK9Xls+uFGlSZ2H75ArJky5JJiLGH0=" + "io/netty#netty-resolver/4.2.0.Final": { + "jar": "sha256-ySpDpbHanOEWv3PvuyNkT+acHNM9037ZDcxXnvWt0Sg=", + "pom": "sha256-cGaHuj0B5olAF0hwSJ1Nt6R0Rj6UAv7p6QqySgnccK0=" }, - "io/netty#netty-transport-native-epoll/4.1.119.Final/linux-x86_64": { - "jar": "sha256-ElV5I6UGnnNqkwXHOoezA7qeibMto+yV3qaoVvP9Y5c=" + "io/netty#netty-transport-classes-epoll/4.2.0.Final": { + "jar": "sha256-tyKjARA3ByL1AljVtKIZcMKvHO+zgQCAwe+zFhJ8ZCg=", + "pom": "sha256-TiF2aSsdI1maf2xsSAf7tBpHbGClxldxccW9WLxvftk=" }, - "io/netty#netty-transport-native-kqueue/4.1.119.Final": { - "jar": "sha256-F0Q4piU+ddPbVQ69CGJxq5bBHU5+jaPWpyr5xrSjhac=", - "pom": "sha256-sRoWwXL4F9pvCSo64FJjKP7oNU7GH9kdmQsEqsaPlA4=" + "io/netty#netty-transport-classes-io_uring/4.2.0.Final": { + "jar": "sha256-Y1RIRQCPj9/wW4JcUOoiCWJQNMLPZfiFl/dvPKvH2O0=", + "pom": "sha256-tjAC7xoEeJ9zHMIF7voNJM5z4bZ9kX34wxvbSj4xkkM=" }, - "io/netty#netty-transport-native-kqueue/4.1.119.Final/osx-aarch_64": { - "jar": "sha256-UtgGg6dkTO9ClKcZ0oXNaJeagkMZCB4kDRScsuZcx1E=" + "io/netty#netty-transport-classes-kqueue/4.2.0.Final": { + "jar": "sha256-4PX/BxGBO+ynWQ9ST9J3oe8WXy7pxRlrq41y10LdbCE=", + "pom": "sha256-KpL37GnxRY82aAnD1M99dRR23CxIuAZxdH0JWPk4sG0=" }, - "io/netty#netty-transport-native-kqueue/4.1.119.Final/osx-x86_64": { - "jar": "sha256-vDl3sM1Wo99hxhF6jfQd/Trv7oYuPFHKDUo4wzP/SqA=" + "io/netty#netty-transport-native-epoll/4.2.0.Final": { + "jar": "sha256-VHWlUTe9NaqZ8iA6nzjqX2N08BS4jfcp7bmZ9KgYo80=", + "pom": "sha256-I0HScHWe5FI3f+gvtxRoHet1Wta4XdPnTrPSMi+HfB0=" }, - "io/netty#netty-transport-native-unix-common/4.1.119.Final": { - "jar": "sha256-iuVhj2kybm0Xt3sBQPnSdxGNvSOQbKB2OLwBNlcoxlA=", - "pom": "sha256-SqiNTykFV76vUGtoXKVeZH7LM0d2IYCID+Qiypddgko=" + "io/netty#netty-transport-native-epoll/4.2.0.Final/linux-aarch_64": { + "jar": "sha256-o9xKVsE5jbEifUQcr0Ii2xaKXT9449X7tGu6lkmkOLU=" }, - "io/netty#netty-transport/4.1.119.Final": { - "jar": "sha256-wJIeoOecO5Ntqr4Iom6SZkKkrSSVHWEV+0M2LCHf6xA=", - "pom": "sha256-emUG02VfdKWneuAMaq/ZB70qt+0gAMNesqiObuTdA70=" + "io/netty#netty-transport-native-epoll/4.2.0.Final/linux-x86_64": { + "jar": "sha256-EQc20zqQ7V3p/HSEpDuopaJ+YRz57Bzl83f6Fu3wk6I=" + }, + "io/netty#netty-transport-native-io_uring/4.2.0.Final": { + "jar": "sha256-oTzFZIYRhC4iEavTzG7QwHNqlF2OxgHE3Pa9kkPboGw=", + "pom": "sha256-f45+F28dIA4O6ojEIu8fOPIbh1kmSsTNLsY2oLVCHDk=" + }, + "io/netty#netty-transport-native-io_uring/4.2.0.Final/linux-aarch_64": { + "jar": "sha256-YavxiRa4SKO7bAO0UnUyRxVeVb4YNWtdcTtaE0TInvs=" + }, + "io/netty#netty-transport-native-io_uring/4.2.0.Final/linux-x86_64": { + "jar": "sha256-VjWAqkvFfpxORqWG90gz8LNKLL9M8z6CCIMgqodqtxY=" + }, + "io/netty#netty-transport-native-kqueue/4.2.0.Final": { + "jar": "sha256-izT+uqOG2dFXVzP28oJDgaJcslyFhpUY98VvriN1AJg=", + "pom": "sha256-sVEZGtkMTI/ScxJcB/2Z2nkYxIsW1TJ4EbeXhYd9Fr4=" + }, + "io/netty#netty-transport-native-kqueue/4.2.0.Final/osx-aarch_64": { + "jar": "sha256-B7vau9N0Ngx7tGDqF4iaNlvC9q+yKUO6u6/fdv+nSA8=" + }, + "io/netty#netty-transport-native-kqueue/4.2.0.Final/osx-x86_64": { + "jar": "sha256-sCYa4U6hX5dz4ayf8uu3oNlyF9HauW0HWVnFYEVMQw4=" + }, + "io/netty#netty-transport-native-unix-common/4.2.0.Final": { + "jar": "sha256-7qfwGHxAlNWTQbFQ1K0fxEyWOuZHcn1fM6hkR00g9VI=", + "pom": "sha256-kT7odeA5R97x91lJLS+ZNgKWAfE+6EET/zlCSd4NiSk=" + }, + "io/netty#netty-transport/4.2.0.Final": { + "jar": "sha256-LAurKGrjmt+MKikn2C5v2WTcGbPtH729TG9OIg8FKP8=", + "pom": "sha256-YNXY8UcYoSxfjYkUPjo2/7tWE72VAJLHyaol4sy+Urc=" }, "it/unimi/dsi#fastutil/8.5.15": { "jar": "sha256-z/62ZzvfHm5Dd9aE3y9VrDWc9c9t9hPgXmLe7qUAk2o=", @@ -704,24 +734,24 @@ "jar": "sha256-Yq4oGH7SsGKBPaap1We/7nM8NBWCaZti3ZgCMHKaAxM=", "pom": "sha256-NYRJ1sc1OFhFCN2K5s/eVrr0o0t2e3HZzEZE8PH0IRo=" }, - "net/kyori#adventure-api/4.19.0": { - "jar": "sha256-WYIOnHz1S59nitY/VDta9kUltZPClxu2ujw7C1nd9v8=", - "module": "sha256-8JZ+QQNS2qP8qQWTX3g8VOpwG13hGAcVVOEwiBzXfb8=", - "pom": "sha256-lV69XjpLUNJ3cR2S3LdROCb8GRBn6u7l6ctDsr/1Sws=" + "net/kyori#adventure-api/4.21.0": { + "jar": "sha256-ZKdldgQB541DOofb1M2lcBazA4U8b9Hclwh7WjqmgTM=", + "module": "sha256-+lKIKqUdj68bqml6drFHBnQUmNTKOkGg2MSrkTr6mV8=", + "pom": "sha256-dRFiV0Q3x90YtMgLxL5lBOtRCVVTL6YGhO8xU5LhQCc=" }, - "net/kyori#adventure-bom/4.19.0": { - "module": "sha256-VbTxTZkdxIaGX8zClEu4dASgS63yfUUjvvMDFcBMKrE=", - "pom": "sha256-ZUAHrgk+ph5coMKWnY2y7byiBIRCiIJqWndTrNbW4Ao=" + "net/kyori#adventure-bom/4.21.0": { + "module": "sha256-6oUg3iIrlad0iW1bqJtFbKHQs7+RZbPsyOwvLXZhKPM=", + "pom": "sha256-fpuPxF10yGMnby42w0azTt+R2UJGxGgjRxv4w1hlenQ=" }, - "net/kyori#adventure-key/4.19.0": { - "jar": "sha256-GsZBwbobRBxJZSYyjpJ2jITS13Je3ZxFFFKfL/E7DPc=", - "module": "sha256-28bDKTs1bt81Tz8eX7ZVWObG6tF1hYXaw8veopN2ph4=", - "pom": "sha256-4o2gejddhOAtTeEbFbp7TFx2KAt2zjE2e5mDsO7kP1Q=" + "net/kyori#adventure-key/4.21.0": { + "jar": "sha256-apOYydQCCJ+doGCla0XK59WMvxmTcabY7Bom2PlMxrs=", + "module": "sha256-aepciDIN/bFf/lUqRKf0G8gBQqu6Kuds6nG3g4uF4Ho=", + "pom": "sha256-BERAvYv/A9TmYDNK3F5V8/bPlLf/ddBzS4DEHjqCgJc=" }, - "net/kyori#adventure-nbt/4.19.0": { - "jar": "sha256-uB/+eVyjSBrKwMQProzG/NPjW9Viy6AeMJIL0/9hO8k=", - "module": "sha256-SvJGrxsR/JnjDOAOgF4QPmDPG5s3/7BP8Ke5prHHCuU=", - "pom": "sha256-4UQRdGf45nwVyZ4pfksjLTQEUqAOU3dasu1skQ1IcUo=" + "net/kyori#adventure-nbt/4.21.0": { + "jar": "sha256-r27AXxaClKLmiLs8UhGxI70NTXh5HiS7fxE5rZi16zU=", + "module": "sha256-AGs77o7gGbcDYQ2MfBgzRW5OQ7nhEJO5yFF6Ck0M+B0=", + "pom": "sha256-0DAw5LnLm+QZSU42YB/opYAbt0nfH4pY8Xhn4SBwRzE=" }, "net/kyori#adventure-platform-api/4.3.4": { "jar": "sha256-7GBGKMK3wWXqdMH8s6LQ8DNZwsd6FJYOOgvC43lnCsI=", @@ -733,45 +763,50 @@ "module": "sha256-VYXzbUzK6MaYbW4tmAjZs5ywl28CLK8sANPP5v1HTQQ=", "pom": "sha256-wP6w6syf5B8iL5iXsS4lrDw0Ub3VYWwUhclppgBO2eE=" }, - "net/kyori#adventure-text-logger-slf4j/4.19.0": { - "jar": "sha256-rPVYdaGXso8VqtF49fD+cj92I6D+GYob0Lyp0Ri7kEM=", - "module": "sha256-h9kOx6lt2kSbwAJvw0ns9OsoeuZI5UtKwpnXV7owtZ4=", - "pom": "sha256-8Dt8W/AgOtlrs+Fik7WK41How3oJD1Bv2nIyhw+FkOc=" + "net/kyori#adventure-text-logger-slf4j/4.21.0": { + "jar": "sha256-RyStz+/740AsjoMhhGkGArN0uxZuvRfm7ACMRFxTeTU=", + "module": "sha256-5WCx5qig2rD9wE+mseKirWZ3EkMJiyolz7A76DFNxtU=", + "pom": "sha256-7V/qFBbC6VjJcntV4fEaRoDmyM52WLE8FVt7UrEKPso=" }, - "net/kyori#adventure-text-minimessage/4.19.0": { - "jar": "sha256-Ur8zHlzz4/FiPReXl3mDS2UJ/u0C9HE2fFlPK40EkAM=", - "module": "sha256-H61A67t3+hPhBu6iFgGfe7qTysos4wpNZO65pc/IB5s=", - "pom": "sha256-7XBjLxNp3dwUai1jpgvn/zmMb4WP6hJKTeQJ8flfCg8=" + "net/kyori#adventure-text-minimessage/4.21.0": { + "jar": "sha256-UctIeIUbcmM76h0bWyTo3jRhS8koroodupa2OOmk6MQ=", + "module": "sha256-c/i/PZOmL76h8kLHmSq0qLNhuml92HWZCku22tY3qCs=", + "pom": "sha256-zwtZrXXi99pqoHZ0wlrwAKD4UNXmceXSs8aKgtTeVxA=" }, - "net/kyori#adventure-text-serializer-ansi/4.19.0": { - "jar": "sha256-4FADDha8o98IqSdTKW9ZTM0DxhSoKpxVN3GzJYJc+lw=", - "module": "sha256-wz3JY/1s6c/JuSv5WqNFxkx5oooGtIZa8BNWWrHtlSc=", - "pom": "sha256-/iuvsoLfqeqW6VuGy+k7lReG3VaNBm03inrGu2JBXwQ=" + "net/kyori#adventure-text-serializer-ansi/4.21.0": { + "jar": "sha256-LwrIh56+RgbvZhviUgAzqVEo6TDK0wr1vAxpy1kSmcU=", + "module": "sha256-V+Qm8xoIWTqA1aZvxnr/Y1y9Cqh8x8RWicmTpqoGwU0=", + "pom": "sha256-+cXbfm4x6DLrME+ZtgqP8AbTZ39XZOSqH1muT0KgDUU=" }, - "net/kyori#adventure-text-serializer-gson/4.19.0": { - "jar": "sha256-Z6mZgHH1A/gWHTfXchIBND0Y6FvMHpw4cvIVSAYjMak=", - "module": "sha256-K8DaajmTCvil6OUCKtTcolbM9ONEPb6NmZudKfFscqM=", - "pom": "sha256-hl1NmguHwh7eh4rhCfebKGTVJqx+XNUqGYLhX8UA9Fs=" + "net/kyori#adventure-text-serializer-commons/4.21.0": { + "jar": "sha256-LusmYFxyOlfltj0kwt1kGCFToUhsqOnzC8ukLSB/LCo=", + "module": "sha256-2SyvdO7dl496C1Q9dH4bNGD2+incUK9KAJEXKyyYJqM=", + "pom": "sha256-iSySW39EOPgDnk93KciCbI84LICMDDTIhoOtNqEN3PI=" }, - "net/kyori#adventure-text-serializer-json-legacy-impl/4.19.0": { - "jar": "sha256-jCc+wSoy1KJPfvcutsoXgnI20HN3/Sw00a2YruGk1JY=", - "module": "sha256-iN90DyLxs420gv/D2AZvFxsef7OKwPkDaZKQpCORvEU=", - "pom": "sha256-OVVdX3z4aEOKTs49HY4RNbokZbt0G7Fsik9HSN0NLJ0=" + "net/kyori#adventure-text-serializer-gson/4.21.0": { + "jar": "sha256-ObUc+poE324dL0MdJqaX7WGWI2ls3rHAChr9NHxc4IQ=", + "module": "sha256-xSvs+73VcbpmWXy7iHfbGxeBYfCNA44zYIv9P54aD28=", + "pom": "sha256-aEx9Da6SK8h5u+4lweWm/L6vCdnbDhijb9IuUZlqWsM=" }, - "net/kyori#adventure-text-serializer-json/4.19.0": { - "jar": "sha256-Na/GB6tPCsEEcGCGWpXYDxmVDQJoztodmQrI08kLMOE=", - "module": "sha256-yFSFbtKZciyb1p/BTzDQPdkaO/XflLFz+X0VtQl9jVQ=", - "pom": "sha256-HbcQwOOhGoS4L9d00bKSIFSYK+sNHFUBFLoIB6crENk=" + "net/kyori#adventure-text-serializer-json-legacy-impl/4.21.0": { + "jar": "sha256-zMCsXIBSo1C/yrpnyk03xyFL5aH42Syq44wcrWz4v1U=", + "module": "sha256-b4OuzShhdN3x79WpDiGuHB2uI3dxU71gx5C0BM8mgAQ=", + "pom": "sha256-ix6svUQKhS+N0V5SekEvDIU+uAaJc72krT+6K+Eq/QQ=" }, - "net/kyori#adventure-text-serializer-legacy/4.19.0": { - "jar": "sha256-hCkvU4/pyPeIXBQSXzq4vAFHt5SvazT84rCMBr3xmHg=", - "module": "sha256-pLhTnhajp6wXCcolTZgc5dhYNIe88PzcFgX1S6PiksE=", - "pom": "sha256-QdzUZVpfEFN8S+rVQ6QxQM105i+Bf5q3IvTKj/dqDxo=" + "net/kyori#adventure-text-serializer-json/4.21.0": { + "jar": "sha256-kocXstx2RathZhfAvVXoCpwDWHYrWQoNPAu+MCsuVIE=", + "module": "sha256-wTimiDaAyLv+TCvGCGU/AKxhu/QGqbXYHSityPXo3Q0=", + "pom": "sha256-XAMhaDcf2h9er2XKH0YsCV/ci8qGlyxL15T9CsaVLtg=" }, - "net/kyori#adventure-text-serializer-plain/4.19.0": { - "jar": "sha256-AbCOQiGv7zyNN3NO7axhnA5k4T3Mu6uknPxkmR2WihQ=", - "module": "sha256-yP6RIud0PDNL2hziel3DKLOtOsTtPBoBu2sRORDeemw=", - "pom": "sha256-9LPEmbFsK4SEQckhiC8+qOq0h5V6u88wHWntn8YJbxc=" + "net/kyori#adventure-text-serializer-legacy/4.21.0": { + "jar": "sha256-msG5n4KEWOGQCPZ1eBoOjIUXzfoiofxbuHp79pVUw1w=", + "module": "sha256-mJvCjUI2jqtsZERpc3oocvgf+BTCp+wWGwUqHRgkQQg=", + "pom": "sha256-KpOkDYdQEqmRPf4z6W5LXIUlRwDqVDSndkjHNLDFAhk=" + }, + "net/kyori#adventure-text-serializer-plain/4.21.0": { + "jar": "sha256-Ep1piIu5P+lvUS8eWBodNvAog2G4Xo7IBP1u7LzvMS4=", + "module": "sha256-qtwvfOI85wiFn3c/Bti6y6r1fWsGfG1vtSwx40gCrt4=", + "pom": "sha256-kqv+DaajY+E0gwjXNMuwTfyZkzjKq5zqVV4/JN9WLD0=" }, "net/kyori#ansi/1.1.1": { "jar": "sha256-tsVp4aCSW57rNJ4S2zXiI3VWEH4zNmV+Cy694mHYr9c=", @@ -788,10 +823,10 @@ "module": "sha256-qfpHivwqQ0b4pb4JH14UZmhgGS3YZbHj2FkilmRsdP4=", "pom": "sha256-XuAEEIIvNukBnZR2LOAbzWA5VpdlNRvvBmCUXNT5pW4=" }, - "net/kyori#option/1.0.0": { - "jar": "sha256-K95aei1z+hFmoPFmOiLDr30naP/E/qMxd0w8D2IiXRE=", - "module": "sha256-YXzjwBN6oKMvvZDUWRTGL+OGpeFGM6PKQSmXH9fVcq8=", - "pom": "sha256-2YZ98Ipo4JPUCc9aTuHeAWJPSZJJ0Yh2SwbKQaOQ6Sk=" + "net/kyori#option/1.1.0": { + "jar": "sha256-l7abSxff4CIXyRMa00JWTLya69BMdetoljm194/UsRw=", + "module": "sha256-Ntn51ZofzGCTZ6rMqiSTGWA+Ukf2qP4RK3O6uSGscNg=", + "pom": "sha256-HzMYoc7mPoCFCWJCzwYZpEuFdva1bCORoAzF4SdYR7Y=" }, "net/minecrell#terminalconsoleappender/1.3.0": { "jar": "sha256-Gv6hvKCVBo9/RIPwYf7tlHU740Iz3bDfnsOA/BTVqYU=", @@ -1186,10 +1221,14 @@ "pom": "sha256-hHjnmqIupq95eWRD+O0w//pdxkfrPS0YYLrC4j800pc=" }, "org/jspecify#jspecify/0.3.0": { - "jar": "sha256-4cfhgytglfz8vldIVwDHMw1T1OV+LFu/nHGBmwLpeL4=", "module": "sha256-M7jCLyQkwpAyQaf+olj8QasMTWiJd2V2xRkEdWLuQ6U=", "pom": "sha256-9LGyrWHKF/KNBjxWEJ0+g5g5oQswG8lzSVQ+zu5X8xY=" }, + "org/jspecify#jspecify/1.0.0": { + "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", + "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", + "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" + }, "org/junit#junit-bom/5.10.1": { "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix index fbec41ba1752..e45aa4516f39 100644 --- a/pkgs/by-name/ve/velocity/package.nix +++ b/pkgs/by-name/ve/velocity/package.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "velocity"; - version = "3.4.0-unstable-2025-04-03"; + version = "3.4.0-unstable-2025-04-30"; src = fetchFromGitHub { owner = "PaperMC"; repo = "Velocity"; - rev = "c72a3eefdeee26d39d5382c30435f9ce1819153e"; - hash = "sha256-mBVNZAuAarBBQRD4H7XR/Hp+VmO+yoOwrkj/tQeEOWA="; + rev = "b411a0fa09f76aec062921b77642828408f0099f"; + hash = "sha256-R61N4OxS5r4vtZC9IRGX1aizj6J5JB6nVP09+q1pyUo="; }; nativeBuildInputs = diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 2615406b4c61..d2eb0522a7a5 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.11.9"; + version = "1.12.0"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-/CJt4CZ9R1xB72Zwc76te51Fb3q4KHuzDxP3jWGzW8E="; + hash = "sha256-sGRR3nHPQttiBIIaA2yYFyRezEq+2Ds+mgCpy6TYueU="; }; pnpmDeps = pnpm_10.fetchDeps { diff --git a/pkgs/by-name/wh/whois/package.nix b/pkgs/by-name/wh/whois/package.nix index 7b12b26ecf9e..249f3bea1b63 100644 --- a/pkgs/by-name/wh/whois/package.nix +++ b/pkgs/by-name/wh/whois/package.nix @@ -11,14 +11,14 @@ }: stdenv.mkDerivation rec { - version = "5.5.23"; + version = "5.6.0"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - hash = "sha256-c/Mx2HXAj6mHH8rElG7+F94sSrVSL1N9HZBvaMWUjlw="; + hash = "sha256-NzOJMciqSY8ivvj6fBV1+w009F1zf47U1FQACSfsbUM="; }; patches = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dff26c40c918..cf3d51cb4d67 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1125,6 +1125,7 @@ mapAliases { shout = nodePackages.shout; # Added unknown; moved 2024-10-19 sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21 SkypeExport = skypeexport; # Added 2024-06-12 + skypeforlinux = throw "Skype has been shut down in May 2025"; # Added 2025-05-05 slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17 slurm-llnl = slurm; # renamed July 2017 snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04;