diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 0f8ed3b972ae..51d4b5c10da1 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -36,7 +36,7 @@ jobs: permission-pull-requests: write permission-workflows: write - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: ref: ${{ github.event.pull_request.head.sha }} token: ${{ steps.app-token.outputs.token }} diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index 44198e2e2735..28f61fdb31fa 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -46,7 +46,7 @@ jobs: # https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/ FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true" steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f199d849ac01..42e95a07a3c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: runs-on: ${{ matrix.runner }} timeout-minutes: 60 steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: .github/actions @@ -67,7 +67,7 @@ jobs: # Sandbox is disabled on MacOS by default. extra_nix_config: sandbox = true - - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 + - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16 continue-on-error: true with: # The nixpkgs-gha cache should not be trusted or used outside of Nixpkgs and its forks' CI. diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index b9f2246e768a..3b9de597f64d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-slim timeout-minutes: 3 steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false path: trusted @@ -75,7 +75,7 @@ jobs: runs-on: ubuntu-24.04-arm timeout-minutes: 5 steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: .github/actions @@ -87,7 +87,7 @@ jobs: - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 - - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 + - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16 continue-on-error: true with: # The nixpkgs-gha cache should not be trusted or used outside of Nixpkgs and its forks' CI. diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml index feb770a24ecd..b5439c586c6f 100644 --- a/.github/workflows/comment.yml +++ b/.github/workflows/comment.yml @@ -23,7 +23,7 @@ jobs: timeout-minutes: 2 if: contains(github.event.comment.body, '@NixOS/nixpkgs-merge-bot merge') steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: | diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 77dd85f6ae63..05afe086e2e5 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -43,7 +43,7 @@ jobs: ciPinBumpCommit: ${{ steps.find-pinned-commit.outputs.ciPinBumpCommit }} ciPinBumpCommitShort: ${{ steps.find-pinned-commit.outputs.ciPinBumpCommitShort }} steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false path: trusted @@ -51,7 +51,7 @@ jobs: ci/supportedVersions.nix - name: Check out the PR at the test merge commit - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false ref: ${{ inputs.mergedSha }} @@ -167,7 +167,7 @@ jobs: sudo mkswap /swap sudo swapon /swap - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: .github/actions @@ -182,7 +182,7 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 - - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 + - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16 continue-on-error: true with: # The nixpkgs-gha cache should not be trusted or used outside of Nixpkgs and its forks' CI. @@ -252,7 +252,7 @@ jobs: statuses: write timeout-minutes: 5 steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: .github/actions @@ -441,7 +441,7 @@ jobs: runs-on: ubuntu-24.04-arm timeout-minutes: 10 steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: .github/actions diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3e733c06cf6b..4d31b761dd3b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-24.04-arm timeout-minutes: 10 steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: .github/actions @@ -61,7 +61,7 @@ jobs: runs-on: ubuntu-24.04-arm timeout-minutes: 10 steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: .github/actions @@ -72,7 +72,7 @@ jobs: - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 - - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 + - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16 continue-on-error: true with: # The nixpkgs-gha cache should not be trusted or used outside of Nixpkgs and its forks' CI. @@ -90,7 +90,7 @@ jobs: runs-on: ubuntu-24.04-arm timeout-minutes: 10 steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: .github/actions @@ -102,7 +102,7 @@ jobs: - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 - - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 + - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16 continue-on-error: true with: # The nixpkgs-gha cache should not be trusted or used outside of Nixpkgs and its forks' CI. @@ -134,7 +134,7 @@ jobs: runs-on: ubuntu-slim timeout-minutes: 5 steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false path: trusted diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml index 0720817c6da7..0c5291a9b725 100644 --- a/.github/workflows/merge-group.yml +++ b/.github/workflows/merge-group.yml @@ -25,7 +25,7 @@ jobs: targetSha: ${{ steps.prepare.outputs.targetSha }} systems: ${{ steps.prepare.outputs.systems }} steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: | diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml index ac79898cb14b..d2c4a396291c 100644 --- a/.github/workflows/periodic-merge.yml +++ b/.github/workflows/periodic-merge.yml @@ -34,7 +34,7 @@ jobs: permission-contents: write permission-pull-requests: write - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml index 715728dadcf2..d6949e06ef45 100644 --- a/.github/workflows/pull-request-target.yml +++ b/.github/workflows/pull-request-target.yml @@ -31,7 +31,7 @@ jobs: systems: ${{ steps.prepare.outputs.systems }} touched: ${{ steps.prepare.outputs.touched }} steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout-cone-mode: true # default, for clarity diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index a458489f6886..1d709c0dce6b 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-slim timeout-minutes: 2 steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: | diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml index 69f03ea1dc03..625195834fb4 100644 --- a/.github/workflows/teams.yml +++ b/.github/workflows/teams.yml @@ -30,7 +30,7 @@ jobs: permission-pull-requests: write - name: Fetch source - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout: | @@ -64,7 +64,7 @@ jobs: echo "git-string=$name <$email>" >> "$GITHUB_OUTPUT" - name: Create Pull Request - uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0 + uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0 with: token: ${{ steps.app-token.outputs.token }} add-paths: maintainers/github-teams.json diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ae1681d8d9e3..20e7faf41630 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: push: ${{ steps.files.outputs.push }} targetSha: ${{ steps.prepare.outputs.targetSha }} steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false sparse-checkout-cone-mode: true # default, for clarity diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js index b3c3af8ec389..efb0b1e0a11c 100644 --- a/ci/github-script/bot.js +++ b/ci/github-script/bot.js @@ -332,13 +332,15 @@ module.exports = async ({ github, context, core, dry }) => { pull_number, per_page: 100, }) - const commitMessages = prCommits.map((c) => c.commit.message) + const commitSubjects = prCommits.map( + (c) => c.commit.message.split('\n')[0], + ) // Label new package PRs: "packagename: init at X.Y.Z" // Exclude NixOS module commits like "nixos/timekpr: init at 0.5.8" - const newPackagePattern = /(? 0 - const commitsIndicateNewPackage = commitMessages.some((msg) => + const commitsIndicateNewPackage = commitSubjects.some((msg) => newPackagePattern.test(msg), ) evalLabels['8.has: package (new)'] = @@ -347,8 +349,9 @@ module.exports = async ({ github, context, core, dry }) => { // Label package update PRs: "packagename: X.Y.Z -> A.B.C" // Matches versions like: 1.2.3, 0-unstable-2024-01-15, 1.3rc1, alpha, unstable // Exclude NixOS module commits like "nixos/ncps: types.str -> types.path" - const updatePackagePattern = /(?|→) [\w.-]+/ - const commitsIndicateUpdate = commitMessages.some((msg) => + const updatePackagePattern = + /^(?|→) [\w.-]*\d[\w.-]*$/ + const commitsIndicateUpdate = commitSubjects.some((msg) => updatePackagePattern.test(msg), ) evalLabels['8.has: package (update)'] = commitsIndicateUpdate diff --git a/doc/build-helpers/special/fhs-environments.section.md b/doc/build-helpers/special/fhs-environments.section.md index 91c0931e0e4e..69d830a32313 100644 --- a/doc/build-helpers/special/fhs-environments.section.md +++ b/doc/build-helpers/special/fhs-environments.section.md @@ -47,11 +47,9 @@ You can create a simple environment using a `shell.nix` like this: (with pkgs; [ udev alsa-lib - ]) - ++ (with pkgs.xorg; [ - libX11 - libXcursor - libXrandr + libx11 + libxcursor + libxrandr ]); multiPkgs = pkgs: diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md index 3f4b6c48e764..57c6d11ae6e0 100644 --- a/doc/languages-frameworks/index.md +++ b/doc/languages-frameworks/index.md @@ -56,7 +56,7 @@ android.section.md astal.section.md beam.section.md chicken.section.md -coq.section.md +rocq.section.md cosmic.section.md crystal.section.md cuda.section.md diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/rocq.section.md similarity index 55% rename from doc/languages-frameworks/coq.section.md rename to doc/languages-frameworks/rocq.section.md index 0eab34d044e4..ae1fec87e478 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/rocq.section.md @@ -1,14 +1,21 @@ -# Coq and coq packages {#sec-language-coq} +# Rocq and rocq packages {#sec-language-rocq} -## Coq derivation: `coq` {#coq-derivation-coq} +Note that "The Rocq Prover" (Rocq for short) is the new name of the +proof assistant formerly known as Coq. The `coq` and `coqPackages` +derivations currently remain for both older versions of Coq, but also +some versions of Rocq during the renaming transition. In the latter +case, the `coq` derivation encompasses the compatibility binaries +(`coqtop`, `coqc`, etc.) in addition to the `rocq` binary. The packages +only in `coqPackages` are the ones which currently still depend on these +compatibility binaries. -The Coq derivation is overridable through the `coq.override overrides`, where overrides is an attribute set which contains the arguments to override. We recommend overriding either of the following: +## Rocq derivation: `rocq-core` {#rocq-derivation-rocq} -* `version` (optional, defaults to the latest version of Coq selected for nixpkgs, see `pkgs/top-level/coq-packages` to witness this choice), which follows the conventions explained in the `coqPackages` section below, -* `customOCamlPackages` (optional, defaults to `null`, which lets Coq choose a version automatically), which can be set to any of the ocaml packages attribute of `ocaml-ng` (such as `ocaml-ng.ocamlPackages_4_10` which is the default for Coq 8.11 for example). -* `coq-version` (optional, defaults to the short version e.g. "8.10"), is a version number of the form "x.y" that indicates which Coq's version build behavior to mimic when using a source which is not a release. E.g. `coq.override { version = "d370a9d1328a4e1cdb9d02ee032f605a9d94ec7a"; coq-version = "8.10"; }`. +The Rocq derivation is overridable through the `rocq-core.override overrides`, where overrides is an attribute set which contains the arguments to override. We recommend overriding either of the following: -The associated package set can be obtained using `mkCoqPackages coq`, where `coq` is the derivation to use. +* `version` (optional, defaults to the latest version of Rocq selected for nixpkgs, see `pkgs/top-level/rocq-packages` to witness this choice), which follows the conventions explained in the `rocqPackages` section below, +* `customOCamlPackages` (optional, defaults to `null`, which lets Rocq choose a version automatically), which can be set to any of the ocaml packages attribute of `ocaml-ng` (such as `ocaml-ng.ocamlPackages_4_14` which is the default for Rocq 9.1 for example). +* `rocq-version` (optional, defaults to the short version e.g. "9.1"), is a version number of the form "x.y" that indicates which Rocq's version build behavior to mimic when using a source which is not a release. E.g. `rocq-core.override { version = "40be8435e132aab2231a79091f011ebc3e64a753"; rocq-version = "9.1"; }`. ## Creating custom Coq environments with `coq.withPackages` {#coq-withPackages} @@ -29,9 +36,9 @@ coq.withPackages ( ) ``` -## Coq packages attribute sets: `coqPackages` {#coq-packages-attribute-sets-coqpackages} +## Rocq packages attribute sets: `rocqPackages` {#rocq-packages-attribute-sets-rocqpackages} -The recommended way of defining a derivation for a Coq library, is to use the `coqPackages.mkCoqDerivation` function, which is essentially a specialization of `mkDerivation` taking into account most of the specifics of Coq libraries. The following attributes are supported: +The recommended way of defining a derivation for a Rocq library, is to use the `rocqPackages.mkRocqDerivation` function, which is essentially a specialization of `mkDerivation` taking into account most of the specifics of Rocq libraries. The following attributes are supported: * `pname` (required) is the name of the package, * `version` (optional, defaults to `null`), is the version to fetch and build, @@ -41,108 +48,85 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * if it is a path or a string representing an absolute path (i.e. starting with `"/"`), the provided path is selected as a source, and the `version` attribute of the resulting derivation is set to `"dev"`, * if it is a string of the form `owner:branch` then it tries to download the `branch` of owner `owner` for a project of the same name using the same vcs, and the `version` attribute of the resulting derivation is set to `"dev"`, additionally if the owner is not provided (i.e. if the `owner:` prefix is missing), it defaults to the original owner of the package (see below), * if it is a string of the form `"#N"`, and the domain is github, then it tries to download the current head of the pull request `#N` from github, -* `defaultVersion` (optional). Coq libraries may be compatible with some specific versions of Coq only. The `defaultVersion` attribute is used when no `version` is provided (or if `version = null`) to select the version of the library to use by default, depending on the context. This selection will mainly depend on a `coq` version number but also possibly on other packages versions (e.g. `mathcomp`). If its value ends up to be `null`, the package is marked for removal in end-user `coqPackages` attribute set. +* `defaultVersion` (optional). Rocq libraries may be compatible with some specific versions of Rocq only. The `defaultVersion` attribute is used when no `version` is provided (or if `version = null`) to select the version of the library to use by default, depending on the context. This selection will mainly depend on a `rocq-core` version number but also possibly on other packages versions (e.g. `mathcomp`). If its value ends up to be `null`, the package is marked for removal in end-user `rocqPackages` attribute set. * `release` (optional, defaults to `{}`), lists all the known releases of the library and for each of them provides an attribute set with at least a `hash` attribute (you may put the empty string `""` in order to automatically insert a fake hash, this will trigger an error which will allow you to find the correct hash), each attribute set of the list of releases also takes optional overloading arguments for the fetcher as below (i.e.`domain`, `owner`, `repo`, `rev`, `artifact` assuming the default fetcher is used) and optional overrides for the result of the fetcher (i.e. `version` and `src`). * `fetcher` (optional, defaults to a generic fetching mechanism supporting github or gitlab based infrastructures), is a function that takes at least an `owner`, a `repo`, a `rev`, and a `hash` and returns an attribute set with a `version` and `src`. * `repo` (optional, defaults to the value of `pname`), -* `owner` (optional, defaults to `"coq-community"`). -* `domain` (optional, defaults to `"github.com"`), domains including the strings `"github"` or `"gitlab"` in their names are automatically supported, otherwise, one must change the `fetcher` argument to support them (cf `pkgs/development/coq-modules/heq/default.nix` for an example), +* `owner` (optional, defaults to `"rocq-community"`). +* `domain` (optional, defaults to `"github.com"`), domains including the strings `"github"` or `"gitlab"` in their names are automatically supported, otherwise, one must change the `fetcher` argument to support them (cf `pkgs/development/rocq-modules/bignums/default.nix` for an example), * `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags, * `releaseArtifact` (optional, defaults to `(v: null)`), provides a default mapping from release names to artifact names (only works for github artifact for now), * `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers, -* `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, +* `namePrefix` (optional, defaults to `[ "rocq-core" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, * `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune`, `useDuneifVersion` and `mlPlugin` are set). * `extraNativeBuildInputs` (optional, deprecated), an additional list of derivation to add to `nativeBuildInputs`, * `overrideNativeBuildInputs` (optional) replaces the default list of derivation to which `nativeBuildInputs` and `extraNativeBuildInputs` adds extra elements, -* `buildInputs` (optional), is a list of libraries and dependencies that are required to build and run the current derivation, in addition to the default one `[ coq ]`, +* `buildInputs` (optional), is a list of libraries and dependencies that are required to build and run the current derivation, in addition to the default one `[ rocq-core ]`, * `extraBuildInputs` (optional, deprecated), an additional list of derivation to add to `buildInputs`, * `overrideBuildInputs` (optional) replaces the default list of derivation to which `buildInputs` and `extraBuildInputs` adds extras elements, -* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environments of subsequent derivation, which is necessary for Coq packages to work correctly, -* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Coq was built against. +* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Rocq libraries and Rocq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environments of subsequent derivation, which is necessary for Rocq packages to work correctly, +* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `rocq-core.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Rocq was built against. * `useDuneifVersion` (optional, default to `(x: false)` uses Dune to build the package if the provided predicate evaluates to true on the version, e.g. `useDuneifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, * `useDune` (optional, defaults to `false`) uses Dune to build the package if set to true, the presence of this attribute overrides the behavior of the previous one. * `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build. * `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it. -* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation. -* `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`, +* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variables `COQLIBINSTALL` and `COQPLUGININSTALL` so as to install in the proper subdirectory. Indeed Rocq libraries should be installed in `$(out)/lib/coq/${rocq-core.rocq-version}/user-contrib/`. Such directories are automatically added to the `$ROCQPATH` environment variable by the hook defined in the Rocq derivation. +* `setROCQBIN` (optional, defaults to `true`), by default, the environment variable `$ROCQBIN` is set to the current Rocq's binary, but one can disable this behavior by setting it to `false`, * `useMelquiondRemake` (optional, default to `null`) is an attribute set, which, if given, overloads the `preConfigurePhases`, `configureFlags`, `buildPhase`, and `installPhase` attributes of the derivation for a specific use in libraries using `remake` as set up by Guillaume Melquiond for `flocq`, `gappalib`, `interval`, and `coquelicot` (see the corresponding derivation for concrete examples of use of this option). For backward compatibility, the attribute `useMelquiondRemake.logpath` must be set to the logical root of the library (otherwise, one can pass `useMelquiondRemake = {}` to activate this without backward compatibility). * `dropAttrs`, `keepAttrs`, `dropDerivationAttrs` are all optional and allow to tune which attribute is added or removed from the final call to `mkDerivation`. -It also takes other standard `mkDerivation` attributes, they are added as such, except for `meta` which extends an automatically computed `meta` (where the `platform` is the same as `coq` and the homepage is automatically computed). +It also takes other standard `mkDerivation` attributes, they are added as such, except for `meta` which extends an automatically computed `meta` (where the `platform` is the same as `rocq-core` and the homepage is automatically computed). -Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes some `mathcomp` derivations as `extraBuildInputs`. +Here is a simple package example. It is a pure Rocq library, thus it depends on Rocq. It builds on the Mathematical Components library, thus it also takes some `mathcomp` derivations as `extraBuildInputs`. ```nix { lib, - mkCoqDerivation, + mkRocqDerivation, version ? null, - coq, + rocq-core, mathcomp, mathcomp-finmap, mathcomp-bigenough, }: -mkCoqDerivation { - # namePrefix leads to e.g. `name = coq8.11-mathcomp1.11-multinomials-1.5.2` +mkRocqDerivation { + # namePrefix leads to e.g. `name = rocq-core9.1-mathcomp2.5.0-multinomials-2.4.0` namePrefix = [ - "coq" + "rocq-core" "mathcomp" ]; pname = "multinomials"; owner = "math-comp"; inherit version; defaultVersion = + let + case = rocq: mc: out: { + cases = [ + rocq-core + mc + ]; + inherit out; + }; + in with lib.versions; lib.switch - [ coq.version mathcomp.version ] + [ rocq-core.rocq-version mathcomp.version ] [ - { - cases = [ - (range "8.7" "8.12") - (isEq "1.11") - ]; - out = "1.5.2"; - } - { - cases = [ - (range "8.7" "8.11") - (range "1.8" "1.10") - ]; - out = "1.5.0"; - } - { - cases = [ - (range "8.7" "8.10") - (range "1.8" "1.10") - ]; - out = "1.4"; - } - { - cases = [ - (isEq "8.6") - (range "1.6" "1.7") - ]; - out = "1.1"; - } + (case (range "8.18" "9.1") (range "2.1.0" "2.5.0") "2.4.0") + (case (range "8.17" "9.0") (range "2.1.0" "2.3.0") "2.3.0") ] null; release = { - "1.5.2".hash = "sha256-mjCx9XKa38Nz9E6wNK7YSqHdJ7YTua5fD3d6J4e7WpU="; - "1.5.1".hash = "sha256-Q8tm0y2FQAt2V1kZYkDlHWRia/lTvXAMVjdmzEV11I4="; - "1.5.0".hash = "sha256-HIK0f21G69oEW8JG46gSBde/Q2LR3GiBCv680gHbmRg="; - "1.5.0".rev = "1.5"; - "1.4".hash = "sha256-F9g3MSIr3B6UZ3p8QWjz3/Jpw9sudJ+KRlvjiHSO024="; - "1.3".hash = "sha256-BPJTlAL0ETHvLMBslE0KFVt3DNoaGuMrHt2SBGyJe1A="; - "1.2".hash = "sha256-mHXBXSLYO4BN+jfN50y/+XCx0Qq5g4Ac2Y/qlsbgAdY="; - "1.1".hash = "sha256-ejAsMQbB/LtU9j+g160VdGXULrCe9s0gBWzyhKqmCuE="; - "1.0".hash = "sha256-tZTOltEBBKWciDxDMs/Ye4Jnq/33CANrHJ4FBMPtq+I="; + "2.4.0".sha256 = "sha256-7zfIddRH+Sl4nhEPtS/lMZwRUZI45AVFpcC/UC8Z0Yo="; + "2.3.0".sha256 = "sha256-usIcxHOAuN+f/j3WjVbPrjz8Hl9ac8R6kYeAKi3CEts="; }; propagatedBuildInputs = [ - mathcomp.ssreflect + mathcomp.boot mathcomp.algebra mathcomp-finmap + mathcomp.fingroup mathcomp-bigenough ]; @@ -153,13 +137,13 @@ mkCoqDerivation { } ``` -## Three ways of overriding Coq packages {#coq-overriding-packages} +## Three ways of overriding Rocq packages {#rocq-overriding-packages} -There are three distinct ways of changing a Coq package by overriding one of its values: `.override`, `overrideCoqDerivation`, and `.overrideAttrs`. This section explains what sort of values can be overridden with each of these methods. +There are three distinct ways of changing a Rocq package by overriding one of its values: `.override`, `overrideRocqDerivation`, and `.overrideAttrs`. This section explains what sort of values can be overridden with each of these methods. -### `.override` {#coq-override} +### `.override` {#rocq-override} -`.override` lets you change arguments to a Coq derivation. In the case of the `multinomials` package above, `.override` would let you override arguments like `mkCoqDerivation`, `version`, `coq`, `mathcomp`, `mathcom-finmap`, etc. +`.override` lets you change arguments to a Rocq derivation. In the case of the `multinomials` package above, `.override` would let you override arguments like `mkRocqDerivation`, `version`, `rocq-core`, `mathcomp`, `mathcom-finmap`, etc. For example, assuming you have a special `mathcomp` dependency you want to use, here is how you could override the `mathcomp` dependency: @@ -167,35 +151,35 @@ For example, assuming you have a special `mathcomp` dependency you want to use, multinomials.override { mathcomp = my-special-mathcomp; } ``` -In Nixpkgs, all Coq derivations take a `version` argument. This can be overridden in order to easily use a different version: +In Nixpkgs, all Rocq derivations take a `version` argument. This can be overridden in order to easily use a different version: ```nix -coqPackages.multinomials.override { version = "1.5.1"; } +rocqPackages.multinomials.override { version = "1.5.1"; } ``` -Refer to [](#coq-packages-attribute-sets-coqpackages) for all the different formats that you can potentially pass to `version`, as well as the restrictions. +Refer to [](#rocq-packages-attribute-sets-rocqpackages) for all the different formats that you can potentially pass to `version`, as well as the restrictions. -### `overrideCoqDerivation` {#coq-overrideCoqDerivation} +### `overrideRocqDerivation` {#rocq-overrideRocqDerivation} -The `overrideCoqDerivation` function lets you easily change arguments to `mkCoqDerivation`. These arguments are described in [](#coq-packages-attribute-sets-coqpackages). +The `overrideRocqDerivation` function lets you easily change arguments to `mkRocqDerivation`. These arguments are described in [](#rocq-packages-attribute-sets-rocqpackages). For example, here is how you could locally add a new release of the `multinomials` library, and set the `defaultVersion` to use this release: ```nix -coqPackages.lib.overrideCoqDerivation { +rocqPackages.lib.overrideRocqDerivation { defaultVersion = "2.0"; release."2.0".hash = "sha256-czoP11rtrIM7+OLdMisv2EF7n/IbGuwFxHiPtg3qCNM="; -} coqPackages.multinomials +} rocqPackages.multinomials ``` -### `.overrideAttrs` {#coq-overrideAttrs} +### `.overrideAttrs` {#rocq-overrideAttrs} -`.overrideAttrs` lets you override arguments to the underlying `stdenv.mkDerivation` call. Internally, `mkCoqDerivation` uses `stdenv.mkDerivation` to create derivations for Coq libraries. You can override arguments to `stdenv.mkDerivation` with `.overrideAttrs`. +`.overrideAttrs` lets you override arguments to the underlying `stdenv.mkDerivation` call. Internally, `mkRocqDerivation` uses `stdenv.mkDerivation` to create derivations for Rocq libraries. You can override arguments to `stdenv.mkDerivation` with `.overrideAttrs`. For instance, here is how you could add some code to be performed in the derivation after installation is complete: ```nix -coqPackages.multinomials.overrideAttrs (oldAttrs: { +rocqPackages.multinomials.overrideAttrs (oldAttrs: { postInstall = oldAttrs.postInstall or "" + '' echo "you can do anything you want here" ''; diff --git a/doc/packages/index.md b/doc/packages/index.md index dbfe60ca3227..553b3d800193 100644 --- a/doc/packages/index.md +++ b/doc/packages/index.md @@ -32,7 +32,6 @@ cataclysm-dda.section.md urxvt.section.md vcpkg.section.md weechat.section.md -xorg.section.md uv.section.md build-support.md ``` diff --git a/doc/packages/xorg.section.md b/doc/packages/xorg.section.md deleted file mode 100644 index 958c5d7fb306..000000000000 --- a/doc/packages/xorg.section.md +++ /dev/null @@ -1,34 +0,0 @@ -# X.org {#sec-xorg} - -The Nix expressions for the X.org packages reside in `pkgs/servers/x11/xorg/default.nix`. This file is automatically generated from lists of tarballs in an X.org release. As such, it should not be modified directly; rather, you should modify the lists, the generator script, or the file `pkgs/servers/x11/xorg/overrides.nix`, in which you can override or add to the derivations produced by the generator. - -## Katamari Tarballs {#katamari-tarballs} - -X.org upstream releases used to include [katamari](https://en.wiktionary.org/wiki/%E3%81%8B%E3%81%9F%E3%81%BE%E3%82%8A) releases, which included a holistic recommended version for each tarball, up until 7.7. To create a list of tarballs in a katamari release: - -```ShellSession -export release="X11R7.7" -export url="mirror://xorg/$release/src/everything/" -cat $(PRINT_PATH=1 nix-prefetch-url $url | tail -n 1) \ - | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'url'}$2\n"; }; }' \ - | sort > "tarballs-$release.list" -``` - -## Individual Tarballs {#individual-tarballs} - -The upstream release process for [X11R7.8](https://x.org/wiki/Releases/7.8/) does not include a planned katamari. Instead, each component of X.org is released as its own tarball. We maintain `pkgs/servers/x11/xorg/tarballs.list` as a list of tarballs for each individual package. This list includes X.org core libraries and protocol descriptions, extra newer X11 interface libraries, like `xorg.libxcb`, and classic utilities which are largely unused but still available if needed, like `xorg.imake`. - -## Generating Nix Expressions {#generating-nix-expressions} - -The generator is invoked as follows: - -```ShellSession -cd pkgs/servers/x11/xorg -' -A xorg.xkeyboardconfig)/etc/X11/xkb/" +$ echo "$(nix-build --no-out-link '' -A xkeyboard-config)/etc/X11/xkb/" ``` Once the configuration is applied, and you did a logout/login cycle, the @@ -328,7 +328,7 @@ A layout can have several other components besides `xkb_symbols`, for example we will define new keycodes for some multimedia key and bind these to some symbol. -Use the *xev* utility from `pkgs.xorg.xev` to find the codes of the keys +Use the *xev* utility from `pkgs.xev` to find the codes of the keys of interest, then create a `media-key` file to hold the keycodes definitions diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 9db4c6fb8c47..72c5f798068d 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -57,7 +57,7 @@ let inherit (lib.strings) toJSON; cfg = config.systemd; - lndir = "${pkgs.buildPackages.xorg.lndir}/bin/lndir"; + lndir = "${pkgs.buildPackages.lndir}/bin/lndir"; systemd = cfg.package; in rec { diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix index c0ca9d1b537a..9f2fe2fb3437 100644 --- a/nixos/modules/config/fonts/fontdir.nix +++ b/nixos/modules/config/fonts/fontdir.nix @@ -12,15 +12,15 @@ let { runCommand, gzip, - xorg, + font-alias, + mkfontscale, }: runCommand "X11-fonts" { preferLocalBuild = true; nativeBuildInputs = [ gzip - xorg.mkfontscale - xorg.mkfontdir + mkfontscale ]; } '' @@ -34,7 +34,7 @@ let ''} mkfontscale mkfontdir - cat $(find ${pkgs.xorg.fontalias}/ -name fonts.alias) >fonts.alias + cat $(find ${pkgs.font-alias}/ -name fonts.alias) >fonts.alias '' ) { }; diff --git a/nixos/modules/hardware/video/displaylink.nix b/nixos/modules/hardware/video/displaylink.nix index 9433be89b5d5..d8284e85ae45 100644 --- a/nixos/modules/hardware/video/displaylink.nix +++ b/nixos/modules/hardware/video/displaylink.nix @@ -35,7 +35,7 @@ in # make the device available services.xserver.displayManager.sessionCommands = '' - ${lib.getBin pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource 1 0 + ${lib.getBin pkgs.xrandr}/bin/xrandr --setprovideroutputsource 1 0 ''; # Those are taken from displaylink-installer.sh and from Arch Linux AUR package. diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 776d4c23f193..c18df3bc9829 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -488,7 +488,7 @@ in lib.optional primeEnabled { name = igpuDriver; display = offloadCfg.enable; - modules = lib.optional (igpuDriver == "amdgpu") pkgs.xorg.xf86videoamdgpu; + modules = lib.optional (igpuDriver == "amdgpu") pkgs.xf86-video-amdgpu; deviceSection = '' BusID "${igpuBusId}" '' @@ -538,7 +538,7 @@ in gpuProviderName = if igpuDriver == "amdgpu" then # find the name of the provider if amdgpu - "`${lib.getExe pkgs.xorg.xrandr} --listproviders | ${lib.getExe pkgs.gnugrep} -i AMD | ${lib.getExe pkgs.gnused} -n 's/^.*name://p'`" + "`${lib.getExe pkgs.xrandr} --listproviders | ${lib.getExe pkgs.gnugrep} -i AMD | ${lib.getExe pkgs.gnused} -n 's/^.*name://p'`" else igpuDriver; providerCmdParams = @@ -548,8 +548,8 @@ in (syncCfg.enable || (reverseSyncCfg.enable && reverseSyncCfg.setupCommands.enable)) '' # Added by nvidia configuration module for Optimus/PRIME. - ${lib.getExe pkgs.xorg.xrandr} --setprovideroutputsource ${providerCmdParams} - ${lib.getExe pkgs.xorg.xrandr} --auto + ${lib.getExe pkgs.xrandr} --setprovideroutputsource ${providerCmdParams} + ${lib.getExe pkgs.xrandr} --auto ''; environment.etc = { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1dcb5cf8694a..a6913729e510 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -237,6 +237,7 @@ ./programs/htop.nix ./programs/i3lock.nix ./programs/iay.nix + ./programs/idescriptor.nix ./programs/iftop.nix ./programs/iio-hyprland.nix ./programs/immersed.nix diff --git a/nixos/modules/programs/idescriptor.nix b/nixos/modules/programs/idescriptor.nix new file mode 100644 index 000000000000..3f28ae6534f2 --- /dev/null +++ b/nixos/modules/programs/idescriptor.nix @@ -0,0 +1,38 @@ +{ + lib, + pkgs, + config, + ... +}: +let + cfg = config.programs.idescriptor; +in +{ + options.programs.idescriptor = { + enable = lib.mkEnableOption "iDescriptor, a cross-platform iDevice management tool"; + + package = lib.mkPackageOption pkgs "idescriptor" { }; + + users = lib.mkOption { + type = with lib.types; listOf str; + default = [ ]; + description = "Users to be added to the idevice group."; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + services = { + udev.packages = [ cfg.package ]; + + usbmuxd.enable = true; + }; + + users.groups.idevice = { + members = cfg.users; + }; + }; + + meta.maintainers = with lib.maintainers; [ amadejkastelic ]; +} diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 1f8b676e1863..f883abb2b62c 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -356,7 +356,7 @@ in "GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}" ] ++ lib.optional (!config.networking.enableIPv6) "AddressFamily inet" - ++ lib.optional cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth" + ++ lib.optional cfg.setXAuthLocation "XAuthLocation ${pkgs.xauth}/bin/xauth" ++ lib.optional (cfg.forwardX11 != null) "ForwardX11 ${lib.boolToYesNo cfg.forwardX11}" ++ lib.optional ( cfg.pubkeyAcceptedKeyTypes != [ ] diff --git a/nixos/modules/programs/wayland/uwsm.nix b/nixos/modules/programs/wayland/uwsm.nix index 112251143a30..0debb2d6e9ce 100644 --- a/nixos/modules/programs/wayland/uwsm.nix +++ b/nixos/modules/programs/wayland/uwsm.nix @@ -120,8 +120,6 @@ in # UWSM recommends dbus broker for better compatibility services.dbus.implementation = "broker"; - - services.displayManager.enable = true; } (lib.mkIf (cfg.waylandCompositors != { }) { diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 176a8e4c79eb..def4227d34ce 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1446,7 +1446,7 @@ let control = "optional"; modulePath = "${package}/lib/security/pam_xauth.so"; settings = { - xauthpath = "${pkgs.xorg.xauth}/bin/xauth"; + xauthpath = "${pkgs.xauth}/bin/xauth"; systemuser = 99; }; } diff --git a/nixos/modules/services/display-managers/default.nix b/nixos/modules/services/display-managers/default.nix index 90b542ee355d..9b9937900b3b 100644 --- a/nixos/modules/services/display-managers/default.nix +++ b/nixos/modules/services/display-managers/default.nix @@ -29,10 +29,10 @@ let done if test -d ${pkg}/share/xsessions; then - ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions + ${pkgs.buildPackages.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions fi if test -d ${pkg}/share/wayland-sessions; then - ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions + ${pkgs.buildPackages.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions fi '') cfg.sessionPackages} ''; diff --git a/nixos/modules/services/display-managers/lemurs.nix b/nixos/modules/services/display-managers/lemurs.nix index 6f614e5f74f0..9b1bc620d694 100644 --- a/nixos/modules/services/display-managers/lemurs.nix +++ b/nixos/modules/services/display-managers/lemurs.nix @@ -90,8 +90,8 @@ in system_shell = lib.mkDefault "${pkgs.bash}/bin/bash"; initial_path = lib.mkDefault "/run/current-system/sw/bin"; x11 = { - xauth_path = lib.mkDefault "${pkgs.xorg.xauth}/bin/xauth"; - xserver_path = lib.mkDefault "${pkgs.xorg.xorgserver}/bin/X"; + xauth_path = lib.mkDefault "${pkgs.xauth}/bin/xauth"; + xserver_path = lib.mkDefault "${pkgs.xorg-server}/bin/X"; xsessions_path = lib.mkDefault "${desktops}/share/xsessions"; xsetup_path = lib.mkDefault config.services.displayManager.sessionData.wrapper; }; diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index 9b50815b5af0..d49869530e84 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -42,7 +42,7 @@ let term_restore_cursor_cmd = "${pkgs.ncurses}/bin/tput cnorm"; waylandsessions = "${dmcfg.sessionData.desktops}/share/wayland-sessions"; xsessions = "${dmcfg.sessionData.desktops}/share/xsessions"; - xauth_cmd = lib.optionalString xcfg.enable "${pkgs.xorg.xauth}/bin/xauth"; + xauth_cmd = lib.optionalString xcfg.enable "${pkgs.xauth}/bin/xauth"; x_cmd = lib.optionalString xcfg.enable xserverWrapper; setup_cmd = dmcfg.sessionData.wrapper; brightness_up_cmd = "${lib.getExe pkgs.brightnessctl} -q -n s +10%"; diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix index 2125abbbadce..892eb4d2736a 100644 --- a/nixos/modules/services/display-managers/sddm.nix +++ b/nixos/modules/services/display-managers/sddm.nix @@ -96,10 +96,10 @@ let // optionalAttrs xcfg.enable { X11 = { ServerPath = toString xserverWrapper; - XephyrPath = "${pkgs.xorg.xorgserver.out}/bin/Xephyr"; + XephyrPath = "${pkgs.xorg-server.out}/bin/Xephyr"; SessionCommand = toString dmcfg.sessionData.wrapper; SessionDir = "${dmcfg.sessionData.desktops}/share/xsessions"; - XauthPath = "${pkgs.xorg.xauth}/bin/xauth"; + XauthPath = "${pkgs.xauth}/bin/xauth"; DisplayCommand = toString Xsetup; DisplayStopCommand = toString Xstop; EnableHiDPI = cfg.enableHidpi; diff --git a/nixos/modules/services/hardware/libinput.nix b/nixos/modules/services/hardware/libinput.nix index 7cfce7651b54..328536941739 100644 --- a/nixos/modules/services/hardware/libinput.nix +++ b/nixos/modules/services/hardware/libinput.nix @@ -437,10 +437,10 @@ in }) (lib.mkIf (cfg.enable && config.services.xserver.enable) { - services.xserver.modules = [ pkgs.xorg.xf86inputlibinput ]; + services.xserver.modules = [ pkgs.xf86-input-libinput ]; # for man pages - environment.systemPackages = [ pkgs.xorg.xf86inputlibinput ]; + environment.systemPackages = [ pkgs.xf86-input-libinput ]; environment.etc = let @@ -448,7 +448,7 @@ in in { ${cfgPath} = { - source = pkgs.xorg.xf86inputlibinput.out + "/share/" + cfgPath; + source = pkgs.xf86-input-libinput.out + "/share/" + cfgPath; }; }; diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index bf7fa7621a78..35a610305b04 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -327,7 +327,7 @@ in echo "Unknown profle: $AUTORANDR_CURRENT_PROFILE" exit 1 esac - echo "Xft.dpi: $DPI" | ''${pkgs.xorg.xrdb}/bin/xrdb -merge + echo "Xft.dpi: $DPI" | ''${pkgs.xrdb}/bin/xrdb -merge '''; }; } diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 18d1023902b5..1b6eb94a5643 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -50,7 +50,7 @@ in environment.systemPackages = [ pkgs.disnix ] - ++ lib.optional cfg.useWebServiceInterface pkgs.DisnixWebService; + ++ lib.optional cfg.useWebServiceInterface pkgs.disnix-web-service; environment.variables.PATH = lib.optionals cfg.enableProfilePath ( map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin") cfg.profiles ); @@ -63,9 +63,9 @@ in services.tomcat.extraGroups = [ "disnix" ]; services.tomcat.javaOpts = "${lib.optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} "; services.tomcat.sharedLibs = - lib.optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar" + lib.optional cfg.useWebServiceInterface "${pkgs.disnix-web-service}/share/java/DisnixConnection.jar" ++ lib.optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar"; - services.tomcat.webapps = lib.optional cfg.useWebServiceInterface pkgs.DisnixWebService; + services.tomcat.webapps = lib.optional cfg.useWebServiceInterface pkgs.disnix-web-service; users.groups.disnix.gid = config.ids.gids.disnix; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 76a4ea088f31..4b30eac4bdfb 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -85,7 +85,10 @@ let fi ''; provisionConfDir = - pkgs.runCommand "grafana-provisioning" { nativeBuildInputs = [ pkgs.xorg.lndir ]; } + pkgs.runCommand "grafana-provisioning" + { + nativeBuildInputs = [ pkgs.lndir ]; + } '' mkdir -p $out/{alerting,datasources,dashboards,plugins} ${ln { diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 388b0829f742..4eaf17be76d1 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -57,7 +57,7 @@ let $SMARTD_FULLMESSAGE EOF - } | ${pkgs.xorg.xmessage}/bin/xmessage -file - 2>/dev/null & + } | ${pkgs.xmessage}/bin/xmessage -file - 2>/dev/null & ''} ''; diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix index a19e1bd7588b..a0296926699b 100644 --- a/nixos/modules/services/networking/headscale.nix +++ b/nixos/modules/services/networking/headscale.nix @@ -337,6 +337,56 @@ in }; }; + split = lib.mkOption { + type = lib.types.attrsOf (lib.types.listOf lib.types.str); + default = { }; + description = '' + Split DNS configuration (map of domains and which DNS server to use for each). + See . + ''; + example = { + "foo.bar.com" = [ "1.1.1.1" ]; + }; + }; + + extra_records = lib.mkOption { + type = lib.types.listOf ( + lib.types.submodule { + options = { + name = lib.mkOption { + type = lib.types.str; + description = "DNS record name."; + example = "grafana.tailnet.example.com"; + }; + type = lib.mkOption { + type = lib.types.enum [ + "A" + "AAAA" + ]; + description = "DNS record type."; + example = "A"; + }; + value = lib.mkOption { + type = lib.types.str; + description = "DNS record value (IP address)."; + example = "100.64.0.3"; + }; + }; + } + ); + default = [ ]; + description = '' + Extra DNS records to expose to clients. + ''; + example = '' + [ { + name = "grafana.tailnet.example.com"; + type = "A"; + example = "100.64.0.3"; + } ] + ''; + }; + search_domains = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ ]; diff --git a/nixos/modules/services/networking/jibri/default.nix b/nixos/modules/services/networking/jibri/default.nix index ea99cb0f321e..e07bf5131a92 100644 --- a/nixos/modules/services/networking/jibri/default.nix +++ b/nixos/modules/services/networking/jibri/default.nix @@ -355,7 +355,7 @@ in StateDirectory = "jibri"; - ExecStart = "${pkgs.xorg.xorgserver}/bin/Xorg -nocursor -noreset +extension RANDR +extension RENDER -config ${pkgs.jibri}/etc/jitsi/jibri/xorg-video-dummy.conf -logfile /dev/null :0"; + ExecStart = "${pkgs.xorg-server}/bin/Xorg -nocursor -noreset +extension RANDR +extension RENDER -config ${pkgs.jibri}/etc/jitsi/jibri/xorg-video-dummy.conf -logfile /dev/null :0"; }; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 2624827d72c8..68dc37c3de36 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -831,7 +831,7 @@ in { port, addr, ... }: "ListenAddress ${addr}${lib.optionalString (port != null) (":" + toString port)}" ) cfg.listenAddresses - ++ lib.optional cfgc.setXAuthLocation "XAuthLocation ${lib.getExe pkgs.xorg.xauth}" + ++ lib.optional cfgc.setXAuthLocation "XAuthLocation ${lib.getExe pkgs.xauth}" ++ lib.optional cfg.allowSFTP "Subsystem sftp ${cfg.sftpServerExecutable} ${lib.concatStringsSep " " cfg.sftpFlags}" ++ [ "AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}" diff --git a/nixos/modules/services/networking/x2goserver.nix b/nixos/modules/services/networking/x2goserver.nix index 52bf7b25ea5f..b5b5b4607b8a 100644 --- a/nixos/modules/services/networking/x2goserver.nix +++ b/nixos/modules/services/networking/x2goserver.nix @@ -165,8 +165,8 @@ in "L+ /usr/local/bin/cp - - - - ${coreutils}/bin/cp" "L+ /usr/local/bin/sed - - - - ${gnused}/bin/sed" "L+ /usr/local/bin/setsid - - - - ${util-linux}/bin/setsid" - "L+ /usr/local/bin/xrandr - - - - ${xorg.xrandr}/bin/xrandr" - "L+ /usr/local/bin/xmodmap - - - - ${xorg.xmodmap}/bin/xmodmap" + "L+ /usr/local/bin/xrandr - - - - ${xrandr}/bin/xrandr" + "L+ /usr/local/bin/xmodmap - - - - ${xmodmap}/bin/xmodmap" ]; systemd.services.x2goserver = { diff --git a/nixos/modules/services/web-apps/akkoma.md b/nixos/modules/services/web-apps/akkoma.md index e05ab034de2d..7f07f2c73df8 100644 --- a/nixos/modules/services/web-apps/akkoma.md +++ b/nixos/modules/services/web-apps/akkoma.md @@ -187,7 +187,7 @@ derivation. }; nativeBuildInputs = with pkgs; [ jq - xorg.lndir + lndir ]; passAsFile = [ "config" ]; } diff --git a/nixos/modules/services/x11/desktop-managers/cde.nix b/nixos/modules/services/x11/desktop-managers/cde.nix index 8dae3ce0d886..ba62f430ca3f 100644 --- a/nixos/modules/services/x11/desktop-managers/cde.nix +++ b/nixos/modules/services/x11/desktop-managers/cde.nix @@ -17,7 +17,7 @@ in extraPackages = mkOption { type = with types; listOf package; - default = with pkgs.xorg; [ + default = with pkgs; [ xclock bitmap xlsfonts @@ -30,7 +30,7 @@ in xwud ]; defaultText = literalExpression '' - with pkgs.xorg; [ + with pkgs; [ xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud ] ''; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 70f7590218bc..bc5c2b0273e7 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -61,7 +61,7 @@ in enlightenment.ephoto enlightenment.rage enlightenment.terminology - xorg.xcursorthemes + xcursor-themes ]) config.environment.enlightenment.excludePackages; environment.pathsToLink = [ diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index a9397f40c009..d4f222543119 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -24,7 +24,6 @@ let ; cfg = config.services.xserver; - xorg = pkgs.xorg; fontconfig = config.fonts.fontconfig; xresourcesXft = pkgs.writeText "Xresources-Xft" '' @@ -90,11 +89,11 @@ let ''} # Load X defaults. This should probably be safe on wayland too. - ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} + ${pkgs.xrdb}/bin/xrdb -merge ${xresourcesXft} if test -e ~/.Xresources; then - ${xorg.xrdb}/bin/xrdb -merge ~/.Xresources + ${pkgs.xrdb}/bin/xrdb -merge ~/.Xresources elif test -e ~/.Xdefaults; then - ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults + ${pkgs.xrdb}/bin/xrdb -merge ~/.Xdefaults fi # Import environment variables into the systemd user environment. @@ -147,8 +146,8 @@ in xauthBin = mkOption { internal = true; - default = "${xorg.xauth}/bin/xauth"; - defaultText = literalExpression ''"''${pkgs.xorg.xauth}/bin/xauth"''; + default = "${pkgs.xauth}/bin/xauth"; + defaultText = literalExpression ''"''${pkgs.xauth}/bin/xauth"''; description = "Path to the {command}`xauth` program used by display managers."; }; @@ -236,7 +235,7 @@ in config = { services.displayManager.sessionData.wrapper = xsessionWrapper; - services.xserver.displayManager.xserverBin = "${xorg.xorgserver.out}/bin/X"; + services.xserver.displayManager.xserverBin = "${pkgs.xorg-server.out}/bin/X"; services.xserver.displayManager.importedVariables = [ # This is required by user units using the session bus. diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixos/modules/services/x11/display-managers/startx.nix index 792a0e9b7d7c..ce0afefa7b9f 100644 --- a/nixos/modules/services/x11/display-managers/startx.nix +++ b/nixos/modules/services/x11/display-managers/startx.nix @@ -77,7 +77,7 @@ in # Implement xserverArgs via xinit's system-wide xserverrc environment.etc."X11/xinit/xserverrc".source = pkgs.writeShellScript "xserverrc" '' - exec ${pkgs.xorg.xorgserver}/bin/X \ + exec ${pkgs.xorg-server}/bin/X \ ${toString config.services.xserver.displayManager.xserverArgs} "$@" ''; @@ -100,7 +100,7 @@ in ''; }; - environment.systemPackages = with pkgs; [ xorg.xinit ]; + environment.systemPackages = with pkgs; [ xinit ]; }; diff --git a/nixos/modules/services/x11/display-managers/sx.nix b/nixos/modules/services/x11/display-managers/sx.nix index 40381146c8a9..ad435074d765 100644 --- a/nixos/modules/services/x11/display-managers/sx.nix +++ b/nixos/modules/services/x11/display-managers/sx.nix @@ -20,7 +20,7 @@ in ~/.config/sx/sxrc file containing session startup commands, see {manpage}`sx(1)`. This is not automatically generated from the desktopManager and windowManager settings. sx doesn't have a way to directly set - X server flags, but it can be done by overriding its xorgserver + X server flags, but it can be done by overriding its xorg-server dependency. ''; }; diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix index 0327609c25cd..39fa91f75d93 100644 --- a/nixos/modules/services/x11/extra-layouts.nix +++ b/nixos/modules/services/x11/extra-layouts.nix @@ -83,7 +83,7 @@ let }; }; - xkb_patched = pkgs.xorg.xkeyboardconfig_custom { + xkb_patched = pkgs.xkeyboard-config_custom { layouts = config.services.xserver.xkb.extraLayouts; }; diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index f943242f7bae..19c5833dce9a 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -26,7 +26,7 @@ let Option "TapButton2" "0" Option "TapButton3" "0" ''; - pkg = pkgs.xorg.xf86inputsynaptics; + pkg = pkgs.xf86-input-synaptics; etcFile = "X11/xorg.conf.d/70-synaptics.conf"; in { diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index 46b6d5a94044..c1bc0c2ce2ea 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -29,11 +29,11 @@ description = "Terminal Server"; path = [ - pkgs.xorg.xorgserver.out + pkgs.xorg-server.out pkgs.gawk pkgs.which pkgs.openssl - pkgs.xorg.xauth + pkgs.xauth pkgs.net-tools pkgs.shadow pkgs.procps diff --git a/nixos/modules/services/x11/window-managers/twm.nix b/nixos/modules/services/x11/window-managers/twm.nix index 46f81775b65e..2a640457e8f6 100644 --- a/nixos/modules/services/x11/window-managers/twm.nix +++ b/nixos/modules/services/x11/window-managers/twm.nix @@ -28,12 +28,12 @@ in services.xserver.windowManager.session = singleton { name = "twm"; start = '' - ${pkgs.xorg.twm}/bin/twm & + ${pkgs.tab-window-manager}/bin/twm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.xorg.twm ]; + environment.systemPackages = [ pkgs.tab-window-manager ]; }; diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 78cfce01201c..29b739db5510 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -53,7 +53,7 @@ let --set XMONAD_GHC "${xmonadEnv}/bin/ghc" \ '' + '' - --set XMONAD_XMESSAGE "${pkgs.xorg.xmessage}/bin/xmessage" + --set XMONAD_XMESSAGE "${pkgs.xmessage}/bin/xmessage" '' ); diff --git a/nixos/modules/services/x11/xfs.nix b/nixos/modules/services/x11/xfs.nix index 9214f176c10b..022f6a3cbef2 100644 --- a/nixos/modules/services/x11/xfs.nix +++ b/nixos/modules/services/x11/xfs.nix @@ -43,7 +43,7 @@ in description = "X Font Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.xorg.xfs ]; + path = [ pkgs.xfs ]; script = "xfs -config ${configFile}"; }; }; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 25a472095370..bd095ce0b408 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -12,23 +12,88 @@ let # Abbreviations. cfg = config.services.xserver; - xorg = pkgs.xorg; + + knownVideoDriverPackages = { + inherit (pkgs) + xf86-video-amdgpu + xf86-video-apm + xf86-video-ark + xf86-video-ast + xf86-video-ati + xf86-video-chips + xf86-video-cirrus + xf86-video-dummy + xf86-video-fbdev + xf86-video-geode + xf86-video-i128 + xf86-video-i740 + xf86-video-intel + xf86-video-mga + xf86-video-neomagic + xf86_video_nested + xf86-video-nouveau + xf86-video-nv + xf86-video-omap + xf86-video-openchrome + xf86-video-qxl + xf86-video-r128 + xf86-video-s3virge + xf86-video-savage + xf86-video-siliconmotion + xf86-video-sis + xf86-video-sisusb + xf86-video-suncg6 + xf86-video-sunffb + xf86-video-sunleo + xf86-video-tdfx + xf86-video-trident + xf86-video-v4l + xf86-video-vbox + xf86-video-vesa + xf86-video-vmware + xf86-video-voodoo + ; + }; # Map video driver names to driver packages. FIXME: move into card-specific modules. - knownVideoDrivers = { + videoDrivers = + mapAttrs' (name: value: { + name = removePrefix "xf86-video-" value.pname; + value = { + modules = [ value ]; + }; + }) knownVideoDriverPackages + // videoDriverAliases + // videoDriverOverrides; + + videoDriverOverrides = { + # Override the driver name of vbox is "vboxvideo". + vbox = { + driverName = "vboxvideo"; + modules = [ knownVideoDriverPackages.xf86-video-vbox ]; + }; + }; + + videoDriverAliases = { # Alias so people can keep using "virtualbox" instead of "vboxvideo". virtualbox = { - modules = [ xorg.xf86videovboxvideo ]; + modules = [ knownVideoDriverPackages.xf86-video-vbox ]; + driverName = "vboxvideo"; + }; + + # Alias so people can keep using "vboxvideo" instead of "vbox". + vboxvideo = { + modules = [ knownVideoDriverPackages.xf86-video-vbox ]; driverName = "vboxvideo"; }; # Alias so that "radeon" uses the xf86-video-ati driver. radeon = { - modules = [ xorg.xf86videoati ]; + modules = [ knownVideoDriverPackages.xf86-video-ati ]; driverName = "ati"; }; - # modesetting does not have a xf86videomodesetting package as it is included in xorgserver + # modesetting does not have a xf86-video-modesetting package as it is included in xorg-server modesetting = { }; }; @@ -42,8 +107,8 @@ let # old non-fontconfig applications. (Possibly this could be done # better using a fontconfig rule.) [ - pkgs.xorg.fontadobe100dpi - pkgs.xorg.fontadobe75dpi + pkgs.font-adobe-100dpi + pkgs.font-adobe-75dpi ]; xrandrOptions = { @@ -165,7 +230,7 @@ let # If not running a fancy desktop environment, the cursor is likely set to # the default `cursor.pcf` bitmap font. This is 17px wide, so it's very # small and almost invisible on 4K displays. - fontcursormisc_hidpi = pkgs.xorg.fontxfree86type1.overrideAttrs ( + fontcursormisc_hidpi = pkgs.font-xfree86-type1.overrideAttrs ( old: let # The scaling constant is 230/96: the scalable `left_ptr` glyph at @@ -399,19 +464,11 @@ in "nvidia" "amdgpu" ]; - # TODO(@oxij): think how to easily add the rest, like those nvidia things - relatedPackages = concatLists ( - mapAttrsToList ( - n: v: - optional (hasPrefix "xf86video" n) { - path = [ - "xorg" - n - ]; - title = removePrefix "xf86video" n; - } - ) pkgs.xorg - ); + relatedPackages = mapAttrsToList (name: value: { + path = [ name ]; + title = removePrefix "xf86-video-" value.pname; + }) knownVideoDriverPackages; + description = '' The names of the video drivers the configuration supports. They will be tried in order until one that @@ -777,19 +834,14 @@ in # FIXME: somehow check for unknown driver names. services.xserver.drivers = flip concatMap cfg.videoDrivers ( name: - let - driver = attrByPath [ name ] ( - if xorg ? ${"xf86video" + name} then { modules = [ xorg.${"xf86video" + name} ]; } else null - ) knownVideoDrivers; - in - optional (driver != null) ( + lib.optional (videoDrivers ? name) ( { inherit name; modules = [ ]; driverName = name; display = true; } - // driver + // videoDrivers.${name} ) ); @@ -825,27 +877,27 @@ in cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in { - ${cfgPath}.source = xorg.xf86inputevdev.out + "/share/" + cfgPath; + ${cfgPath}.source = pkgs.xf86-input-evdev.out + "/share/" + cfgPath; } ); environment.systemPackages = utils.removePackagesByName [ - xorg.xorgserver.out - xorg.xrandr - xorg.xrdb - xorg.setxkbmap - xorg.iceauth # required for KDE applications (it's called by dcopserver) - xorg.xlsclients - xorg.xset - xorg.xsetroot - xorg.xinput - xorg.xprop - xorg.xauth + pkgs.xorg-server.out + pkgs.xrandr + pkgs.xrdb + pkgs.setxkbmap + pkgs.iceauth # required for KDE applications (it's called by dcopserver) + pkgs.xlsclients + pkgs.xset + pkgs.xsetroot + pkgs.xinput + pkgs.xprop + pkgs.xauth pkgs.xterm - xorg.xf86inputevdev.out # get evdev.4 man page + pkgs.xf86-input-evdev.out # get evdev.4 man page ] config.services.xserver.excludePackages - ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh; + ++ optional (elem "virtualbox" cfg.videoDrivers) pkgs.xrefresh; environment.pathsToLink = [ "/share/X11" ]; @@ -869,8 +921,8 @@ in ++ optional cfg.terminateOnReset "-terminate"; services.xserver.modules = concatLists (catAttrs "modules" cfg.drivers) ++ [ - xorg.xorgserver.out - xorg.xf86inputevdev.out + pkgs.xorg-server.out + pkgs.xf86-input-evdev.out ]; system.checks = singleton ( @@ -995,7 +1047,7 @@ in ''; fonts.packages = [ - (if cfg.upscaleDefaultCursor then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc) + (if cfg.upscaleDefaultCursor then fontcursormisc_hidpi else pkgs.font-cursor-misc) pkgs.font-misc-misc pkgs.font-alias ]; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index dce59a0a93b7..0a16df3dafd6 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -214,7 +214,7 @@ in ]; # `xwininfo' is used by the test driver to query open windows. - environment.systemPackages = [ pkgs.xorg.xwininfo ]; + environment.systemPackages = [ pkgs.xwininfo ]; # Log everything to the serial console. services.journald.extraConfig = '' diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index 74dc7d4156a8..2281de15b79a 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -18,7 +18,6 @@ let types ; cfg = config.virtualisation.vmware.guest; - xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse; in { imports = [ @@ -94,7 +93,7 @@ in environment.etc.vmware-tools.source = "${cfg.package}/etc/vmware-tools/*"; services.xserver = mkIf (!cfg.headless) { - modules = optionals pkgs.stdenv.hostPlatform.isx86 [ xf86inputvmmouse ]; + modules = optionals pkgs.stdenv.hostPlatform.isx86 [ pkgs.xf86-input-vmmouse ]; config = optionalString (pkgs.stdenv.hostPlatform.isx86) '' Section "InputClass" diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index eb36ce9df60d..752630e898b3 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -53,7 +53,7 @@ docbook5 libxml2 docbook_xsl_ns - xorg.lndir + lndir documentation-highlighter perlPackages.ConfigIniFiles ]; diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 508b943910da..7a336445d793 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -44,7 +44,7 @@ let stdenvNoCC texinfo unionfs-fuse - xorg.lndir + lndir # These are used in the configure-from-userdata tests # for EC2. Httpd and valgrind are requested by the diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index cef75b350be5..892c066c568b 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -740,7 +740,7 @@ let switch-to-configuration-ng texinfo unionfs-fuse - xorg.lndir + lndir shellcheck-minimal # Only the out output is included here, which is what is diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index fa26be60aa49..1c26d7423a86 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -118,7 +118,7 @@ import ./make-test-python.nix ( switch-to-configuration-ng texinfo unionfs-fuse - xorg.lndir + lndir shellcheck-minimal # Only the out output is included here, which is what is diff --git a/nixos/tests/qtile/default.nix b/nixos/tests/qtile/default.nix index dbed96c2f7d9..7c51754d550e 100644 --- a/nixos/tests/qtile/default.nix +++ b/nixos/tests/qtile/default.nix @@ -37,7 +37,7 @@ environment.systemPackages = [ pkgs.kitty - pkgs.xorg.xwininfo + pkgs.xwininfo ]; }; diff --git a/nixos/tests/tigervnc.nix b/nixos/tests/tigervnc.nix index 4774198f5b14..9ef3d3883a78 100644 --- a/nixos/tests/tigervnc.nix +++ b/nixos/tests/tigervnc.nix @@ -17,7 +17,7 @@ makeTest { { environment.systemPackages = with pkgs; [ tigervnc # for Xvnc - xorg.xwininfo + xwininfo imagemagickBig # for display with working label: support ]; networking.firewall.allowedTCPPorts = [ 5901 ]; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 4159c53657d7..5b70b7a10e89 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -19,7 +19,12 @@ pulseaudio, wrapGAppsHook3, xdg-utils, - xorg, + libxcb-util, + libxcb-wm, + libxtst, + libxcursor, + libx11, + libxcb, zlib, }: @@ -41,7 +46,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontWrapGApps = true; # we only want $gappsWrapperArgs here - buildInputs = with xorg; [ + buildInputs = [ alsa-lib cairo freetype @@ -53,15 +58,15 @@ stdenv.mkDerivation rec { # libjpeg8 is required for converting jpeg's to colour palettes libjpeg libxcb - libXcursor - libX11 - libXtst + libxcursor + libx11 + libxtst libxkbcommon pipewire pulseaudio (lib.getLib stdenv.cc.cc) - xcbutil - xcbutilwm + libxcb-util + libxcb-wm zlib ]; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index e99f707d0823..44689e616fe0 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -26,7 +26,12 @@ wrapGAppsHook3, xcb-imdkit, xdg-utils, - xorg, + libxcb-util, + libxcb-wm, + libxtst, + libxcursor, + libx11, + libxcb, zlib, }: @@ -64,10 +69,10 @@ stdenv.mkDerivation rec { # libjpeg8 is required for converting jpeg's to colour palettes libjpeg libnghttp2 - xorg.libxcb - xorg.libXcursor - xorg.libX11 - xorg.libXtst + libxcb + libxcursor + libx11 + libxtst libxkbcommon libudev-zero pango @@ -75,8 +80,8 @@ stdenv.mkDerivation rec { (lib.getLib stdenv.cc.cc) vulkan-loader xcb-imdkit - xorg.xcbutil - xorg.xcbutilwm + libxcb-util + libxcb-wm zlib ]; diff --git a/pkgs/applications/audio/open-music-kontrollers/mephisto.nix b/pkgs/applications/audio/open-music-kontrollers/mephisto.nix index 2658a3ca217b..641dce27bdee 100644 --- a/pkgs/applications/audio/open-music-kontrollers/mephisto.nix +++ b/pkgs/applications/audio/open-music-kontrollers/mephisto.nix @@ -13,7 +13,8 @@ lv2, lv2lint, sord, - xorg, + libxext, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -41,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { libvterm-neovim lv2 sord - xorg.libX11 - xorg.libXext + libx11 + libxext glew lv2lint ]; diff --git a/pkgs/applications/backup/timeshift/wrapper.nix b/pkgs/applications/backup/timeshift/wrapper.nix index 11e27546334b..781741e5984e 100644 --- a/pkgs/applications/backup/timeshift/wrapper.nix +++ b/pkgs/applications/backup/timeshift/wrapper.nix @@ -4,7 +4,7 @@ wrapGAppsHook3, gdk-pixbuf, librsvg, - xorg, + lndir, shared-mime-info, }: @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ wrapGAppsHook3 - xorg.lndir + lndir ]; installPhase = '' diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index a4ac00d73bf3..6526006ec5ef 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -70,7 +70,8 @@ runCommand, wayland, xkeyboard_config, - xorg, + libsm, + libice, zlib, makeDesktopItem, tiling_wm, # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper @@ -175,8 +176,8 @@ let xcbutilkeysyms xcbutilimage xcbutilcursor - xorg.libICE - xorg.libSM + libice + libsm libxkbfile libXcomposite libXcursor diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ca576607d033..82bf8c761bb5 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -24,8 +24,8 @@ let sha256Hash = "sha256-KHvWVIxNzwdgl9kdqXD5Cpvz58r8pWs2VRyPV3VrJH0="; }; latestVersion = { - version = "2025.3.1.4"; # "Android Studio Panda 1 | 2025.3.1 Canary 4" - sha256Hash = "sha256-5ymB/HKSmi32AWV39+HYmfY11frkNxf2dq8Ld4f9qfA="; + version = "2025.3.1.5"; # "Android Studio Panda 1 | 2025.3.1 Canary 5" + sha256Hash = "sha256-CmM619Itz/0qVSUz6ztZTR93FmEVoUzMJawHwc+Nf8o="; }; in { diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix index 5fde0c16fbff..44489af09de8 100644 --- a/pkgs/applications/editors/jetbrains/ides/rider.nix +++ b/pkgs/applications/editors/jetbrains/ides/rider.nix @@ -14,7 +14,7 @@ libSM, libX11, dotnetCorePackages, - xorg, + libxcb-keysyms, expat, libxml2, xz, @@ -64,7 +64,7 @@ in musl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.xcbutilkeysyms + libxcb-keysyms ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch) [ expat diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix index 8c3094c302a6..80e53e88874b 100644 --- a/pkgs/applications/editors/jetbrains/source/build.nix +++ b/pkgs/applications/editors/jetbrains/source/build.nix @@ -22,7 +22,7 @@ maven, p7zip, pkg-config, - xorg, + libx11, }: { version, @@ -97,7 +97,7 @@ let ]; buildInputs = [ glib - xorg.libX11 + libx11 libdbusmenu ]; inherit src; diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 44988cbbaad5..16a5bbebef24 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -9,7 +9,7 @@ fetchurl, lib, stdenv, - xorg, + libx11, glib, glibcLocales, gtk3, @@ -47,7 +47,7 @@ let arch = if stdenv.hostPlatform.system == "i686-linux" then "x32" else "x64"; libPath = lib.makeLibraryPath [ - xorg.libX11 + libx11 glib gtk3 cairo diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 0dfc59a083e9..1db60808f0d9 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -9,7 +9,8 @@ fetchurl, stdenv, lib, - xorg, + libxtst, + libx11, glib, libglvnd, glibcLocales, @@ -49,8 +50,8 @@ let versionFile = toString ./packages.nix; neededLibraries = [ - xorg.libX11 - xorg.libXtst + libx11 + libxtst glib libglvnd openssl_1_1 diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5527eb25d13a..aba760423a04 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6909,12 +6909,12 @@ final: prev: { indent-tools-nvim = buildVimPlugin { pname = "indent-tools.nvim"; - version = "0.5.1-unstable-2023-10-28"; + version = "0.5.2-unstable-2026-01-23"; src = fetchFromGitHub { owner = "arsham"; repo = "indent-tools.nvim"; - rev = "31b839d65aa04b568fabe5e100a63cc44ef3f5d5"; - hash = "sha256-F0Q7UvvOGulkLce1JiT9GvB+itCtwnJLzMpETm+Sg28="; + rev = "9b6a33be70c72da562c83d1e741ebe1ce6c20a3c"; + hash = "sha256-jJOG6t18egq1uDGegDKvbz9NGmqiuHg7b2EyJZh3TMM="; }; meta.homepage = "https://github.com/arsham/indent-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -7561,14 +7561,13 @@ final: prev: { leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "0-unstable-2025-12-08"; - src = fetchFromGitHub { - owner = "ggandor"; - repo = "leap.nvim"; - rev = "f19d43590c4b6d31188ee1ea2954d2b7558a9e11"; - hash = "sha256-u8G8aGqZ5ovUCV+yaaj+zy6emz9h59lVBhzsxEFcPhg="; + version = "0-unstable-2026-01-25"; + src = fetchgit { + url = "https://codeberg.org/andyg/leap.nvim/"; + rev = "572fbcfd2cca5f7b3e56b1ac1d720861f2a4db78"; + hash = "sha256-k9Uj6VOGc+LWyec6yk7tiCg+gVHjBMifxg/G3nxzT6g="; }; - meta.homepage = "https://github.com/ggandor/leap.nvim/"; + meta.homepage = "https://codeberg.org/andyg/leap.nvim/"; meta.hydraPlatforms = [ ]; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 2674cae5b91e..6f24b18ac5c9 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -48,7 +48,7 @@ xdg-utils, xdotool, xkb-switch, - xorg, + xwininfo, xxd, ycmd, zathura, @@ -3404,7 +3404,7 @@ assertNoAdditions { postPatch = '' substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace-fail xdotool ${xdotool}/bin/xdotool substituteInPlace lua/stylish/components/menu.lua --replace-fail xdotool ${xdotool}/bin/xdotool - substituteInPlace lua/stylish/components/menu.lua --replace-fail xwininfo ${xorg.xwininfo}/bin/xwininfo + substituteInPlace lua/stylish/components/menu.lua --replace-fail xwininfo ${xwininfo}/bin/xwininfo ''; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c0b089d017be..2ab1f5451f91 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -580,7 +580,7 @@ https://github.com/swaits/lazyjj.nvim/,HEAD, https://github.com/Julian/lean.nvim/,, https://github.com/leanprover/lean.vim/,, https://github.com/ggandor/leap-ast.nvim/,HEAD, -https://github.com/ggandor/leap.nvim/,HEAD, +https://codeberg.org/andyg/leap.nvim/,HEAD, https://github.com/kawre/leetcode.nvim/,HEAD, https://github.com/mrjones2014/legendary.nvim/,HEAD, https://github.com/camspiers/lens.vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index 224b7b3595cf..c8eaa26ddea8 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "25.4.0"; - hash = "sha256-furuRhQPcK9r4G878WKD9BiQuiwRbn+pJpNWAbpIgOw="; + version = "25.5.1"; + hash = "sha256-4wdY8cmKWfp/ua39lcD8ibxoy8W0zyX97vMyDEZu2o4="; }; meta = { diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 36917ed70beb..5b318c759ea6 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -15,7 +15,14 @@ libgbm, nss, nspr, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxkbfile, + libxcb, systemdLibs, fontconfig, imagemagick, @@ -118,13 +125,13 @@ stdenv.mkDerivation ( cups expat libxkbcommon - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libxcb - xorg.libXext - xorg.libXfixes - xorg.libXrandr + libx11 + libxcomposite + libxdamage + libxcb + libxext + libxfixes + libxrandr cairo pango alsa-lib @@ -243,7 +250,7 @@ stdenv.mkDerivation ( nspr systemdLibs webkitgtk_4_1 - xorg.libxkbfile + libxkbfile ]; runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix b/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix index 3fea5eeacdfa..634fdd4ffd95 100644 --- a/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix +++ b/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix @@ -2,7 +2,8 @@ lib, fetchFromGitHub, mkLibretroCore, - xorg, + libxext, + libx11, }: mkLibretroCore { core = "bsnes-hd-beta"; @@ -16,8 +17,8 @@ mkLibretroCore { }; extraBuildInputs = [ - xorg.libX11 - xorg.libXext + libx11 + libxext ]; makefile = "GNUmakefile"; diff --git a/pkgs/applications/emulators/libretro/cores/desmume.nix b/pkgs/applications/emulators/libretro/cores/desmume.nix index bd03cb5bf341..7aa0fc0054cf 100644 --- a/pkgs/applications/emulators/libretro/cores/desmume.nix +++ b/pkgs/applications/emulators/libretro/cores/desmume.nix @@ -6,7 +6,7 @@ libpcap, libGLU, libGL, - xorg, + libx11, }: mkLibretroCore { core = "desmume"; @@ -23,7 +23,7 @@ mkLibretroCore { libpcap libGLU libGL - xorg.libX11 + libx11 ]; makeFlags = diff --git a/pkgs/applications/emulators/libretro/cores/desmume2015.nix b/pkgs/applications/emulators/libretro/cores/desmume2015.nix index d31091595f1e..cb8566a6b511 100644 --- a/pkgs/applications/emulators/libretro/cores/desmume2015.nix +++ b/pkgs/applications/emulators/libretro/cores/desmume2015.nix @@ -6,7 +6,7 @@ libpcap, libGLU, libGL, - xorg, + libx11, }: mkLibretroCore { core = "desmume2015"; @@ -23,7 +23,7 @@ mkLibretroCore { libpcap libGLU libGL - xorg.libX11 + libx11 ]; makeFlags = diff --git a/pkgs/applications/emulators/libretro/cores/dolphin.nix b/pkgs/applications/emulators/libretro/cores/dolphin.nix index ac529309bad7..e4fdc6899c51 100644 --- a/pkgs/applications/emulators/libretro/cores/dolphin.nix +++ b/pkgs/applications/emulators/libretro/cores/dolphin.nix @@ -13,7 +13,16 @@ pkg-config, sfml, udev, - xorg, + libxcb-util, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxext, + libx11, + libsm, + libpthread-stubs, + libxcb, }: mkLibretroCore { core = "dolphin"; @@ -40,16 +49,16 @@ mkLibretroCore { pcre sfml udev - xorg.libSM - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXxf86vm - xorg.libpthreadstubs - xorg.libxcb - xorg.xcbutil + libsm + libx11 + libxext + libxi + libxinerama + libxrandr + libxxf86vm + libpthread-stubs + libxcb + libxcb-util ]; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix index 2751ae53e473..952cfa55951c 100644 --- a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix @@ -8,7 +8,7 @@ libpng, mkLibretroCore, nasm, - xorg, + libx11, }: mkLibretroCore { core = "mupen64plus-next"; @@ -50,7 +50,7 @@ mkLibretroCore { libGLU libGL libpng - xorg.libX11 + libx11 ]; makefile = "Makefile"; makeFlags = [ diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index f73057a79706..4dbaeac266a9 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -10,7 +10,7 @@ libGLU, mkLibretroCore, openssl, - xorg, + libx11, }: mkLibretroCore { core = "play"; @@ -32,7 +32,7 @@ mkLibretroCore { icu libGL libGLU - xorg.libX11 + libx11 ]; extraNativeBuildInputs = [ cmake ]; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index a931219f2e33..86713fa5941a 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -9,7 +9,7 @@ pkg-config, python3, snappy, - xorg, + libx11, }: mkLibretroCore { core = "ppsspp"; @@ -33,7 +33,7 @@ mkLibretroCore { libGL libzip snappy - xorg.libX11 + libx11 ]; makefile = "Makefile"; cmakeFlags = [ diff --git a/pkgs/applications/emulators/libretro/cores/same_cdi.nix b/pkgs/applications/emulators/libretro/cores/same_cdi.nix index a92e4390b89e..d0ee91f77bbb 100644 --- a/pkgs/applications/emulators/libretro/cores/same_cdi.nix +++ b/pkgs/applications/emulators/libretro/cores/same_cdi.nix @@ -8,7 +8,7 @@ mkLibretroCore, portaudio, python3, - xorg, + libx11, }: mkLibretroCore { core = "same_cdi"; @@ -45,7 +45,7 @@ mkLibretroCore { libGL libGLU portaudio - xorg.libX11 + libx11 ]; meta = { diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 6ec634d47d82..2cde881e05ed 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -127,7 +127,7 @@ stdenv.mkDerivation ( ++ lib.optional fontconfigSupport pkgs.fontconfig ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio - ++ lib.optional (xineramaSupport && x11Support) pkgs.xorg.libXinerama + ++ lib.optional (xineramaSupport && x11Support) pkgs.libxinerama ++ lib.optional udevSupport pkgs.udev ++ lib.optional vulkanSupport ( if stdenv.hostPlatform.isDarwin then moltenvk else pkgs.vulkan-loader @@ -163,17 +163,17 @@ stdenv.mkDerivation ( pkgs.libdrm ] ++ lib.optionals x11Support ( - with pkgs.xorg; + with pkgs; [ - libX11 - libXcomposite - libXcursor - libXext - libXfixes - libXi - libXrandr - libXrender - libXxf86vm + libx11 + libxcomposite + libxcursor + libxext + libxfixes + libxi + libxrandr + libxrender + libxxf86vm ] ) ++ lib.optionals waylandSupport ( diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix index 2ca48d238443..23d9c0c93b45 100644 --- a/pkgs/applications/graphics/gimp/2.0/default.nix +++ b/pkgs/applications/graphics/gimp/2.0/default.nix @@ -37,7 +37,7 @@ gettext, makeWrapper, gtk-doc, - xorg, + libxpm, glib-networking, libmypaint, gexiv2, @@ -202,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: { libwebp libheif libexif - xorg.libXpm + libxpm glib-networking libmypaint mypaint-brushes1 diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index e93bba704943..ea0d6ef4a0c9 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -49,7 +49,8 @@ perl, appstream, desktop-file-utils, - xorg, + libxpm, + libxmu, glib-networking, json-glib, libmypaint, @@ -188,8 +189,8 @@ stdenv.mkDerivation (finalAttrs: { libheif python libexif - xorg.libXpm - xorg.libXmu + libxpm + libxmu glib-networking libmypaint mypaint-brushes1 diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index d8612f866964..bfc91646471d 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, libX11, - libXinerama, + libxinerama, imlib2, }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 imlib2 - libXinerama + libxinerama ]; buildPhase = '' diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index 928e304e7fa0..10a0d0c1d3ef 100644 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitLab, qt6, - xorg, + libxtst, + libx11, cmake, ninja, libcprime, @@ -29,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qt6.qtbase - xorg.libXtst - xorg.libX11 + libxtst + libx11 libcprime libcsys ]; diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix index 895e0b7463d1..dfb4d4f4868d 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitLab, kdePackages, - xorg, + libxcomposite, cmake, ninja, libcprime, @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ kdePackages.qtbase kdePackages.kglobalaccel - xorg.libXcomposite + libxcomposite libcprime libcsys ]; diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index 8cd1042db144..8c42c4bc91b8 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -11,7 +11,9 @@ wf-recorder, libdbusmenu, playerctl, - xorg, + libxdamage, + xrandr, + xinput, iio-sensor-proxy, inotify-tools, bluez, @@ -58,9 +60,9 @@ stdenv.mkDerivation (finalAttrs: { grim wf-recorder playerctl - xorg.xrandr - xorg.xinput - xorg.libXdamage + xrandr + xinput + libxdamage iio-sensor-proxy inotify-tools bluez diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index 6bcc95825548..77c41b7093f4 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -17,7 +17,8 @@ pcre, util-linux, wayland, - xorg, + libxtst, + libxdmcp, cmake, doxygen, @@ -49,8 +50,8 @@ mkDerivation { pcre util-linux wayland - xorg.libXdmcp - xorg.libXtst + libxdmcp + libxtst ]; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 84433d5492f4..08f2bf8bc401 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -43,7 +43,8 @@ tinyxml, util-linux, wxGTK32, - xorg, + libxtst, + libxdmcp, xz, }: @@ -119,8 +120,8 @@ stdenv.mkDerivation (finalAttrs: { libselinux libsepol util-linux - xorg.libXdmcp - xorg.libXtst + libxdmcp + libxtst ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 1782a051373e..841e6c459d14 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -19,7 +19,9 @@ icu, freetype, pugixml, - xorg, + libxrandr, + libxinerama, + libxcursor, nix-update-script, }: @@ -79,9 +81,9 @@ stdenv.mkDerivation (finalAttrs: { icu freetype pugixml - xorg.libXrandr - xorg.libXinerama - xorg.libXcursor + libxrandr + libxinerama + libxcursor ]; # Yes, this is PRE configure. The configure phase uses cmake diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 947500522390..830601e189cf 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -30,7 +30,7 @@ qhull, onetbb, wxGTK32, - xorg, + libx11, libbgcode, heatshrink, catch2_3, @@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { qhull onetbb wxGTK-override' - xorg.libX11 + libx11 libbgcode heatshrink catch2_3 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 013382e7f1f4..14f5fbeca252 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -12,7 +12,12 @@ ## various stuff that can be plugged in ffmpeg_7, - xorg, + libxxf86vm, + libxxf86dga, + libxt, + libxscrnsaver, + libxext, + libx11, alsa-lib, libpulseaudio, libcanberra-gtk3, @@ -31,6 +36,7 @@ sndio, libjack2, speechd-minimal, + zlib, }: ## configurability of the wrapper itself @@ -98,7 +104,7 @@ let libva libgbm libnotify - xorg.libXScrnSaver + libxscrnsaver cups pciutils vulkan-loader @@ -109,19 +115,16 @@ let ++ lib.optional ffmpegSupport ffmpeg_7 ++ lib.optional gssSupport libkrb5 ++ lib.optional useGlvnd libglvnd - ++ lib.optionals (cfg.enableQuakeLive or false) ( - with xorg; - [ - stdenv.cc - libX11 - libXxf86dga - libXxf86vm - libXext - libXt - alsa-lib - zlib - ] - ) + ++ lib.optionals (cfg.enableQuakeLive or false) [ + stdenv.cc + libx11 + libxxf86dga + libxxf86vm + libxext + libxt + alsa-lib + zlib + ] ++ lib.optional (config.pulseaudio or (!isDarwin)) libpulseaudio ++ lib.optional alsaSupport alsa-lib ++ lib.optional sndioSupport sndio diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index e2e03f4b8b63..ae424918dad6 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -55,23 +55,20 @@ buildFHSEnv { unsharePid = false; targetPkgs = - pkgs: - with pkgs; - with xorg; - [ - libICE - libSM - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXrender - libXmu - libXxf86vm + pkgs: with pkgs; [ + libice + libsm + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrender + libxmu + libxxf86vm libGL libxcb - xkeyboardconfig + xkeyboard-config curl dbus firefox-bin @@ -87,7 +84,7 @@ buildFHSEnv { zlib libgbm libxshmfence - libpthreadstubs + libpthread-stubs libappindicator ]; diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index 04270c82c848..e552f292ef70 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -2,7 +2,7 @@ lib, mkFranzDerivation, fetchurl, - xorg, + libxshmfence, stdenv, }: @@ -29,7 +29,7 @@ mkFranzDerivation rec { inherit hash; }; - extraBuildInputs = [ xorg.libxshmfence ]; + extraBuildInputs = [ libxshmfence ]; passthru = { updateScript = ./update.sh; diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index e8019c32595c..62462a150b08 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -5,7 +5,17 @@ wrapGAppsHook3, autoPatchelfHook, dpkg, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, atk, glib, pango, @@ -71,19 +81,19 @@ stdenv.mkDerivation ( ]; buildInputs = extraBuildInputs - ++ (with xorg; [ - libXi - libXcursor - libXdamage - libXrandr - libXcomposite - libXext - libXfixes - libXrender - libX11 - libXtst - libXScrnSaver - ]) + ++ [ + libxi + libxcursor + libxdamage + libxrandr + libxcomposite + libxext + libxfixes + libxrender + libx11 + libxtst + libxscrnsaver + ] ++ [ libgbm gtk3 diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 116336eb2a70..550a8ffc07fe 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -13,7 +13,10 @@ desktop-file-utils, imagemagick, twemoji-color-font, - xorg, + xkeyboard-config, + libxscrnsaver, + libxcursor, + libx11, libsodium, libopus, libGL, @@ -47,20 +50,16 @@ mkDerivation rec { libopus libGL alsa-lib - ] - ++ [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats - ] - ++ (with xorg; [ - libX11 - libXScrnSaver - libXcursor - xkeyboardconfig - ]); + libx11 + libxscrnsaver + libxcursor + xkeyboard-config + ]; fontsConf = makeFontsConf { fontDirectories = [ twemoji-color-font ]; @@ -89,8 +88,8 @@ mkDerivation rec { makeQtWrapper $out/Ripcord $out/bin/ripcord \ --chdir "$out" \ --set FONTCONFIG_FILE "${fontsConf}" \ - --prefix LD_LIBRARY_PATH ":" "${xorg.libXcursor}/lib" \ - --prefix QT_XKB_CONFIG_ROOT ":" "${xorg.xkeyboardconfig}/share/X11/xkb" \ + --prefix LD_LIBRARY_PATH ":" "${libxcursor}/lib" \ + --prefix QT_XKB_CONFIG_ROOT ":" "${xkeyboard-config}/share/X11/xkb" \ --set RIPCORD_ALLOW_UPDATES 0 runHook postInstall diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 87e20c57efab..39a0e28fcbb6 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -8,7 +8,11 @@ "." "netclient" ], - xorg, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, }: buildGoModule rec { @@ -30,11 +34,11 @@ buildGoModule rec { buildInputs = [ libglvnd - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr + libx11 + libxcursor + libxi + libxinerama + libxrandr ]; meta = { diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 2774a4903eae..95650f52160f 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -26,7 +26,7 @@ # Build options enableGTK3 ? false, gtkmm3, - xorg, + libpthread-stubs, wrapGAppsHook3, enableQt5 ? false, enableQt6 ? false, @@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: { ) ++ optionals enableGTK3 [ gtkmm3 - xorg.libpthreadstubs + libpthread-stubs ] ++ optionals enableSystemd [ systemd ] ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ]; diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 6a7afab23b3d..8740190ada02 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -65,7 +65,18 @@ tzdata, which, woff2, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxmu, + libxinerama, + libxfixes, + libxext, + libxaw, + libx11, + xprop, + xdpyinfo, + libxcb, zlib, homepage, @@ -199,10 +210,10 @@ stdenv.mkDerivation rec { stdenv.cc.cc (lib.getLib systemd) woff2 - xorg.libXScrnSaver - xorg.libXaw - xorg.libXmu - xorg.libXtst + libxscrnsaver + libxaw + libxmu + libxtst zlib ]; @@ -213,17 +224,17 @@ stdenv.mkDerivation rec { libGL pcsclite - xorg.libX11 - xorg.libXScrnSaver - xorg.libXext - xorg.libXfixes - xorg.libXinerama - xorg.libXmu - xorg.libXrender - xorg.libXtst - xorg.libxcb - xorg.xdpyinfo - xorg.xprop + libx11 + libxscrnsaver + libxext + libxfixes + libxinerama + libxmu + libxrender + libxtst + libxcb + xdpyinfo + xprop ]; installPhase = diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a517dec53f94..6d176db0c832 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -38,7 +38,15 @@ jdk21, ant, cups, - xorg, + libxtst, + libxi, + libxinerama, + libxext, + libxdmcp, + libxaw, + libx11, + libpthread-stubs, + libxshmfence, fontforge, jre21_minimal, openssl, @@ -433,13 +441,13 @@ stdenv.mkDerivation (finalAttrs: { libGL libGLU libtool - xorg.libX11 - xorg.libXaw - xorg.libXdmcp - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libXtst + libx11 + libxaw + libxdmcp + libxext + libxi + libxinerama + libxtst libabw libargon2 libatomic_ops @@ -455,7 +463,7 @@ stdenv.mkDerivation (finalAttrs: { libmspack libmwaw libodfgen - xorg.libpthreadstubs + libpthread-stubs librdf_redland librevenge librsvg @@ -466,7 +474,7 @@ stdenv.mkDerivation (finalAttrs: { libwps libxcrypt libxml2 - xorg.libxshmfence + libxshmfence libxslt libzmf libwebp diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index f136b0e8ba99..43ea2802346b 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -4,7 +4,7 @@ # The unwrapped libreoffice derivation unwrapped, makeWrapper, - xorg, # for lndir + lndir, runCommand, # For Emulating wrapGAppsHook3 gsettings-desktop-schemas, @@ -125,7 +125,7 @@ runCommand "${unwrapped.name}-wrapped" paths = [ unwrapped ]; nativeBuildInputs = [ makeWrapper - xorg.lndir + lndir ]; passthru = { inherit unwrapped; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index c123a7b6f692..cabb13b6f0f2 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { # Join all plugins via symlinking lib.pipe extraPackages [ (map (pkg: '' - ${buildPackages.xorg.lndir}/bin/lndir -silent ${pkg} $out + ${buildPackages.lndir}/bin/lndir -silent ${pkg} $out '')) lib.concatStrings ] diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 885a55334f02..660a191e3cc1 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -10,7 +10,7 @@ pango, lib, stdenv, - xorg, + libx11, }: { @@ -52,7 +52,7 @@ let glib gtk2-x11 pango - xorg.libX11 + libx11 ]; dontBuild = true; diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index b778ec64e230..abbb0ce62309 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -15,7 +15,7 @@ sqlite, unixODBC, gtk2, - xorg, + libxtst, glibcLocales, releasePath ? null, }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { gtk2 sqlite unixODBC - xorg.libXtst + libxtst glibcLocales ]; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { gtk2 gtk3 libsecret - xorg.libXtst + libxtst ]; in '' diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index a52435a26659..69a276ba762c 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -16,7 +16,18 @@ openssl, unixODBC, xkeyboard_config, - xorg, + libxtst, + libxrender, + libxrandr, + libxmu, + libxi, + libxfixes, + libxext, + libxcursor, + libx11, + libsm, + libice, + libxcb, zlib, libxml2, libuuid, @@ -63,21 +74,19 @@ stdenv.mkDerivation rec { zlib libGL libGLU - ] - ++ (with xorg; [ - libX11 - libXext - libXtst - libXi - libXmu - libXrender + libx11 + libxext + libxtst + libxi + libxmu + libxrender libxcb - libXcursor - libXfixes - libXrandr - libICE - libSM - ]); + libxcursor + libxfixes + libxrandr + libice + libsm + ]; # some bundled libs are found through LD_LIBRARY_PATH autoPatchelfIgnoreMissingDeps = true; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index c3e0e5147448..c82b02838e55 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -9,7 +9,7 @@ fetchurl, lib, stdenv, - xorg, + libx11, glib, libGL, glibcLocales, @@ -48,7 +48,7 @@ let versionFile = toString ./default.nix; neededLibraries = [ - xorg.libX11 + libx11 glib gtk3 cairo diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 1a72ebc4eded..ded3569c6fe0 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -26,7 +26,7 @@ x264, curl, wayland, - xorg, + libx11, pkg-config, libvlc, libGL, @@ -215,7 +215,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = let wrapperLibraries = [ - xorg.libX11 + libx11 libvlc libGL ] diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index 1c9d80391b65..d9c108090eac 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -7,7 +7,14 @@ ninja, obs-studio, qtbase, - xorg, + libxt, + libxtst, + libxi, + libxinerama, + libxext, + libxdmcp, + libxau, + libx11, libxkbcommon, libxkbfile, sdl3, @@ -35,14 +42,14 @@ stdenv.mkDerivation (finalAttrs: { obs-studio qtbase sdl3 - xorg.libX11 - xorg.libXau - xorg.libXdmcp - xorg.libXtst - xorg.libXext - xorg.libXi - xorg.libXt - xorg.libXinerama + libx11 + libxau + libxdmcp + libxtst + libxext + libxi + libxt + libxinerama libxkbcommon libxkbfile ]; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 88431b3f0c15..006b2635f597 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -24,7 +24,18 @@ libgbm, nss, nspr, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, streamlink, }: let @@ -53,7 +64,7 @@ stdenv.mkDerivation rec { } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = with xorg; [ + nativeBuildInputs = [ at-spi2-core atk alsa-lib @@ -72,18 +83,18 @@ stdenv.mkDerivation rec { nss nspr libuuid - libX11 + libx11 libxcb - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXScrnSaver - libXtst + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxscrnsaver + libxtst makeWrapper wrapGAppsHook3 ]; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 61453be5e0be..dc4c069df341 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -9,7 +9,8 @@ ffmpeg, libva, libvdpau, - xorg, + libx11, + libxcb, libGL, libGLU, }: @@ -31,8 +32,8 @@ stdenv.mkDerivation rec { alsa-lib libva libvdpau - xorg.libxcb - xorg.libX11 + libxcb + libx11 libGL libGLU ]; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index c89b04605fc4..06d245582a38 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -14,7 +14,8 @@ xz, pkg-config, which, - xorg, + xorg-server, + xrandr, yasm, patchelf, makeself, @@ -48,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { which yasm makeself - xorg.xorgserver + xorg-server openssl linuxHeaders xz @@ -89,8 +90,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace ./src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDrmClient.cpp --replace-fail /usr/bin/VBoxDRMClient /run/current-system/sw/bin/VBoxDRMClient substituteInPlace ./src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDrmClient.cpp --replace-fail /usr/bin/VBoxClient /run/current-system/sw/bin/VBoxClient - substituteInPlace ./src/VBox/Additions/x11/VBoxClient/display.cpp --replace-fail /usr/X11/bin/xrandr ${xorg.xrandr}/bin/xrandr - substituteInPlace ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk --replace-fail /usr/include/xorg "${xorg.xorgserver.dev}/include/xorg " + substituteInPlace ./src/VBox/Additions/x11/VBoxClient/display.cpp --replace-fail /usr/X11/bin/xrandr ${xrandr}/bin/xrandr + substituteInPlace ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk --replace-fail /usr/include/xorg "${xorg-server.dev}/include/xorg " ''; configurePhase = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 94c4da5f53ef..de7823f7966a 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -5,12 +5,17 @@ lib, dbus, kmod, - xorg, + libxt, + libxrandr, + libxmu, + libxfixes, + libxext, + libxcursor, zlib, patchelf, makeWrapper, wayland, - libX11, + libx11, }: let virtualboxVersion = "7.2.4"; @@ -44,11 +49,11 @@ let } { name = "libXfixes.so"; - pkg = xorg.libXfixes; + pkg = libxfixes; } { name = "libXrandr.so"; - pkg = xorg.libXrandr; + pkg = libxrandr; } { name = "libwayland-client.so"; @@ -56,11 +61,11 @@ let } { name = "libX11.so"; - pkg = libX11; + pkg = libx11; } { name = "libXt.so"; - pkg = xorg.libXt; + pkg = libxt; } ]; in @@ -103,12 +108,12 @@ stdenv.mkDerivation { stdenv.cc.cc stdenv.cc.libc zlib - xorg.libX11 - xorg.libXt - xorg.libXext - xorg.libXmu - xorg.libXfixes - xorg.libXcursor + libx11 + libxt + libxext + libxmu + libxfixes + libxcursor ] } $i done diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index d050baa5cbd8..6c477bec07f2 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -10,7 +10,15 @@ imagemagick, pkg-config, gdk-pixbuf, - xorg, + libxcb-util, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxdmcp, + libxau, + libxshmfence, + libxcb, libstartup_notification, libxdg_basedir, libpthreadstubs, @@ -122,15 +130,15 @@ stdenv.mkDerivation rec { net-tools pango xcb-util-cursor - xorg.libXau - xorg.libXdmcp - xorg.libxcb - xorg.libxshmfence - xorg.xcbutil - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm + libxau + libxdmcp + libxcb + libxshmfence + libxcb-util + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm libxkbcommon xcbutilxrm ] diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 16cf3b8c1a90..d761e7144297 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -25,7 +25,8 @@ xorgserver, xvfb-run, xdotool, - xorg, + xrandr, + setxkbmap, which, asciidoc, xmlto, @@ -106,8 +107,8 @@ stdenv.mkDerivation (finalAttrs: { xorgserver xvfb-run xdotool - xorg.setxkbmap - xorg.xrandr + setxkbmap + xrandr which ]; diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix index 0512ea66c73c..e1ba87a78404 100644 --- a/pkgs/applications/window-managers/i3/easyfocus.nix +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -6,7 +6,7 @@ xorgproto, libxcb, xcbutilkeysyms, - xorg, + libx11, i3ipc-glib, glib, }: @@ -27,7 +27,7 @@ stdenv.mkDerivation { libxcb xcbutilkeysyms xorgproto - xorg.libX11.dev + libx11.dev i3ipc-glib glib.dev ]; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index bd05c1eb9326..51d3af3ed4b3 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -15,7 +15,7 @@ libxkbfile, libjpeg_turbo, xcbutilxrm, - xorg, + libxcb-util, }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libxkbfile libjpeg_turbo xcbutilxrm - xorg.xcbutil + libxcb-util ]; makeFlags = [ "all" ]; diff --git a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix index a1f6ecd82cb7..285ffaeb1212 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, i3lock, }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { hash = "sha256-EoX8ts0yV/zkb4wgEh4P8noU+UraRS4w9pp+76v+Nm0="; }; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; propagatedBuildInputs = [ i3lock ]; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index b082a162e833..de64e19608cf 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -15,7 +15,7 @@ cairo, libxkbcommon, libxkbfile, - xorg, + libxcb-util, }: stdenv.mkDerivation rec { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { cairo libxkbcommon libxkbfile - xorg.xcbutil + libxcb-util ]; meta = { diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index cb7597bba41e..47633170e263 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, rustPlatform, - xorg, + libxcb-keysyms, python3, pkg-config, cairo, @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { cairo expat libxkbcommon - xorg.xcbutilkeysyms + libxcb-keysyms ]; # For now, this is the only available featureset. This is also why the file is diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 7a034b8ea642..79b932157728 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -22,7 +22,7 @@ pango, pkg-config, which, - xorg, + libxrender, xorgproto, gitUpdater, }: @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { libpng librsvg pango - xorg.libXrender + libxrender xorgproto ]; diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index 2ada60594b5e..aa21a197caf5 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -24,7 +24,7 @@ wayland-scanner, wlroots_0_19, pango, - xorg, + libxcb-wm, yyjson, }: let @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 vulkan-headers wayland-protocols - xorg.xcbutilwm + libxcb-wm yyjson ]; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index fd95aea165d7..2ca83c4fe503 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -119,7 +119,7 @@ rec { gtk3 bashInteractive zenity - xorg.xrandr + xrandr which perl xdg-user-dirs # flutter desktop apps @@ -139,35 +139,35 @@ rec { multiPkgs = pkgs: with pkgs; [ desktop-file-utils - xorg.libXcomposite - xorg.libXtst - xorg.libXrandr - xorg.libXext - xorg.libX11 - xorg.libXfixes + libxcomposite + libxtst + libxrandr + libxext + libx11 + libxfixes libGL gst_all_1.gstreamer gst_all_1.gst-plugins-ugly gst_all_1.gst-plugins-base libdrm - xorg.xkeyboardconfig - xorg.libpciaccess + xkeyboard-config + libpciaccess glib bzip2 zlib gdk-pixbuf - xorg.libXinerama - xorg.libXdamage - xorg.libXcursor - xorg.libXrender - xorg.libXScrnSaver - xorg.libXxf86vm - xorg.libXi - xorg.libSM - xorg.libICE + libxinerama + libxdamage + libxcursor + libxrender + libxscrnsaver + libxxf86vm + libxi + libsm + libice freetype curlWithGnuTls nspr @@ -187,14 +187,14 @@ rec { at-spi2-atk libudev0-shim - xorg.libXt - xorg.libXmu - xorg.libxcb - xorg.xcbutil - xorg.xcbutilwm - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil + libxt + libxmu + libxcb + libxcb-util + libxcb-wm + libxcb-image + libxcb-keysyms + libxcb-render-util libGLU libuuid libogg @@ -228,7 +228,7 @@ rec { libgcrypt libvpx librsvg - xorg.libXft + libxft libvdpau alsa-lib diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 73d1ccef9574..183f717d6c4b 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -93,7 +93,17 @@ in nss_latest, onnxruntime, pango, - xorg, + libxt, + libxtst, + libxrender, + libxi, + libxft, + libxext, + libxdamage, + libxcursor, + libx11, + xorgproto, + pixman, zip, zlib, pkgsBuildBuild, @@ -576,17 +586,17 @@ buildStdenv.mkDerivation { libwebp nspr pango - xorg.libX11 - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXft - xorg.libXi - xorg.libXrender - xorg.libXt - xorg.libXtst - xorg.pixman - xorg.xorgproto + libx11 + libxcursor + libxdamage + libxext + libxft + libxi + libxrender + libxt + libxtst + pixman + xorgproto zlib (if (lib.versionAtLeast version "144") then nss_latest else nss_esr) ] diff --git a/pkgs/build-support/build-nim-sbom.nix b/pkgs/build-support/build-nim-sbom.nix index 1a13196f24a0..b0595028e111 100644 --- a/pkgs/build-support/build-nim-sbom.nix +++ b/pkgs/build-support/build-nim-sbom.nix @@ -4,7 +4,7 @@ fetchgit, fetchzip, runCommand, - xorg, + lndir, nim, nimOverrides, }: @@ -70,7 +70,7 @@ let "out" "src" ]; - nativeBuildInputs = [ xorg.lndir ]; + nativeBuildInputs = [ lndir ]; } '' cat << EOF >> $out diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix index bca7163fdeea..857862b54100 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix @@ -4439,7 +4439,7 @@ rec { # recreate a file hierarchy as when running tests with cargo # the source for test data - ${pkgs.xorg.lndir}/bin/lndir ${crate.src} + ${pkgs.lndir}/bin/lndir ${crate.src} # build outputs testRoot=target/debug diff --git a/pkgs/by-name/_0/_010editor/package.nix b/pkgs/by-name/_0/_010editor/package.nix index 7f92612cfd6d..3884de5b4c22 100644 --- a/pkgs/by-name/_0/_010editor/package.nix +++ b/pkgs/by-name/_0/_010editor/package.nix @@ -9,7 +9,7 @@ cups, qt6, undmg, - xorg, + xkeyboard-config, }: stdenv.mkDerivation (finalAttrs: { @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { cups qt6.qtbase qt6.qtwayland - xorg.xkeyboardconfig + xkeyboard-config ]; installPhase = @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { # Wrap binary: clean env, fix XKB lookup makeWrapper $out/opt/010editor $out/bin/010editor \ --unset QT_PLUGIN_PATH \ - --set XKB_CONFIG_ROOT ${xorg.xkeyboardconfig}/share/X11/xkb + --set XKB_CONFIG_ROOT ${xkeyboard-config}/share/X11/xkb # Install icon + desktop entry install -D $out/opt/010_icon_128x128.png $out/share/icons/hicolor/128x128/apps/010.png diff --git a/pkgs/by-name/_1/_1fps/package.nix b/pkgs/by-name/_1/_1fps/package.nix index 90fef1a29cbb..bd2dda9dd807 100644 --- a/pkgs/by-name/_1/_1fps/package.nix +++ b/pkgs/by-name/_1/_1fps/package.nix @@ -2,7 +2,9 @@ lib, fetchFromGitHub, buildGoModule, - xorg, + libxtst, + libxi, + libx11, stdenv, }: buildGoModule rec { @@ -21,9 +23,9 @@ buildGoModule rec { vendorHash = "sha256-29x5Lh++NBAsg2O2Vr6pf9iRuVOvow2R5Iqz6twZGXA="; buildInputs = [ - xorg.libX11 - xorg.libXtst - xorg.libXi + libx11 + libxtst + libxi ]; meta = { diff --git a/pkgs/by-name/ab/above/package.nix b/pkgs/by-name/ab/above/package.nix index 8f3365d4068f..2a09ad9fcc7c 100644 --- a/pkgs/by-name/ab/above/package.nix +++ b/pkgs/by-name/ab/above/package.nix @@ -4,16 +4,16 @@ fetchFromGitHub, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "above"; - version = "2.8"; + version = "2.8.1"; pyproject = true; src = fetchFromGitHub { owner = "casterbyte"; repo = "Above"; - tag = "v${version}"; - hash = "sha256-kG+eaTT72jmeC9R9IKwfd/+9oLAzHLJoKfFJhJDJzDM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-wyXWGfthzJeHZoJe4OKe9k2BIwLae/aOUtiJpT4SfHw="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -23,19 +23,15 @@ python3.pkgs.buildPythonApplication rec { scapy ]; - postFixup = '' - mv $out/bin/above.py $out/bin/$pname - ''; - # Project has no tests doCheck = false; meta = { description = "Invisible network protocol sniffer"; homepage = "https://github.com/casterbyte/Above"; - changelog = "https://github.com/casterbyte/Above/releases/tag/${src.tag}"; + changelog = "https://github.com/casterbyte/Above/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "above"; }; -} +}) diff --git a/pkgs/by-name/ac/activate-linux/package.nix b/pkgs/by-name/ac/activate-linux/package.nix index 00e347c4fb30..e67d3ccda23f 100644 --- a/pkgs/by-name/ac/activate-linux/package.nix +++ b/pkgs/by-name/ac/activate-linux/package.nix @@ -3,7 +3,14 @@ fetchFromGitHub, lib, pkg-config, - xorg, + libxt, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libx11, + xorgproto, cairo, wayland, wayland-protocols, @@ -31,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo - xorg.libX11 - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXt - xorg.xorgproto + libx11 + libxext + libxfixes + libxi + libxinerama + libxrandr + libxt + xorgproto wayland wayland-protocols libconfig diff --git a/pkgs/by-name/ah/ahk_x11/package.nix b/pkgs/by-name/ah/ahk_x11/package.nix index d426783ec477..22ddf27dc20c 100644 --- a/pkgs/by-name/ah/ahk_x11/package.nix +++ b/pkgs/by-name/ah/ahk_x11/package.nix @@ -5,7 +5,10 @@ copyDesktopItems, gtk3, libxkbcommon, - xorg, + libxinerama, + libxtst, + libxext, + libxi, libnotify, gobject-introspection, # needed to build gi-crystal openbox, @@ -21,14 +24,6 @@ let pname = "ahk_x11"; version = "1.0.7"; - - inherit (xorg) - libXinerama - libXtst - libXext - libXi - ; - in crystal.buildCrystalPackage { inherit pname version; @@ -75,10 +70,10 @@ crystal.buildCrystalPackage { buildInputs = [ gtk3 libxkbcommon - libXinerama - libXtst - libXext - libXi + libxinerama + libxtst + libxext + libxi libnotify ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ai/airgeddon/package.nix b/pkgs/by-name/ai/airgeddon/package.nix index 0059f1a35707..40e0c1791439 100644 --- a/pkgs/by-name/ai/airgeddon/package.nix +++ b/pkgs/by-name/ai/airgeddon/package.nix @@ -17,7 +17,8 @@ tmux, # X11 Front xterm, - xorg, + xset, + xdpyinfo, # what the author calls "Internals" usbutils, wget, @@ -108,8 +109,8 @@ let ] ++ lib.optionals supportX11 [ xterm - xorg.xset - xorg.xdpyinfo + xset + xdpyinfo ]; in stdenv.mkDerivation rec { diff --git a/pkgs/by-name/ai/airtame/package.nix b/pkgs/by-name/ai/airtame/package.nix index 277092539143..edb3f9b2905e 100644 --- a/pkgs/by-name/ai/airtame/package.nix +++ b/pkgs/by-name/ai/airtame/package.nix @@ -23,7 +23,11 @@ libGL, vulkan-loader, curlWithGnuTls, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, lib, libnotify, libappindicator-gtk3, @@ -31,12 +35,12 @@ pciutils, }: let - xorgDeps = with xorg; [ - libXdamage - libXext - libXfixes - libXcomposite - libXrandr + xorgDeps = [ + libxdamage + libxext + libxfixes + libxcomposite + libxrandr ]; deps = [ diff --git a/pkgs/by-name/ai/airwin2rack/package.nix b/pkgs/by-name/ai/airwin2rack/package.nix index bd9db16c3cc5..4437cafb965b 100644 --- a/pkgs/by-name/ai/airwin2rack/package.nix +++ b/pkgs/by-name/ai/airwin2rack/package.nix @@ -8,7 +8,13 @@ cmake, pkg-config, alsa-lib, - xorg, + libxrender, + libxrandr, + libxinerama, + libxext, + libxcursor, + libxcomposite, + libx11, fontconfig, freetype, libjack2, @@ -84,13 +90,13 @@ stdenv.mkDerivation { buildInputs = [ alsa-lib - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXext - xorg.libXinerama - xorg.libXrandr - xorg.libXrender + libx11 + libxcomposite + libxcursor + libxext + libxinerama + libxrandr + libxrender fontconfig libjack2 freetype diff --git a/pkgs/by-name/aj/aja-desktop-software/package.nix b/pkgs/by-name/aj/aja-desktop-software/package.nix index f69404bfe5c3..2d86fbc194bd 100644 --- a/pkgs/by-name/aj/aja-desktop-software/package.nix +++ b/pkgs/by-name/aj/aja-desktop-software/package.nix @@ -79,14 +79,14 @@ buildFHSEnv { glib fontconfig freetype - xorg.libxcb - xorg.libX11 - xorg.xcbutilwm - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.libSM - xorg.libICE + libxcb + libx11 + libxcb-wm + libxcb-image + libxcb-keysyms + libxcb-render-util + libsm + libice libxkbcommon dbus avahi diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index c2fc017a3740..23170d0b56e2 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -17,7 +17,11 @@ fontconfig, freetype, libGL, - xorg, + libxxf86vm, + libxi, + libxcursor, + libx11, + libxcb, libxkbcommon, wayland, xdg-utils, @@ -34,11 +38,11 @@ let ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXxf86vm - xorg.libxcb + libx11 + libxcursor + libxi + libxxf86vm + libxcb libxkbcommon wayland ]; diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix index 627b89b7ce21..68c97b44b237 100644 --- a/pkgs/by-name/al/alfaview/package.nix +++ b/pkgs/by-name/al/alfaview/package.nix @@ -22,7 +22,11 @@ openssl, systemd, xcb-util-cursor, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libx11, }: stdenv.mkDerivation rec { @@ -61,11 +65,11 @@ stdenv.mkDerivation rec { stdenv.cc.cc systemd xcb-util-cursor - xorg.libX11 - xorg.xcbutilwm - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil + libx11 + libxcb-wm + libxcb-image + libxcb-keysyms + libxcb-render-util ]; libPath = lib.makeLibraryPath buildInputs; diff --git a/pkgs/by-name/al/alttab/package.nix b/pkgs/by-name/al/alttab/package.nix index 0695c17551de..776fc2cc203a 100644 --- a/pkgs/by-name/al/alttab/package.nix +++ b/pkgs/by-name/al/alttab/package.nix @@ -12,7 +12,14 @@ uthash, which, xnee, - xorg, + libxrender, + libxrandr, + libxpm, + libxmu, + libxft, + libx11, + xprop, + xeyes, python3Packages, }: @@ -40,12 +47,12 @@ stdenv.mkDerivation rec { buildInputs = [ libpng uthash - xorg.libX11 - xorg.libXft - xorg.libXmu - xorg.libXpm - xorg.libXrandr - xorg.libXrender + libx11 + libxft + libxmu + libxpm + libxrandr + libxrender ]; enableParallelBuilding = true; @@ -58,8 +65,8 @@ stdenv.mkDerivation rec { python3Packages.xvfbwrapper which xnee - xorg.xeyes - xorg.xprop + xeyes + xprop ]; meta = { diff --git a/pkgs/by-name/al/alttpr-opentracker/package.nix b/pkgs/by-name/al/alttpr-opentracker/package.nix index 07a6123025f0..377cff32bf46 100644 --- a/pkgs/by-name/al/alttpr-opentracker/package.nix +++ b/pkgs/by-name/al/alttpr-opentracker/package.nix @@ -13,7 +13,10 @@ libunwind, openssl, xinput, - xorg, + libxi, + libx11, + libsm, + libice, }: buildDotnetModule rec { pname = "opentracker"; @@ -52,13 +55,11 @@ buildDotnetModule rec { gtk3 openssl xinput - ] - ++ (with xorg; [ - libICE - libSM - libX11 - libXi - ]); + libice + libsm + libx11 + libxi + ]; autoPatchelfIgnoreMissingDeps = [ "libc.musl-x86_64.so.1" diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index ae84cf33a388..313f2ea1fb07 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -30,10 +30,10 @@ let multiPkgs = pkgs: with pkgs; [ (lib.getLib stdenv.cc.cc) - xorg.libX11 - xorg.libXext - xorg.libXrandr - xorg.libXxf86vm + libx11 + libxext + libxrandr + libxxf86vm curl libGLU libglvnd diff --git a/pkgs/by-name/am/amoeba/package.nix b/pkgs/by-name/am/amoeba/package.nix index 3b77d67bda29..d90130bc7ee0 100644 --- a/pkgs/by-name/am/amoeba/package.nix +++ b/pkgs/by-name/am/amoeba/package.nix @@ -9,7 +9,7 @@ gtk3, libvorbis, libGLU, - xorg, + libxxf86vm, pkg-config, installShellFiles, }: @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 libvorbis libGLU - xorg.libXxf86vm + libxxf86vm ]; installPhase = '' diff --git a/pkgs/by-name/an/anakron/package.nix b/pkgs/by-name/an/anakron/package.nix index 5cd737856512..6dc0b8e4c45f 100644 --- a/pkgs/by-name/an/anakron/package.nix +++ b/pkgs/by-name/an/anakron/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchzip, - xorg, + mkfontscale, }: stdenvNoCC.mkDerivation rec { @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-l4MA3OsMnqPIBWKx3ZO5XnxjE0gnIGyAtsZe2z/9zrw="; }; - nativeBuildInputs = [ xorg.mkfontscale ]; + nativeBuildInputs = [ mkfontscale ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/an/anarch/package.nix b/pkgs/by-name/an/anarch/package.nix index 811fe5e253d9..39d5b9776a45 100644 --- a/pkgs/by-name/an/anarch/package.nix +++ b/pkgs/by-name/an/anarch/package.nix @@ -3,7 +3,12 @@ stdenv, fetchFromGitLab, SDL2, - xorg, + libxscrnsaver, + libxrandr, + libxi, + libxfixes, + libxext, + libxcursor, }: stdenv.mkDerivation (finalAttrs: { @@ -19,12 +24,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 - xorg.libXcursor - xorg.libXrandr - xorg.libXfixes - xorg.libXext - xorg.libXi - xorg.libXScrnSaver + libxcursor + libxrandr + libxfixes + libxext + libxi + libxscrnsaver ]; # upstream is an error-prone make/build script diff --git a/pkgs/by-name/an/angle/package.nix b/pkgs/by-name/an/angle/package.nix index 93a02c006fd7..597c7e41ad1f 100644 --- a/pkgs/by-name/an/angle/package.nix +++ b/pkgs/by-name/an/angle/package.nix @@ -9,7 +9,10 @@ python3, symlinkJoin, lib, - xorg, + libxi, + libxext, + libx11, + libxcb, wayland, pciutils, libGL, @@ -71,10 +74,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals stdenv.isLinux [ glib - xorg.libxcb.dev - xorg.libX11.dev - xorg.libXext.dev - xorg.libXi + libxcb.dev + libx11.dev + libxext.dev + libxi wayland.dev pciutils libGL diff --git a/pkgs/by-name/an/angr-management/package.nix b/pkgs/by-name/an/angr-management/package.nix index de685658d86f..13d51f51677d 100644 --- a/pkgs/by-name/an/angr-management/package.nix +++ b/pkgs/by-name/an/angr-management/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, python312, - xorg, + libxcb-cursor, }: python312.pkgs.buildPythonApplication rec { @@ -23,7 +23,7 @@ python312.pkgs.buildPythonApplication rec { "qtawesome" ]; - buildInputs = [ xorg.xcbutilcursor ]; + buildInputs = [ libxcb-cursor ]; build-system = with python312.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/an/animatch/package.nix b/pkgs/by-name/an/animatch/package.nix index e85ea5fe0253..1a62ed74dce5 100644 --- a/pkgs/by-name/an/animatch/package.nix +++ b/pkgs/by-name/an/animatch/package.nix @@ -5,7 +5,7 @@ fetchFromGitLab, libGL, stdenv, - xorg, + libx11, }: stdenv.mkDerivation rec { pname = "animatch"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ allegro5 libGL - xorg.libX11 + libx11 ]; cmakeFlags = [ diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix index 1d6e98bc0c2f..532ee5c64ebf 100644 --- a/pkgs/by-name/an/animeko/package.nix +++ b/pkgs/by-name/an/animeko/package.nix @@ -36,7 +36,7 @@ libjpeg8, libkate, librsvg, - xorg, + libxpm, libsForQt5, libupnp, aalib, @@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { libjpeg8 libkate librsvg - xorg.libXpm + libxpm libsForQt5.qt5.qtsvg libsForQt5.qt5.qtbase libsForQt5.qt5.qtx11extras diff --git a/pkgs/by-name/an/anki-bin/package.nix b/pkgs/by-name/an/anki-bin/package.nix index d16f39ecd09a..8850e149e682 100644 --- a/pkgs/by-name/an/anki-bin/package.nix +++ b/pkgs/by-name/an/anki-bin/package.nix @@ -93,8 +93,8 @@ let targetPkgs = pkgs: (with pkgs; [ - xorg.libxkbfile - xorg.libxshmfence + libxkbfile + libxshmfence libxcb-cursor krb5 zstd diff --git a/pkgs/by-name/an/anki/addons/recolor/default.nix b/pkgs/by-name/an/anki/addons/recolor/default.nix index 3a6fd9e05910..249fac0f9f01 100644 --- a/pkgs/by-name/an/anki/addons/recolor/default.nix +++ b/pkgs/by-name/an/anki/addons/recolor/default.nix @@ -6,21 +6,56 @@ }: anki-utils.buildAnkiAddon (finalAttrs: { pname = "recolor"; - version = "3.1"; + version = "3.3"; src = fetchFromGitHub { owner = "AnKing-VIP"; repo = "AnkiRecolor"; tag = finalAttrs.version; sparseCheckout = [ "src/addon" ]; - hash = "sha256-28DJq2l9DP8O6OsbNQCZ0pm4S6CQ3Yz0Vfvlj+iQw8Y="; + hash = "sha256-Rfie1m4wfwZvmxxFngt1tky1j5dIZKX7c64A1pSbE3c="; }; sourceRoot = "${finalAttrs.src.name}/src/addon"; + + patches = [ + # With this patch, Nix users only need to update their ReColor config when a + # migration happens rather than on every update. + # Upstream always wants the last used addon version in the config file in case an + # update corrupts the config. That isn't a concern here, since the config is + # readonly with Nix. + ./only-update-config-version-when-migration-happens.patch + ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "ReColor your Anki desktop to whatever aesthetic you like"; + longDescription = '' + This add-on must be configured with a theme to use. You can find some pre-made + themes at . + + Example: + + ```nix + pkgs.ankiAddons.recolor.withConfig { + config = { + colors = { + ACCENT_CARD = [ + "Card mode" + "#cba6f7" + "#cba6f7" + "--accent-card" + ]; + # ... + }; + version = { + major = 3; + minor = 1; + }; + }; + } + ``` + ''; homepage = "https://github.com/AnKing-VIP/AnkiRecolor"; - # No license file, but it can be assumed to be AGPL3 based on - # https://ankiweb.net/account/terms. license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ junestepp ]; }; diff --git a/pkgs/by-name/an/anki/addons/recolor/only-update-config-version-when-migration-happens.patch b/pkgs/by-name/an/anki/addons/recolor/only-update-config-version-when-migration-happens.patch new file mode 100644 index 000000000000..ab927b4b44a7 --- /dev/null +++ b/pkgs/by-name/an/anki/addons/recolor/only-update-config-version-when-migration-happens.patch @@ -0,0 +1,30 @@ +From b291ccbc93fec594346ed9590618c4b740f447fe Mon Sep 17 00:00:00 2001 +From: June Stepp +Date: Thu, 9 Oct 2025 16:43:16 -0500 +Subject: [PATCH] Only update config version when migration happens + +--- + migrate.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/migrate.py b/migrate.py +index c84e0c1..7138748 100644 +--- a/migrate.py ++++ b/migrate.py +@@ -18,11 +18,12 @@ def maybe_migrate_config(conf: ConfigManager) -> None: + v2_to_v3(conf) + elif version < "3.0": + v2_to_v3(conf) ++ else: ++ return + +- if version != version_string: +- conf["version.major"] = int(version_string.split(".")[0]) +- conf["version.minor"] = int(version_string.split(".")[1]) +- conf.save() ++ conf["version.major"] = int(version_string.split(".")[0]) ++ conf["version.minor"] = int(version_string.split(".")[1]) ++ conf.save() + + # some versions of v2 may be incorrectly in -1.-1 + def detect_v2(conf: ConfigManager) -> bool: diff --git a/pkgs/by-name/an/anttweakbar/package.nix b/pkgs/by-name/an/anttweakbar/package.nix index 441303c2e37d..14d0c2e8d0e8 100644 --- a/pkgs/by-name/an/anttweakbar/package.nix +++ b/pkgs/by-name/an/anttweakbar/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, unzip, - xorg, + libx11, libGLU, libGL, }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; buildInputs = [ - xorg.libX11 + libx11 libGLU libGL ]; diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix index 1e63152d690f..380ef06b22b9 100644 --- a/pkgs/by-name/an/anvil-editor/package.nix +++ b/pkgs/by-name/an/anvil-editor/package.nix @@ -11,7 +11,10 @@ libxkbcommon, vulkan-headers, libGL, - xorg, + libxfixes, + libxcursor, + libx11, + libxcb, }: buildGoModule (finalAttrs: { @@ -57,10 +60,10 @@ buildGoModule (finalAttrs: { libxkbcommon vulkan-headers libGL - xorg.libX11 - xorg.libxcb - xorg.libXcursor - xorg.libXfixes + libx11 + libxcb + libxcursor + libxfixes ]; # Got different result in utf8 char length? diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix index 4311d0366b21..2cdf36d623b1 100644 --- a/pkgs/by-name/an/anydesk/package.nix +++ b/pkgs/by-name/an/anydesk/package.nix @@ -17,7 +17,20 @@ libGLU, libGL, pango, - xorg, + libxt, + libxtst, + libxrender, + libxrandr, + libxmu, + libxi, + libxfixes, + libxext, + libxdamage, + libx11, + libsm, + libice, + libxkbfile, + libxcb, minizip, lsb-release, freetype, @@ -63,23 +76,21 @@ stdenv.mkDerivation (finalAttrs: { polkit polkit_gnome pulseaudio - ] - ++ (with xorg; [ libxcb libxkbfile - libX11 - libXdamage - libXext - libXfixes - libXi - libXmu - libXrandr - libXtst - libXt - libICE - libSM - libXrender - ]); + libx11 + libxdamage + libxext + libxfixes + libxi + libxmu + libxrandr + libxtst + libxt + libice + libsm + libxrender + ]; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/ap/appgate-sdp/package.nix b/pkgs/by-name/ap/appgate-sdp/package.nix index f9e5666bad4b..baf8eca6ddf2 100644 --- a/pkgs/by-name/ap/appgate-sdp/package.nix +++ b/pkgs/by-name/ap/appgate-sdp/package.nix @@ -36,7 +36,19 @@ stdenv, systemd, xdg-utils, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxkbfile, zlib, }: @@ -69,19 +81,19 @@ let pango stdenv.cc.cc systemd - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxkbfile - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxkbfile + libxshmfence zlib ]; in diff --git a/pkgs/by-name/ar/ardour/package.nix b/pkgs/by-name/ar/ardour/package.nix index 393986b7cb87..e21a47802dcd 100644 --- a/pkgs/by-name/ar/ardour/package.nix +++ b/pkgs/by-name/ar/ardour/package.nix @@ -59,7 +59,8 @@ vamp-plugin-sdk, wafHook, xjadeo, - xorg, + libxrandr, + libxinerama, optimize ? true, # disable to print Lua DSP script output to stdout videoSupport ? true, }: @@ -164,8 +165,8 @@ stdenv.mkDerivation ( suil taglib vamp-plugin-sdk - xorg.libXinerama - xorg.libXrandr + libxinerama + libxrandr ] ++ lib.optionals videoSupport [ harvid diff --git a/pkgs/by-name/as/astrolog/package.nix b/pkgs/by-name/as/astrolog/package.nix index cfd8af5027d3..6dfa4b421878 100644 --- a/pkgs/by-name/as/astrolog/package.nix +++ b/pkgs/by-name/as/astrolog/package.nix @@ -3,7 +3,7 @@ stdenv, fetchzip, fetchurl, - xorg, + libx11, withBigAtlas ? true, withEphemeris ? true, withMoonsEphemeris ? true, @@ -23,7 +23,7 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace cc "$CC" --replace strip "$STRIP" ''; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; env.NIX_CFLAGS_COMPILE = "-Wno-format-security"; installPhase = diff --git a/pkgs/by-name/as/astromenace/package.nix b/pkgs/by-name/as/astromenace/package.nix index 87a490d46371..38960e4bc225 100644 --- a/pkgs/by-name/as/astromenace/package.nix +++ b/pkgs/by-name/as/astromenace/package.nix @@ -6,7 +6,9 @@ cmake, ninja, makeWrapper, - xorg, + libxinerama, + libx11, + libice, libGLU, libGL, SDL2, @@ -50,9 +52,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libICE - xorg.libX11 - xorg.libXinerama + libice + libx11 + libxinerama libGLU libGL SDL2 diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 2ec41ca791d2..9938e461bc58 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -16,7 +16,9 @@ libglvnd, libpulseaudio, udev, - xorg, + libxxf86vm, + libxcursor, + libx11, }: let # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." @@ -63,9 +65,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { libglvnd libpulseaudio udev - xorg.libX11 - xorg.libXcursor - xorg.libXxf86vm + libx11 + libxcursor + libxxf86vm ] ++ lib.optional gamemodeSupport gamemode.lib ++ lib.optional textToSpeechSupport flite diff --git a/pkgs/by-name/av/avocode/package.nix b/pkgs/by-name/av/avocode/package.nix index 5961fddf2b00..6845d24ac124 100644 --- a/pkgs/by-name/av/avocode/package.nix +++ b/pkgs/by-name/av/avocode/package.nix @@ -21,7 +21,19 @@ expat, udev, adwaita-icon-theme, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxcb, mozjpeg, makeWrapper, wrapGAppsHook3, @@ -41,46 +53,43 @@ stdenv.mkDerivation rec { sha256 = "sha256-vNQT4jyMIIAk1pV3Hrp40nawFutWCv7xtwg2gU6ejy0="; }; - libPath = lib.makeLibraryPath ( - with xorg; - [ - stdenv.cc.cc - at-spi2-core.out - gdk-pixbuf - glib - gtk3 - atk - at-spi2-atk - pango - cairo - freetype - fontconfig - dbus - nss - nspr - alsa-lib - cups - expat - udev - libX11 - libxcb - libxshmfence - libxkbcommon - libXi - libXcursor - libXdamage - libXrandr - libXcomposite - libXext - libXfixes - libXrender - libXtst - libXScrnSaver - libuuid - libdrm - libgbm - ] - ); + libPath = lib.makeLibraryPath [ + stdenv.cc.cc + at-spi2-core.out + gdk-pixbuf + glib + gtk3 + atk + at-spi2-atk + pango + cairo + freetype + fontconfig + dbus + nss + nspr + alsa-lib + cups + expat + udev + libx11 + libxcb + libxshmfence + libxkbcommon + libxi + libxcursor + libxdamage + libxrandr + libxcomposite + libxext + libxfixes + libxrender + libxtst + libxscrnsaver + libuuid + libdrm + libgbm + ]; desktopItem = makeDesktopItem { name = "Avocode"; diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index a027fe75761b..72e180febd7a 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -31,7 +31,9 @@ stdenv, vulkan-headers, xbyak, - xorg, + libxext, + libx11, + libxcb, enableQtTranslations ? true, qt6, gtk3, @@ -112,9 +114,9 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals stdenv.hostPlatform.isLinux [ pipewire qt6.qtwayland - xorg.libX11 - xorg.libxcb - xorg.libXext + libx11 + libxcb + libxext ] ++ optionals stdenv.hostPlatform.isDarwin [ moltenvk diff --git a/pkgs/by-name/az/azuredatastudio/package.nix b/pkgs/by-name/az/azuredatastudio/package.nix index 6b117f205b5c..39ba55d10e8c 100644 --- a/pkgs/by-name/az/azuredatastudio/package.nix +++ b/pkgs/by-name/az/azuredatastudio/package.nix @@ -29,7 +29,15 @@ pango, systemd, wrapGAppsHook3, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxshmfence, + libxkbfile, + libxcb, zlib, }: @@ -164,16 +172,16 @@ stdenv.mkDerivation rec { nss nspr libdrm - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxshmfence libxkbcommon - xorg.libxkbfile + libxkbfile pango stdenv.cc.cc systemd diff --git a/pkgs/by-name/ba/badlion-client/package.nix b/pkgs/by-name/ba/badlion-client/package.nix index ebf0608ffc83..adc6ad57e857 100644 --- a/pkgs/by-name/ba/badlion-client/package.nix +++ b/pkgs/by-name/ba/badlion-client/package.nix @@ -30,7 +30,7 @@ appimageTools.wrapAppImage rec { --set APPIMAGE 1 ''; - extraPkgs = pkgs: [ pkgs.xorg.libxshmfence ]; + extraPkgs = pkgs: [ pkgs.libxshmfence ]; meta = { description = "Most Complete All-In-One Mod Library for Minecraft with 100+ Mods, FPS Improvements, and more"; diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix index 2430aa67752a..982a8259d7f7 100644 --- a/pkgs/by-name/ba/bambu-studio/package.nix +++ b/pkgs/by-name/ba/bambu-studio/package.nix @@ -38,7 +38,7 @@ onetbb, webkitgtk_4_1, wxGTK31, - xorg, + libx11, withSystemd ? stdenv.hostPlatform.isLinux, }: let @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { onetbb webkitgtk_4_1 wxGTK' - xorg.libX11 + libx11 opencv ] ++ lib.optionals withSystemd [ systemd ] diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix index 12ff1f3905da..ba56ce00a1d8 100644 --- a/pkgs/by-name/ba/basalt-monado/package.nix +++ b/pkgs/by-name/ba/basalt-monado/package.nix @@ -21,7 +21,7 @@ pkg-config, stdenv, onetbb, - xorg, + libx11, cudaPackages, enableCuda ? config.cudaSupport, }: @@ -63,7 +63,7 @@ stdenv.mkDerivation { magic-enum opencv'.cxxdev onetbb - xorg.libX11 + libx11 ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc diff --git a/pkgs/by-name/ba/bashrun2/package.nix b/pkgs/by-name/ba/bashrun2/package.nix index 057d1e3894a4..6323618c0d26 100644 --- a/pkgs/by-name/ba/bashrun2/package.nix +++ b/pkgs/by-name/ba/bashrun2/package.nix @@ -3,7 +3,7 @@ lib, stdenv, makeWrapper, - xorg, + libx11, ncurses, coreutils, bashInteractive, @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libX11 + libx11 ]; patches = [ diff --git a/pkgs/by-name/bb/bb/package.nix b/pkgs/by-name/bb/bb/package.nix index dfc4fecf42a8..2041e2bbe59b 100644 --- a/pkgs/by-name/bb/bb/package.nix +++ b/pkgs/by-name/bb/bb/package.nix @@ -5,7 +5,9 @@ autoreconfHook, aalib, ncurses, - xorg, + libxdmcp, + libxau, + libx11, libmikmod, }: @@ -29,9 +31,9 @@ stdenv.mkDerivation rec { aalib ncurses libmikmod - xorg.libXau - xorg.libXdmcp - xorg.libX11 + libxau + libxdmcp + libx11 ]; # regparm attribute is not supported by clang diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index 89e129e59f3b..f55378b207d0 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -20,7 +20,13 @@ gdk-pixbuf, nss, nspr, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, alsa-lib, expat, libxkbcommon, @@ -65,13 +71,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib stdenv.cc.cc) - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb libxkbcommon glibc gcc diff --git a/pkgs/by-name/be/bemenu/package.nix b/pkgs/by-name/be/bemenu/package.nix index da29bc3e1ae8..37d749a086a7 100644 --- a/pkgs/by-name/be/bemenu/package.nix +++ b/pkgs/by-name/be/bemenu/package.nix @@ -17,7 +17,12 @@ wayland-protocols, wayland-scanner, x11Support ? stdenv.hostPlatform.isLinux, - xorg, + libxinerama, + libxft, + libxdmcp, + libx11, + libpthread-stubs, + libxcb, }: stdenv.mkDerivation (finalAttrs: { @@ -56,12 +61,12 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols ] ++ lib.optionals x11Support [ - xorg.libX11 - xorg.libXinerama - xorg.libXft - xorg.libXdmcp - xorg.libpthreadstubs - xorg.libxcb + libx11 + libxinerama + libxft + libxdmcp + libpthread-stubs + libxcb ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/be/bepass/package.nix b/pkgs/by-name/be/bepass/package.nix index bdd19c2a9a1d..c575769443fd 100644 --- a/pkgs/by-name/be/bepass/package.nix +++ b/pkgs/by-name/be/bepass/package.nix @@ -5,7 +5,7 @@ enableGUI ? false, # upstream working in progress pkg-config, glfw, - xorg, + libxft, libXcursor, libXrandr, libXinerama, @@ -33,7 +33,7 @@ buildGoModule rec { nativeBuildInputs = lib.optionals enableGUI [ pkg-config ]; buildInputs = lib.optionals enableGUI [ glfw - xorg.libXft + libxft libXcursor libXrandr libXinerama diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index ee2b22f4817f..fb8395362b05 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -30,7 +30,6 @@ webkitgtk_4_1, python3, curl, - pcre, mount, zenity, # It is not allowed to distribute binaries with the VST2 SDK plugin without a license @@ -117,7 +116,6 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon xcbutilkeysyms xcb-util-cursor - pcre mount ]; diff --git a/pkgs/by-name/be/betterlockscreen/package.nix b/pkgs/by-name/be/betterlockscreen/package.nix index 13d9998fdbb4..c1e5b1bbcf0f 100644 --- a/pkgs/by-name/be/betterlockscreen/package.nix +++ b/pkgs/by-name/be/betterlockscreen/package.nix @@ -16,7 +16,9 @@ gnused, imagemagick, procps, - xorg, + xset, + xrandr, + xdpyinfo, }: let @@ -30,9 +32,9 @@ let gnused imagemagick procps - xorg.xdpyinfo - xorg.xrandr - xorg.xset + xdpyinfo + xrandr + xset ] ++ lib.optionals withDunst [ dunst ]; in diff --git a/pkgs/by-name/bi/binocle/package.nix b/pkgs/by-name/bi/binocle/package.nix index e6b10eb15dd0..ad58b3e93909 100644 --- a/pkgs/by-name/bi/binocle/package.nix +++ b/pkgs/by-name/bi/binocle/package.nix @@ -4,7 +4,10 @@ rustPlatform, fetchFromGitHub, makeWrapper, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, vulkan-loader, }: @@ -28,16 +31,13 @@ rustPlatform.buildRustPackage rec { postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapProgram $out/bin/binocle \ --suffix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath ( - with xorg; - [ - libX11 - libXcursor - libXi - libXrandr - ] - ++ [ vulkan-loader ] - ) + lib.makeLibraryPath [ + libx11 + libxcursor + libxi + libxrandr + vulkan-loader + ] } ''; diff --git a/pkgs/by-name/bi/bitwig-studio3/package.nix b/pkgs/by-name/bi/bitwig-studio3/package.nix index a65d3b08be92..cd811e1cf615 100644 --- a/pkgs/by-name/bi/bitwig-studio3/package.nix +++ b/pkgs/by-name/bi/bitwig-studio3/package.nix @@ -9,7 +9,12 @@ glib, gtk3, lib, - xorg, + libxcb-util, + libxcb-wm, + libxtst, + libxcursor, + libx11, + libxcb, libglvnd, libjack2, ffmpeg, @@ -39,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { dontBuild = true; dontWrapGApps = true; # we only want $gappsWrapperArgs here - buildInputs = with xorg; [ + buildInputs = [ alsa-lib cairo freetype @@ -47,16 +52,16 @@ stdenv.mkDerivation (finalAttrs: { glib gtk3 libxcb - xcbutil - xcbutilwm + libxcb-util + libxcb-wm zlib - libXtst + libxtst libxkbcommon pulseaudio libjack2 - libX11 + libx11 libglvnd - libXcursor + libxcursor (lib.getLib stdenv.cc.cc) ]; diff --git a/pkgs/by-name/bl/bloodhound/package.nix b/pkgs/by-name/bl/bloodhound/package.nix index b5ee9459595a..e9bac8137221 100644 --- a/pkgs/by-name/bl/bloodhound/package.nix +++ b/pkgs/by-name/bl/bloodhound/package.nix @@ -33,7 +33,18 @@ udev, unzip, xdg-utils, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxkbfile, }: stdenv.mkDerivation (finalAttrs: { pname = "bloodhound"; @@ -73,19 +84,19 @@ stdenv.mkDerivation (finalAttrs: { systemd (lib.getLib stdenv.cc.cc) udev - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxkbfile - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxkbfile + libxshmfence ]; buildInputs = [ diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix index c5eeb8e962d9..fc9591d9ecfd 100644 --- a/pkgs/by-name/bl/bluespec/package.nix +++ b/pkgs/by-name/bl/bluespec/package.nix @@ -13,7 +13,7 @@ pkg-config, tcl, tk, - xorg, + libxft, yices, # bsc uses a patched version of yices zlib, ghc, @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { tcl tk which - xorg.libXft + libxft zlib ]; diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index e7f7b13656dc..9708c601a424 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -5,7 +5,11 @@ rustPlatform, clangStdenv, gtk3, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, perl, pkg-config, openssl, @@ -26,11 +30,11 @@ let wayland # WINIT_UNIX_BACKEND=x11 - xorg.libXcursor - xorg.libXrandr - xorg.libXi - xorg.libX11 - xorg.libxcb + libxcursor + libxrandr + libxi + libx11 + libxcb ]; in rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index 04678bd953db..8de0713bdda1 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -9,7 +9,12 @@ libz, cef-binary, luajit, - xorg, + libxxf86vm, + libxi, + libxext, + libx11, + libsm, + libxcb, libgbm, glib, jdk17, @@ -58,8 +63,8 @@ let buildInputs = [ libgbm - xorg.libX11 - xorg.libxcb + libx11 + libxcb libarchive libz cef @@ -110,11 +115,11 @@ buildFHSEnv { pkgs: [ bolt ] ++ (with pkgs; [ - xorg.libSM - xorg.libXxf86vm - xorg.libX11 - xorg.libXi - xorg.libXext + libsm + libxxf86vm + libx11 + libxi + libxext glib pango cairo diff --git a/pkgs/by-name/bo/boops/package.nix b/pkgs/by-name/bo/boops/package.nix index e3e3908479ff..a29cef3ff332 100644 --- a/pkgs/by-name/bo/boops/package.nix +++ b/pkgs/by-name/bo/boops/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitHub, - xorg, + libx11, cairo, lv2, libsndfile, @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 cairo lv2 libsndfile diff --git a/pkgs/by-name/bo/bottles/package.nix b/pkgs/by-name/bo/bottles/package.nix index 8b84cb39c1c6..914cc4beb877 100644 --- a/pkgs/by-name/bo/bottles/package.nix +++ b/pkgs/by-name/bo/bottles/package.nix @@ -27,23 +27,23 @@ let multiPkgs = let xorgDeps = - pkgs: with pkgs.xorg; [ - libpthreadstubs - libSM - libX11 - libXaw + pkgs: with pkgs; [ + libpthread-stubs + libsm + libx11 + libxaw libxcb - libXcomposite - libXcursor - libXdmcp - libXext - libXi - libXinerama - libXmu - libXrandr - libXrender - libXv - libXxf86vm + libxcomposite + libxcursor + libxdmcp + libxext + libxi + libxinerama + libxmu + libxrandr + libxrender + libxv + libxxf86vm ]; gstreamerDeps = pkgs: with pkgs.gst_all_1; [ diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 85ff58f20b58..3d61baca34d6 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -47,7 +47,7 @@ wayland, xdg-utils, coreutils, - xorg, + libxcb, zlib, # Darwin dependencies @@ -132,7 +132,7 @@ let pipewire udev wayland - xorg.libxcb + libxcb zlib snappy libkrb5 diff --git a/pkgs/by-name/bs/bsequencer/package.nix b/pkgs/by-name/bs/bsequencer/package.nix index 10deec5009b1..f5a8553c33dd 100644 --- a/pkgs/by-name/bs/bsequencer/package.nix +++ b/pkgs/by-name/bs/bsequencer/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, cairo, lv2, pkg-config, @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 cairo lv2 ]; diff --git a/pkgs/by-name/bs/bshapr/package.nix b/pkgs/by-name/bs/bshapr/package.nix index 18656405e55a..52852ccbee24 100644 --- a/pkgs/by-name/bs/bshapr/package.nix +++ b/pkgs/by-name/bs/bshapr/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, cairo, lv2, pkg-config, @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 cairo lv2 ]; diff --git a/pkgs/by-name/bs/bslizr/package.nix b/pkgs/by-name/bs/bslizr/package.nix index ec102ea1b281..e5a18432a19b 100644 --- a/pkgs/by-name/bs/bslizr/package.nix +++ b/pkgs/by-name/bs/bslizr/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, cairo, lv2, pkg-config, @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 cairo lv2 ]; diff --git a/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix index 05e1e2eebf26..48ccec922720 100644 --- a/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix +++ b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix @@ -3,7 +3,7 @@ stdenv, glib, gobject-introspection, - xorg, + lndir, wrapGAppsHook3, budgie-desktop, plugins ? [ ], @@ -37,7 +37,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out for i in $(cat $pathsPath); do - ${xorg.lndir}/bin/lndir -silent $i $out + ${lndir}/bin/lndir -silent $i $out done ''; diff --git a/pkgs/by-name/bu/budgie-screensaver/package.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix index 355e811a2b85..59c6b9dbbe44 100644 --- a/pkgs/by-name/bu/budgie-screensaver/package.nix +++ b/pkgs/by-name/bu/budgie-screensaver/package.nix @@ -17,7 +17,7 @@ systemd, testers, wrapGAppsHook3, - xorg, + libxxf86vm, }: stdenv.mkDerivation (finalAttrs: { @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { libX11 linux-pam systemd - xorg.libXxf86vm + libxxf86vm ]; # Fix GCC 14 build. diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix index 93889789d360..307d6febde4a 100644 --- a/pkgs/by-name/bu/budgie-session/package.nix +++ b/pkgs/by-name/bu/budgie-session/package.nix @@ -24,7 +24,7 @@ makeWrapper, nix-update-script, systemd, - xorg, + xtrans, libepoxy, bash, }: @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { libICE gnome-desktop json-glib - xorg.xtrans + xtrans adwaita-icon-theme gnome-settings-daemon gsettings-desktop-schemas diff --git a/pkgs/by-name/bu/bumblebee-status/plugins.nix b/pkgs/by-name/bu/bumblebee-status/plugins.nix index 10cb5a565772..58ca8ddb2899 100644 --- a/pkgs/by-name/bu/bumblebee-status/plugins.nix +++ b/pkgs/by-name/bu/bumblebee-status/plugins.nix @@ -15,7 +15,7 @@ in arandr.propagatedBuildInputs = [ py.tkinter pkgs.arandr - pkgs.xorg.xrandr + pkgs.xrandr ]; # checkupdates is unpackaged # arch-update.propagatedBuildInputs = [checkupdates]; @@ -43,7 +43,7 @@ in caffeine.propagatedBuildInputs = [ pkgs.xdg-utils pkgs.xdotool - pkgs.xorg.xprop + pkgs.xprop pkgs.libnotify ]; cmus.propagatedBuildInputs = [ pkgs.cmus ]; @@ -96,24 +96,24 @@ in hddtemp = { }; hostname = { }; http_status = { }; - indicator.propagatedBuildInputs = [ pkgs.xorg.xset ]; + indicator.propagatedBuildInputs = [ pkgs.xset ]; kernel = { }; keys = { }; # python3Packages.xkbgroup is unpackaged layout = { - buildInputs = [ pkgs.xorg.libX11 ]; + buildInputs = [ pkgs.libx11 ]; # propagatedBuildInputs = [py.xkbgroup]; }; # python3Packages.xkbgroup is unpackaged layout-xkb = { - buildInputs = [ pkgs.xorg.libX11 ]; + buildInputs = [ pkgs.libx11 ]; # propagatedBuildInputs = [py.xkbgroup]; }; layout-xkbswitch.propagatedBuildInputs = [ pkgs.xkb-switch ]; # python3Packages.xkbgroup is unpackaged # NOTE: Yes, there is also a plugin named `layout-xkb` with a dash. layout_xkb = { - buildInputs = [ pkgs.xorg.libX11 ]; + buildInputs = [ pkgs.libx11 ]; # propagatedBuildInputs = [python3Packages.xkbgroup]; }; # NOTE: Yes, there is also a plugin named `layout-xkbswitch` with a dash. @@ -162,7 +162,7 @@ in redshift.propagatedBuildInputs = [ pkgs.redshift ]; # rofication is unpackaged # rofication.propagatedBuildInputs = [rofication]; - rotation.propagatedBuildInputs = [ pkgs.xorg.xrandr ]; + rotation.propagatedBuildInputs = [ pkgs.xrandr ]; rss = { }; sensors.propagatedBuildInputs = [ pkgs.lm_sensors ]; sensors2.propagatedBuildInputs = [ pkgs.lm_sensors ]; @@ -205,7 +205,7 @@ in weather.propagatedBuildInputs = [ py.requests ]; xkcd = { }; # i3 is optional - xrandr.propagatedBuildInputs = [ pkgs.xorg.xrandr ]; + xrandr.propagatedBuildInputs = [ pkgs.xrandr ]; yubikey.propagatedBuildInputs = [ pkgs.yubico ]; zpool = { }; } diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index b2c1f16def59..7a83807f950b 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -76,13 +76,13 @@ buildFHSEnv { nspr nss pango - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr ]; extraInstallCommands = '' diff --git a/pkgs/by-name/by/byzanz/package.nix b/pkgs/by-name/by/byzanz/package.nix index 9c4ac245201b..a40f53ee2e59 100644 --- a/pkgs/by-name/by/byzanz/package.nix +++ b/pkgs/by-name/by/byzanz/package.nix @@ -13,7 +13,8 @@ libtool, pkg-config, which, - xorg, + libxdamage, + xwininfo, }: stdenv.mkDerivation { @@ -57,8 +58,8 @@ stdenv.mkDerivation { libtool cairo gtk3 - xorg.xwininfo - xorg.libXdamage + xwininfo + libxdamage ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix b/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix index 51307ae91d12..bb04e0b7cc69 100644 --- a/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix +++ b/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix @@ -1,7 +1,7 @@ { fetchurl, appimageTools, - xorg, + lndir, pname, version, sha256, @@ -29,7 +29,7 @@ in extraInstallCommands = '' mkdir -p $out/share - "${xorg.lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share" + "${lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share" ln -s ${extracted}/caprine.png $out/share/icons/caprine.png mkdir $out/share/applications cp ${extracted}/caprine.desktop $out/share/applications/ diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index 7867ce393a88..a2f0476fbf22 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.116"; + version = "0.9.124"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; tag = "cargo-nextest-${version}"; - hash = "sha256-Ff9GibY6pm7+NbgAB8iNO+uj+uK1sxU+UkaiIS5BLEk="; + hash = "sha256-qvJ/dqbls2fVSPY++kYBIeiu14eDD8ORuvcD8dEtMZ8="; }; # FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918 @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ./no-dtrace-macos.patch ]; - cargoHash = "sha256-XHS9QEUplO1y1/iShafXsYNkLDzQ6wkVTRkpxovMM7Q="; + cargoHash = "sha256-3fZSXBP6vMh7GN2eY2upsvV/mTuDOcSovdsbcZBQA4U="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix index 8ec65814ae99..35f2618f79e1 100644 --- a/pkgs/by-name/ca/cargo-ui/package.nix +++ b/pkgs/by-name/ca/cargo-ui/package.nix @@ -9,7 +9,11 @@ expat, fontconfig, libGL, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, }: rustPlatform.buildRustPackage rec { @@ -35,11 +39,11 @@ rustPlatform.buildRustPackage rec { expat fontconfig libGL - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libxcb + libx11 + libxcursor + libxi + libxrandr + libxcb ]; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/ca/catclock/package.nix b/pkgs/by-name/ca/catclock/package.nix index 1cd93052c864..e42e8bc6da01 100644 --- a/pkgs/by-name/ca/catclock/package.nix +++ b/pkgs/by-name/ca/catclock/package.nix @@ -3,7 +3,9 @@ lib, fetchFromGitHub, motif, - xorg, + libxt, + libxext, + libx11, withAudioTracking ? false, libpulseaudio, aubio, @@ -34,9 +36,9 @@ stdenv.mkDerivation { buildInputs = [ motif - xorg.libX11 - xorg.libXext - xorg.libXt + libx11 + libxext + libxt ] ++ lib.optionals withAudioTracking [ libpulseaudio diff --git a/pkgs/by-name/ce/cef-binary/package.nix b/pkgs/by-name/ce/cef-binary/package.nix index 167881be91a9..4a0872d16a22 100644 --- a/pkgs/by-name/ce/cef-binary/package.nix +++ b/pkgs/by-name/ce/cef-binary/package.nix @@ -21,7 +21,14 @@ libGL, udev, systemdLibs, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxshmfence, + libxcb, version ? "142.0.10", gitRevision ? "29548e2", chromiumVersion ? "142.0.7444.135", @@ -55,14 +62,14 @@ let libGL udev systemdLibs - xorg.libxcb - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence + libxcb + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxshmfence ]; selectSystem = diff --git a/pkgs/by-name/ce/celeste64/package.nix b/pkgs/by-name/ce/celeste64/package.nix index 2fb6ec64b711..fbb8d0849c61 100644 --- a/pkgs/by-name/ce/celeste64/package.nix +++ b/pkgs/by-name/ce/celeste64/package.nix @@ -12,7 +12,12 @@ libselinux, wayland, libdecor, - xorg, + libxrandr, + libxi, + libxfixes, + libxext, + libxcursor, + libx11, libxkbcommon, libdrm, withSELinux ? false, @@ -44,12 +49,12 @@ buildDotnetModule rec { wayland libdrm libxkbcommon - xorg.libX11 - xorg.libXfixes - xorg.libXext - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxfixes + libxext + libxcursor + libxi + libxrandr ] ++ lib.optionals withSELinux [ libselinux ]; diff --git a/pkgs/by-name/ce/celestegame/package.nix b/pkgs/by-name/ce/celestegame/package.nix index 0339ed298f2b..e0f629748379 100644 --- a/pkgs/by-name/ce/celestegame/package.nix +++ b/pkgs/by-name/ce/celestegame/package.nix @@ -82,9 +82,7 @@ buildFHSEnv { version = celeste.version + (lib.optionalString withEverest "+everest.${everest.version}"); multiPkgs = - pkgs: - with pkgs; - [ + pkgs: with pkgs; [ glib glibc_multi kdePackages.wayland @@ -134,23 +132,21 @@ buildFHSEnv { libpulseaudio pipewire vulkan-loader - ] - ++ (with xorg; [ - libX11 - libXcomposite - libXdamage - libXfixes - libXext + libx11 + libxcomposite + libxdamage + libxfixes + libxext libxcb - libXcursor - libXinerama - libXi - libXrandr - libXScrnSaver - libXxf86vm - libXau - libXdmcp - ]); + libxcursor + libxinerama + libxi + libxrandr + libxscrnsaver + libxxf86vm + libxau + libxdmcp + ]; targetPkgs = pkgs: [ celeste ]; diff --git a/pkgs/by-name/ce/centerpiece/package.nix b/pkgs/by-name/ce/centerpiece/package.nix index e150dcd40317..df2414229b3c 100644 --- a/pkgs/by-name/ce/centerpiece/package.nix +++ b/pkgs/by-name/ce/centerpiece/package.nix @@ -10,7 +10,10 @@ libxkbcommon, wayland, enableX11 ? true, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage rec { @@ -34,15 +37,12 @@ rustPlatform.buildRustPackage rec { vulkan-loader wayland ] - ++ lib.optionals enableX11 ( - with xorg; - [ - libX11 - libXcursor - libXi - libXrandr - ] - ); + ++ lib.optionals enableX11 [ + libx11 + libxcursor + libxi + libxrandr + ]; postFixup = lib.optional stdenv.hostPlatform.isLinux '' rpath=$(patchelf --print-rpath $out/bin/centerpiece) diff --git a/pkgs/by-name/ce/cernlib/package.nix b/pkgs/by-name/ce/cernlib/package.nix index 44d551428671..03dd6992b523 100644 --- a/pkgs/by-name/ce/cernlib/package.nix +++ b/pkgs/by-name/ce/cernlib/package.nix @@ -9,7 +9,10 @@ openssl, libnsl, motif, - xorg, + libxt, + libxft, + libxaw, + libx11, libxcrypt, }: @@ -47,20 +50,18 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - buildInputs = - with xorg; - [ - freetype - gfortran - openssl - libX11 - libXaw - libXft - libXt - libxcrypt - motif - ] - ++ lib.optional stdenv.hostPlatform.isLinux libnsl; + buildInputs = [ + freetype + gfortran + openssl + libx11 + libxaw + libxft + libxt + libxcrypt + motif + ] + ++ lib.optional stdenv.hostPlatform.isLinux libnsl; setupHook = ./setup-hook.sh; diff --git a/pkgs/by-name/cg/cgminer/package.nix b/pkgs/by-name/cg/cgminer/package.nix index 8e96b24e0310..8a4d6bb1a164 100644 --- a/pkgs/by-name/cg/cgminer/package.nix +++ b/pkgs/by-name/cg/cgminer/package.nix @@ -11,7 +11,9 @@ ocl-icd, opencl-headers, libusb1, - xorg, + libxinerama, + libxext, + libx11, jansson, }: @@ -37,9 +39,9 @@ stdenv.mkDerivation rec { ncurses ocl-icd opencl-headers - xorg.libX11 - xorg.libXext - xorg.libXinerama + libx11 + libxext + libxinerama jansson libusb1 ]; diff --git a/pkgs/by-name/cg/cgns/package.nix b/pkgs/by-name/cg/cgns/package.nix index f027bd13fe79..817d5f39431f 100644 --- a/pkgs/by-name/cg/cgns/package.nix +++ b/pkgs/by-name/cg/cgns/package.nix @@ -7,7 +7,7 @@ gfortran, tk, hdf5, - xorg, + libxmu, libGLU, withTools ? false, testers, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withTools [ tk - xorg.libXmu + libxmu libGLU ]; diff --git a/pkgs/by-name/ch/cherry/package.nix b/pkgs/by-name/ch/cherry/package.nix index 55f778cc7372..ee5f2613e8f3 100644 --- a/pkgs/by-name/ch/cherry/package.nix +++ b/pkgs/by-name/ch/cherry/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchFromGitHub, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation rec { @@ -17,8 +18,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - xorg.fonttosfnt - xorg.mkfontdir + fonttosfnt + mkfontscale ]; buildPhase = '' diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 32fb80eab144..9e78eb855790 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2026-01-17"; + version = "0.4.0-unstable-2026-01-22"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "a98aca98ea0aaf8aec1f13b088eaff6bd1ea5632"; - hash = "sha256-IjsdKKevGgn0ZyxjlxRPhdnApR8/O3tDdIjQS61aM/s="; + rev = "77a0299172e271fe62393f870d61f2033f201ca2"; + hash = "sha256-4V7nFW4KhfxOFvjQllcE6YHNuUDiYDFvBrlZk5r5tUQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix index 56fafa564c12..749f38a0d900 100644 --- a/pkgs/by-name/ci/cinnamon-desktop/package.nix +++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix @@ -14,7 +14,9 @@ stdenv, systemd, xkeyboard_config, - xorg, + libxrandr, + libxext, + libxkbfile, wrapGAppsHook3, glib, }: @@ -46,9 +48,9 @@ stdenv.mkDerivation rec { isocodes systemd xkeyboard_config - xorg.libxkbfile - xorg.libXext - xorg.libXrandr + libxkbfile + libxext + libxrandr ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix index 57f16731c8bf..f4d8d0e7d83b 100644 --- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix +++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix @@ -22,7 +22,10 @@ pam, cairo, xdotool, - xorg, + libxrandr, + libxinerama, + libxext, + libx11, iso-flags-png-320x240, }: @@ -61,10 +64,10 @@ stdenv.mkDerivation rec { gtk3 glib - xorg.libXext - xorg.libXinerama - xorg.libX11 - xorg.libXrandr + libxext + libxinerama + libx11 + libxrandr (python3.withPackages ( pp: with pp; [ diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix index 501f001979c2..6167b605a5a7 100644 --- a/pkgs/by-name/ci/cinnamon-session/package.nix +++ b/pkgs/by-name/ci/cinnamon-session/package.nix @@ -17,7 +17,13 @@ systemd, wrapGAppsHook3, xapp, - xorg, + libxtst, + libxrender, + libxext, + libxcomposite, + libxau, + libx11, + xtrans, libexecinfo, pango, }: @@ -49,17 +55,17 @@ stdenv.mkDerivation rec { glib libcanberra pango - xorg.libX11 - xorg.libXext + libx11 + libxext xapp - xorg.libXau - xorg.libXcomposite + libxau + libxcomposite systemd - xorg.libXtst - xorg.libXrender - xorg.xtrans + libxtst + libxrender + xtrans # other (not meson.build) cinnamon-settings-daemon diff --git a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix index a97f7d879630..45d2c5bc788d 100644 --- a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix +++ b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix @@ -19,7 +19,9 @@ polkit, librsvg, libwacom, - xorg, + libxi, + libxext, + libx11, fontconfig, tzdata, nss, @@ -30,13 +32,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "6.6.2"; + version = "6.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-settings-daemon"; tag = version; - hash = "sha256-s8LKta03ei4MIQICY5t4Kh2oDEN9egstX8IQ56FXq7s="; + hash = "sha256-sa3DYH4/yRycHyrAG8IfCCpHhFNKwq8yOgLoKHprGfk="; }; patches = [ @@ -58,9 +60,9 @@ stdenv.mkDerivation rec { polkit librsvg libwacom - xorg.libXext - xorg.libX11 - xorg.libXi + libxext + libx11 + libxi fontconfig nss libgudev diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix index 4c0c1d06d1dc..d2ba38f50427 100644 --- a/pkgs/by-name/ci/cinnamon/package.nix +++ b/pkgs/by-name/ci/cinnamon/package.nix @@ -74,13 +74,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon"; - version = "6.6.5"; + version = "6.6.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; tag = version; - hash = "sha256-i+eUSEz6Zgfm8HISSuxQ04lz86Rrp99NWaWAplJCLCs="; + hash = "sha256-yOgDajTZFC566uhf9pvenAIMdDTU1JOF+ahtgPp6kTY="; }; patches = [ diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix index 70cb47068bb6..1a571c3d3e94 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix @@ -19,7 +19,10 @@ libxslt, nspr, nss, - xorg, + libxscrnsaver, + libx11, + libsm, + libice, buildFHSEnv, copyDesktopItems, makeDesktopItem, @@ -65,13 +68,11 @@ let libxslt nspr nss - ] - ++ (with xorg; [ - libICE - libSM - libX11 - libXScrnSaver - ]); + libice + libsm + libx11 + libxscrnsaver + ]; unpackPhase = '' runHook preUnpack diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index 3d9dee8ca0a2..acae24140b3d 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -20,7 +20,24 @@ nspr, nss, wayland, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxcb, buildFHSEnv, copyDesktopItems, makeDesktopItem, @@ -77,27 +94,25 @@ let nspr nss wayland - ] - ++ (with xorg; [ - libICE - libSM - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst + libice + libsm + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst libxcb - xcbutilimage - xcbutilkeysyms - xcbutilrenderutil - xcbutilwm - ]); + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm + ]; unpackPhase = '' runHook preUnpack diff --git a/pkgs/by-name/cl/clanlib/package.nix b/pkgs/by-name/cl/clanlib/package.nix index f97087bd9257..5ecd5b46fec5 100644 --- a/pkgs/by-name/cl/clanlib/package.nix +++ b/pkgs/by-name/cl/clanlib/package.nix @@ -6,7 +6,7 @@ libGL, libpng, pkg-config, - xorg, + xorgproto, freetype, fontconfig, alsa-lib, @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGL libpng - xorg.xorgproto + xorgproto freetype fontconfig alsa-lib diff --git a/pkgs/by-name/cl/clapper/package.nix b/pkgs/by-name/cl/clapper/package.nix index e1c0393e23ea..56154daf4c3d 100644 --- a/pkgs/by-name/cl/clapper/package.nix +++ b/pkgs/by-name/cl/clapper/package.nix @@ -3,7 +3,7 @@ clapper-unwrapped, wrapGAppsHook4, gobject-introspection, - xorg, + lndir, clapper-enhancers, }: @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ wrapGAppsHook4 gobject-introspection - xorg.lndir + lndir ]; buildInputs = [ clapper-unwrapped ] ++ clapper-unwrapped.buildInputs; diff --git a/pkgs/by-name/cl/claws-mail/package.nix b/pkgs/by-name/cl/claws-mail/package.nix index c3ce6862c281..dcd0e50bf22f 100644 --- a/pkgs/by-name/cl/claws-mail/package.nix +++ b/pkgs/by-name/cl/claws-mail/package.nix @@ -24,7 +24,7 @@ # Arguments to include external libraries enableLibSM ? true, - xorg, + libsm, enableGnuTLS ? true, gnutls, enableEnchant ? enableSpellcheck, @@ -179,7 +179,7 @@ let { flags = [ "libsm" ]; enabled = enableLibSM; - deps = [ xorg.libSM ]; + deps = [ libsm ]; } { flags = [ "litehtml_viewer-plugin" ]; diff --git a/pkgs/by-name/cl/clearlyU/package.nix b/pkgs/by-name/cl/clearlyU/package.nix index bba31404b07b..7198b1393830 100644 --- a/pkgs/by-name/cl/clearlyU/package.nix +++ b/pkgs/by-name/cl/clearlyU/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchurl, - xorg, + mkfontscale, + fonttosfnt, libfaketime, }: @@ -16,8 +17,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale libfaketime ]; diff --git a/pkgs/by-name/cl/clickup/package.nix b/pkgs/by-name/cl/clickup/package.nix index fe6a05d37577..d9d92ce54de6 100644 --- a/pkgs/by-name/cl/clickup/package.nix +++ b/pkgs/by-name/cl/clickup/package.nix @@ -17,7 +17,7 @@ let appimage = appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: [ pkgs.xorg.libxkbfile ]; + extraPkgs = pkgs: [ pkgs.libxkbfile ]; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/cl/clipboard-jh/package.nix b/pkgs/by-name/cl/clipboard-jh/package.nix index 96443b89733b..e3bd85271cc6 100644 --- a/pkgs/by-name/cl/clipboard-jh/package.nix +++ b/pkgs/by-name/cl/clipboard-jh/package.nix @@ -8,7 +8,7 @@ wayland-protocols, wayland-scanner, wayland, - xorg, + libx11, nix-update-script, alsa-lib, openssl, @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libffi wayland-protocols wayland - xorg.libX11 + libx11 alsa-lib ]; diff --git a/pkgs/by-name/cn/cnping/package.nix b/pkgs/by-name/cn/cnping/package.nix index 9efb14936c68..5ad90e9a4a7e 100644 --- a/pkgs/by-name/cn/cnping/package.nix +++ b/pkgs/by-name/cn/cnping/package.nix @@ -3,7 +3,9 @@ stdenv, fetchFromGitHub, libglvnd, - xorg, + libxinerama, + libxext, + libx11, }: stdenv.mkDerivation { @@ -20,9 +22,9 @@ stdenv.mkDerivation { buildInputs = [ libglvnd - xorg.libXinerama - xorg.libXext - xorg.libX11 + libxinerama + libxext + libx11 ]; # The "linuxinstall" target won't work for us: diff --git a/pkgs/by-name/co/code-server/package.nix b/pkgs/by-name/co/code-server/package.nix index a6fbb49d73d2..eefc92499d8e 100644 --- a/pkgs/by-name/co/code-server/package.nix +++ b/pkgs/by-name/co/code-server/package.nix @@ -16,7 +16,8 @@ nodejs_20, node-gyp, libsecret, - xorg, + libx11, + libxkbfile, ripgrep, cctools, xcbuild, @@ -137,8 +138,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libX11 - xorg.libxkbfile + libx11 + libxkbfile ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix index f6849d326a87..77ed45f951ae 100644 --- a/pkgs/by-name/co/codeql/package.nix +++ b/pkgs/by-name/co/codeql/package.nix @@ -3,7 +3,11 @@ stdenv, fetchzip, zlib, - xorg, + libxtst, + libxrender, + libxi, + libxext, + libx11, freetype, jdk17, curl, @@ -24,11 +28,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ zlib - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXtst - xorg.libXrender + libx11 + libxext + libxi + libxtst + libxrender freetype jdk17 (lib.getLib stdenv.cc.cc) diff --git a/pkgs/by-name/co/cogl/package.nix b/pkgs/by-name/co/cogl/package.nix index e3d1975ac146..a51b9b182871 100644 --- a/pkgs/by-name/co/cogl/package.nix +++ b/pkgs/by-name/co/cogl/package.nix @@ -6,7 +6,10 @@ libGL, glib, gdk-pixbuf, - xorg, + libxrandr, + libxfixes, + libxdamage, + libxcomposite, libintl, pangoSupport ? true, pango, @@ -87,10 +90,10 @@ stdenv.mkDerivation rec { libgbm mesa-gl-headers libGL - xorg.libXrandr - xorg.libXfixes - xorg.libXcomposite - xorg.libXdamage + libxrandr + libxfixes + libxcomposite + libxdamage ] ++ lib.optionals gstreamerSupport [ gst_all_1.gstreamer diff --git a/pkgs/by-name/co/colmap/package.nix b/pkgs/by-name/co/colmap/package.nix index 27ed6edf3f53..2c3c7289cc11 100644 --- a/pkgs/by-name/co/colmap/package.nix +++ b/pkgs/by-name/co/colmap/package.nix @@ -21,7 +21,7 @@ config, stdenv, qt5, - xorg, + libsm, cudaSupport ? config.cudaSupport, cudaCapabilities ? cudaPackages.flags.cudaCapabilities, cudaPackages, @@ -105,7 +105,7 @@ stdenv'.mkDerivation { cgal gmp mpfr - xorg.libSM + libsm ] ++ depsAlsoForPycolmap; diff --git a/pkgs/by-name/co/commandergenius/package.nix b/pkgs/by-name/co/commandergenius/package.nix index 62065d635370..70d515fdd09a 100644 --- a/pkgs/by-name/co/commandergenius/package.nix +++ b/pkgs/by-name/co/commandergenius/package.nix @@ -15,7 +15,7 @@ SDL2_mixer, SDL2_ttf, python3, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { zlib curl python3 - xorg.libX11 + libx11 ]; cmakeFlags = [ diff --git a/pkgs/by-name/co/conda/package.nix b/pkgs/by-name/co/conda/package.nix index 50c657d7f893..6bdeec27e4de 100644 --- a/pkgs/by-name/co/conda/package.nix +++ b/pkgs/by-name/co/conda/package.nix @@ -8,19 +8,24 @@ libselinux, libarchive, libGL, - xorg, + libxrender, + libxi, + libxau, + libx11, + libsm, + libice, zlib, # Conda installs its packages and environments under this directory installationPath ? "~/.conda", # Conda manages most pkgs itself, but expects a few to be on the system. condaDeps ? [ stdenv.cc - xorg.libSM - xorg.libICE - xorg.libX11 - xorg.libXau - xorg.libXi - xorg.libXrender + libsm + libice + libx11 + libxau + libxi + libxrender libselinux libGL zlib @@ -117,7 +122,7 @@ buildFHSEnv { export NIX_CFLAGS_LINK="-L${installationPath}/lib" # Some other required environment variables export FONTCONFIG_FILE=/etc/fonts/fonts.conf - export QTCOMPOSE=${xorg.libX11}/share/X11/locale + export QTCOMPOSE=${libx11}/share/X11/locale export LIBARCHIVE=${lib.getLib libarchive}/lib/libarchive.so # Allows `conda activate` to work properly if [ ! -f ${condaSh} ]; then diff --git a/pkgs/by-name/co/conduktor/package.nix b/pkgs/by-name/co/conduktor/package.nix index a84c63fc6789..ee86a659cacd 100644 --- a/pkgs/by-name/co/conduktor/package.nix +++ b/pkgs/by-name/co/conduktor/package.nix @@ -10,7 +10,7 @@ pango, cairo, gdk-pixbuf, - xorg, + libxtst, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { pango cairo gdk-pixbuf - xorg.libXtst + libxtst ] } \ --add-flags "--module-path ${openjfx_jdk}/lib --add-modules=javafx.controls,javafx.fxml" diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix index 16d0110ec7d7..a7fdf7563cb8 100644 --- a/pkgs/by-name/co/coppwr/package.nix +++ b/pkgs/by-name/co/coppwr/package.nix @@ -8,7 +8,9 @@ vulkan-loader, wayland, libGL, - xorg, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -35,9 +37,9 @@ rustPlatform.buildRustPackage (finalAttrs: { vulkan-loader wayland libGL - xorg.libXcursor - xorg.libXi - xorg.libX11 + libxcursor + libxi + libx11 ]; preBuild = '' diff --git a/pkgs/by-name/co/cov-build/package.nix b/pkgs/by-name/co/cov-build/package.nix index 46c79b66f898..c753437bb0ac 100644 --- a/pkgs/by-name/co/cov-build/package.nix +++ b/pkgs/by-name/co/cov-build/package.nix @@ -8,7 +8,9 @@ alsa-lib, libxcrypt-legacy, lttng-ust_2_12, - xorg, + libxtst, + libxrender, + libxext, zlib, }: @@ -36,9 +38,9 @@ stdenv.mkDerivation rec { alsa-lib libxcrypt-legacy lttng-ust_2_12 - xorg.libXext - xorg.libXrender - xorg.libXtst + libxext + libxrender + libxtst zlib ]; diff --git a/pkgs/by-name/cr/creep/package.nix b/pkgs/by-name/cr/creep/package.nix index f79b3e228f82..06cab50ef7ad 100644 --- a/pkgs/by-name/cr/creep/package.nix +++ b/pkgs/by-name/cr/creep/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, libfaketime, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation rec { @@ -19,8 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libfaketime - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale ]; buildPhase = '' diff --git a/pkgs/by-name/cr/crossfire-client/package.nix b/pkgs/by-name/cr/crossfire-client/package.nix index 00ed610a2c5d..79ac50a254c0 100644 --- a/pkgs/by-name/cr/crossfire-client/package.nix +++ b/pkgs/by-name/cr/crossfire-client/package.nix @@ -14,7 +14,8 @@ libpng, fribidi, harfbuzzFull, - xorg, + libxdmcp, + libpthread-stubs, util-linux, curl, SDL2, @@ -49,8 +50,8 @@ stdenv.mkDerivation { libpng fribidi harfbuzzFull - xorg.libpthreadstubs - xorg.libXdmcp + libpthread-stubs + libxdmcp curl SDL2 SDL2_image diff --git a/pkgs/by-name/cr/crossfire-gridarta/package.nix b/pkgs/by-name/cr/crossfire-gridarta/package.nix index a231feee581d..3f4b8ab5d15b 100644 --- a/pkgs/by-name/cr/crossfire-gridarta/package.nix +++ b/pkgs/by-name/cr/crossfire-gridarta/package.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation { - name = "crossfire-gridarta"; + pname = "crossfire-gridarta"; version = "2025-04"; src = fetchgit { diff --git a/pkgs/by-name/cr/crossfire-jxclient/package.nix b/pkgs/by-name/cr/crossfire-jxclient/package.nix index 5752c17955f5..70f62541184c 100644 --- a/pkgs/by-name/cr/crossfire-jxclient/package.nix +++ b/pkgs/by-name/cr/crossfire-jxclient/package.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "crossfire-jxclient"; + pname = "crossfire-jxclient"; version = "2025-01"; src = fetchgit { diff --git a/pkgs/by-name/cr/crusader/package.nix b/pkgs/by-name/cr/crusader/package.nix index ff10d08eca57..6a988c1e3631 100644 --- a/pkgs/by-name/cr/crusader/package.nix +++ b/pkgs/by-name/cr/crusader/package.nix @@ -13,7 +13,9 @@ fontconfig, libgcc, libxkbcommon, - xorg, + libxi, + libxcursor, + libx11, libGL, wayland, @@ -50,9 +52,9 @@ rustPlatform.buildRustPackage rec { libxkbcommon ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXcursor - xorg.libXi + libx11 + libxcursor + libxi ]; # required for crusader-gui diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index 1993682eb0ac..4d445fa00c80 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -14,7 +14,12 @@ makeWrapper, openexr, onetbb, - xorg, + libxrandr, + libxi, + libxinerama, + libxext, + libxcursor, + libx11, ilmbase, llvmPackages, unstableGitUpdater, @@ -49,12 +54,12 @@ stdenv.mkDerivation { libpng openexr onetbb - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libXrandr + libx11 + libxcursor + libxext + libxi + libxinerama + libxrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ilmbase diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix index 5c1513c10155..0bc132727e15 100644 --- a/pkgs/by-name/cy/cypress/package.nix +++ b/pkgs/by-name/cy/cypress/package.nix @@ -12,7 +12,6 @@ stdenv, udev, unzip, - xorg, }: let diff --git a/pkgs/by-name/da/daktilo/package.nix b/pkgs/by-name/da/daktilo/package.nix index e9b3e9773a61..ca4158b7b718 100644 --- a/pkgs/by-name/da/daktilo/package.nix +++ b/pkgs/by-name/da/daktilo/package.nix @@ -6,7 +6,9 @@ unixtools, pkg-config, alsa-lib, - xorg, + libxtst, + libxi, + libx11, }: rustPlatform.buildRustPackage rec { @@ -29,9 +31,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ alsa-lib - xorg.libX11 - xorg.libXi - xorg.libXtst + libx11 + libxi + libxtst ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/da/darkplaces/package.nix b/pkgs/by-name/da/darkplaces/package.nix index 7776b8a984cd..f970515af9c8 100644 --- a/pkgs/by-name/da/darkplaces/package.nix +++ b/pkgs/by-name/da/darkplaces/package.nix @@ -6,7 +6,7 @@ libjpeg, SDL2, libvorbis, - xorg, + libx11, }: stdenv.mkDerivation { pname = "darkplaces"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { zlib libjpeg SDL2 - xorg.libX11 + libx11 ]; buildFlags = [ "release" ]; diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index ec22c2d055c7..0b77d82e0942 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -9,7 +9,28 @@ addDriverRunpath, dbus, libGLU, - xorg, + xkeyboard-config, + libxcb-util, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxxf86vm, + libxt, + libxtst, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxcb, buildFHSEnv, bash, writeText, @@ -46,7 +67,7 @@ let # Pretty sure, there are missing dependencies ... buildInputs = [ libGLU - xorg.libXxf86vm + libxxf86vm ]; src = @@ -221,28 +242,28 @@ buildFHSEnv { python3.pkgs.numpy udev xdg-utils # xdg-open needed to open URLs - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXrender - xorg.libXt - xorg.libXtst - xorg.libXxf86vm - xorg.libxcb - xorg.xcbutil - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.xkeyboardconfig + libice + libsm + libx11 + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxinerama + libxrandr + libxrender + libxt + libxtst + libxxf86vm + libxcb + libxcb-util + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm + xkeyboard-config zlib ]; diff --git a/pkgs/by-name/db/dbqn/package.nix b/pkgs/by-name/db/dbqn/package.nix index cb7e6927ab10..00c5b8ecc31d 100644 --- a/pkgs/by-name/db/dbqn/package.nix +++ b/pkgs/by-name/db/dbqn/package.nix @@ -1,13 +1,13 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, - jdk, + jre, makeWrapper, buildNativeImage ? false, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "dbqn" + lib.optionalString buildNativeImage "-native"; version = "0.2.2"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - jdk + jre makeWrapper ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString buildNativeImage '' native-image --report-unsupported-elements-at-runtime \ - -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \ + -H:CLibraryPath=${lib.getLib jre}/lib -J-Dfile.encoding=UTF-8 \ -jar BQN.jar dbqn '' + '' @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/dbqn mv BQN.jar $out/share/dbqn/ - makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dbqn" \ + makeWrapper "${lib.getBin jre}/bin/java" "$out/bin/dbqn" \ --add-flags "-jar $out/share/dbqn/BQN.jar" '' ) @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sternenseemann ]; - inherit (jdk.meta) platforms; - broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dbqn-native.x86_64-darwin + inherit (jre.meta) platforms; + broken = stdenvNoCC.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dbqn-native.x86_64-darwin }; } diff --git a/pkgs/by-name/db/dbus/package.nix b/pkgs/by-name/db/dbus/package.nix index fbdd1a174912..4efedb9106fe 100644 --- a/pkgs/by-name/db/dbus/package.nix +++ b/pkgs/by-name/db/dbus/package.nix @@ -7,7 +7,6 @@ enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, systemdMinimal, audit, - libcap_ng, libapparmor, dbus, docbook_xml_dtd_44, @@ -17,8 +16,10 @@ ninja, python3, x11Support ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), - xorg, writeText, + libx11, + libsm, + libice, }: stdenv.mkDerivation (finalAttrs: { @@ -71,20 +72,17 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ expat ] - ++ lib.optionals x11Support ( - with xorg; - [ - libX11 - libICE - libSM - ] - ) + ++ lib.optionals x11Support [ + libx11 + libice + libsm + ] ++ lib.optional enableSystemd systemdMinimal ++ lib.optionals stdenv.hostPlatform.isLinux [ audit - libcap_ng libapparmor ]; + # ToDo: optional selinux? __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/dd/ddcutil/package.nix b/pkgs/by-name/dd/ddcutil/package.nix index 0b67ce5e17f7..449904b5abdb 100644 --- a/pkgs/by-name/dd/ddcutil/package.nix +++ b/pkgs/by-name/dd/ddcutil/package.nix @@ -10,7 +10,8 @@ libgudev, libusb1, libdrm, - xorg, + libxrandr, + libxext, }: stdenv.mkDerivation rec { @@ -34,8 +35,8 @@ stdenv.mkDerivation rec { libgudev libusb1 udev - xorg.libXext - xorg.libXrandr + libxext + libxrandr ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/de/deezer-enhanced/package.nix b/pkgs/by-name/de/deezer-enhanced/package.nix index bbc0468530f3..5f850f2cdd27 100644 --- a/pkgs/by-name/de/deezer-enhanced/package.nix +++ b/pkgs/by-name/de/deezer-enhanced/package.nix @@ -9,7 +9,13 @@ gnutar, ### Libs - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, libxkbcommon, glib, nss, @@ -47,13 +53,13 @@ stdenvNoCC.mkDerivation rec { buildInputs = [ ### Xorg libs - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb ### Systemd libs systemdLibs @@ -90,13 +96,13 @@ stdenvNoCC.mkDerivation rec { --set LD_LIBRARY_PATH ${ lib.makeLibraryPath [ ### Xorg libs - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb ### Systemd libs systemdLibs diff --git a/pkgs/by-name/de/densify/package.nix b/pkgs/by-name/de/densify/package.nix index 0cac63030e5c..1f1d018da3f2 100644 --- a/pkgs/by-name/de/densify/package.nix +++ b/pkgs/by-name/de/densify/package.nix @@ -5,7 +5,7 @@ gtk3, gobject-introspection, wrapGAppsHook3, - xorg, + xrandr, gnugrep, ghostscript, libnotify, @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { lib.makeBinPath [ ghostscript gnugrep - xorg.xrandr + xrandr libnotify ] }" diff --git a/pkgs/by-name/di/dina-font/package.nix b/pkgs/by-name/di/dina-font/package.nix index 4b6c1c613144..269db69affa6 100644 --- a/pkgs/by-name/di/dina-font/package.nix +++ b/pkgs/by-name/di/dina-font/package.nix @@ -4,7 +4,8 @@ fetchzip, fontforge, bdftopcf, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation { @@ -26,8 +27,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ fontforge bdftopcf - xorg.mkfontscale - xorg.fonttosfnt + mkfontscale + fonttosfnt ]; buildPhase = '' diff --git a/pkgs/by-name/di/directfb/package.nix b/pkgs/by-name/di/directfb/package.nix index 79b009cd05ea..5fc7e7458b68 100644 --- a/pkgs/by-name/di/directfb/package.nix +++ b/pkgs/by-name/di/directfb/package.nix @@ -13,7 +13,10 @@ libpng, giflib, enableX11 ? true, - xorg, + libxrender, + libxext, + libx11, + xorgproto, enableSDL ? true, SDL, }: @@ -86,15 +89,12 @@ stdenv.mkDerivation rec { libpng ] ++ lib.optional enableSDL SDL - ++ lib.optionals enableX11 ( - with xorg; - [ - xorgproto - libX11 - libXext - libXrender - ] - ); + ++ lib.optionals enableX11 [ + xorgproto + libx11 + libxext + libxrender + ]; env = { NIX_LDFLAGS = "-lgcc_s"; diff --git a/pkgs/by-name/di/DisnixWebService/package.nix b/pkgs/by-name/di/disnix-web-service/package.nix similarity index 87% rename from pkgs/by-name/di/DisnixWebService/package.nix rename to pkgs/by-name/di/disnix-web-service/package.nix index 447b18f5281c..a46a2e266d25 100644 --- a/pkgs/by-name/di/DisnixWebService/package.nix +++ b/pkgs/by-name/di/disnix-web-service/package.nix @@ -13,7 +13,7 @@ let jdk = jdk8; in stdenv.mkDerivation (finalAttrs: { - pname = "DisnixWebService"; + pname = "disnix-web-service"; version = "0.10.1"; src = fetchFromGitHub { @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ]; env = { - PREFIX = "\${env.out}"; + PREFIX = placeholder "out"; AXIS2_LIB = "${axis2}/lib"; AXIS2_WEBAPP = "${axis2}/webapps/axis2"; DBUS_JAVA_LIB = "${dbus_java}/share/java"; @@ -49,9 +49,9 @@ stdenv.mkDerivation (finalAttrs: { # add modificationtime="0" to the and tasks to achieve reproducibility xmlstarlet ed -L -a "//jar|//war" -t attr -n "modificationtime" -v "0" build.xml - sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ - -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ - scripts/disnix-soap-client + substituteInPlace scripts/disnix-soap-client \ + --replace-fail "#JAVA_HOME=" ${lib.escapeShellArg "JAVA_HOME=${jdk}"} \ + --replace-fail "#AXIS2_LIB=" "AXIS2_LIB=$AXIS2_LIB" ''; buildPhase = '' diff --git a/pkgs/by-name/di/displaycal/package.nix b/pkgs/by-name/di/displaycal/package.nix index 5b114b0bff14..c441b4632aa7 100644 --- a/pkgs/by-name/di/displaycal/package.nix +++ b/pkgs/by-name/di/displaycal/package.nix @@ -5,7 +5,11 @@ wrapGAppsHook3, gtk3, librsvg, - xorg, + libxxf86vm, + libxrandr, + libxinerama, + libxext, + libx11, argyllcms, }: @@ -41,14 +45,12 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 librsvg - ] - ++ (with xorg; [ - libX11 - libXxf86vm - libXext - libXinerama - libXrandr - ]); + libx11 + libxxf86vm + libxext + libxinerama + libxrandr + ]; # Workaround for eoyilmaz/displaycal-py3#261 setupPyGlobalFlags = [ "appdata" ]; diff --git a/pkgs/by-name/dj/djview/package.nix b/pkgs/by-name/dj/djview/package.nix index 1945c82c063b..4ea51bc96674 100644 --- a/pkgs/by-name/dj/djview/package.nix +++ b/pkgs/by-name/dj/djview/package.nix @@ -8,7 +8,7 @@ pkg-config, djvulibre, libsForQt5, - xorg, + libxt, libtiff, }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ djvulibre libsForQt5.qtbase - xorg.libXt + libxt libtiff ]; diff --git a/pkgs/by-name/dr/dragonfly-reverb/package.nix b/pkgs/by-name/dr/dragonfly-reverb/package.nix index 305854d58ad9..613e3d9e4edc 100644 --- a/pkgs/by-name/dr/dragonfly-reverb/package.nix +++ b/pkgs/by-name/dr/dragonfly-reverb/package.nix @@ -5,7 +5,7 @@ libjack2, libGL, pkg-config, - xorg, + libx11, }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 - xorg.libX11 + libx11 libGL ]; diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix index 6a588d8ca82b..e9b98a9a5a7e 100644 --- a/pkgs/by-name/dr/drawterm/package.nix +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -5,7 +5,8 @@ unstableGitUpdater, installShellFiles, makeWrapper, - xorg, + libxt, + libx11, pkg-config, wayland-scanner, pipewire, @@ -51,8 +52,8 @@ stdenv.mkDerivation { libdecor ] ++ lib.optionals withXorg [ - xorg.libX11 - xorg.libXt + libx11 + libxt ]; makeFlags = diff --git a/pkgs/by-name/dr/dreamchess/package.nix b/pkgs/by-name/dr/dreamchess/package.nix index d53a874d8d91..6862666c8980 100644 --- a/pkgs/by-name/dr/dreamchess/package.nix +++ b/pkgs/by-name/dr/dreamchess/package.nix @@ -17,7 +17,8 @@ libXext, libGL, libGLU, - xorg, + libx11, + libxcb, }: stdenv.mkDerivation (finalAttrs: { @@ -46,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { libXext libGL libGLU - xorg.libxcb - xorg.libX11 + libxcb + libx11 ]; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/dr/drumkv1/package.nix b/pkgs/by-name/dr/drumkv1/package.nix index c7b30b6e4310..12b3981c5ef7 100644 --- a/pkgs/by-name/dr/drumkv1/package.nix +++ b/pkgs/by-name/dr/drumkv1/package.nix @@ -10,7 +10,7 @@ liblo, lv2, qt6, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { libsndfile liblo lv2 - xorg.libX11 + libx11 qt6.qtbase qt6.qtwayland qt6.qtsvg diff --git a/pkgs/by-name/dx/dxx-rebirth/full.nix b/pkgs/by-name/dx/dxx-rebirth/full.nix index 98c07f09e92b..9fc8f73a64f3 100644 --- a/pkgs/by-name/dx/dxx-rebirth/full.nix +++ b/pkgs/by-name/dx/dxx-rebirth/full.nix @@ -11,7 +11,8 @@ let generic = ver: assets: stdenv.mkDerivation { - name = "d${toString ver}x-rebirth-full-${assets.version}"; + pname = "d${toString ver}x-rebirth-full"; + inherit (assets) version; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/e-/e-search/package.nix b/pkgs/by-name/e-/e-search/package.nix index 6d7b1fa47a6a..951cc856cb65 100644 --- a/pkgs/by-name/e-/e-search/package.nix +++ b/pkgs/by-name/e-/e-search/package.nix @@ -26,7 +26,11 @@ libsForQt5, pango, pangomm, - xorg, + libxt, + libxtst, + libxrandr, + libx11, + libxcb, zlib, nix-update-script, commandLineArgs ? "", @@ -108,11 +112,11 @@ stdenv.mkDerivation (finalAttrs: { libsForQt5.qt5.qtxmlpatterns pango pangomm - xorg.libX11 - xorg.libXrandr - xorg.libXt - xorg.libXtst - xorg.libxcb + libx11 + libxrandr + libxt + libxtst + libxcb zlib ]; diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index bcd8c9340546..c5b324ae13dc 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -14,7 +14,7 @@ libGL, SDL2, SDL2_mixer, - xorg, + libx11, graphicsmagick, unstableGitUpdater, }: @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libGL - xorg.libX11 + libx11 ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ef/efont-unicode/package.nix b/pkgs/by-name/ef/efont-unicode/package.nix index b01dfb81f8c6..8fc8a4c71f53 100644 --- a/pkgs/by-name/ef/efont-unicode/package.nix +++ b/pkgs/by-name/ef/efont-unicode/package.nix @@ -3,7 +3,9 @@ stdenv, fetchurl, libfaketime, - xorg, + mkfontscale, + fonttosfnt, + bdftopcf, }: stdenv.mkDerivation rec { @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-fT7SsYlV3dCQrf0IZfiNI1grj3ngDgr8IkWdg+f9m3M="; }; - nativeBuildInputs = with xorg; [ + nativeBuildInputs = [ libfaketime bdftopcf fonttosfnt diff --git a/pkgs/by-name/eg/ego/package.nix b/pkgs/by-name/eg/ego/package.nix index ee135f7ff9c1..bffa1ea6ec8f 100644 --- a/pkgs/by-name/eg/ego/package.nix +++ b/pkgs/by-name/eg/ego/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, makeBinaryWrapper, acl, - xorg, + xhost, }: rustPlatform.buildRustPackage rec { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - wrapProgram $out/bin/ego --prefix PATH : ${lib.makeBinPath [ xorg.xhost ]} + wrapProgram $out/bin/ego --prefix PATH : ${lib.makeBinPath [ xhost ]} ''; meta = { diff --git a/pkgs/by-name/el/electricsheep/package.nix b/pkgs/by-name/el/electricsheep/package.nix index 7fb02d70d2bf..41ec4b9f9227 100644 --- a/pkgs/by-name/el/electricsheep/package.nix +++ b/pkgs/by-name/el/electricsheep/package.nix @@ -8,7 +8,7 @@ lua5_1, curl, libpng, - xorg, + libxrender, pkg-config, flam3, libgtop, @@ -47,7 +47,7 @@ stdenv.mkDerivation { lua5_1 curl libpng - xorg.libXrender + libxrender flam3 libgtop boost diff --git a/pkgs/by-name/el/electron-fiddle/package.nix b/pkgs/by-name/el/electron-fiddle/package.nix index 85d7c0689272..9b3e4854410e 100644 --- a/pkgs/by-name/el/electron-fiddle/package.nix +++ b/pkgs/by-name/el/electron-fiddle/package.nix @@ -129,28 +129,28 @@ buildFHSEnv { nspr nss pango - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb # for running Electron before 18.3.5/19.0.5/20.0.0 inside gdk-pixbuf # for running Electron before 16.0.0 inside - xorg.libxshmfence + libxshmfence # for running Electron before 11.0.0 inside - xorg.libXcursor - xorg.libXi - xorg.libXrender - xorg.libXtst + libxcursor + libxi + libxrender + libxtst # for running Electron before 10.0.0 inside - xorg.libXScrnSaver + libxscrnsaver # for running Electron before 8.0.0 inside libuuid diff --git a/pkgs/by-name/el/eli/package.nix b/pkgs/by-name/el/eli/package.nix index 28973f67f1d3..27907866d2e2 100644 --- a/pkgs/by-name/el/eli/package.nix +++ b/pkgs/by-name/el/eli/package.nix @@ -8,7 +8,10 @@ fontconfig, tk, ncurses, - xorg, + libxt, + libxext, + libxaw, + libx11, file, }: @@ -47,13 +50,11 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses fontconfig - ] - ++ (with xorg; [ - libX11.dev - libXt.dev - libXaw.dev - libXext.dev - ]); + libx11.dev + libxt.dev + libxaw.dev + libxext.dev + ]; nativeBuildInputs = [ file diff --git a/pkgs/by-name/en/enpass/package.nix b/pkgs/by-name/en/enpass/package.nix index fec608d27e23..55b21ee2a309 100644 --- a/pkgs/by-name/en/enpass/package.nix +++ b/pkgs/by-name/en/enpass/package.nix @@ -2,7 +2,17 @@ stdenv, fetchurl, dpkg, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxscrnsaver, + libxrender, + libxi, + libx11, + libsm, + libice, + libxcb, glib, libGLU, libGL, @@ -42,38 +52,35 @@ let baseUrl = "https://apt.enpass.io"; # used of both wrappers and libpath - libPath = lib.makeLibraryPath ( - with xorg; - [ - libGLU - libGL - fontconfig - freetype - libpulseaudio - zlib - dbus - libX11 - libXi - libSM - libICE - libXrender - libXScrnSaver - libxcb - libcap - glib - gtk3 - pango - curl - libuuid - cups - xcbutilwm # libxcb-icccm.so.4 - xcbutilimage # libxcb-image.so.0 - xcbutilkeysyms # libxcb-keysyms.so.1 - xcbutilrenderutil # libxcb-render-util.so.0 - xz - libxkbcommon - ] - ); + libPath = lib.makeLibraryPath [ + libGLU + libGL + fontconfig + freetype + libpulseaudio + zlib + dbus + libx11 + libxi + libsm + libice + libxrender + libxscrnsaver + libxcb + libcap + glib + gtk3 + pango + curl + libuuid + cups + libxcb-wm # libxcb-icccm.so.4 + libxcb-image # libxcb-image.so.0 + libxcb-keysyms # libxcb-keysyms.so.1 + libxcb-render-util # libxcb-render-util.so.0 + xz + libxkbcommon + ]; package = stdenv.mkDerivation { inherit (data) version; diff --git a/pkgs/by-name/en/entangle/package.nix b/pkgs/by-name/en/entangle/package.nix index 418ced9fd5ce..ef14a48b48cf 100644 --- a/pkgs/by-name/en/entangle/package.nix +++ b/pkgs/by-name/en/entangle/package.nix @@ -35,7 +35,8 @@ orc, udev, util-linux, - xorg, + libxtst, + libxdmcp, zstd, }: @@ -107,11 +108,9 @@ stdenv.mkDerivation (finalAttrs: { udev util-linux zstd - ] - ++ (with xorg; [ - libXdmcp - libXtst - ]); + libxdmcp + libxtst + ]; # Disable building of doc/reference since it requires network connection to render XML to HTML # Patch build script shebangs diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix index 546cdcf30f10..830615a493de 100644 --- a/pkgs/by-name/en/envision/package.nix +++ b/pkgs/by-name/en/envision/package.nix @@ -35,11 +35,11 @@ buildFHSEnv { # Additional dependencies required by Monado when built using Envision libgbm shaderc - xorg.libX11 - xorg.libxcb - xorg.libXrandr - xorg.libXrender - xorg.xorgproto + libx11 + libxcb + libxrandr + libxrender + xorgproto SDL2 wayland mesa-gl-headers diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index de96bc2a561e..22e6d087b77f 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -8,7 +8,7 @@ versionCheckHook, }: let - version = "1.36.4"; + version = "1.37.0"; inherit (stdenv.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; @@ -21,8 +21,8 @@ let hash = { - aarch64-linux = "sha256-RVUeO6MbI2j7gM9MEkshhXxU4Oga7jtwjr17C6P3VbE="; - x86_64-linux = "sha256-WjmAldjB3TY+zBC2udvYIVSo+7XrFVENX7fL250LDlk="; + aarch64-linux = "sha256-9KEqySEbwO53yN2oaXIrbSih6dm2LNuX7I8g3oIA+ig="; + x86_64-linux = "sha256-Clcp7k6YDTRuvO6A8Y5+/lIyuRFBu0x3bsOtzKeG5gw="; } .${system} or throwSystem; in diff --git a/pkgs/by-name/en/envypn-font/package.nix b/pkgs/by-name/en/envypn-font/package.nix index 9c5bda82eeb1..991c27d9b2e6 100644 --- a/pkgs/by-name/en/envypn-font/package.nix +++ b/pkgs/by-name/en/envypn-font/package.nix @@ -3,7 +3,8 @@ stdenv, fetchurl, libfaketime, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation rec { @@ -17,8 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libfaketime - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale ]; unpackPhase = '' diff --git a/pkgs/by-name/ep/epick/package.nix b/pkgs/by-name/ep/epick/package.nix index abc25b068154..bc8dc6253ca9 100644 --- a/pkgs/by-name/ep/epick/package.nix +++ b/pkgs/by-name/ep/epick/package.nix @@ -8,7 +8,10 @@ fontconfig, freetype, libGL, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage rec { @@ -33,10 +36,10 @@ rustPlatform.buildRustPackage rec { expat fontconfig freetype - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; postInstall = '' diff --git a/pkgs/by-name/eq/eq10q/package.nix b/pkgs/by-name/eq/eq10q/package.nix index 3e758c0c94ca..377268ae9e49 100644 --- a/pkgs/by-name/eq/eq10q/package.nix +++ b/pkgs/by-name/eq/eq10q/package.nix @@ -9,7 +9,9 @@ libxcb, lv2, pkg-config, - xorg, + libxdmcp, + libpthread-stubs, + libxshmfence, }: stdenv.mkDerivation rec { pname = "eq10q"; @@ -28,9 +30,9 @@ stdenv.mkDerivation rec { gtkmm2 libxcb lv2 - xorg.libpthreadstubs - xorg.libXdmcp - xorg.libxshmfence + libpthread-stubs + libxdmcp + libxshmfence ]; patches = [ diff --git a/pkgs/by-name/eq/equibop/disable_update_checking.patch b/pkgs/by-name/eq/equibop/disable_update_checking.patch deleted file mode 100644 index c074a821e463..000000000000 --- a/pkgs/by-name/eq/equibop/disable_update_checking.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git i/src/main/index.ts w/src/main/index.ts -index 23ea0d6..1ef465f 100644 ---- i/src/main/index.ts -+++ w/src/main/index.ts -@@ -22,7 +22,9 @@ import { isDeckGameMode } from "./utils/steamOS"; - - if (!IS_DEV) { -- autoUpdater.checkForUpdatesAndNotify(); -+ console.log("Update checking is disabled. Skipping..."); -+ // autoUpdater.checkForUpdatesAndNotify(); -+ - } - - console.log("Equibop v" + app.getVersion()); - diff --git a/pkgs/by-name/eq/equibop/node-modules.nix b/pkgs/by-name/eq/equibop/node-modules.nix new file mode 100644 index 000000000000..1f804de9617a --- /dev/null +++ b/pkgs/by-name/eq/equibop/node-modules.nix @@ -0,0 +1,54 @@ +# fixed output derrivation adapted from +# https://github.com/NixOS/nixpkgs/blob/28c3f83a9a77e3ada57afb71cc4052d2c435597a/pkgs/by-name/op/opencode/package.nix#L59-L122 +{ + lib, + stdenvNoCC, + equibop, + bun, + writableTmpDirAsHomeHook, +}: +stdenvNoCC.mkDerivation { + inherit (equibop) version src; + pname = equibop.pname + "-modules"; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" + "SOCKS_SERVER" + ]; + + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + + dontConfigure = true; + dontFixup = true; + + buildPhase = '' + runHook preBuild + + export BUN_INSTALL_CACHE_DIR=$(mktemp -d) + + bun install \ + --filter=equibop \ + --force \ + --frozen-lockfile \ + --ignore-scripts \ + --linker=hoisted \ + --no-progress + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -R ./node_modules $out + + runHook postInstall + ''; + + outputHash = "sha256-YqUAP11oSxfKifa8QL4VXGCWV5xGG2+vk60f4NdIXIA="; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; +} diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index ebf7288b7524..51163aad809b 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -1,52 +1,46 @@ { lib, stdenv, + callPackage, fetchFromGitHub, - replaceVars, makeWrapper, makeDesktopItem, copyDesktopItems, - equicord, electron, - libicns, + python3Packages, pipewire, libpulseaudio, autoPatchelfHook, - pnpm_10, - fetchPnpmDeps, - pnpmConfigHook, + bun, nodejs, - nix-update-script, withTTS ? true, withMiddleClickScroll ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "equibop"; - version = "2.1.7"; + version = "3.1.7"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equibop"; tag = "v${finalAttrs.version}"; - hash = "sha256-wvg06YSQOZvP/NHl3WPfnI9F0+KN0cJ2CBwaZD8Xpfk="; + hash = "sha256-AzXBANUcm/DYYkNlO7q++/Dx826o5Hg/1cYJ84rMY0U="; }; - pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) - pname - version - src - patches - ; - pnpm = pnpm_10; - fetcherVersion = 1; - hash = "sha256-HQxQIMbj2xsxD1jwj/itfAW6KHxX81Eu60ouzxQDu44="; - }; + postPatch = '' + substituteInPlace scripts/build/build.mts \ + --replace-fail 'gitHash = execSync("git rev-parse HEAD", { encoding: "utf-8" }).trim();' 'gitHash = "${finalAttrs.src.hash}"' + + # disable auto updates + substituteInPlace src/main/updater.ts \ + --replace-fail 'const isOutdated = autoUpdater.checkForUpdates().then(res => Boolean(res?.isUpdateAvailable));' 'const isOutdated = false;' + ''; + + node-modules = callPackage ./node-modules.nix { }; nativeBuildInputs = [ + bun nodejs - pnpmConfigHook - pnpm_10 # XXX: Equibop *does not* ship venmic as a prebuilt node module. The package # seems to build with or without this hook, but I (NotAShelf) don't have the # time to test the consequences of removing this hook. Please open a pull @@ -64,30 +58,45 @@ stdenv.mkDerivation (finalAttrs: { (lib.getLib stdenv.cc.cc) ]; - patches = [ - ./disable_update_checking.patch - ]; + configurePhase = '' + runHook preConfigure - env = { - ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - }; + cp -R ${finalAttrs.node-modules} node_modules + + runHook postConfigure + ''; + + # electron builds must be writable to support electron fuses + preBuild = + lib.optionalString stdenv.hostPlatform.isDarwin '' + cp -r ${electron.dist}/Electron.app . + chmod -R u+w Electron.app + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + ''; buildPhase = '' runHook preBuild - pnpm build - pnpm exec electron-builder \ + bun run build + + bun run compileArrpc + + # can't run it via bunx / npx since fixupPhase was skipped for node_modules + node node_modules/electron-builder/out/cli/cli.js \ --dir \ - -c.asarUnpack="**/*.node" \ - -c.electronDist=${electron.dist} \ - -c.electronVersion=${electron.version} + -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else "electron-dist"} \ + -c.electronVersion=${electron.version} \ + -c.npmRebuild=false runHook postBuild ''; postBuild = '' pushd build - ${libicns}/bin/icns2png -x icon.icns + ${lib.getExe' python3Packages.icnsutil "icnsutil"} e icon.icns popd ''; @@ -96,11 +105,14 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/opt/Equibop cp -r dist/*unpacked/resources $out/opt/Equibop/ - for file in build/icon_*x32.png; do - file_suffix=''${file//build\/icon_} - install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/equibop.png + for file in build/icon.icns.export/*.png; do + base=''${file##*/} + size=''${base/x*/} + install -Dm0644 $file $out/share/icons/hicolor/''${size}x''${size}/apps/equibop.png done + install -Dm0644 build/icon.svg $out/share/icons/hicolor/scalable/apps/equibop.svg + runHook postInstall ''; @@ -133,7 +145,13 @@ stdenv.mkDerivation (finalAttrs: { }; passthru = { - updateScript = nix-update-script { }; + # fails to update node-modules FOD :/ + # updateScript = nix-update-script { + # extraArgs = [ + # "--subpackage" + # "node-modules" + # ]; + # }; }; meta = { @@ -141,8 +159,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Equicord/Equibop"; changelog = "https://github.com/Equicord/Equibop/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; - maintainers = [ - lib.maintainers.NotAShelf + maintainers = with lib.maintainers; [ + NotAShelf + rexies ]; mainProgram = "equibop"; # I am not confident in my ability to support Darwin, please PR if this is important to you diff --git a/pkgs/by-name/er/erlang-language-platform/hashes.json b/pkgs/by-name/er/erlang-language-platform/hashes.json index ab9cb5357300..bd3bd24a8d1a 100644 --- a/pkgs/by-name/er/erlang-language-platform/hashes.json +++ b/pkgs/by-name/er/erlang-language-platform/hashes.json @@ -1,14 +1,17 @@ { - "elp-linux-aarch64-unknown-linux-gnu-otp-26.2": "sha256-xKl19cLz3Pm39QS8+9fOCGJHpxl4NoPYHIwTqKDq4Jc=", - "elp-linux-aarch64-unknown-linux-gnu-otp-27.3": "sha256-GNoV6Ihtro3ecl4cncyQKQez/5CBqj1E3JV1JK8l2V8=", - "elp-linux-aarch64-unknown-linux-gnu-otp-28": "sha256-DW00mSXJWIBfwsV9juMKaiFwNkezT1Ro+5zMaCwFRzE=", - "elp-linux-x86_64-unknown-linux-gnu-otp-26.2": "sha256-fQvlzwS7crDsqmSjsUlFXbqKnCKldOYuiQDmGojqJb8=", - "elp-linux-x86_64-unknown-linux-gnu-otp-27.3": "sha256-4pZtSVCDIiJ7k83go7WjJq4wxWbc9nG4hJoAgXDMOZM=", - "elp-linux-x86_64-unknown-linux-gnu-otp-28": "sha256-3hY+5TDBobRjKgfptvgHmdtuWm8UE7KoWFhsR2qmQhc=", - "elp-macos-aarch64-apple-darwin-otp-26.2": "sha256-38N+0msiPMv9eFTSzWdEqmczDp49JvTlu3kDedmC+Lw=", - "elp-macos-aarch64-apple-darwin-otp-27.3": "sha256-2uZyvyVwQULz+3HtvkIGvjO5Dm7qAAIbHE/VUcqcXkQ=", - "elp-macos-aarch64-apple-darwin-otp-28": "sha256-BosctdlXWTxkVyLX8awlJtyHAtfoVxFlvs7qrSlPTZc=", - "elp-macos-x86_64-apple-darwin-otp-26.2": "sha256-p0xotdrflT2CANJi4OaevJZT4nhFRAfdzrhQ/7M8ykA=", - "elp-macos-x86_64-apple-darwin-otp-27.3": "sha256-qTvsGRCVqqoSWK/t7MysE1wlD0PwtUQQ1N1Zols+Egk=", - "elp-macos-x86_64-apple-darwin-otp-28": "sha256-DSB8AXWM1KByuzg5HY2lh2x4zmeeR2nyiERR3Iovpns=" + "elp-linux-aarch64-unknown-linux-gnu-otp-26.2": "sha256-t9Ka7V1M7BYjoqgmhD3x5b6b39Dq35RjkgWwZkT1D2Y=", + "elp-linux-aarch64-unknown-linux-gnu-otp-27.3": "sha256-65BdH9LJSzRQQqFQvAKbDMJvQtpuM+QDN3HbpPC6Zws=", + "elp-linux-aarch64-unknown-linux-gnu-otp-28": "sha256-RJmkxEJJenWR7hyL5hTX53CmWi8FE3DGnGT/uWrYEkU=", + "elp-linux-x86_64-unknown-linux-gnu-otp-26.2": "sha256-CFFOhI1aYs+gc/vMUml+/1sPT4O4rOHynL/yIq4aTN8=", + "elp-linux-x86_64-unknown-linux-gnu-otp-27.3": "sha256-c4DXTD0VxIdGFsxp4PKgq6PZlv9CUi2DteZ77Qs9lV0=", + "elp-linux-x86_64-unknown-linux-gnu-otp-28": "sha256-72kcw8OqSdkl2vL33qd3Fpk2UsRVl6mF5MgWMlnjjCU=", + "elp-macos-aarch64-apple-darwin-otp-26.2": "sha256-DsB7Y5yJ9dcD9kIrdwwFRxkQ/0hUxJ7cgpYKJLi8k5Q=", + "elp-macos-aarch64-apple-darwin-otp-27.3": "sha256-brx8NyWhloBo88RGAxqYWgbEEkcMOKgCglgX9xyTBNs=", + "elp-macos-aarch64-apple-darwin-otp-28": "sha256-rHbXbB0tmPz4BEjJ9AAvns4qvkpH2d3j7qFR7H6rlvc=", + "elp-macos-x86_64-apple-darwin-otp-26.2": "sha256-wfhlLbWIc9Rgv8cgipuiaL36BSmGE3SSBm8I7jvZHrk=", + "elp-macos-x86_64-apple-darwin-otp-27.3": "sha256-pgNKP2Eh5f9pREYzLsXZZNZvPYtnx/6vJsibCWsibDA=", + "elp-macos-x86_64-apple-darwin-otp-28": "sha256-crMKoxhhcOxquiyu5TBd6dF1tsdN7VqHd3hHAT1/iac=", + "elp-windows-x86_64-pc-windows-msvc-otp-26.2": "sha256-4U9XGA3b6aI8f2sHMGec87KghnAyY8auqKq4U3joEKY=", + "elp-windows-x86_64-pc-windows-msvc-otp-27.3": "sha256-HrgOkCM54va380X7w+5FMszXC3mb8F6kZa73zNspX+0=", + "elp-windows-x86_64-pc-windows-msvc-otp-28": "sha256-egwPYf8MfGWLj+Ruk/tPQmWKRaOFMUNLtNJkSJl3RPw=" } diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix index bc8835165951..cdb1d13e0ba1 100644 --- a/pkgs/by-name/er/erlang-language-platform/package.nix +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -33,7 +33,7 @@ let in stdenv.mkDerivation rec { pname = "erlang-language-platform"; - version = "2025-07-21"; + version = "2026-01-15"; src = fetchurl { url = "https://github.com/WhatsApp/erlang-language-platform/releases/download/${version}/${release_name}.tar.gz"; diff --git a/pkgs/by-name/et/etterna/package.nix b/pkgs/by-name/et/etterna/package.nix index 842495a98dab..569535a18b63 100644 --- a/pkgs/by-name/et/etterna/package.nix +++ b/pkgs/by-name/et/etterna/package.nix @@ -9,7 +9,11 @@ pkg-config, openssl, libGLU, - xorg, + libxvmc, + libxrandr, + libxinerama, + libxext, + libx11, alsa-lib, libjack2, libpulseaudio, @@ -49,11 +53,11 @@ stdenv.mkDerivation (finalAttrs: { libGLU libogg sse2neon - xorg.libXinerama - xorg.libXrandr - xorg.libX11 - xorg.libXext # Needed for DPMS - xorg.libXvMC + libxinerama + libxrandr + libx11 + libxext # Needed for DPMS + libxvmc ]; desktopItems = [ diff --git a/pkgs/by-name/eu/eureka-editor/package.nix b/pkgs/by-name/eu/eureka-editor/package.nix index e27027ae21f2..c611c410683f 100644 --- a/pkgs/by-name/eu/eureka-editor/package.nix +++ b/pkgs/by-name/eu/eureka-editor/package.nix @@ -5,7 +5,7 @@ fltk, zlib, xdg-utils, - xorg, + libxinerama, libjpeg, libGLU, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { zlib xdg-utils libjpeg - xorg.libXinerama + libxinerama libGLU ]; diff --git a/pkgs/by-name/ev/everspace/package.nix b/pkgs/by-name/ev/everspace/package.nix index aa6edff81292..d8c8b86efb3a 100644 --- a/pkgs/by-name/ev/everspace/package.nix +++ b/pkgs/by-name/ev/everspace/package.nix @@ -17,7 +17,17 @@ openal, # Unreal Engine 4 Dependencies - xorg, + libxxf86vm, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxcursor, + libxau, + libx11, + libxcb, }: # Known issues: @@ -51,17 +61,17 @@ stdenv.mkDerivation rec { libGL # ue4 - xorg.libX11 - xorg.libXScrnSaver - xorg.libXau - xorg.libXcursor - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXxf86vm - xorg.libxcb + libx11 + libxscrnsaver + libxau + libxcursor + libxext + libxfixes + libxi + libxrandr + libxrender + libxxf86vm + libxcb ]; unpackPhase = '' diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index 8d4937f0fa31..602b12276abf 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, python3Packages, - xorg, + xhost, }: python3Packages.buildPythonApplication rec { pname = "exegol"; @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { supabase ] ++ pyjwt.optional-dependencies.crypto - ++ [ xorg.xhost ] + ++ [ xhost ] ++ lib.optional (!stdenv.hostPlatform.isLinux) tzlocal; doCheck = true; diff --git a/pkgs/by-name/ex/exegol4/package.nix b/pkgs/by-name/ex/exegol4/package.nix index fd0b774384bd..9a3bfaed5d9e 100644 --- a/pkgs/by-name/ex/exegol4/package.nix +++ b/pkgs/by-name/ex/exegol4/package.nix @@ -2,7 +2,7 @@ fetchPypi, lib, python3Packages, - xorg, + xhost, }: python3Packages.buildPythonApplication rec { pname = "exegol"; @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { argcomplete tzlocal ] - ++ [ xorg.xhost ]; + ++ [ xhost ]; doCheck = true; diff --git a/pkgs/by-name/ex/exfat/package.nix b/pkgs/by-name/ex/exfat/package.nix index 33ae9f27de82..77dd66b107fb 100644 --- a/pkgs/by-name/ex/exfat/package.nix +++ b/pkgs/by-name/ex/exfat/package.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ fuse ]; + outputs = [ + "out" + "man" + ]; + meta = { description = "Free exFAT file system implementation"; inherit (src.meta) homepage; diff --git a/pkgs/by-name/ex/exodus/package.nix b/pkgs/by-name/ex/exodus/package.nix index cf299cea789b..998a94578efb 100644 --- a/pkgs/by-name/ex/exodus/package.nix +++ b/pkgs/by-name/ex/exodus/package.nix @@ -12,7 +12,19 @@ atk, cairo, gdk-pixbuf, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxcb, xorg_sys_opengl, util-linux, alsa-lib, @@ -62,21 +74,21 @@ stdenv.mkDerivation (finalAttrs: { atk cairo gdk-pixbuf - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libxshmfence - xorg.libXtst + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrender + libxshmfence + libxtst xorg_sys_opengl util-linux - xorg.libXrandr - xorg.libXScrnSaver + libxrandr + libxscrnsaver alsa-lib dbus.lib at-spi2-atk diff --git a/pkgs/by-name/fa/fastcompmgr/package.nix b/pkgs/by-name/fa/fastcompmgr/package.nix index 240b40b44b8c..46a881d0e5e4 100644 --- a/pkgs/by-name/fa/fastcompmgr/package.nix +++ b/pkgs/by-name/fa/fastcompmgr/package.nix @@ -1,7 +1,11 @@ { stdenv, fetchFromGitHub, - xorg, + libxrender, + libxfixes, + libxdamage, + libxcomposite, + libx11, pkgs, lib, }: @@ -19,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXfixes - xorg.libXrender + libx11 + libxcomposite + libxdamage + libxfixes + libxrender ]; installPhase = '' diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 98dee9336f1f..60f149c76b01 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -35,7 +35,9 @@ vulkan-loader, wayland, xfconf, - xorg, + libxext, + libxdmcp, + libxau, yyjson, zlib, zfs, @@ -169,9 +171,9 @@ stdenv.mkDerivation (finalAttrs: { libXrandr libxcb # Required by libxcb messages - xorg.libXau - xorg.libXdmcp - xorg.libXext + libxau + libxdmcp + libxext ] ++ lib.optionals xfceSupport [ # Needed for XFWM theme and XFCE Terminal font. diff --git a/pkgs/by-name/fb/fbmenugen/package.nix b/pkgs/by-name/fb/fbmenugen/package.nix index 5e56e114376f..9d9fe7d7b1a5 100644 --- a/pkgs/by-name/fb/fbmenugen/package.nix +++ b/pkgs/by-name/fb/fbmenugen/package.nix @@ -6,7 +6,7 @@ makeWrapper, perlPackages, replaceVars, - xorg, + xmessage, wrapGAppsHook3, gitUpdater, }: @@ -24,7 +24,7 @@ perlPackages.buildPerlPackage rec { patches = [ (replaceVars ./0001-Fix-paths.patch { - xmessage = xorg.xmessage; + xmessage = xmessage; inherit fluxbox gnused; # replaced in postPatch fbmenugen = null; @@ -46,7 +46,7 @@ perlPackages.buildPerlPackage rec { perlPackages.Gtk3 perlPackages.LinuxDesktopFiles perlPackages.perl - xorg.xmessage + xmessage ]; dontConfigure = true; diff --git a/pkgs/by-name/fe/feather-tk/package.nix b/pkgs/by-name/fe/feather-tk/package.nix index 8f1890ed47cf..86ca0e289908 100644 --- a/pkgs/by-name/fe/feather-tk/package.nix +++ b/pkgs/by-name/fe/feather-tk/package.nix @@ -14,7 +14,7 @@ nativefiledialog-extended, nlohmann_json, plutovg, - xorg, + xvfb-run, zlib, python3Packages ? null, enableNFD ? true, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = enableTests; nativeCheckInputs = lib.optionals (enableTests && stdenv.isLinux) [ - xorg.xvfb-run + xvfb-run ]; checkPhase = lib.optionalString enableTests '' diff --git a/pkgs/by-name/fe/feh/package.nix b/pkgs/by-name/fe/feh/package.nix index 5bfb7676320c..54fdfc74f589 100644 --- a/pkgs/by-name/fe/feh/package.nix +++ b/pkgs/by-name/fe/feh/package.nix @@ -3,7 +3,9 @@ stdenv, fetchFromGitHub, makeWrapper, - xorg, + libxt, + libxinerama, + libx11, imlib2Full, libjpeg, libpng, @@ -34,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - xorg.libXt - xorg.libX11 - xorg.libXinerama + libxt + libx11 + libxinerama imlib2Full libjpeg libpng diff --git a/pkgs/by-name/fe/fend/package.nix b/pkgs/by-name/fe/fend/package.nix index 0a0e3c064b54..57dcb17684ae 100644 --- a/pkgs/by-name/fe/fend/package.nix +++ b/pkgs/by-name/fe/fend/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fend"; - version = "1.5.7"; + version = "1.5.8"; src = fetchFromGitHub { owner = "printfn"; repo = "fend"; tag = "v${finalAttrs.version}"; - hash = "sha256-3qEKYb8uYsTZ+UkpJkCKeGmY3iRQz9VfklE4LmcdA2E="; + hash = "sha256-XIdz7s8DCmXSeFIC06C+/wLDyMBcqIrjDSQUAhxX72s="; }; - cargoHash = "sha256-HzmRO7MDSVJHkeOWIKrEnaFmq68rCBcmWvXwQWGzA/s="; + cargoHash = "sha256-mDsAZvnBGXhEl2Qbww2svPznl6k9b44zGdMkeejIWVU="; nativeBuildInputs = [ pandoc diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index 8e251069a1e6..197e3a2671a3 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -23,7 +23,11 @@ libdrm, libGL, wayland, - xorg, + libxrender, + libxrandr, + libx11, + xorgproto, + libxcb, withQt ? true, qt6, }: @@ -35,11 +39,11 @@ let libdrm libGL wayland - xorg.libX11 - xorg.libxcb - xorg.libXrandr - xorg.libXrender - xorg.xorgproto + libx11 + libxcb + libxrandr + libxrender + xorgproto ]; pkgsCross32 = pkgsCross.gnu32; diff --git a/pkgs/by-name/fi/filebrowser-quantum/package.nix b/pkgs/by-name/fi/filebrowser-quantum/package.nix new file mode 100644 index 000000000000..df9cef0c6285 --- /dev/null +++ b/pkgs/by-name/fi/filebrowser-quantum/package.nix @@ -0,0 +1,79 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + buildNpmPackage, +}: + +let + version = "1.1.0-stable"; + + src = fetchFromGitHub { + owner = "gtsteffaniak"; + repo = "filebrowser"; + tag = "v${version}"; + hash = "sha256-S3MtqIqmFYDY053HX8yYGxHc6ev0Y8eXbe24TL8PtYQ="; + }; + + frontend = buildNpmPackage { + pname = "filebrowser-quantum-frontend"; + inherit version src; + + sourceRoot = "${src.name}/frontend"; + npmDepsHash = "sha256-pJR5m1XrqeHwOADWMnFDtHivaKCBqqdG2O6fWql7ugA="; + + buildPhase = '' + runHook preBuild + + npm run build:docker + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r dist/* $out + + runHook postInstall + ''; + }; + +in +buildGoModule { + pname = "filebrowser-quantum"; + inherit version src; + + sourceRoot = "${src.name}/backend"; + + vendorHash = "sha256-t4cREfkj+z+EvgXjzqYc8xs0jhTMUZMjcHxkkuuLpZs="; + + preBuild = '' + mkdir -p http/embed + cp -r ${frontend}/* http/embed/ + ''; + + postInstall = '' + mv $out/bin/backend $out/bin/filebrowser-quantum + ''; + + ldflags = [ + "-w" + "-s" + "-X github.com/gtsteffaniak/filebrowser/backend/version.CommitSHA=testingCommit" + "-X github.com/gtsteffaniak/filebrowser/backend/version.Version=testing" + ]; + + meta = { + description = "Access and manage your files from the web"; + homepage = "https://github.com/gtsteffaniak/filebrowser"; + changelog = "https://github.com/gtsteffaniak/filebrowser/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + jocimsus + denperidge + ]; + mainProgram = "filebrowser-quantum"; + }; +} diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix index 4cbefda35698..57f7b0a7fc5c 100644 --- a/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/pkgs/by-name/fi/firefoxpwa/package.nix @@ -24,7 +24,7 @@ pkg-config, stdenv, udev, - xorg, + libxscrnsaver, }: rustPlatform.buildRustPackage rec { @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage rec { pciutils pipewire udev - xorg.libXScrnSaver + libxscrnsaver ] ++ gtk_modules ++ extraLibs; diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix index 8375fe0d3601..66f2d85cfe3a 100644 --- a/pkgs/by-name/fl/flaresolverr/package.nix +++ b/pkgs/by-name/fl/flaresolverr/package.nix @@ -8,7 +8,7 @@ chromium, python3, undetected-chromedriver, - xorg, + xvfb, nixosTests, }: @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${python}/bin/python $out/bin/flaresolverr \ --add-flags "$out/share/flaresolverr-${finalAttrs.version}/src/flaresolverr.py" \ - --prefix PATH : "${lib.makeBinPath [ xorg.xvfb ]}" + --prefix PATH : "${lib.makeBinPath [ xvfb ]}" ''; passthru = { diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index e1bf5f0e0b1c..7f7e51d963a9 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -56,7 +56,7 @@ wrapGAppsNoGuiHook, xdg-dbus-proxy, xmlto, - xorg, + libxau, zstd, withAutoSideloading ? false, withDconf ? lib.meta.availableOn stdenv.hostPlatform dconf, @@ -219,7 +219,7 @@ stdenv.mkDerivation (finalAttrs: { python3 wayland wayland-protocols - xorg.libXau + libxau zstd ] ++ lib.optional withDconf dconf diff --git a/pkgs/by-name/fl/flitter/package.nix b/pkgs/by-name/fl/flitter/package.nix index 4b9ddc259b59..5bb63f144f0b 100644 --- a/pkgs/by-name/fl/flitter/package.nix +++ b/pkgs/by-name/fl/flitter/package.nix @@ -4,7 +4,7 @@ rustPlatform, fetchFromGitHub, pkg-config, - xorg, + libx11, }: rustPlatform.buildRustPackage rec { @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - xorg.libX11 + libx11 ]; meta = { diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 9d0cdb34865b..8f0e21779ecf 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -49,14 +49,14 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "12.6.1"; + version = "12.6.2"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-RMrFuxcPDJ3LJgsPzZhs/Zd2A9m3uqgUbHpwQ6+ojys="; + hash = "sha256-Y5dX1iemh4o5dZrDyhWeMEiocpplEe66p8UadtbJ4Jw="; }; vendorHash = "sha256-fvSiEIE4XSJ8Ot4Tcmt8chD11fHVsECD2/8xrgIKhJs="; diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index f3eff48d9700..c11dd55225ca 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -21,7 +21,7 @@ nixosTests, openssh, sqliteSupport ? true, - xorg, + lndir, runCommand, stdenv, fetchFromGitea, @@ -167,7 +167,7 @@ buildGoModule rec { { nativeBuildInputs = [ brotli - xorg.lndir + lndir ]; } '' diff --git a/pkgs/by-name/fr/frame/package.nix b/pkgs/by-name/fr/frame/package.nix index b3fa616561ae..8e2755273597 100644 --- a/pkgs/by-name/fr/frame/package.nix +++ b/pkgs/by-name/fr/frame/package.nix @@ -4,7 +4,10 @@ stdenv, fetchurl, pkg-config, - xorg, + xorg-server, + libxi, + libxext, + libx11, }: stdenv.mkDerivation rec { @@ -20,10 +23,10 @@ stdenv.mkDerivation rec { stdenv ] ++ lib.optionals enableX11 [ - xorg.xorgserver - xorg.libX11 - xorg.libXext - xorg.libXi + xorg-server + libx11 + libxext + libxi ]; configureFlags = lib.optional enableX11 "--with-x11"; diff --git a/pkgs/by-name/fu/furtherance/package.nix b/pkgs/by-name/fu/furtherance/package.nix index 6dfaef0e9fb3..fc370f63110a 100644 --- a/pkgs/by-name/fu/furtherance/package.nix +++ b/pkgs/by-name/fu/furtherance/package.nix @@ -7,7 +7,10 @@ libxkbcommon, openssl, pkg-config, - xorg, + libxscrnsaver, + libxi, + libxcursor, + libx11, vulkan-loader, wayland, }: @@ -32,10 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: { fontconfig openssl libxkbcommon - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcursor - xorg.libXi + libx11 + libxscrnsaver + libxcursor + libxi vulkan-loader wayland ]; diff --git a/pkgs/by-name/fx/fxlinuxprintutil/package.nix b/pkgs/by-name/fx/fxlinuxprintutil/package.nix index 6db57516e01d..2bc0a978e924 100644 --- a/pkgs/by-name/fx/fxlinuxprintutil/package.nix +++ b/pkgs/by-name/fx/fxlinuxprintutil/package.nix @@ -8,7 +8,7 @@ cups, tcl, tk, - xorg, + libx11, makeWrapper, }: let @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # replaces the code that looks for X11’s locale.alias in /usr/share/X11/locale or # /usr/lib/X11/locale with /nix/store/libX11/share/X11/locale (replaceVars ./fxlocalechk.tcl.patch { - inherit (xorg) libX11; + libX11 = libx11; }) ]; diff --git a/pkgs/by-name/ga/galaxy-buds-client/package.nix b/pkgs/by-name/ga/galaxy-buds-client/package.nix index eb16155be2aa..ecedbe0ceb6d 100644 --- a/pkgs/by-name/ga/galaxy-buds-client/package.nix +++ b/pkgs/by-name/ga/galaxy-buds-client/package.nix @@ -7,7 +7,9 @@ fontconfig, glib, libglvnd, - xorg, + libx11, + libsm, + libice, makeWrapper, makeDesktopItem, copyDesktopItems, @@ -45,9 +47,9 @@ buildDotnetModule rec { runtimeDeps = [ libglvnd - xorg.libSM - xorg.libICE - xorg.libX11 + libsm + libice + libx11 ]; postFixup = '' diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 7224f1591a3d..af481e2aefbe 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -8,7 +8,20 @@ pkg-config, ninja, cmake, - xorg, + libxxf86vm, + libxtst, + libxres, + libxrender, + libxmu, + libxi, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + xwininfo, + xprop, + libxcb, libdrm, libei, vulkan-loader, @@ -128,8 +141,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ pipewire hwdata - xorg.libX11 - xorg.libxcb + libx11 + libxcb wayland wayland-protocols vulkan-loader @@ -141,16 +154,16 @@ stdenv.mkDerivation (finalAttrs: { wlroots_0_17.buildInputs ++ [ # gamescope uses a custom wlroots branch - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXi - xorg.libXmu - xorg.libXrender - xorg.libXres - xorg.libXtst - xorg.libXxf86vm + libxcomposite + libxcursor + libxdamage + libxext + libxi + libxmu + libxrender + libxres + libxtst + libxxf86vm libavif libdrm libei @@ -174,7 +187,6 @@ stdenv.mkDerivation (finalAttrs: { # --debug-layers flag expects these in the path wrapProgram "$out/bin/gamescope" \ --prefix PATH : ${ - with xorg; lib.makeBinPath [ xprop xwininfo diff --git a/pkgs/by-name/ga/gapcast/package.nix b/pkgs/by-name/ga/gapcast/package.nix index 57ed1665d766..ab868cd2413b 100644 --- a/pkgs/by-name/ga/gapcast/package.nix +++ b/pkgs/by-name/ga/gapcast/package.nix @@ -4,7 +4,7 @@ buildGoModule, fetchFromGitHub, libpcap, - xorg, + libx11, }: buildGoModule rec { @@ -22,7 +22,7 @@ buildGoModule rec { buildInputs = [ libpcap - xorg.libX11 + libx11 ]; ldflags = [ diff --git a/pkgs/by-name/ga/gauge/package.nix b/pkgs/by-name/ga/gauge/package.nix index cbc37f6d0a2f..5f568a9321ae 100644 --- a/pkgs/by-name/ga/gauge/package.nix +++ b/pkgs/by-name/ga/gauge/package.nix @@ -4,7 +4,7 @@ makeWrapper, stdenvNoCC, lib, - xorg, + lndir, gaugePlugins, plugins ? [ ], }: @@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ gauge-unwrapped makeWrapper - xorg.lndir + lndir ]; passthru = { diff --git a/pkgs/by-name/gd/gdlauncher-carbon/package.nix b/pkgs/by-name/gd/gdlauncher-carbon/package.nix index 800a799b40fc..941875d3abd7 100644 --- a/pkgs/by-name/gd/gdlauncher-carbon/package.nix +++ b/pkgs/by-name/gd/gdlauncher-carbon/package.nix @@ -7,7 +7,13 @@ makeWrapper, copyDesktopItems, autoPatchelfHook, - xorg, + libxxf86vm, + libxrandr, + libxext, + libxcursor, + libx11, + xrandr, + libxcb, libpulseaudio, libGL, udev, @@ -46,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libxcb + libxcb stdenv.cc.cc.lib ]; @@ -70,11 +76,11 @@ stdenv.mkDerivation (finalAttrs: { postConfigure = let libPath = lib.makeLibraryPath [ - xorg.libX11 - xorg.libXext - xorg.libXcursor - xorg.libXrandr - xorg.libXxf86vm + libx11 + libxext + libxcursor + libxrandr + libxxf86vm # lwjgl libpulseaudio @@ -88,8 +94,8 @@ stdenv.mkDerivation (finalAttrs: { # Used for opening directories and URLs in the electron app xdg-utils - # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - xorg.xrandr + # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 + xrandr ]; in '' diff --git a/pkgs/by-name/ge/geis/package.nix b/pkgs/by-name/ge/geis/package.nix index 8446cb446a17..540c84ca8446 100644 --- a/pkgs/by-name/ge/geis/package.nix +++ b/pkgs/by-name/ge/geis/package.nix @@ -13,7 +13,10 @@ gobject-introspection, grail, gtk3, - xorg, + libxtst, + libxi, + libxext, + libx11, pango, xorgserver, testers, @@ -51,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf grail gtk3 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXtst + libx11 + libxext + libxi + libxtst pango python3Packages.python xorgserver diff --git a/pkgs/by-name/ge/gencfsm/package.nix b/pkgs/by-name/ge/gencfsm/package.nix index 780684a117ff..89bd43c7cd80 100644 --- a/pkgs/by-name/ge/gencfsm/package.nix +++ b/pkgs/by-name/ge/gencfsm/package.nix @@ -14,7 +14,8 @@ gtk3, vala, wrapGAppsHook3, - xorg, + libsm, + libice, gobject-introspection, }: @@ -49,8 +50,8 @@ stdenv.mkDerivation rec { encfs gtk3 libgee - xorg.libSM - xorg.libICE + libsm + libice libsecret ]; diff --git a/pkgs/by-name/ge/genymotion/package.nix b/pkgs/by-name/ge/genymotion/package.nix index 6be7b711824a..1cfe08fb9dd7 100644 --- a/pkgs/by-name/ge/genymotion/package.nix +++ b/pkgs/by-name/ge/genymotion/package.nix @@ -7,7 +7,7 @@ zlib, libGL, glib, - xorg, + libx11, libxkbcommon, xdg-utils, libXrender, @@ -30,7 +30,7 @@ let stdenv.cc.cc zlib glib - xorg.libX11 + libx11 libxkbcommon libXmu libXi diff --git a/pkgs/by-name/ge/geogebra/package.nix b/pkgs/by-name/ge/geogebra/package.nix index 128b1973a50b..2c4b3610c3f5 100644 --- a/pkgs/by-name/ge/geogebra/package.nix +++ b/pkgs/by-name/ge/geogebra/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, libGL, - xorg, + libxxf86vm, jre, makeDesktopItem, makeWrapper, @@ -92,7 +92,7 @@ let --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ libGL - xorg.libXxf86vm + libxxf86vm ] }" \ --set MESA_GL_VERSION_OVERRIDE 3.0 \ diff --git a/pkgs/by-name/ge/geteduroam-cli/package.nix b/pkgs/by-name/ge/geteduroam-cli/package.nix index c662ecdec1f2..be8758abdec8 100644 --- a/pkgs/by-name/ge/geteduroam-cli/package.nix +++ b/pkgs/by-name/ge/geteduroam-cli/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "geteduroam-cli"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "geteduroam"; repo = "linux-app"; tag = finalAttrs.version; - hash = "sha256-+3mluLby3R0xVU9fIG+1B1A4yM1IfyUvw4wclwnV5s8="; + hash = "sha256-fmkTenN5F2FEimYUQi6JVUGmHcnVJvE9Giur+xTl+1s="; }; - vendorHash = "sha256-l9hge1TS+7ix9/6LKWq+lTMjNM4/Lnw8gNrWB6hWCTk="; + vendorHash = "sha256-kmBuyIs5S6h51+tF7vhY92o6VP+M7QI9AwuZSQUwjXg="; subPackages = [ "cmd/geteduroam-cli" diff --git a/pkgs/by-name/gf/gfxstream/package.nix b/pkgs/by-name/gf/gfxstream/package.nix index af693f9d97ea..5ec352798319 100644 --- a/pkgs/by-name/gf/gfxstream/package.nix +++ b/pkgs/by-name/gf/gfxstream/package.nix @@ -12,7 +12,7 @@ libglvnd, vulkan-headers, vulkan-loader, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { libglvnd vulkan-headers vulkan-loader - xorg.libX11 + libx11 ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ]; diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix index 72b8d217748e..0a79f4f1874a 100644 --- a/pkgs/by-name/gh/ghostscript/package.nix +++ b/pkgs/by-name/gh/ghostscript/package.nix @@ -27,7 +27,10 @@ cupsSupport ? config.ghostscript.cups or (!stdenv.hostPlatform.isDarwin), cups, x11Support ? cupsSupport, - xorg, # with CUPS, X11 only adds very little + libice, + libx11, + libxext, + libxt, dynamicDrivers ? true, # for passthru.tests @@ -130,10 +133,10 @@ stdenv.mkDerivation rec { openjpeg ] ++ lib.optionals x11Support [ - xorg.libICE - xorg.libX11 - xorg.libXext - xorg.libXt + libice + libx11 + libxext + libxt ] ++ lib.optional cupsSupport cups; diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix index c6b89f93fa4a..7c4c1754eb6d 100644 --- a/pkgs/by-name/gi/giac/package.nix +++ b/pkgs/by-name/gi/giac/package.nix @@ -28,7 +28,7 @@ enableGUI ? false, libGL, libGLU, - xorg, + libx11, fltk, enableMicroPy ? false, python3, @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { libGL libGLU fltk - xorg.libX11 + libx11 ] ++ lib.optional enableMicroPy python3; diff --git a/pkgs/by-name/gi/gimx/package.nix b/pkgs/by-name/gi/gimx/package.nix index 7b37c872dc57..5b7be0af6a25 100644 --- a/pkgs/by-name/gi/gimx/package.nix +++ b/pkgs/by-name/gi/gimx/package.nix @@ -9,7 +9,8 @@ libxml2, ncurses5, libmhash, - xorg, + libxi, + libx11, }: let @@ -45,8 +46,8 @@ stdenv.mkDerivation rec { libxml2 ncurses5 libmhash - xorg.libX11 - xorg.libXi + libx11 + libxi ]; installPhase = '' diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index e36941a93de4..3ac3f6182756 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -10,7 +10,8 @@ curl, nss, nspr, - xorg, + libxdamage, + libx11, libdrm, alsa-lib, cups, @@ -53,8 +54,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildInputs = [ gnome-keyring - xorg.libXdamage - xorg.libX11 + libxdamage + libx11 libsecret git curl diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index d3eba9bdda68..31cf5440fc04 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gitify"; - version = "6.15.0"; + version = "6.16.0"; src = fetchFromGitHub { owner = "gitify-app"; repo = "gitify"; tag = "v${finalAttrs.version}"; - hash = "sha256-rSz8lBlKIBVIEhFZayeFweMSzR4QtH+JxI1ltzIzB8M="; + hash = "sha256-yNgVcf7V1TPc6L5SaKhMulUlGJeBnqs/gZGeaz1AtW8="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 2; - hash = "sha256-2sDJazY9VB87cKUwfVyhk/muoWxmcPlzJdepbJ83Rrk="; + hash = "sha256-l61t3UKNAoBldquzXJPomrKDbiXXJMSdcsk43pQpcgc="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/gl/glee/package.nix b/pkgs/by-name/gl/glee/package.nix index 05da6adf308b..240e40f9fb07 100644 --- a/pkgs/by-name/gl/glee/package.nix +++ b/pkgs/by-name/gl/glee/package.nix @@ -5,7 +5,7 @@ cmake, libGLU, libGL, - xorg, + libx11, }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU libGL - xorg.libX11 + libx11 ]; postPatch = '' diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index 1b7b9655a6b7..67b2d65a3753 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -14,7 +14,15 @@ zlib, libGL, libGLU, - xorg, + libxrender, + libxinerama, + libxft, + libxfixes, + libxext, + libxcursor, + libx11, + libsm, + libice, opencascade-occt, llvmPackages, python3Packages, @@ -53,15 +61,15 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU - xorg.libXrender - xorg.libXcursor - xorg.libXfixes - xorg.libXext - xorg.libXft - xorg.libXinerama - xorg.libX11 - xorg.libSM - xorg.libICE + libxrender + libxcursor + libxfixes + libxext + libxft + libxinerama + libx11 + libsm + libice ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix index ee21354c1abe..4681896ebdb3 100644 --- a/pkgs/by-name/gn/gnome-flashback/package.nix +++ b/pkgs/by-name/gn/gnome-flashback/package.nix @@ -29,7 +29,7 @@ wrapGAppsHook3, writeTextFile, xkeyboard_config, - xorg, + libxxf86vm, nixosTests, runCommand, buildEnv, @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { libcanberra-gtk3 libpulseaudio libxkbfile - xorg.libXxf86vm + libxxf86vm polkit gdm gnome-panel diff --git a/pkgs/by-name/gn/gnome-panel/wrapper.nix b/pkgs/by-name/gn/gnome-panel/wrapper.nix index 0d7fb34e4772..cb7f6d5d160d 100644 --- a/pkgs/by-name/gn/gnome-panel/wrapper.nix +++ b/pkgs/by-name/gn/gnome-panel/wrapper.nix @@ -4,7 +4,7 @@ buildEnv, gnome-panel, gnome-flashback, - xorg, + lndir, glib, wrapGAppsHook3, panelModulePackages ? [ ], @@ -49,10 +49,10 @@ stdenv.mkDerivation { runHook preInstall mkdir -p $out - ${xorg.lndir}/bin/lndir -silent ${gnome-panel} $out + ${lndir}/bin/lndir -silent ${gnome-panel} $out rm -r $out/lib/gnome-panel/modules - ${xorg.lndir}/bin/lndir -silent ${panelModulesEnv} $out + ${lndir}/bin/lndir -silent ${panelModulesEnv} $out rm $out/share/systemd/user/gnome-panel.service substitute ${gnome-panel}/share/systemd/user/gnome-panel.service \ diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index 0d43c58ba7eb..4fc3f41a0ed4 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -25,7 +25,7 @@ libxslt, gettext, systemd, - xorg, + xtrans, libepoxy, gnome-session-ctl, wrapGAppsHook4, @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { libICE gnome-desktop json-glib - xorg.xtrans + xtrans adwaita-icon-theme gnome-settings-daemon gsettings-desktop-schemas diff --git a/pkgs/by-name/go/go-hass-agent/package.nix b/pkgs/by-name/go/go-hass-agent/package.nix index f3d776d71fac..6e4681c8e9e0 100644 --- a/pkgs/by-name/go/go-hass-agent/package.nix +++ b/pkgs/by-name/go/go-hass-agent/package.nix @@ -8,7 +8,11 @@ pkg-config, writableTmpDirAsHomeHook, libglvnd, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxcursor, go, nix-update-script, }: @@ -52,11 +56,11 @@ buildGoModule (finalAttrs: { buildInputs = [ libglvnd - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXxf86vm + libxcursor + libxi + libxinerama + libxrandr + libxxf86vm ]; desktopItems = [ "assets/go-hass-agent.desktop" ]; diff --git a/pkgs/by-name/go/go-sct/package.nix b/pkgs/by-name/go/go-sct/package.nix index e1a2f47a52fb..95be022c323a 100644 --- a/pkgs/by-name/go/go-sct/package.nix +++ b/pkgs/by-name/go/go-sct/package.nix @@ -2,7 +2,8 @@ lib, buildGoModule, fetchFromGitHub, - xorg, + libxrandr, + libx11, wayland, }: @@ -25,8 +26,8 @@ buildGoModule { vendorHash = "sha256-Rx5/oORink2QtRcD+JqbyFroWYhuYmuYDzZ391R4Jsw="; buildInputs = [ - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr wayland.dev ]; diff --git a/pkgs/by-name/go/go2tv/package.nix b/pkgs/by-name/go/go2tv/package.nix index 678cbc76854b..9858e2247b94 100644 --- a/pkgs/by-name/go/go2tv/package.nix +++ b/pkgs/by-name/go/go2tv/package.nix @@ -2,7 +2,13 @@ lib, buildGoModule, fetchFromGitHub, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxext, + libxcursor, + libx11, libglvnd, pkg-config, withGui ? true, @@ -24,13 +30,13 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXinerama - xorg.libXi - xorg.libXext - xorg.libXxf86vm + libx11 + libxcursor + libxrandr + libxinerama + libxi + libxext + libxxf86vm libglvnd ]; diff --git a/pkgs/by-name/go/gobble/package.nix b/pkgs/by-name/go/gobble/package.nix index 31d3a75a3b76..fed8ce67400f 100644 --- a/pkgs/by-name/go/gobble/package.nix +++ b/pkgs/by-name/go/gobble/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - xorg, + libxcb, installShellFiles, pandoc, }: @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-DnIZTeRyxhmVK2uB21ScPiEyL4k9kAWfVoLNIAM9P68="; - buildInputs = [ xorg.libxcb ]; + buildInputs = [ libxcb ]; nativeBuildInputs = [ pandoc installShellFiles diff --git a/pkgs/by-name/go/gohufont/package.nix b/pkgs/by-name/go/gohufont/package.nix index 8f16374282d8..ca646bc54a47 100644 --- a/pkgs/by-name/go/gohufont/package.nix +++ b/pkgs/by-name/go/gohufont/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchFromGitHub, - xorg, + mkfontscale, + fonttosfnt, bdf2psf, bdftopcf, libfaketime, @@ -20,10 +21,10 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - xorg.mkfontscale + mkfontscale bdf2psf bdftopcf - xorg.fonttosfnt + fonttosfnt libfaketime ]; diff --git a/pkgs/by-name/go/gomanagedocker/package.nix b/pkgs/by-name/go/gomanagedocker/package.nix index d370035add3b..508bd2b10460 100644 --- a/pkgs/by-name/go/gomanagedocker/package.nix +++ b/pkgs/by-name/go/gomanagedocker/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, versionCheckHook, nix-update-script, - xorg, + libx11, pkg-config, gpgme, btrfs-progs, @@ -34,7 +34,7 @@ buildGoModule { gpgme btrfs-progs ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 ]; ldflags = [ "-s" diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix index 4dc2d43a85a9..b133c02dceb8 100644 --- a/pkgs/by-name/go/goose-cli/package.nix +++ b/pkgs/by-name/go/goose-cli/package.nix @@ -5,7 +5,7 @@ fetchurl, rustPlatform, dbus, - xorg, + libxcb, pkg-config, protobuf, openssl, @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { dbus openssl ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libxcb ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; env.LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix index 44901b00999f..e4ea8996db4d 100644 --- a/pkgs/by-name/gp/gpac/package.nix +++ b/pkgs/by-name/gp/gpac/package.nix @@ -29,7 +29,9 @@ pulseaudio, SDL2, curl, - xorg, + libxv, + libx11, + xorgproto, withFullDeps ? false, withFfmpeg ? withFullDeps, @@ -108,9 +110,9 @@ stdenv.mkDerivation (finalAttrs: { nghttp2 openjpeg libcaca - xorg.libX11 - xorg.libXv - xorg.xorgproto + libx11 + libxv + xorgproto mesa mesa_glu xvidcore diff --git a/pkgs/by-name/gr/grail/package.nix b/pkgs/by-name/gr/grail/package.nix index 93a3bd282d96..b7d13c2bc205 100644 --- a/pkgs/by-name/gr/grail/package.nix +++ b/pkgs/by-name/gr/grail/package.nix @@ -4,7 +4,11 @@ stdenv, fetchurl, pkg-config, - xorg, + libxtst, + libxi, + libxfixes, + libxext, + libx11, python3, frame, }: @@ -24,11 +28,11 @@ stdenv.mkDerivation rec { frame ] ++ lib.optionals enableX11 [ - xorg.libX11 - xorg.libXtst - xorg.libXext - xorg.libXi - xorg.libXfixes + libx11 + libxtst + libxext + libxi + libxfixes ]; configureFlags = lib.optional enableX11 "--with-x11"; diff --git a/pkgs/by-name/gr/graphite/package.nix b/pkgs/by-name/gr/graphite/package.nix index f523b0b924f4..aec9910cbbc6 100644 --- a/pkgs/by-name/gr/graphite/package.nix +++ b/pkgs/by-name/gr/graphite/package.nix @@ -25,7 +25,9 @@ vulkan-loader, libGL, libxkbcommon, - xorg, + libxcursor, + libx11, + libxcb, }: let @@ -123,9 +125,9 @@ let wayland openssl libxkbcommon - xorg.libXcursor - xorg.libxcb - xorg.libX11 + libxcursor + libxcb + libx11 ]; cef = cef-binary.overrideAttrs { postFixup = '' diff --git a/pkgs/by-name/gr/grayjay/package.nix b/pkgs/by-name/gr/grayjay/package.nix index 002c5c3fa223..877fa35e238b 100644 --- a/pkgs/by-name/gr/grayjay/package.nix +++ b/pkgs/by-name/gr/grayjay/package.nix @@ -7,7 +7,13 @@ libz, icu, openssl, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, gtk3, glib, nss, @@ -69,7 +75,7 @@ buildDotnetModule (finalAttrs: { buildInputs = [ openssl libgcc - xorg.libX11 + libx11 gtk3 glib alsa-lib @@ -155,12 +161,12 @@ buildDotnetModule (finalAttrs: { runtimeDeps = [ libz - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb dbus atk diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix index 48b28dbb356f..fcd3148602a3 100644 --- a/pkgs/by-name/gr/gromit-mpx/package.nix +++ b/pkgs/by-name/gr/gromit-mpx/package.nix @@ -8,7 +8,7 @@ glib, libappindicator-gtk3, libpthreadstubs, - xorg, + libxdmcp, libxkbcommon, libepoxy, at-spi2-core, @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { glib libappindicator-gtk3 libpthreadstubs - xorg.libXdmcp + libxdmcp libxkbcommon libepoxy at-spi2-core diff --git a/pkgs/by-name/gt/gtk3/package.nix b/pkgs/by-name/gt/gtk3/package.nix index df643c263bbc..1037bdd50e65 100644 --- a/pkgs/by-name/gt/gtk3/package.nix +++ b/pkgs/by-name/gt/gtk3/package.nix @@ -29,7 +29,16 @@ && stdenv.hostPlatform.emulatorAvailable buildPackages, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages, fribidi, - xorg, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxdamage, + libxcursor, + libxcomposite, + libsm, + libice, libepoxy, libxkbcommon, libxml2, @@ -161,20 +170,17 @@ stdenv.mkDerivation (finalAttrs: { glib gsettings-desktop-schemas ] - ++ lib.optionals x11Support ( - with xorg; - [ - libICE - libSM - libXcomposite - libXcursor - libXdamage - libXfixes - libXi - libXrandr - libXrender - ] - ) + ++ lib.optionals x11Support [ + libice + libsm + libxcomposite + libxcursor + libxdamage + libxfixes + libxi + libxrandr + libxrender + ] ++ [ # TODO: Reorder me on `staging`. pango @@ -185,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols ] ++ lib.optionals xineramaSupport [ - xorg.libXinerama + libxinerama ] ++ lib.optionals cupsSupport [ cups diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix index edd5393618ec..1c4f88ccb9f5 100644 --- a/pkgs/by-name/gt/gtk4/package.nix +++ b/pkgs/by-name/gt/gtk4/package.nix @@ -24,7 +24,14 @@ gobject-introspection, fribidi, harfbuzz, - xorg, + libxrender, + libxrandr, + libxi, + libxinerama, + libxdamage, + libxcursor, + libsm, + libice, libepoxy, libxkbcommon, libpng, @@ -141,16 +148,14 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-bad fribidi harfbuzz + libice + libsm + libxcursor + libxdamage + libxi + libxrandr + libxrender ] - ++ (with xorg; [ - libICE - libSM - libXcursor - libXdamage - libXi - libXrandr - libXrender - ]) ++ lib.optionals trackerSupport [ tinysparql ] @@ -160,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols ] ++ lib.optionals xineramaSupport [ - xorg.libXinerama + libxinerama ] ++ lib.optionals cupsSupport [ cups diff --git a/pkgs/by-name/gw/gwyddion/package.nix b/pkgs/by-name/gw/gwyddion/package.nix index 6f7b969aa0c4..f092370b80da 100644 --- a/pkgs/by-name/gw/gwyddion/package.nix +++ b/pkgs/by-name/gw/gwyddion/package.nix @@ -17,7 +17,7 @@ libwebp, # libXmu is not used if libunique is. libXmuSupport ? false, - xorg, + libxmu, libxsltSupport ? true, libxslt, fitsSupport ? true, @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { libGL ] ++ lib.optional openexrSupport openexr - ++ lib.optional libXmuSupport xorg.libXmu + ++ lib.optional libXmuSupport libxmu ++ lib.optional fitsSupport cfitsio ++ lib.optional libpngSupport libpng ++ lib.optional libxsltSupport libxslt diff --git a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix index b05b5516b651..a687a0e2c1bb 100644 --- a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix +++ b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix @@ -3,7 +3,7 @@ stdenv, gcc13Stdenv, fetchFromGitHub, - xorg, + libx11, xorgproto, cairo, lv2, @@ -27,7 +27,7 @@ buildStdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 xorgproto cairo lv2 diff --git a/pkgs/by-name/gx/gxplugins-lv2/package.nix b/pkgs/by-name/gx/gxplugins-lv2/package.nix index 47a51da77ec6..1113c158c481 100644 --- a/pkgs/by-name/gx/gxplugins-lv2/package.nix +++ b/pkgs/by-name/gx/gxplugins-lv2/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, xorgproto, cairo, lv2, @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 xorgproto cairo lv2 diff --git a/pkgs/by-name/ha/hakuneko/package.nix b/pkgs/by-name/ha/hakuneko/package.nix index 14af708e1c83..06aad1b99b05 100644 --- a/pkgs/by-name/ha/hakuneko/package.nix +++ b/pkgs/by-name/ha/hakuneko/package.nix @@ -12,7 +12,8 @@ nss, nspr, systemd, - xorg, + libxtst, + libxscrnsaver, }: let desktopItem = makeDesktopItem { @@ -61,8 +62,8 @@ stdenv.mkDerivation rec { alsa-lib nss nspr - xorg.libXScrnSaver - xorg.libXtst + libxscrnsaver + libxtst systemd ]; diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index cff0316ca521..027865351458 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -12,7 +12,10 @@ rustPlatform, vulkan-loader, wayland, - xorg, + libxi, + libxcursor, + libx11, + libxcb, alsa-lib, }: @@ -43,10 +46,10 @@ rustPlatform.buildRustPackage rec { libxkbcommon vulkan-loader wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libxcb + libx11 + libxcursor + libxi + libxcb ]; desktopItems = [ diff --git a/pkgs/by-name/he/helio-workstation/package.nix b/pkgs/by-name/he/helio-workstation/package.nix index 07108a2c222b..ce0ab0ec5a6b 100644 --- a/pkgs/by-name/he/helio-workstation/package.nix +++ b/pkgs/by-name/he/helio-workstation/package.nix @@ -4,7 +4,12 @@ fetchFromGitHub, alsa-lib, freetype, - xorg, + libxrandr, + libxinerama, + libxext, + libxcursor, + libxcomposite, + libx11, curl, libGL, libjack2, @@ -28,12 +33,12 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib freetype - xorg.libX11 - xorg.libXext - xorg.libXinerama - xorg.libXrandr - xorg.libXcursor - xorg.libXcomposite + libx11 + libxext + libxinerama + libxrandr + libxcursor + libxcomposite curl libGL libjack2 diff --git a/pkgs/by-name/he/helm/package.nix b/pkgs/by-name/he/helm/package.nix index 0919ddef6bf0..96c3fa7b7457 100644 --- a/pkgs/by-name/he/helm/package.nix +++ b/pkgs/by-name/he/helm/package.nix @@ -3,7 +3,13 @@ stdenv, fetchFromGitHub, fetchpatch, - xorg, + libxrender, + libxrandr, + libxinerama, + libxext, + libxcursor, + libxcomposite, + libx11, freetype, alsa-lib, curl, @@ -26,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXext - xorg.libXinerama - xorg.libXrender - xorg.libXrandr + libx11 + libxcomposite + libxcursor + libxext + libxinerama + libxrender + libxrandr freetype alsa-lib curl diff --git a/pkgs/by-name/he/hey-mail/package.nix b/pkgs/by-name/he/hey-mail/package.nix index 472c5fc80dfe..c9864f6a7dad 100644 --- a/pkgs/by-name/he/hey-mail/package.nix +++ b/pkgs/by-name/he/hey-mail/package.nix @@ -30,7 +30,17 @@ gdk-pixbuf, pango, cairo, - xorg, + libxtst, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, ffmpeg, http-parser, nss, @@ -62,17 +72,17 @@ let gdk-pixbuf pango cairo - xorg.libxcb - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg.libXrandr + libxcb + libx11 + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrender + libxtst + libxrandr ffmpeg http-parser nss diff --git a/pkgs/by-name/hh/hhpc/package.nix b/pkgs/by-name/hh/hhpc/package.nix index af81dc16b893..b0eb04ec6b3f 100644 --- a/pkgs/by-name/hh/hhpc/package.nix +++ b/pkgs/by-name/hh/hhpc/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, pkg-config, }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/by-name/hi/highlight-pointer/package.nix b/pkgs/by-name/hi/highlight-pointer/package.nix index 5facf4b096eb..d65dfc7a81e2 100644 --- a/pkgs/by-name/hi/highlight-pointer/package.nix +++ b/pkgs/by-name/hi/highlight-pointer/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, libX11, - xorg, + libxi, + libxfixes, libXext, }: @@ -21,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libX11 libXext - xorg.libXi - xorg.libXfixes + libxi + libxfixes ]; installPhase = '' diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 12b4f490c425..6958fc4ad4b1 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -23,7 +23,13 @@ hmclJdk jdk17 ], - xorg, + libxxf86vm, + libxtst, + libxrandr, + libxext, + libxcursor, + libx11, + xrandr, glib, libGL, glfw, @@ -138,12 +144,12 @@ stdenv.mkDerivation (finalAttrs: { vulkan-loader ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXxf86vm - xorg.libXext - xorg.libXcursor - xorg.libXrandr - xorg.libXtst + libx11 + libxxf86vm + libxext + libxcursor + libxrandr + libxtst libpulseaudio wayland alsa-lib @@ -177,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { --add-flags "-jar $out/lib/hmcl/hmcl-terracotta-patch.jar" \ --set LD_LIBRARY_PATH ${lib.makeLibraryPath finalAttrs.runtimeDeps} \ --prefix PATH : "${ - lib.makeBinPath (minecraftJdks ++ lib.optional stdenv.hostPlatform.isLinux xorg.xrandr) + lib.makeBinPath (minecraftJdks ++ lib.optional stdenv.hostPlatform.isLinux xrandr) }" \ --run 'cd $HOME' \ ''${gappsWrapperArgs[@]} diff --git a/pkgs/by-name/ho/houdini/package.nix b/pkgs/by-name/ho/houdini/package.nix index 0efde5272233..7d74e20b19d3 100644 --- a/pkgs/by-name/ho/houdini/package.nix +++ b/pkgs/by-name/ho/houdini/package.nix @@ -19,9 +19,7 @@ buildFHSEnv { unsharePid = false; targetPkgs = - pkgs: - with pkgs; - [ + pkgs: with pkgs; [ libGLU libGL alsa-lib @@ -44,35 +42,33 @@ buildFHSEnv { ocl-icd # needed for opencl numactl # needed by hfs ocl backend zstd # needed from 20.0 - ] - ++ (with xorg; [ - libICE - libSM - libXmu - libXi - libXt - libXext - libX11 - libXrender - libXcursor - libXfixes - libXrender - libXcomposite - libXdamage - libXtst + libice + libsm + libxmu + libxi + libxt + libxext + libx11 + libxrender + libxcursor + libxfixes + libxrender + libxcomposite + libxdamage + libxtst libxcb - libXScrnSaver - libXrandr + libxscrnsaver + libxrandr libxcb libxkbfile libxshmfence - xcbutil - xcbutilimage - xcbutilrenderutil - xcbutilcursor - xcbutilkeysyms - xcbutilwm - ]); + libxcb-util + libxcb-image + libxcb-render-util + libxcb-cursor + libxcb-keysyms + libxcb-wm + ]; passthru = { inherit unwrapped; diff --git a/pkgs/by-name/ho/hover/package.nix b/pkgs/by-name/ho/hover/package.nix index ad4f9f92efcb..90de28ebf09e 100644 --- a/pkgs/by-name/ho/hover/package.nix +++ b/pkgs/by-name/ho/hover/package.nix @@ -7,7 +7,16 @@ pkg-config, fetchFromGitHub, roboto, - xorg, + libxxf86vm, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxcursor, + libx11, + xorgproto, libglvnd, addDriverRunpath, makeWrapper, @@ -20,16 +29,16 @@ let pname = "hover"; version = "0.47.2"; - libs = with xorg; [ - libX11.dev - libXcursor.dev - libXext.dev - libXi.dev - libXinerama.dev - libXrandr.dev - libXrender.dev - libXfixes.dev - libXxf86vm + libs = [ + libx11.dev + libxcursor.dev + libxext.dev + libxi.dev + libxinerama.dev + libxrandr.dev + libxrender.dev + libxfixes.dev + libxxf86vm libglvnd.dev xorgproto ]; diff --git a/pkgs/by-name/ht/hterm/package.nix b/pkgs/by-name/ht/hterm/package.nix index 7b66584be0fd..bbd8e1d918a2 100644 --- a/pkgs/by-name/ht/hterm/package.nix +++ b/pkgs/by-name/ht/hterm/package.nix @@ -8,7 +8,7 @@ expat, fontconfig, gtk2, - xorg, + libsm, autoPatchelfHook, }: stdenv.mkDerivation (finalAttrs: { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { expat fontconfig.lib gtk2 - xorg.libSM + libsm ]; installPhase = '' diff --git a/pkgs/by-name/ht/httpx/package.nix b/pkgs/by-name/ht/httpx/package.nix index c31a2c2b6a21..657e57b85f3d 100644 --- a/pkgs/by-name/ht/httpx/package.nix +++ b/pkgs/by-name/ht/httpx/package.nix @@ -5,18 +5,18 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "httpx"; - version = "1.7.4"; + version = "1.8.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; - tag = "v${version}"; - hash = "sha256-Ln0VBlaMsNG3Tmfhk86ARqXPT1T3T5zsbWJXs1bOK7s="; + tag = "v${finalAttrs.version}"; + hash = "sha256-hgeBZJqBFNWqcElfgGv8r1yAzifoD27GHPyxh6LpOaU="; }; - vendorHash = "sha256-SwlBW7BV+SdAR3H3HOpysfWNFWNqOhhsq3fPr2JSvvA="; + vendorHash = "sha256-Ug39SdHVZFf7e1BGcszuTqxdQ5yfVNQiYhcsrvxT4cQ="; subPackages = [ "cmd/httpx" ]; @@ -42,9 +42,9 @@ buildGoModule rec { result reliability with increased threads. ''; homepage = "https://github.com/projectdiscovery/httpx"; - changelog = "https://github.com/projectdiscovery/httpx/releases/tag/v${version}"; + changelog = "https://github.com/projectdiscovery/httpx/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "httpx"; }; -} +}) diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index b6b50e6576d8..36ffdb3fc71d 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -38,7 +38,11 @@ wayland, wayland-protocols, wayland-scanner, - xorg, + libxcb-wm, + libxcb-errors, + libxdmcp, + libxcursor, + libxcb, xwayland, debug ? false, enableXWayland ? true, @@ -173,15 +177,15 @@ customStdenv.mkDerivation (finalAttrs: { tomlplusplus wayland wayland-protocols - xorg.libXcursor + libxcursor ] (optionals customStdenv.hostPlatform.isBSD [ epoll-shim ]) (optionals customStdenv.hostPlatform.isMusl [ libexecinfo ]) (optionals enableXWayland [ - xorg.libxcb - xorg.libXdmcp - xorg.xcbutilerrors - xorg.xcbutilwm + libxcb + libxdmcp + libxcb-errors + libxcb-wm xwayland ]) (optionals withSystemd [ systemd ]) diff --git a/pkgs/by-name/id/ida-free/package.nix b/pkgs/by-name/id/ida-free/package.nix index ab78ed059636..f7bc54417795 100644 --- a/pkgs/by-name/id/ida-free/package.nix +++ b/pkgs/by-name/id/ida-free/package.nix @@ -17,7 +17,19 @@ makeWrapper, openssl, stdenv, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxcb-cursor, + libxrender, + libxi, + libxext, + libxau, + libx11, + libsm, + libice, + libxcb, zlib, }: stdenv.mkDerivation (finalAttrs: rec { @@ -54,19 +66,19 @@ stdenv.mkDerivation (finalAttrs: rec { libxkbcommon openssl stdenv.cc.cc - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXau - xorg.libxcb - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.xcbutilcursor + libice + libsm + libx11 + libxau + libxcb + libxext + libxi + libxrender + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm + libxcb-cursor zlib ]; buildInputs = runtimeDependencies; diff --git a/pkgs/by-name/id/ideogram/package.nix b/pkgs/by-name/id/ideogram/package.nix index ac7d171cfc40..7cb5784d2640 100644 --- a/pkgs/by-name/id/ideogram/package.nix +++ b/pkgs/by-name/id/ideogram/package.nix @@ -13,7 +13,8 @@ libgee, pantheon, desktop-file-utils, - xorg, + libxtst, + libx11, wrapGAppsHook3, }: @@ -43,8 +44,8 @@ stdenv.mkDerivation rec { gtk3 libgee pantheon.granite - xorg.libX11 - xorg.libXtst + libx11 + libxtst ]; postPatch = '' diff --git a/pkgs/by-name/id/idescriptor/99-idevice.rules b/pkgs/by-name/id/idescriptor/99-idevice.rules new file mode 100644 index 000000000000..eb51d32d3526 --- /dev/null +++ b/pkgs/by-name/id/idescriptor/99-idevice.rules @@ -0,0 +1 @@ +SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", MODE="0666", GROUP="idevice" diff --git a/pkgs/by-name/id/idescriptor/package.nix b/pkgs/by-name/id/idescriptor/package.nix new file mode 100644 index 000000000000..43472b1e0afd --- /dev/null +++ b/pkgs/by-name/id/idescriptor/package.nix @@ -0,0 +1,127 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildGoModule, + copyDesktopItems, + makeDesktopItem, + cmake, + pkg-config, + avahi-compat, + ffmpeg, + libheif, + libimobiledevice, + libimobiledevice-glue, + libplist, + go, + qrencode, + libssh, + libtatsu, + libusbmuxd, + libusb1, + libzip, + openssl, + pugixml, + qt6, + lxqt, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "idescriptor"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "iDescriptor"; + repo = "iDescriptor"; + tag = "v${finalAttrs.version}"; + hash = "sha256-pj/8PCZUTPu28MQd3zL8ceDsQy4+55348ZOCpiQaiEo="; + fetchSubmodules = true; + }; + + ipatool-go-modules = + (buildGoModule { + pname = "ipatool-go"; + inherit (finalAttrs) version src; + modRoot = "lib/ipatool-go"; + vendorHash = "sha256-4ZCNgLAcZtEd7zDbIu3kyP/Cyp6TaBM9gyZEohgzCk8="; + proxyVendor = true; + doCheck = false; + env.GOWORK = "off"; + }).goModules; + + nativeBuildInputs = [ + cmake + copyDesktopItems + pkg-config + go + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + avahi-compat + ffmpeg + libheif + libimobiledevice + libimobiledevice-glue + libplist + qrencode + libssh + libtatsu + libusbmuxd + libusb1 + libzip + openssl + pugixml + qt6.qtbase + qt6.qtlocation + qt6.qtmultimedia + qt6.qtpositioning + qt6.qtserialport + qt6.qtsvg + qt6.qttools + qt6.qtwayland + lxqt.qtermwidget + ]; + + cmakeFlags = [ + "-DPACKAGE_MANAGER_MANAGED=ON" + "-DPACKAGE_MANAGER_HINT=nixpkgs" + ]; + + preConfigure = '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH=$TMPDIR/go + export GOPROXY=file://${finalAttrs.ipatool-go-modules} + export GOSUMDB=off + ''; + + postInstall = '' + install -Dm644 -t $out/lib/udev/rules.d ${./99-idevice.rules} + + install -Dm644 $src/resources/icons/app-icon/icon.png \ + $out/share/icons/hicolor/256x256/apps/idescriptor.png + ''; + + desktopItems = [ + (makeDesktopItem { + name = "iDescriptor"; + exec = "iDescriptor"; + icon = "idescriptor"; + desktopName = "iDescriptor"; + comment = "Cross-platform iDevice management tool"; + categories = [ + "System" + "Utility" + ]; + }) + ]; + + meta = { + homepage = "https://github.com/iDescriptor/iDescriptor"; + changelog = "https://github.com/iDescriptor/iDescriptor/releases/tag/v${finalAttrs.version}"; + description = "A cross-platform iDevice management tool"; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ amadejkastelic ]; + mainProgram = "iDescriptor"; + }; +}) diff --git a/pkgs/by-name/im/imlib2/package.nix b/pkgs/by-name/im/imlib2/package.nix index 2614dc6c9151..c20a777b9a27 100644 --- a/pkgs/by-name/im/imlib2/package.nix +++ b/pkgs/by-name/im/imlib2/package.nix @@ -32,7 +32,8 @@ openbox, fluxbox, enlightenment, - xorg, + libxft, + libxext, testers, gitUpdater, @@ -60,8 +61,8 @@ stdenv.mkDerivation (finalAttrs: { libid3tag ] ++ optionals x11Support [ - xorg.libXft - xorg.libXext + libxft + libxext ] ++ optional heifSupport libheif ++ optional svgSupport librsvg diff --git a/pkgs/by-name/im/immersed/linux.nix b/pkgs/by-name/im/immersed/linux.nix index dda4ed55adae..36b46c4c8916 100644 --- a/pkgs/by-name/im/immersed/linux.nix +++ b/pkgs/by-name/im/immersed/linux.nix @@ -38,8 +38,8 @@ appimageTools.wrapAppImage { e2fsprogs zlib libp11 - xorg.libX11 - xorg.libSM + libx11 + libsm ]; multiArch = true; diff --git a/pkgs/by-name/im/imnodes/package.nix b/pkgs/by-name/im/imnodes/package.nix index d7fae28fd0db..aece5ddd1f37 100644 --- a/pkgs/by-name/im/imnodes/package.nix +++ b/pkgs/by-name/im/imnodes/package.nix @@ -6,7 +6,7 @@ cmake, imgui, SDL2, - xorg, + libxext, imnodes, withExamples ? false, }: @@ -39,7 +39,7 @@ stdenv.mkDerivation { ] ++ lib.optionals withExamples [ SDL2 - xorg.libXext + libxext ]; cmakeFlags = [ (lib.cmakeBool "IMNODES_EXAMPLES" withExamples) ]; diff --git a/pkgs/by-name/im/imv/package.nix b/pkgs/by-name/im/imv/package.nix index 18d4da04410f..d4f29d00972e 100644 --- a/pkgs/by-name/im/imv/package.nix +++ b/pkgs/by-name/im/imv/package.nix @@ -14,7 +14,8 @@ pango, inih, withWindowSystem ? if stdenv.hostPlatform.isLinux then "all" else "x11", - xorg, + libx11, + libxcb, libxkbcommon, libGL, wayland, @@ -50,8 +51,8 @@ let windowSystems = { all = windowSystems.x11 ++ windowSystems.wayland; x11 = [ - xorg.libxcb - xorg.libX11 + libxcb + libx11 ]; wayland = [ wayland diff --git a/pkgs/by-name/in/inih/package.nix b/pkgs/by-name/in/inih/package.nix index 4bfe3df86292..f1e4c50c8b7b 100644 --- a/pkgs/by-name/in/inih/package.nix +++ b/pkgs/by-name/in/inih/package.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { ninja ]; + outputs = [ + "out" + "dev" + ]; + meta = { description = "Simple .INI file parser in C, good for embedded systems"; homepage = "https://github.com/benhoyt/inih"; diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix index d703194effe9..bbfe5db25c18 100644 --- a/pkgs/by-name/in/inlyne/package.nix +++ b/pkgs/by-name/in/inlyne/package.nix @@ -6,7 +6,11 @@ stdenv, pkg-config, fontconfig, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, libxkbcommon, wayland, libGL, @@ -36,10 +40,10 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ fontconfig - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libxcb + libxcursor + libxi + libxrandr + libxcb wayland libxkbcommon openssl @@ -71,7 +75,7 @@ rustPlatform.buildRustPackage rec { --add-rpath ${ lib.makeLibraryPath [ libGL - xorg.libX11 + libx11 ] } ''; diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index 52cd47569f68..436d8648805b 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -4,7 +4,7 @@ fetchurl, dpkg, libuuid, - xorg, + libx11, curlMinimal, openssl_3, libsecret, @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { intune = lib.makeLibraryPath [ stdenv.cc.cc libuuid - xorg.libX11 + libx11 curlMinimal_openssl_3 openssl_3 libsecret diff --git a/pkgs/by-name/in/inxi/package.nix b/pkgs/by-name/in/inxi/package.nix index 111b67019f64..1ca7af8652f9 100644 --- a/pkgs/by-name/in/inxi/package.nix +++ b/pkgs/by-name/in/inxi/package.nix @@ -25,7 +25,9 @@ pciutils, withRecommendedDisplayInformationPrograms ? withRecommends, mesa-demos, - xorg, + xrandr, + xprop, + xdpyinfo, }: let @@ -46,14 +48,12 @@ let upower pciutils ]; - recommendedDisplayInformationPrograms = lib.optionals withRecommendedDisplayInformationPrograms ( - [ mesa-demos ] - ++ (with xorg; [ - xdpyinfo - xprop - xrandr - ]) - ); + recommendedDisplayInformationPrograms = lib.optionals withRecommendedDisplayInformationPrograms [ + mesa-demos + xdpyinfo + xprop + xrandr + ]; programs = [ ps dnsutils diff --git a/pkgs/by-name/ip/ipmiview/package.nix b/pkgs/by-name/ip/ipmiview/package.nix index ec6543c27094..4761fd92fa96 100644 --- a/pkgs/by-name/ip/ipmiview/package.nix +++ b/pkgs/by-name/ip/ipmiview/package.nix @@ -11,7 +11,11 @@ gcc-unwrapped, iputils, psmisc, - xorg, + libxtst, + libxrender, + libxi, + libxext, + libx11, }: stdenv.mkDerivation rec { @@ -29,7 +33,6 @@ stdenv.mkDerivation rec { makeWrapper ]; buildPhase = - with xorg; let stunnelBinary = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -44,11 +47,11 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${ lib.makeLibraryPath [ - libX11 - libXext - libXrender - libXtst - libXi + libx11 + libxext + libxrender + libxtst + libxi ] }" ./jre/lib/libawt_xawt.so patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/libfontmanager.so diff --git a/pkgs/by-name/ip/ipscan/package.nix b/pkgs/by-name/ip/ipscan/package.nix index 9180269a4e4c..8497ae57c9cf 100644 --- a/pkgs/by-name/ip/ipscan/package.nix +++ b/pkgs/by-name/ip/ipscan/package.nix @@ -6,7 +6,7 @@ jre, swt, makeWrapper, - xorg, + libxtst, dpkg, gtk3, glib, @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix LD_LIBRARY_PATH : "$out/lib/:${ lib.makeLibraryPath [ swt - xorg.libXtst + libxtst gtk3 glib ] diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index c44851d0e337..0e483c20773e 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -50,7 +50,8 @@ let # Isabelle uses a branch of vampire that is not in the normal release line # that adds support for higher order goals - vampire' = (vampire.override { stdenv = gcc14Stdenv; }).overrideAttrs (_: { + vampireStdenv = if stdenv.hostPlatform.isLinux then gcc14Stdenv else stdenv; + vampire' = (vampire.override { stdenv = vampireStdenv; }).overrideAttrs (_: { pname = "vampire-for-isabelle"; version = "4.8"; @@ -61,7 +62,16 @@ let hash = "sha256-CmppaGa4M9tkE1b25cY1LSPFygJy5yV4kpHKbPqvcVE="; }; - cmakeFlags = [ (lib.cmakeFeature "CMAKE_BUILD_HOL" "On") ]; + patches = [ ./vampire-add-install-directive.patch ]; + + postInstall = '' + mv $out/bin/vampire_rel $out/bin/vampire + ''; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_BUILD_HOL" "On") + (lib.cmakeFeature "CMAKE_DISABLE_FIND_PACKAGE_Z3" "On") + ]; }); sha1 = stdenv.mkDerivation { diff --git a/pkgs/by-name/is/isabelle/vampire-add-install-directive.patch b/pkgs/by-name/is/isabelle/vampire-add-install-directive.patch new file mode 100644 index 000000000000..5be3502600b8 --- /dev/null +++ b/pkgs/by-name/is/isabelle/vampire-add-install-directive.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -997,6 +997,8 @@ set_target_properties(vampire PROPERTIES + ) + configure_file(version.cpp.in version.cpp) + ++install(TARGETS vampire) ++ + if(CMAKE_BUILD_TYPE STREQUAL Release AND IPO) + message(STATUS "compiling Vampire with IPO: this might take a while") + set_property(TARGET obj PROPERTY INTERPROCEDURAL_OPTIMIZATION true) diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix index 6cac3298d81a..b337c74dd618 100644 --- a/pkgs/by-name/is/isle-portable/package.nix +++ b/pkgs/by-name/is/isle-portable/package.nix @@ -10,7 +10,14 @@ pkg-config, # Build Inputs - xorg, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxcursor, + libx11, wayland, libxkbcommon, wayland-protocols, @@ -62,14 +69,14 @@ stdenv.mkDerivation (finalAttrs: { iniparser ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXext - xorg.libXrandr - xorg.libXrender - xorg.libXfixes - xorg.libXi - xorg.libXinerama - xorg.libXcursor + libx11 + libxext + libxrandr + libxrender + libxfixes + libxi + libxinerama + libxcursor wayland libxkbcommon wayland-protocols diff --git a/pkgs/by-name/it/itsycal/package.nix b/pkgs/by-name/it/itsycal/package.nix index a2473445bedf..2f6941f9d4d5 100644 --- a/pkgs/by-name/it/itsycal/package.nix +++ b/pkgs/by-name/it/itsycal/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "itsycal"; - version = "0.15.8"; + version = "0.15.10"; src = fetchzip { url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip"; - hash = "sha256-zo77yCfIzb2ZmExJslQ64GPQqakXtiRmm0UYEgj+3eM="; + hash = "sha256-6+E/4SbRIChJMc2VDMNYongsAWRtcFxtIj6lvTiexrU="; }; installPhase = '' diff --git a/pkgs/by-name/jf/jfbview/package.nix b/pkgs/by-name/jf/jfbview/package.nix index 8d099de18acc..ff649a23ff6d 100644 --- a/pkgs/by-name/jf/jfbview/package.nix +++ b/pkgs/by-name/jf/jfbview/package.nix @@ -11,7 +11,7 @@ ncurses, openjpeg, zlib, - xorg, + libx11, cmake, }: @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { libjpeg ncurses openjpeg - xorg.libX11 + libx11 zlib ]; diff --git a/pkgs/by-name/jg/jgmenu/package.nix b/pkgs/by-name/jg/jgmenu/package.nix index ce599c2efc51..88b90bd0257d 100644 --- a/pkgs/by-name/jg/jgmenu/package.nix +++ b/pkgs/by-name/jg/jgmenu/package.nix @@ -9,7 +9,8 @@ libxfce4util, libxml2, menu-cache, - xorg, + libxrandr, + libxinerama, makeWrapper, enableXfcePanelApplet ? false, xfce4-panel, @@ -39,8 +40,8 @@ stdenv.mkDerivation rec { librsvg libxml2 menu-cache - xorg.libXinerama - xorg.libXrandr + libxinerama + libxrandr python3Packages.python ] ++ lib.optionals enableXfcePanelApplet [ diff --git a/pkgs/by-name/ji/jibri/package.nix b/pkgs/by-name/ji/jibri/package.nix index ba21f38becd8..a50fbede9a46 100644 --- a/pkgs/by-name/ji/jibri/package.nix +++ b/pkgs/by-name/ji/jibri/package.nix @@ -6,17 +6,18 @@ jdk11_headless, makeWrapper, writeText, - xorg, + xorg-server, + xf86-video-dummy, nixosTests, }: let xorgModulePaths = writeText "module-paths" '' Section "Files" - ModulePath "${xorg.xorgserver}/lib/xorg/modules - ModulePath "${xorg.xorgserver}/lib/xorg/extensions - ModulePath "${xorg.xorgserver}/lib/xorg/drivers - ModulePath "${xorg.xf86videodummy}/lib/xorg/modules/drivers + ModulePath "${xorg-server}/lib/xorg/modules + ModulePath "${xorg-server}/lib/xorg/extensions + ModulePath "${xorg-server}/lib/xorg/drivers + ModulePath "${xf86-video-dummy}/lib/xorg/modules/drivers EndSection ''; diff --git a/pkgs/by-name/ji/jitsi/package.nix b/pkgs/by-name/ji/jitsi/package.nix index f10caa8b259f..1f7048158088 100644 --- a/pkgs/by-name/ji/jitsi/package.nix +++ b/pkgs/by-name/ji/jitsi/package.nix @@ -12,7 +12,10 @@ gtk2, libpulseaudio, openssl, - xorg, + libxv, + libxscrnsaver, + libxext, + libx11, }: let @@ -47,10 +50,10 @@ stdenv.mkDerivation rec { gtk2 libpulseaudio openssl - xorg.libX11 - xorg.libXext - xorg.libXScrnSaver - xorg.libXv + libx11 + libxext + libxscrnsaver + libxv ]; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/by-name/jo/jogl/package.nix b/pkgs/by-name/jo/jogl/package.nix index 06be6562a899..6c09360c2c47 100644 --- a/pkgs/by-name/jo/jogl/package.nix +++ b/pkgs/by-name/jo/jogl/package.nix @@ -9,7 +9,13 @@ stripJavaArchivesHook, xcbuild, udev, - xorg, + libxxf86vm, + libxt, + libxrender, + libxrandr, + libxi, + libxcursor, + libx11, libgbm, coreutils, }: @@ -77,13 +83,13 @@ stdenv.mkDerivation { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev - xorg.libX11 - xorg.libXrandr - xorg.libXcursor - xorg.libXi - xorg.libXt - xorg.libXxf86vm - xorg.libXrender + libx11 + libxrandr + libxcursor + libxi + libxt + libxxf86vm + libxrender libgbm ]; diff --git a/pkgs/by-name/jo/joplin-desktop/buildPlugin.nix b/pkgs/by-name/jo/joplin-desktop/joplin-plugin-backup.nix similarity index 54% rename from pkgs/by-name/jo/joplin-desktop/buildPlugin.nix rename to pkgs/by-name/jo/joplin-desktop/joplin-plugin-backup.nix index 40b2d68d036a..8ee2d3a23840 100644 --- a/pkgs/by-name/jo/joplin-desktop/buildPlugin.nix +++ b/pkgs/by-name/jo/joplin-desktop/joplin-plugin-backup.nix @@ -2,36 +2,30 @@ lib, stdenv, fetchzip, - npm-lockfile-fix, buildNpmPackage, clang_20, - name, - url, - hash, - npmDepsHash, patches ? [ ], }: +let + releaseData = (lib.importJSON ./release-data.json).plugins."io.github.jackgruber.backup"; +in + buildNpmPackage { - inherit name npmDepsHash patches; + name = "joplin-plugin-backup"; + + inherit (releaseData) npmDepsHash; + inherit patches; src = fetchzip { - inherit url hash; - postFetch = '' - # Add missing integrity and resolved fields - ${lib.getExe npm-lockfile-fix} $out/package-lock.json - ''; + inherit (releaseData) url hash; }; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 # clang_21 breaks keytar ]; - postPatch = '' - sed -i '/preinstall/d' package.json - ''; - npmBuildScript = "dist"; installPhase = '' diff --git a/pkgs/by-name/jo/joplin-desktop/missing-hashes.json b/pkgs/by-name/jo/joplin-desktop/missing-hashes.json index 7c3f79d470e0..c6a4bcfdc1f8 100644 --- a/pkgs/by-name/jo/joplin-desktop/missing-hashes.json +++ b/pkgs/by-name/jo/joplin-desktop/missing-hashes.json @@ -1,76 +1,100 @@ { - "@esbuild/aix-ppc64@npm:0.25.4": "c3d5aaf00899940960a27f93a63d9169efc4ff317f10bc3608291678ce71255d657129061dbfa016a0d16fd7b6bfbeb9d37558e9113432f8ff5d04b8b8e54b2f", - "@esbuild/aix-ppc64@npm:0.25.8": "451dc5fd41cf67ccc24b8d1da6f95b1082552b6908f0cb0c78fba3da39a4b6c3669ce37dc3c2c383cc18266ea35c0fcec6696fb24f8a0aaf097b94def035c129", - "@esbuild/android-arm64@npm:0.25.4": "aa5285109d86607c973ee8d20b582cb444bae31457982dbd3b004feaa4776d145d48a6692537defd8477f2bd0bdf06ff8c7e688dd07fe30b5d031c6dd434c580", - "@esbuild/android-arm64@npm:0.25.8": "ef542eda68837bd16cdae4ed99c312405673da95ec3fba1d2f0f102cbd983fdd7357acd1504b5a5ef517b952c9978a0c4baa65211626db6cf862e2bf9ebebe49", - "@esbuild/android-arm@npm:0.25.4": "8c5c306e03044527fb2f4eaaeda255d7f40d6a3d02aa9abd1334d67a9ea1a5ab2ab654df77eb7e17e64947c5893e1ba53fc9d3bbefa15f0692e6b56823c47abc", - "@esbuild/android-arm@npm:0.25.8": "a0a5995ed8ff2c9775e8395d3da0b7d7b9246040db680aedeb8df9ca980891fe322a6b833cf0bc554852de351aa1351b37aff0213113d4d4afd28c638edc74f1", - "@esbuild/android-x64@npm:0.25.4": "aa8665b302b65ca62e15a34e72e43d1ce7a253a354d8684cbe5ea1a04a79d1323416b46c727d6ab73a76a4ec047fb2859b054f8f80fe9ac1d286a4d00ed754e6", - "@esbuild/android-x64@npm:0.25.8": "afb24505bf544e53c71707456a85dc21bcc26106c1863aad85733eb5d5bd2e334cb58a2fe31973b4311cc08802493c8d920f41c91f88884baf4c6700a04182ec", - "@esbuild/darwin-arm64@npm:0.25.4": "81b4d0482813ccff8c783035317d78220a4ec3eee3798e50b804a781a071f5790c7903c2f9216a25f5c167becd4c3d78fcf0a13e454b3973eb7d82b7ce1d4688", - "@esbuild/darwin-arm64@npm:0.25.8": "c5bcf68dce1ba9fa111c2da068c50ade5fd74f724bab93058542619a67554b598ef0c47593f4d5cc382f0ac53507e2bc0ac3111824df9d5776c7cd8fe2c28001", - "@esbuild/darwin-x64@npm:0.25.4": "633d97f18c299c8da3730ae04831895779b5f1271020cc924e06c6a5f0c5aac9f0653d60cca7d6ac23926797368301cd6ce2059b25f432aa2f1f378fcb34530d", - "@esbuild/darwin-x64@npm:0.25.8": "db948746f087aace173b52d08b7085514755cbc5bab7f1e64ff7e075489fb8596c7490038bea9e54337586ba02ca3c9f56365029660e711a380bb30f1dccb41a", - "@esbuild/freebsd-arm64@npm:0.25.4": "4d52cf4e18e1f4ab2fd80c4c4a9ab9c20658c77d832d33603b5d19b3ed4565ad7186b86e30a92b78aa11694d884201d0914dba649d6277737574896a897a2af7", - "@esbuild/freebsd-arm64@npm:0.25.8": "faa5a23e4f2e8d1fae84ea0ae424b3b89e8c425e15427e749d0ca9f5a8ca77c6b237886914ce61495ce1f01cb5430b0e55ea61d21a2dc4930be09dffec56059f", - "@esbuild/freebsd-x64@npm:0.25.4": "af75d6724969c4d831bb09209f4ddb46532516932db98a3e4c5c5dcc7f3cd0fe0930f2875fa901b8bb9c0ecfe0a65313da6127ea9387c63859e5d58cff975e68", - "@esbuild/freebsd-x64@npm:0.25.8": "e5a93cef5e2c6b191f178aa73137d2c44cee60a7a6be8806d630ec82ff1dfc72ccd30297c6b607d2ad715ef20b88068e93abb0fa8e187c8fe2547920eef9b4e7", - "@esbuild/linux-arm64@npm:0.25.4": "72b7e3b8fe3bd27206577f8eceea1e0c289dc01fa2f5b03fe22f4ea27931ca664a9b93b35f9ae424e78552caec76330383fe7dc5afeeaffa0e00645ec143a49b", - "@esbuild/linux-arm64@npm:0.25.8": "deb61aafe7a2cb32d9f43b5030fb070856f45210d2ac8ac9ce527fec4016bb4a58ffea93536834cd386786cd6ec40327e057853b0348b45d7a06e6eeec71a63c", - "@esbuild/linux-arm@npm:0.25.4": "407dcf9e8fc4ebc75689b6257be576047c03285067b5b22db74dd07ae067f8dd9126936dedfeb27934e09d0d700ecb3f8d70876fe61b90d92355f35c2a5d6540", - "@esbuild/linux-arm@npm:0.25.8": "3382c6f8e7b3bb479c5b4a01b0baa78054efdf002241eea1d606c8727b9d2168f0ee1798b5627de6b92285b85904e358c9531a1c0f07ef585845fd7d88696db4", - "@esbuild/linux-ia32@npm:0.25.4": "47b13c9952c893e749380551dfa3580eb562a0394911a9ced68b23c0cafe116614b30ffd6744dc71ec312fab8bc7115f856f078fe29f1253a1dd99d3215a1424", - "@esbuild/linux-ia32@npm:0.25.8": "e32f2fa63c74d6723c876cec9b42c04e6aa5e6d0cd9a7447d0b4b00d7615a484da55ef95b4fcf871492019a007c40defb497ef6075ad94da46b6121828fcf83a", - "@esbuild/linux-loong64@npm:0.25.4": "75222fb808060b3f2507aee40c6ee877a1ed768c593dd8f192e1ea640bddf3b414080407ddaccac6d0cde35750a7f92c434e04af2c142075dc810c5b7a7ce5eb", - "@esbuild/linux-loong64@npm:0.25.8": "a55894549cd7e64c2062863eaf697175a1d6f86def565555614ad335b462afbfebf403ec0f1d83bf8dff145d57c4046815b26c70e98f068a9f99317fc37d71e8", - "@esbuild/linux-mips64el@npm:0.25.4": "3f129931a6973a4fa470ddc46e3e3fa150aca64029951fe7a8d9616f41ddf8422d3744a30b0c5f36a35bff19b32b25c85bf1e5760537b329f18558e289213eea", - "@esbuild/linux-mips64el@npm:0.25.8": "5c1ef406e07fbb766417be11b859baa3e905587c8bf3465f0f6ffd6cfd54b658ceffc616bfbea0340473deaebd430db6aea33468876796bcad83f05bf1910d9d", - "@esbuild/linux-ppc64@npm:0.25.4": "6f84018eda99c3f06d519abbdbdf15700707236b8643ba24150d5168062ba310ee3c972645554b05d4b768438697a9a04014bc884a1beb15bf05bbe1b29e34ca", - "@esbuild/linux-ppc64@npm:0.25.8": "a5f386bd5b18eb3eb7f240b112595182f450382ca93a7d6cad4c57b82e13830aff22250ff02728dd5b8d65f3b9908ef291f223a6e83d78d64f497d3117a567a1", - "@esbuild/linux-riscv64@npm:0.25.4": "c5b674c2f48c5292f594141a4739f9f266ce8a1a2514eaefacc6fac761f1fa6c208981ca4c9e774c383ca33a46cad539b1fa46af6827cf89db721f33c36093c8", - "@esbuild/linux-riscv64@npm:0.25.8": "6b624062871ac3bb93af3b560a97fb489eef06cb12f4716c0c7d54fb31d4047fec570bbc9cc2bc9f98e8a4fbd07db6fa542115c02ec3bb66922e8b1988304cc1", - "@esbuild/linux-s390x@npm:0.25.4": "a54c0972230a2264714371f6545ff0d9b20d349b08e4837e7063378886f88c08ade0ed5b2c7ba744c4679deb2f60e8485ef475f92cdbadca9d34f462a2724cc1", - "@esbuild/linux-s390x@npm:0.25.8": "c13f82778a07b14fa50d52322f4b347bea6540a207e0468b060588922fae2278ae1b18a88bbd1cf3656b5d7eb8a84dcf8a237c91e7e0629fa6e56be41db46055", - "@esbuild/linux-x64@npm:0.25.4": "1ba32d40895c826e6990157a141e23d68fdf00b46d60ef3572a89781f177df75e023d38b130087b167a6e38410c3af0a6bec7b2d3b1af2a37a21c1ed70dcba45", - "@esbuild/linux-x64@npm:0.25.8": "e6483e5c367e7c35899c98bc378e8a37f5617a741297d9b91c59c1d29b9b00f26f9c315a736b41af33f21d9d74a8c648715ce13ac520b3fa7604978a05dedd99", - "@esbuild/netbsd-arm64@npm:0.25.4": "37bc10864f14c60f995e2ef13bb53102d0ce0eab1d32dfe5f48254aafe6d791d7129cbb00c6acf9e32b561db5420c5558b84800cf6958d40d3d55a7e3f456ebb", - "@esbuild/netbsd-arm64@npm:0.25.8": "02afba2e5fbf8e8cc4c375edfce673b38015213744f1df05a74ab9de99f5860e50dc26af97b4f0b4f804c461ab45cfa773603ce0e1b0528bd93e7a979eca7682", - "@esbuild/netbsd-x64@npm:0.25.4": "6875cc83961e613dd28f1c1d5c3b7404dc7cd4b54071596712c56574b1a24517424483c7c363c0aefa8259cf2d621e080b8270c0c242010ad04ce367aa87e897", - "@esbuild/netbsd-x64@npm:0.25.8": "76c43cc94f9b287a6a0d277d51f17e650d168e26008741e86035f2e054b8216d61855feddc2c0b48f989b46c58913168148a30b30fff5b87a1bc08fd78cbd0e7", - "@esbuild/openbsd-arm64@npm:0.25.4": "a7981586bbfea74746aa87113089020c73677209b71fadab43e6693c141b9415c342df01694e70aa607a1e80e9e37ccf4682dc2f095cae1ffb60c740e63e7d32", - "@esbuild/openbsd-arm64@npm:0.25.8": "9c0fbf35b6cefcc46c1c545520c50c65e89d620c65c97a55d47f1440e908cbbe6535073cb78ae69c1e2ba76621f09f3ab0f4bf9d5567660b8726c198a0ebdb0f", - "@esbuild/openbsd-x64@npm:0.25.4": "7b1bf4a5032e32ed3ce33bf9373964bdf29e49b0e16179e179d7c7dd0a36dbc6ee98ba67e0ef637ed7823b3ac094e21ccde848a066deb091bacc6ea4726a2ede", - "@esbuild/openbsd-x64@npm:0.25.8": "cd45098a84bcc86d4b1a809cf6e5f9548aa69cdff3a0f63a9bb039d05fdfd0daa2e166e1e30b8fbb71ede895dfc9c371e8368e3d51e7bf0484083f9bb112945a", - "@esbuild/openharmony-arm64@npm:0.25.8": "769c3e589d62648c67cd36306aaee683429e42e7d02608a52929f245c3a42d8036156fe90d59aff7695c2e75712be89ae4d4f06f4249f15a06bdc091ff42908d", - "@esbuild/sunos-x64@npm:0.25.4": "e1807f6dbd3bdf2f1ff9dc404fe0b667dea3bb03825344728de264c4f15323e99e3f1d8125b5c39e2aae94d2c1cad344e3b8a77b5e8c8e0004f09aa12daa82d9", - "@esbuild/sunos-x64@npm:0.25.8": "8b3c79794775dce54d8d2c2c87cf876e8708ba2d7ca0ccda41d96c9bf3193237909f148195a20b7fa876c8e07def6db22510948a795156beeace160e9830ab62", - "@esbuild/win32-arm64@npm:0.25.4": "0422de25c136f407bc223e1a9a65a6f528e64201a1b06b7ddcf3190045914c6d68f550a8190d18e58c4e22231acc4c7982d45bd5ceab6a739e2c539d135376fe", - "@esbuild/win32-arm64@npm:0.25.8": "80f13cf66b45a32892f9b433689897362b69042173bc1e47ff333d8dd9df746be27bee031197653ee4e034a1563f61ae34efc44c61160a104dfda6500f6b4936", - "@esbuild/win32-ia32@npm:0.25.4": "5a8738ba94c72bc07bd17952cb5ba7f7f13593687cfe57792d36fcd9809082ac95ceb54b7739da68044de01f6d5d6826a2587ea2bce48b0de1c70f8de9b5257e", - "@esbuild/win32-ia32@npm:0.25.8": "e4f0595306b2acbf19b62305c7acf97aa18954acf04f194c3cfd7a5782fab145ec6a551eaf657c3f0d2774cf19bc1fcb7ba76fb10cac32a4c2f48825c955690e", - "@esbuild/win32-x64@npm:0.25.4": "0bc72a7dc50b20d2cb7cd38a0d85ab3ff0c6467ba7d817a74da8c671703f97c7c7f7a7375d0069c3f0a76571dc04a1072852e711131cf4d1a62a70e7a38449db", - "@esbuild/win32-x64@npm:0.25.8": "4bf57733c5c4c1409cfceaf19bf5b8ce3c9b9a29705bc8a24fc72652846afd0bd478b14a17db326ae27896574ee346ffb96b2fa043f0716d1a7f30b89f8b3855", - "@img/sharp-darwin-arm64@npm:0.34.2": "891e401a14429d293c1cdd1a9dd47b81f3fafd1b14a57f884307727662af1541dcd802a31488c394113a4ab25ebcbab1246c5ab3c90beba42f7e8afaf56f073e", - "@img/sharp-darwin-x64@npm:0.34.2": "8d5e11f3430fa61966cb600cd23e2217f1666d481bbf754bdd731e60d4a6c34c78ff0169f7ec3463252d6542b0a3bafc0686473650b0e6b8a45fddbc49a8b52a", - "@img/sharp-libvips-darwin-arm64@npm:1.1.0": "f6bcbe44fa9bc0c4c87af8c655c7ecdc704b684da1169841921ff7c61692167ee3ab6a4a3a8131f206f0aa7245987be1c07a483111eadd3a684b1547ca2acf02", - "@img/sharp-libvips-darwin-x64@npm:1.1.0": "af6cd4ca1ccc96dcd5cb20ac45941180117baad387331a699a05e588fa843b85d327651356940d9e3e2c1fe17f0ce183043bebf882086d3cb0785bb4bc8bca05", - "@img/sharp-libvips-linux-arm64@npm:1.1.0": "1d62f454f599580d64ecf72da24a08cb9347f1319e31678594f432e71762053c60c7bca5d70be720285b0754d8ed842efb160bef02abe36f5f57d735db0c012b", - "@img/sharp-libvips-linux-arm@npm:1.1.0": "5028a1ad8e247dc1624baaa084e981f2f152c7ee5f567ee253720b4553d06a969bd6285f1795b374532f99e63b44b4d39494cc3d5dd8f438dab67d4c018f3520", - "@img/sharp-libvips-linux-ppc64@npm:1.1.0": "d7c39d636083be25c71966e992803d652f5260c8fa0ece49348705c739042851c83057ec1f2d1cad8419afd3132311a6a0fcade343e69c9fbe8cbd8a12a54056", - "@img/sharp-libvips-linux-s390x@npm:1.1.0": "612a7a967192a2bb31d757305a0abac4bdd17f4e41fed4fccee673961fd3743d1f435e9869efe324fa726d39286bcb4bfc9d5b7ceaebb2700483a3d6e2be0eb5", - "@img/sharp-libvips-linux-x64@npm:1.1.0": "73cea31f06110740998a44cb27387d59ab5878fdb4080213a46bf312fee1e8a3b69b8d97a78611fe951fc113d7aa732d0a7d8acadf6bc77322e73b6d5228f5f2", - "@img/sharp-libvips-linuxmusl-arm64@npm:1.1.0": "21d8124bccdc98817fc69022826a18a2630fbc1a3b16bfaf1d7f7c3df95d834cd75ef79e54c2edd0be44481d26e0f98ebcadc7b5e30bd73bf9afa66224cc4f8c", - "@img/sharp-libvips-linuxmusl-x64@npm:1.1.0": "6671bcdb165a7958b0478c64a5acd7eb279ebea446b91e938888a1d6e2e7c58699c55bf4a856047847e6cc56a6cdc60c9a13e2a002f081c923331585a0db2c73", - "@img/sharp-linux-arm64@npm:0.34.2": "4e314f4ea4182c6b67d03eaa8600afd78fa298f17e6f71e7d78fc3e2b91d65c3eca0474979cc9ab48eea7573d1150609326955a2b4ed168cbcfb881ca8632bb3", - "@img/sharp-linux-arm@npm:0.34.2": "3ec11f1c8312d4313623f20a09f60e53c07770c64dac50264f9da2e60688d992abb8a55ba4c665c88204db611cecf6e16d6397e57aac92390bddc2d7ee6a9ac2", - "@img/sharp-linux-s390x@npm:0.34.2": "1fc3ae6eeb2af800567d26582ae97465ce5bf3aee4b4125f3b11899c8aec9b6b9e538bfc1176c257788c20e67d6f57cb1e67e9fe6c96c900d2b43127ef6a3f45", - "@img/sharp-linux-x64@npm:0.34.2": "8bad1ee5e9a23520da830090e29e2c8fc62c6dcf9255e490cfb664483423126b6a5417b1beb0e5433f678bd91996ebbc925c6a5f2cf477966ca4a5ebeee3fdf5", - "@img/sharp-linuxmusl-arm64@npm:0.34.2": "f4189234d072002934a77ea9131514fa4922c3d6acdec9768e9ca88cb088d67f1001a07fe19a920abcdbd7888b0a408128ec5561849829f8c99c4814dc04315a", - "@img/sharp-linuxmusl-x64@npm:0.34.2": "884532e80b772891d9452a1e6ad070e4668cd4aceb91935b7352d96f0813f1a6a3fafa3550e63f6f93dbcfdaafe8e8dcee7d6df6e12ebe3b66ca69d947ef0572", - "@img/sharp-wasm32@npm:0.34.2": "ca383f6c9a8d7afc00c446b175cbc8b7827d5e02c602aeb6e889f641e3eac4b3969bbed62be8c5e595f4774b378f39d67b8f3558b1ce4ff361298e8fe3efd5ec", - "@img/sharp-win32-arm64@npm:0.34.2": "b7ce72e2861be11dd9ba8a0f00da57d97d4c93e88abf5f276dee516bde07527931908913cc576acc77c1f3cc61567e557cb927afcc88c5abee5d255f70f124a3", - "@img/sharp-win32-ia32@npm:0.34.2": "edf6719745e473a4cd13745cd3543c885dc076bee38b8f8b7ee42967670e6403d54d060c22288c3118c3872acdbfa27042df6b941e62d61e81294ed309828c77", - "@img/sharp-win32-x64@npm:0.34.2": "bb153458a2b1b4d794e1267b53626d7ec9080fddf38df2321b8e9d71da0eeea4669df7d88365e22c51f445595e5f281d7986dd5678cf8c331ad724f0dc29d06c", + "@esbuild/aix-ppc64@npm:0.25.10": "6ed1afe8ab7e186e94ca26c359c685d11394deb101f0d61d62ce00f1d29147edf04a441b532f2fd683484cd980973e41e0d9bca7a71fdf2d1bcf767d45d28d18", + "@esbuild/aix-ppc64@npm:0.25.12": "b2cc7e0cd348bc315907f6ce090ee545d4157a19fc44327ff0262ba9296f0fad19c57dd679b1b526a0a18f34f1971b128e15b41bca794c74a9b2c32238fdd537", + "@esbuild/android-arm64@npm:0.25.10": "3e2d57893179a673aebeeff8779e96532da0a9f204bd018f94fb7db258d65d1324e47c621a7d5399f5ae0a51337a44897e8e003d940d4120d749e57fb3b139f5", + "@esbuild/android-arm64@npm:0.25.12": "f770937988ec42e289277abc03800ccf88902684dbda3013a8ab274bb9eca36d35619a75f0f0510e225bdb4c7cf9a426218c7d2641a98fed74287a52d60d8865", + "@esbuild/android-arm@npm:0.25.10": "c0785d963c24bab19a8a07cfa47c174d7be7bf46e329726686d743a14604b096f3a85f42807ff72dd918094d117396d3005ae88a20f15b2304691fa7d8d6b7fd", + "@esbuild/android-arm@npm:0.25.12": "7a5d507aa717d85470c595e11f3c03fbf4f0bffdd10d30f49e1a3f14c2553191f156b214eacd6911fa36719faef23c28be7d88ac876ec300995987964ea16e99", + "@esbuild/android-x64@npm:0.25.10": "f49fbfeb6f95589ecc152668266a28ce37cc24c10756c203898be07af127b09eaf077428cef86dbcbd6f207706e8917dc6d354558afcf5cf7c532ea882b13779", + "@esbuild/android-x64@npm:0.25.12": "cd459b0433b0541bae9ffafd274c57529125719a5b78f4ee92aa9f8a1f54b002a18d889bee19084a503c114412269ef4e740d21b4a2de811ec2a076e96b35f48", + "@esbuild/darwin-arm64@npm:0.25.10": "2d049309a05272607dda18f59ce0b262ec1ae383133697b7a0c013c0835ec72910f61fd17a1be744c17562a092b1fa0a945ee1bd2cdcd029922c6401727a46b0", + "@esbuild/darwin-arm64@npm:0.25.12": "067f4588b9b64c93742c4a8cec35282dd076583006ce8089aae3095fcae5b606a2f60d86caf0527be6009be234178fb83d360af82698e2017a6f9fb9345e084d", + "@esbuild/darwin-x64@npm:0.25.10": "4eae1ae1486307a9cdc521e0416f28dff3f2693d051c81de15378bb100aef809f862526cb9c03360db69aa6832762b01b955f0a8bbcf8adc191af87d9f0e4e4f", + "@esbuild/darwin-x64@npm:0.25.12": "c29947d07adacadcb29092860b69d1b668d9c5abfaf525e2a7f3ece61c3f4e72a95c1c66ad0e80fbf31d01210ae4e8330d4ae6d9c6c9ad2b8aa159eb115f9a8d", + "@esbuild/freebsd-arm64@npm:0.25.10": "f4915a93ba262028f30fe5d87210ef84e1fa725cb76fbc4ab9c72c4d6a862d79c6ac2c54f6e606a8a53ab1ecf53c21fb5064571147e8a9a10aabf1a7d95f32f6", + "@esbuild/freebsd-arm64@npm:0.25.12": "c51691aeb04e41c554a59cbb5ab8d917446f352aeec70e3d5a7f25409e9115ff2db930589052df3e7d60f03eff4c298bda89db62f2408d1a49b6a70e69c5d4a0", + "@esbuild/freebsd-x64@npm:0.25.10": "94628bffea4936e26570450348be6629b1872ad73cc4af7efdc2bd29ba95a6f3bcfd87b3ce0371f61fee22bbfa5e6f9e148a6c6b8c62c5b32a0786ec4ba7b789", + "@esbuild/freebsd-x64@npm:0.25.12": "9b84c48176350811690751c34d1513005290641923a161f96cb433cbcbb8c072ecb92cef39ba641f48032071f74c6119e5f081b5788242109426c54f3ef1a01e", + "@esbuild/linux-arm64@npm:0.25.10": "ec1d900010bba313b403a7350a87e10ad0eb390373b290158e98902cb3ad15738596af7ad188942db1fec027b9e73336f193d8bce821097d13c224ecaa832550", + "@esbuild/linux-arm64@npm:0.25.12": "1e9cc29569890f5944e7dbe2e597eb19d76e85fe07aef6253129b16800ccb5b33a79cea17873d7debdf681d34adf77e06ae99742fe06cab095f3db441b741b1e", + "@esbuild/linux-arm@npm:0.25.10": "5459fc95b966199b27060a0926d5a1822d4c7f4132150fbbdee99eb3960b8cef8314c451c4f8c4d02e39c12b36267bbd59f030fda8a9b512ca2bd44dbb4bafe7", + "@esbuild/linux-arm@npm:0.25.12": "fcf091d6a51834c9a942ee33b568342990c7fa29d2ff338ce628a41bc415696d09bca7ef502c2b04518973010f73ab3d13e37096030db9c8d393ab29408f104b", + "@esbuild/linux-ia32@npm:0.25.10": "283430e003d45a698a3d5a4e1ccb243f0134679fdb839c4ef1b48c79b2d975969fa676e261a772eaa3042a9870f7392930974cca0a779ee9950698607d174c48", + "@esbuild/linux-ia32@npm:0.25.12": "ccd563c3189e5f651b479dd80d3bebd9d5c4747ce7448bb80266c804c3141eb3514b8c70445d77301899c54c1ff8c74614f8423704fde475a5c67efe86713235", + "@esbuild/linux-loong64@npm:0.25.10": "c8ae07926c5d31f66ae81db3267ae62c4f844abb87188a901c91f9ab7b8a88d381152a59a89c1bfef61459dafc0a066f722b3c410ef07801d2570c1497477b44", + "@esbuild/linux-loong64@npm:0.25.12": "6df2710d99d84006ad8151a9ca26861dbb97524a15e61f56eb1a5a76786865ad03be838fe3d414a72b239262364964528f3136c2965b3c442c7ed85090b145c4", + "@esbuild/linux-mips64el@npm:0.25.10": "cc3828db4e00fe8ab932c896628cd193aa40dcfb03584f776d3b6be141691f2b0379b5a3070cba56375b00181a13ed955d70e2f2f3c828a5a794ac9eb06f6a07", + "@esbuild/linux-mips64el@npm:0.25.12": "883bd8c4afd70b8e372db8a6bdb429d419ae30253a63987ff824994958d8431b6e51ead05e6372b2a233e025ea57f6f65b04ebaff8308e39acf54bfa73a5cae2", + "@esbuild/linux-ppc64@npm:0.25.10": "7f2995c79a76ed739fe85773cd9933f90ef50c003b3cd340db9c738e714e05698d48b355d0495ffef92f7444018454c1c7072992e5411e9466856388b24c1417", + "@esbuild/linux-ppc64@npm:0.25.12": "71f8544a3b99b4c95d49604b66d144e9617ae9925914c1bd5bc6731d15d4e48e7f8e9bffd85835e1c93a88c3537b53f3e99b500e4dd2533af9483055b02f9d38", + "@esbuild/linux-riscv64@npm:0.25.10": "3cba9a06e732e4c86f943699e47a2ac7dcbd225b753d2d004179069c860013a340033f1c7990e5adb62fd0930d6982baf43ce4f4e85a2cbd0d11eda30d7fdb54", + "@esbuild/linux-riscv64@npm:0.25.12": "fe8048262c5c6a040c047a9b7ab8547b0e7a32ce50f622ea8dadc3ec22065676efbc9b36896ca96959f77839757319633a2d05af5f2de7b32389a03b80f027f1", + "@esbuild/linux-s390x@npm:0.25.10": "b3e46636050ef3fbd80696545c84fae1969c3f58b0004af07044051b88623601da280d32d146d1f7f2b534ddff764e26dfd0baa6fa098e4379d8b7c476d7b631", + "@esbuild/linux-s390x@npm:0.25.12": "e5c023be1dfd75c915453763f944db8ab3da4f60a00c2b0e6f3b9349bc6c51e5ac5ce928db56e8f316e910213adf2172efd1b37abe070f6cda0c28583d770bab", + "@esbuild/linux-x64@npm:0.25.10": "c677043cba5cf7c1953429d09ed5efa23d6cad209feae2080c3ab14b2f30d56a926ea4a5bc3cd3fa20cfdc3e2c6bca2eaa68e91ee92608819d02aba6c6beacbd", + "@esbuild/linux-x64@npm:0.25.12": "8b2c7f5e00c40058f5c150df267cd303eae5907822f196902cd8e64af70475e800a7f132ac6388aa2b77b877d6314147e67f3fb67d97c867adccd54a2a6caaf6", + "@esbuild/netbsd-arm64@npm:0.25.10": "28049c2ad9a67b366a843931742d6a5bf535deebc0b5f6918ee69980ee35a4f16d38f1e4dc2bbb1ac00e852bebb5268fff9c41939ad81bc28e4d65ad9143e51b", + "@esbuild/netbsd-arm64@npm:0.25.12": "19bc5a1295697aa8787929472323494302d117ea1e592f17cfae443525c1e5917a5f77e6582fc1ec9de3a11a9e296bc12749c6b12cde0aab10695b5c25f29f73", + "@esbuild/netbsd-x64@npm:0.25.10": "36d4e9ab1b9fc28b26e571b72ec4baeb639e3596a2ac7cddb86c9c812c550fbe8f860abf4915f1053280b904f1a99fd26b2d1cde3c899ba33d394b6d0bdc383a", + "@esbuild/netbsd-x64@npm:0.25.12": "8eb2ff51aa39b43a021e4b51411789b6299fd0dc38b3896719684333e32fd42ed4508ab67dcc88435631e5333573a4848dbfeec12569de46c2318dcdb39ad3ab", + "@esbuild/openbsd-arm64@npm:0.25.10": "d477b47a4c4201c5c4b53d14299abace47f54d3f9311534bf667b14f3935cb9bfe40724e758c1ad595e29b8e8b2cd331de0d7c4a84da290261f6a48f94eb489e", + "@esbuild/openbsd-arm64@npm:0.25.12": "5ff26a012d0d35673bc3800d28f284a62c310801a68c55b2d1ed8a7e09ef7568117fb8ab2d7ec7a6e7d73ce6a9e05150ee07335fc6447ba98658469b9da1cb2e", + "@esbuild/openbsd-x64@npm:0.25.10": "15f4560420b57e548f26913d1bdbd00ae6535d912ce87b7e8e1a366b754511581fbfdf192c5622b1757bb56b082b316336853dfd6f6140a2b4c002c4ceaaff5d", + "@esbuild/openbsd-x64@npm:0.25.12": "41dce65493548bc0dc411a6175e9fb109a93bbbf370ef444d1459698226ad2a3096ab7edd420c27eb3d15e6bbd0bc79357bd7c0a59c5527ace0fefac181638f8", + "@esbuild/openharmony-arm64@npm:0.25.10": "3dd9f05a63e4bcb67a9097663c03b7d917bd1ae8338bafcd2f0cd788d672d729451ad41b993567ef067c49acf8581fb2bb949a4434e48b9492b6087c2a28032c", + "@esbuild/openharmony-arm64@npm:0.25.12": "b3e0502067e760e5b92d3180e20372cbb2dba8267fbb56206d50bdeccd8895feb408020b98c3f17054eea0f1fba365385850cb91d1f79a25dfa3751032278825", + "@esbuild/sunos-x64@npm:0.25.10": "1733bda6f4f5e13aa764ff27e454f5876ff72ed36bf94600a98791c678831c736f66130d527fa330b7f6cbea3d982491e8454f65a84583eb5da85588dec260fb", + "@esbuild/sunos-x64@npm:0.25.12": "50ed9767e00ff74a1d98d94c5fe6027bc5e9e095a64735d1d0676ec72adc4b15b0095e97f5ac71602f2c5fcdcf3e9f6cfe005315e998d9d3e12ca93a2076b639", + "@esbuild/win32-arm64@npm:0.25.10": "16fce99202539f6319f439a0db7b078b95ac4f18c1d9736a6fe0cbea1e88faf725e798af2f1a5ff3f39f9b47eb2fc70ec78b1b5dae35d06682748b245096a2e8", + "@esbuild/win32-arm64@npm:0.25.12": "4969d20da28a0c783ada6116724f51a542fad81dab043c4f6f9b7c8f4a68be558f03beb29d75bd550ab6e63f720535ebacb9ce1760099be7a63d4e1ec8351e2b", + "@esbuild/win32-ia32@npm:0.25.10": "c6db22bb001c8da006ee83b622b2ae2403583f1bc8e11ae88190801fb19e1c16da6e2356a15b0534463aac1170d6208a230a5aa26cacad4e85fda9991b77a389", + "@esbuild/win32-ia32@npm:0.25.12": "60ce7d21c5e01c8b0c8c2c4660ff6d890a32b1acf09f5499f950a86bc5c6da17eee760c6bb7a720a0429f7633bbb38b2db517e444408d8a6ff6fc76157310980", + "@esbuild/win32-x64@npm:0.25.10": "ec3c325501843d502292cc36a6ddb08ce13fdf5accc5c73b3c2084e6862a757edc4f46677ae5c9c32a0087fcbff2a894181b7e1881137641cc91a2ca146d7cc2", + "@esbuild/win32-x64@npm:0.25.12": "bbdc69d57d85a6b8af85731c0979186aba54eb34c8d1de5eab4aa1d8fd45e3b38b5426c287cedf43228bb0794a741d9b2c55284c7db7d79335bc33dc389e7bb3", + "@img/sharp-darwin-arm64@npm:0.34.3": "952e9e9c34291502e7c21258d2874539a3953a5da8df52c8e2c459f673a76179eddd48c3b7563773db7bb36b2b241d781b98a667fac4b30c1f49c1cc9fdf9b7f", + "@img/sharp-darwin-arm64@npm:0.34.4": "d33346f79a11ebb802d52277e514e627f023de473b0e264f771a407d197874b07642fbf29c8eb38e22f73e117822e429a4567cc053185b8cf24f8496b7b1d574", + "@img/sharp-darwin-x64@npm:0.34.3": "57ccfecf25b6e21b3df16694a959200ee6d00ac150bf4c5e3787bedfa8f944cbc95c7130fb6d66b207a0bd987e30f302b67de35a7481909b9bc175581da1be6f", + "@img/sharp-darwin-x64@npm:0.34.4": "343994f22dac5e529f0c5bff4751f61cf691678f8663fa213c2a98d8842508b6c15f12e711a3c1749e66f363b52536a4d9a5149e040fa7fad6e7c5b6c23e7532", + "@img/sharp-libvips-darwin-arm64@npm:1.2.0": "77a6a47fe9cbc1e6d1c66fd3f617bc64a8b710ed7cb44eee64409d49456dba054495e5ef8de3442e655ad11263ed19df554e9c33c2976e3226c121d826188587", + "@img/sharp-libvips-darwin-arm64@npm:1.2.3": "a2bcd73ca2774a6c09a94200ea4ef96fc514b7af8fe2acf8d623e591569d05c4e703acfd48fee2b5fbfd1f338b11d1b0f253ea1214950e3201a999f564555392", + "@img/sharp-libvips-darwin-x64@npm:1.2.0": "334c823aa129365e7f71b3467fb3c37e7a0065d7cf192b08b2bf85d400a568da42cb236dd238ff35670f296ec5b81f08415e11c257e1c8b8df680923c3acd72a", + "@img/sharp-libvips-darwin-x64@npm:1.2.3": "38c7888fadfd59cc4da606d40ad2482eeb26992b4bb82fb1d8ed950379ecfa5c4c060d1d152cb0e78d8e9bd933ebb5e478ff1ef60a362e743e8b82f78fda9dd0", + "@img/sharp-libvips-linux-arm64@npm:1.2.0": "c8e7d5641ed6d1a406d08b45536fa6a9e221024bad1b3b6e7e16942500c5ca3f5ae444ac141a61ed9b43f6f7e73ee66bf973e24a90fd94dfcf83d4617492c085", + "@img/sharp-libvips-linux-arm64@npm:1.2.3": "fcb603357a32067ca1f5ab9f66526465df839aefe5dbb3d180331907efe5167bb33b84806f2ebd60932f76f291d1736ea3eaf3b57330d2beaa1ac1bc5de8a872", + "@img/sharp-libvips-linux-arm@npm:1.2.0": "9a854fff624303ed4bfdc7e936af47b3c6b07e486d0b366c8881306d49766b8e972c5a26fa53288b00f4b92a019b374bb66106c9d34f6fb23489cde5b861d2e3", + "@img/sharp-libvips-linux-arm@npm:1.2.3": "79e895b29a1fe84a19a9c6989062df62343d11877de6c2e44899afa0db74f109608cdd56632a615c47a82558a0203e04d87daab1861a18e6669f280dedc89bd6", + "@img/sharp-libvips-linux-ppc64@npm:1.2.0": "bd4e956d5f01efc158e992047460be6b8cddb9f89cdd02f4e377a178da1703ed12125f161ec2eeb99de9d11232333bf501bf5e70b85e0e6f94f1cddf7d5fc954", + "@img/sharp-libvips-linux-ppc64@npm:1.2.3": "208b361d28bec6be0ed261aa4aefb3ad484192081db62eb8ec84c3c09a1e224d8ca07718f97da10c709da45bfb57065cd6409a1473a30b684c0ff87a2bfb07f8", + "@img/sharp-libvips-linux-s390x@npm:1.2.0": "6ed6d891c2ddae07fff09290b24c1ee3531264dcdb0d0d461279fa2168c196490874f84d5b5fa045a3063e76957fee0bfa765860db486779e3acb68ab743400d", + "@img/sharp-libvips-linux-s390x@npm:1.2.3": "fba082c5acbcc22086ce1137643b01add900ae26081550229ced8f827c8b7f80a4d1def8f850e47c8586d5c9f962e21ec77aceb4236d4c3ead3649e324ea77c4", + "@img/sharp-libvips-linux-x64@npm:1.2.0": "2a80a045237e56c5f4ec2b5c4febe9d95066beadff06bd936439f34bdd615205346dbbf996b5b4d1e43af6a128cdfd4b1a76d6fb36d9eb62f61a7248fb242728", + "@img/sharp-libvips-linux-x64@npm:1.2.3": "77a22e988472bf4154aff18b94ccbf9799c723033315bfa590ba630c7b94fbb5b1d6430e461b3431dfaf1f17d7249ca2a287075a4d8ef6029e74e1d7034153e4", + "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "4225b0af93ec3a600f81930bb0ac70671cb76917a033f5ac6033252a79dd04c54b1d1bf602f79877efd07d9382106d8b2058b7c9a2bfcb7beabb6861eab0879a", + "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.3": "be2a7f0e3f2ca126e1cab2e759c6e11ab97bedd127ef8800d5ab974889f3850132a92466b2c33ba96d4143926f12e127b03ac62b3f98176036150dd7925ad621", + "@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "d2a47388c6d1ff90bd85fa0a93f8bf9c5855c2834736bdd78d47d12689e3bcd41c695788c6bef9a8e1c5156951a675e22dc51a0ddf35a7d56c96cae3e9f55688", + "@img/sharp-libvips-linuxmusl-x64@npm:1.2.3": "e69b64ab8964de1958cd4f0818c97d84004db1ca9c1e6ea69505fb9fcf76e1cf3bd1188f859ceadcefe94f08d3d2fcfe61deb9c04684f1b2d07d5a9b5732fbf0", + "@img/sharp-linux-arm64@npm:0.34.3": "a4ec64134484037e6a1583b11e39a16afb95eff963bf9c52deb17557b0a35dbc509325368040b04939e859f3b9531d64e6405fe54d13b3633628a4f77bfd8672", + "@img/sharp-linux-arm64@npm:0.34.4": "54d68128604bfffb9288d6350d45d9b8ea2008999979a780e216325f69881e5fad69b14ad7730800a6171fda408b0b03fd62ceff665ebb914df92c578529daec", + "@img/sharp-linux-arm@npm:0.34.3": "fe4106211c93c566d3712302c081391435caaeb6ecd41e88e94e3e9780d0f27934a02a871d6280625944f625350c4f81871d92210ff6ae5511318248a4ba3ebe", + "@img/sharp-linux-arm@npm:0.34.4": "2a4be8d21d873989964ab09c8e8cfaa686bad95f78233b1f94e2732a6d3bb13a26c87b2be17c53bb25796c42c287bc2fd9d0af782c42b8ef3941087781db8296", + "@img/sharp-linux-ppc64@npm:0.34.3": "0671ccb3a25e53a665d50b2b52cd779b57a07f642686bbb7311c288c44b2d861cd1eacf6bd6883421c73cc5efc8fa8536280dd48fde9a6de8d287e4a99c9ab69", + "@img/sharp-linux-ppc64@npm:0.34.4": "b44ab26aecbd5d4ac3898b183d556ada921d0fca08040ceb93d4c4135665c78b99b0f2c91757b31615667e4f2cccb68c75e4c757c14acaa0e26192d8bb849d46", + "@img/sharp-linux-s390x@npm:0.34.3": "a5e2c3c14faa997616caf0a9296302c58b9565bb24f156dae7ad1770f5f984919fb34a0d1f59f0112205db060e8bc665842fd27621147786893619c51b81af45", + "@img/sharp-linux-s390x@npm:0.34.4": "e04058ed75450258e72d63aaa9238bcd74ee641f055d1d0f7a425369944760103c8b3688eeec4da86df587306f1b4eb40ba7d9d078ccb2289ae117e1222a96f6", + "@img/sharp-linux-x64@npm:0.34.3": "83a82d1a97b975b64be0ed6fd35fe87609ffcbfb7a068a7ea0e67dba7ecd71f32382b86a024bcfda8aceb4ed1628f4ee4a567c4e157e9cd3c9fafa0b225fe6c2", + "@img/sharp-linux-x64@npm:0.34.4": "83e1b91dc63c4b126ff8d711fc9ffbd60de437be342d7e440ad304688ebf166cfd32b539c51720b96b0dd02ef639a267236db2902d10ffa85d4f8ee8c82a986d", + "@img/sharp-linuxmusl-arm64@npm:0.34.3": "53f9f3f673441b21ea0a8d6d95b7ba8f051d4c2d2d4c4cb0fd83bb7593a56f854b255a1b706ddd376f8003adc6431b602afbb8a1ffe0850896147b24912a9504", + "@img/sharp-linuxmusl-arm64@npm:0.34.4": "db0ef92e6d5283276baa42a7fb1a485f2ef837a69bd68a7a88b44464f0dbc929fd6c1da0af6bc4523d7ed492183181c7815330a83fe5da289b7f1b5bd71f571e", + "@img/sharp-linuxmusl-x64@npm:0.34.3": "ebd702f0f88121b31e87db93a87839085605a02826aba5207e9ad4fed89471daf0e32276ef3e13dc289e53042baaa8244bd43c0768c0733e3a4fce02fdf30dab", + "@img/sharp-linuxmusl-x64@npm:0.34.4": "ee69e9edde1e250b55f05c7c838f0b8ecbb0b579ea3c2269a1d757b61ca22fdb49b91518358cca3bcedd09139abd907116335c314388fba8b58812e7ef7cc41a", + "@img/sharp-wasm32@npm:0.34.3": "3a64ba7dec1883eaae60925d77b04322a81d9c2d39359fa021677252df7da3be72f469a298cf2470f7350553eb30ee84e874d7032b06fa91ce27a81e1ec5f6c7", + "@img/sharp-wasm32@npm:0.34.4": "630eb7a14d22f573cc7498c4bb0fcb3b1b5809b6d335af007c495d827273fbfafd5d9821f83a95341095772cbc5e7e1efd484b36463e969fe15be5594b6046b3", + "@img/sharp-win32-arm64@npm:0.34.3": "9328ef81ef6df02a8f83123f59c0addea7dd12681af3068e677ac274ed238321dd5522f2e4157b1a53ee0bc27ea22733263dddf5d4b65d2c5a2533ffb724f81e", + "@img/sharp-win32-arm64@npm:0.34.4": "29ea26d197d79010835518878ba5844d708ea0062b01b0365629a3c9d41bf55b620a835831057672b4c7de7eae360896662581ad96b2e701f8fb0063d3463a47", + "@img/sharp-win32-ia32@npm:0.34.3": "cf08bf95ff895c831bd74c7c4567d6c4ac20100e0d1badd0a9f7100486f3f416022222e29fcbae79b379defd1f0bc13adccc16c119fd4705d00c11c35ca9988a", + "@img/sharp-win32-ia32@npm:0.34.4": "25923d688df7081a222e49afa703db6d20999ddaeb705da0b50fcf3996cc747c3e2b68a56bf5c0ea9b60760ffee3885d958a547c4416f37497a40360e560c4e9", + "@img/sharp-win32-x64@npm:0.34.3": "07078e460f2749ad6422135193bacdfea1f223fab9f8442b5c0cbecb6d3e92070dd0a968219ff386a03930ec4104162627ffcad5b362ec8dc0247848deb52bbc", + "@img/sharp-win32-x64@npm:0.34.4": "84d7e0100131837cf4aff5da0f1a69e2d2b0f79b85011f978f2bc0b4985f947439141139ff82927231e594929c7381107af6d6123a98b4bc027d7ecf2105b1cf", "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141", "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea", "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134", @@ -107,6 +131,5 @@ "lightningcss-linux-x64-gnu@npm:1.27.0": "bb1b5713ddc9d8d711b527bcce47ce3e7fd91f2058c317ad5df09cded4142a85362ee71c353dd3b332497fc32a431a22f7762ce01464ff008b2a7cf2607d3dd3", "lightningcss-linux-x64-musl@npm:1.27.0": "ec9b11bb0d70b929335f735486f8dd8fa6fc22eb95b71545b735b480b9e2b5287a24976735c2c5f4c9c50af07fb5cfdc02b65eceb6ec10256e7c9c637dedee9a", "lightningcss-win32-arm64-msvc@npm:1.27.0": "1814c0d0464c21e808a2909ebbee7e12c42fd81ecd480e7c4e31769c555f238c720087af4383fff14862764f52bf4250cd566c6c45c3d6633bee126ef3355bc3", - "lightningcss-win32-x64-msvc@npm:1.27.0": "be733309737e4c4ed3dff33ec9e80bbc2d269d07bfa3742dd30d9055adfdc2e22be4d484475a7ea7cb7940c17f001cdf64856e157ef9b7c1d2c9342041e9eae4", - "systeminformation@npm:5.21.15": "349877eb556ef2de51d4986f30ff3a2fad89eba356cf4d14ccad290599b2e565959952c95e64488932214572dd206c54792ceb8e24bd967409a8fee40b9882f3" + "lightningcss-win32-x64-msvc@npm:1.27.0": "be733309737e4c4ed3dff33ec9e80bbc2d269d07bfa3742dd30d9055adfdc2e22be4d484475a7ea7cb7940c17f001cdf64856e157ef9b7c1d2c9342041e9eae4" } diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index db69e0a94270..d35cd511d16a 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -13,37 +13,19 @@ cairo, pixman, libsecret, - electron_37, + electron, xcbuild, buildPackages, callPackage, - runCommand, libGL, clang_20, + jq, }: let - electron = electron_37; yarn-berry = yarn-berry_4; releaseData = lib.importJSON ./release-data.json; - - buildPlugin = import ./buildPlugin.nix; - - getPluginPatch = - src: id: - runCommand "${id}.diff" { } '' - patch="${src}/packages/default-plugins/plugin-patches/${id}.diff" - - if [ -f "$patch" ]; then - cp "$patch" "$out" - else - # create an empty patch file if it doesn't exist – can't check this from Nix code without IFD - touch "$out" - fi - ''; - - getDefaultPlugins = map (callPackage buildPlugin); in stdenv.mkDerivation (finalAttrs: { @@ -70,16 +52,14 @@ stdenv.mkDerivation (finalAttrs: { hash = releaseData.deps_hash; }; - # allows overriding to disable building the plugins - defaultPlugins = getDefaultPlugins ( - lib.mapAttrsToList ( - id: plugin: - plugin - // { - patches = [ (getPluginPatch finalAttrs.src id) ]; - } - ) releaseData.plugins - ); + # allows overriding to disable building these plugins or add other ones + defaultPlugins = [ + (callPackage ./joplin-plugin-backup.nix { + patches = [ + (finalAttrs.src + "/packages/default-plugins/plugin-patches/io.github.jackgruber.backup.diff") + ]; + }) + ]; buildInputs = [ libGL @@ -96,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: { pixman libsecret makeWrapper + jq ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild @@ -120,21 +101,26 @@ stdenv.mkDerivation (finalAttrs: { sed -i '/postinstall/d' package.json # Don't install onenote-converter subpackage deps sed -i '/onenote-converter/d' packages/{lib,app-desktop}/package.json - # Don't build the default plugins, would require networking. We build them separately. - sed -i "/'buildDefaultPlugins',/d" packages/app-desktop/gulpfile.ts ''; buildPhase = '' runHook preBuild - unset YARN_ENABLE_SCRIPTS - for node_modules in packages/*/node_modules; do patchShebangs $node_modules done + unset YARN_ENABLE_SCRIPTS + yarn config set enableInlineBuilds true + # fails otherwise because it tries to set up git hooks, not needed here + sed -i 's/"preinstall": ".*"/"preinstall": "echo skipped preinstall"/' packages/default-plugins/node_modules/joplin-plugin-freehand-drawing/package.json + + # Don't let joplin build plugins from source, would require networking. We build them separately. + pluginRepositories=packages/default-plugins/pluginRepositories.json + jq 'with_entries(select(.value | has("package")))' <<< "$(cat $pluginRepositories)" > $pluginRepositories + echo "installing yarn dependencies..." yarn workspaces focus \ root \ diff --git a/pkgs/by-name/jo/joplin-desktop/release-data.json b/pkgs/by-name/jo/joplin-desktop/release-data.json index bfcc3547eab9..f7c232700169 100644 --- a/pkgs/by-name/jo/joplin-desktop/release-data.json +++ b/pkgs/by-name/jo/joplin-desktop/release-data.json @@ -1,19 +1,13 @@ { - "version": "3.4.12", - "hash": "sha256-p9MY7E0qa7LcXBpGs/DmX2A2jXQoOPYiRo/nEzkkQd0=", + "version": "3.5.12", + "hash": "sha256-NUWb2y8sTIzKTURJymb0Bvidz1tl+u3Q7o1UvEnIUtI=", "plugins": { "io.github.jackgruber.backup": { "name": "joplin-plugin-backup", - "url": "https://github.com/JackGruber/joplin-plugin-backup/archive/abb58175e2d2bf34899f1b32cb74137e5c788bf9.tar.gz", - "hash": "sha256-3J7TP3UClLDH402UqppQMsc1WmFjYIpIQ4uwGlTsyBs=", - "npmDepsHash": "sha256-Grn4KQck6o+k8fj6qPxmx7S+4PTWvY5N4pE7Bj+47ps=" - }, - "io.github.personalizedrefrigerator.js-draw": { - "name": "joplin-plugin-freehand-drawing", - "url": "https://github.com/personalizedrefrigerator/joplin-plugin-freehand-drawing/archive/63b6d3f185b5b3664632e498df7c7ad7824038d0.tar.gz", - "hash": "sha256-4sl+ktdMQ8PSELAeWMv9Ezgwrx5YDcC/7ou2ZSF2OyQ=", - "npmDepsHash": "sha256-qwhVFSDafTnKihcwZtLK5fS/Nc15e+ezAso47T1LGec=" + "url": "https://github.com/JackGruber/joplin-plugin-backup/archive/2c3da7056e7ac39c86c2051a4fdb99d9534dd0a1.tar.gz", + "hash": "sha256-rPmBg/+mJH7Fp26gVzuSGFxi1Y4MtfRT+hqppk3tHdY=", + "npmDepsHash": "sha256-xZJ0Oir1A6sLe0ztIyBu39Yy3D6sNrVaciOYG0k85l0=" } }, - "deps_hash": "sha256-7sZX39OtNNPq5RE7+Oj58QqHhcrTY8FOdncKp3b40jQ=" + "deps_hash": "sha256-9xJmudcpUw1xmTvJD3TFrfzYEi+LupZGSzsA5zUOemI=" } diff --git a/pkgs/by-name/jo/joplin-desktop/update.py b/pkgs/by-name/jo/joplin-desktop/update.py index e1ee691c6a50..dc48eaad6907 100755 --- a/pkgs/by-name/jo/joplin-desktop/update.py +++ b/pkgs/by-name/jo/joplin-desktop/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p 'python3.withPackages(ps: [ps.requests ps.plumbum])' nix-prefetch nix-prefetch-git yarn-berry_4 yarn-berry_4.yarn-berry-fetcher prefetch-npm-deps +#!nix-shell -i python3 -p 'python3.withPackages(ps: [ps.requests ps.plumbum])' nurl nix-prefetch-git yarn-berry_4 yarn-berry_4.yarn-berry-fetcher prefetch-npm-deps import json import requests import tempfile @@ -7,9 +7,10 @@ import shutil from pathlib import Path -from plumbum.cmd import nix_prefetch, nix_build, yarn, chmod, yarn_berry_fetcher, prefetch_npm_deps, diff +from plumbum.cmd import nurl, nix_build, yarn, chmod, yarn_berry_fetcher, prefetch_npm_deps, diff, git, nix HERE = Path(__file__).parent +NIXPKGS_ROOT = git.with_cwd(HERE)["rev-parse", "--show-toplevel"]().strip() def write_release(release): with HERE.joinpath("release-data.json").open("w") as fd: @@ -43,16 +44,9 @@ print(version) print("prefetching source...") -release["hash"] = nix_prefetch[ - "--option", - "extra-experimental-features", - "flakes", - "--tag", - f"v{version}", - "--rev", - "--expr", - "null", - package +release["hash"] = nurl[ + "-e", + f'(import {NIXPKGS_ROOT}/. {{}}).joplin-desktop.src.overrideAttrs(_:{{tag="{tag}";}})' ]().strip() print(release["hash"]) @@ -63,7 +57,7 @@ write_release(release) src_dir = nix_build[ "--no-out-link", "-E", - f"((import {{}}).callPackage {package} {{}}).src" + f"(import {NIXPKGS_ROOT}/. {{}}).joplin-desktop.src" ]().strip() print(src_dir) @@ -79,32 +73,23 @@ with default_plugins_dir.joinpath("pluginRepositories.json").open() as fd: release["plugins"] = dict() for key, value in plugin_repositories.items(): + if "package" in value: + print("skipping npm-packaged plugin", key) + continue + print(key) plugin = { - "name": "", - "url": "", - "hash": "", - "npmDepsHash": "", + "name": value["cloneUrl"].split("/")[-1].removesuffix(".git"), + "url": f"{value["cloneUrl"].removesuffix('.git')}/archive/{value["commit"]}.tar.gz", } - plugin["name"] = value["cloneUrl"].split("/")[-1].removesuffix(".git") + fetched_src = json.loads( + nix["store", "prefetch-file", "--json", "--unpack", plugin["url"]]() + ) + plugin["hash"] = fetched_src["hash"] - plugin["url"] = f"{value["cloneUrl"].removesuffix('.git')}/archive/{value["commit"]}.tar.gz" - - plugin["hash"] = nix_prefetch.with_cwd(HERE)[ - "--option", - "extra-experimental-features", - "flakes", - f"((import {{}}).callPackage ./buildPlugin.nix {dict_to_argstr(plugin)}).src" - ]().strip() - - plugin_src = nix_build.with_cwd(HERE)[ - "--no-out-link", - "-E", - f"((import {{}}).callPackage ./buildPlugin.nix {dict_to_argstr(plugin)}).src" - ]().strip() - plugin["npmDepsHash"] = prefetch_npm_deps(Path(plugin_src).joinpath("package-lock.json")).strip() + plugin["npmDepsHash"] = prefetch_npm_deps(Path(fetched_src["storePath"]).joinpath("package-lock.json")).strip() release["plugins"][key] = plugin diff --git a/pkgs/by-name/js/jstest-gtk/package.nix b/pkgs/by-name/js/jstest-gtk/package.nix index 396c445343d7..ba476a2b6b81 100644 --- a/pkgs/by-name/js/jstest-gtk/package.nix +++ b/pkgs/by-name/js/jstest-gtk/package.nix @@ -6,7 +6,7 @@ pkg-config, gtkmm3, libsigcxx, - xorg, + libx11, }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { buildInputs = [ gtkmm3 libsigcxx - xorg.libX11 + libx11 ]; meta = { diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix index 528bc3e1de29..aa110337c81b 100644 --- a/pkgs/by-name/ju/jumpy/package.nix +++ b/pkgs/by-name/ju/jumpy/package.nix @@ -12,7 +12,10 @@ udev, vulkan-loader, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -50,10 +53,10 @@ rustPlatform.buildRustPackage (finalAttrs: { udev vulkan-loader wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix index 37f5224b0e78..e82f304c7dc2 100644 --- a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix +++ b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix @@ -13,7 +13,7 @@ libxcb, lv2, xcbutilwm, - xorg, + libxcb-util, zita-convolver, zita-resampler, }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libxcb lv2 xcbutilwm - xorg.xcbutil + libxcb-util zita-convolver zita-resampler ]; diff --git a/pkgs/by-name/ka/katex/package.nix b/pkgs/by-name/ka/katex/package.nix index 3510d173bbf6..a7de1cc10d5f 100644 --- a/pkgs/by-name/ka/katex/package.nix +++ b/pkgs/by-name/ka/katex/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "katex"; - version = "0.16.27"; + version = "0.16.28"; src = fetchFromGitHub { owner = "katex"; repo = "katex"; rev = "v${finalAttrs.version}"; - hash = "sha256-bw5W8TkM31aeqQ6eJae8voW75RvvUjeTdu7aPQ+lAa0="; + hash = "sha256-M9PqzSQkMcnfuL2n/eLwxnk3E9gSEVu0t6Tahiw7niI="; }; offlineCache = yarn-berry.fetchYarnBerryDeps { diff --git a/pkgs/by-name/kb/kbdd/package.nix b/pkgs/by-name/kb/kbdd/package.nix index 55278a459455..e83b8864ba0f 100644 --- a/pkgs/by-name/kb/kbdd/package.nix +++ b/pkgs/by-name/kb/kbdd/package.nix @@ -5,7 +5,7 @@ pkg-config, dbus-glib, autoreconfHook, - xorg, + libx11, }: stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 dbus-glib ]; diff --git a/pkgs/by-name/kb/kbt/package.nix b/pkgs/by-name/kb/kbt/package.nix index f499a9f6cb6d..45408c8a6537 100644 --- a/pkgs/by-name/kb/kbt/package.nix +++ b/pkgs/by-name/kb/kbt/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, stdenv, pkg-config, - xorg, + libx11, }: rustPlatform.buildRustPackage rec { @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 + libx11 ]; meta = { diff --git a/pkgs/by-name/kd/kdash/package.nix b/pkgs/by-name/kd/kdash/package.nix index fffee971aa87..ad2de8193f0b 100644 --- a/pkgs/by-name/kd/kdash/package.nix +++ b/pkgs/by-name/kd/kdash/package.nix @@ -6,7 +6,7 @@ perl, python3, openssl, - xorg, + libxcb-util, }: rustPlatform.buildRustPackage rec { @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - xorg.xcbutil + libxcb-util ]; # Fix for build failure with gcc15 diff --git a/pkgs/by-name/ke/keepass/package.nix b/pkgs/by-name/ke/keepass/package.nix index e889991fbcb6..73a02c9059dd 100644 --- a/pkgs/by-name/ke/keepass/package.nix +++ b/pkgs/by-name/ke/keepass/package.nix @@ -8,7 +8,7 @@ icoutils, replaceVars, xsel, - xorg, + xprop, xdotool, coreutils, unixtools, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (replaceVars ./fix-paths.patch { xsel = "${xsel}/bin/xsel"; - xprop = "${xorg.xprop}/bin/xprop"; + xprop = "${xprop}/bin/xprop"; xdotool = "${xdotool}/bin/xdotool"; uname = "${coreutils}/bin/uname"; whereis = "${unixtools.whereis}/bin/whereis"; diff --git a/pkgs/by-name/ke/keyboard-layout-editor/package.nix b/pkgs/by-name/ke/keyboard-layout-editor/package.nix index babab710e0b6..3c59c1790a13 100644 --- a/pkgs/by-name/ke/keyboard-layout-editor/package.nix +++ b/pkgs/by-name/ke/keyboard-layout-editor/package.nix @@ -6,7 +6,7 @@ makeBinaryWrapper, openjdk, wrapGAppsHook3, - xorg, + xkbcomp, }: let @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { cp build/libs/keyboard-layout-editor-all-1.0-SNAPSHOT.jar $out/share/java/keyboard-layout-editor.jar mkdir -p $out/bin makeWrapper ${lib.getExe jdk} $out/bin/keyboard-layout-editor \ - --prefix PATH : ${lib.makeBinPath [ xorg.xkbcomp ]} \ + --prefix PATH : ${lib.makeBinPath [ xkbcomp ]} \ --add-flags "--add-opens=javafx.graphics/com.sun.prism=ALL-UNNAMED" \ --add-flags "--add-opens=javafx.graphics/com.sun.javafx.font=ALL-UNNAMED" \ --add-flags "--add-opens=javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED" \ diff --git a/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix index 5974ec91a873..265bbce0997a 100644 --- a/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix +++ b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix @@ -5,7 +5,14 @@ libGL, nssmdns, pkg-config, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxext, + libxcursor, + libx11, + xinput, }: buildGoModule rec { @@ -28,18 +35,16 @@ buildGoModule rec { buildInputs = [ libGL nssmdns - ] - ++ (with xorg; [ - libX11 - libX11.dev - libXcursor - libXext - libXi - libXinerama - libXrandr - libXxf86vm + libx11 + libx11.dev + libxcursor + libxext + libxi + libxinerama + libxrandr + libxxf86vm xinput - ]); + ]; meta = { description = "Desktop application to control Elgato Keylights"; diff --git a/pkgs/by-name/ki/kime/package.nix b/pkgs/by-name/ki/kime/package.nix index e426b3f45bec..c97167e898fb 100644 --- a/pkgs/by-name/ki/kime/package.nix +++ b/pkgs/by-name/ki/kime/package.nix @@ -13,7 +13,7 @@ dbus, libdbusmenu, withXim ? true, - xorg, + libxcb, cairo, withGtk3 ? true, gtk3, @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { libdbusmenu ] ++ lib.optionals withXim [ - xorg.libxcb + libxcb cairo ] ++ lib.optionals withGtk3 [ gtk3 ] diff --git a/pkgs/by-name/ki/kingstvis/package.nix b/pkgs/by-name/ki/kingstvis/package.nix index e5d310405a49..327e47d697f8 100644 --- a/pkgs/by-name/ki/kingstvis/package.nix +++ b/pkgs/by-name/ki/kingstvis/package.nix @@ -8,7 +8,13 @@ lib, libGL, xkeyboard_config, - xorg, + libxrender, + libxi, + libxext, + libx11, + libsm, + libice, + libxcb, zlib, }: @@ -31,13 +37,13 @@ buildFHSEnv { glib libGL xkeyboard_config - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libxcb + libice + libsm + libx11 + libxext + libxi + libxrender + libxcb zlib ]; diff --git a/pkgs/by-name/ki/kirsch/package.nix b/pkgs/by-name/ki/kirsch/package.nix index e4a70e92ff86..7999eeb34d0b 100644 --- a/pkgs/by-name/ki/kirsch/package.nix +++ b/pkgs/by-name/ki/kirsch/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchzip, - xorg, + mkfontscale, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-olm6Q6xcfSEeWXToAs/kse9QNH8k87i8vaPblU6ICnk="; }; - nativeBuildInputs = [ xorg.mkfontscale ]; + nativeBuildInputs = [ mkfontscale ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/kn/knobkraft-orm/package.nix b/pkgs/by-name/kn/knobkraft-orm/package.nix index c33071a73b34..f7b000d1c12f 100644 --- a/pkgs/by-name/kn/knobkraft-orm/package.nix +++ b/pkgs/by-name/kn/knobkraft-orm/package.nix @@ -23,7 +23,8 @@ libsepol, libthai, libdatrie, - xorg, + libxtst, + libxdmcp, lerc, libxkbcommon, libepoxy, @@ -71,11 +72,11 @@ stdenv.mkDerivation (finalAttrs: { libsepol libthai libdatrie - xorg.libXdmcp + libxdmcp lerc libxkbcommon libepoxy - xorg.libXtst + libxtst sqlite git libdeflate diff --git a/pkgs/by-name/kr/krillinai/package.nix b/pkgs/by-name/kr/krillinai/package.nix index 44f7bc7024da..e4225de0c790 100644 --- a/pkgs/by-name/kr/krillinai/package.nix +++ b/pkgs/by-name/kr/krillinai/package.nix @@ -4,7 +4,12 @@ buildGoModule, fetchFromGitHub, pkg-config, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, libGL, nix-update-script, }: @@ -25,12 +30,12 @@ buildGoModule (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libXinerama - xorg.libXxf86vm - xorg.libXcursor - xorg.libXrandr - xorg.libX11 - xorg.libXi + libxinerama + libxxf86vm + libxcursor + libxrandr + libx11 + libxi libGL ]; diff --git a/pkgs/by-name/la/lapce/package.nix b/pkgs/by-name/la/lapce/package.nix index bd9e066f8762..5c0c156e0518 100644 --- a/pkgs/by-name/la/lapce/package.nix +++ b/pkgs/by-name/la/lapce/package.nix @@ -17,18 +17,23 @@ wrapGAppsHook3, wayland, gobject-introspection, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, }: let rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [ libGL libxkbcommon - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libXxf86vm - xorg.libxcb + libx11 + libxcursor + libxi + libxrandr + libxxf86vm + libxcb wayland ]; in diff --git a/pkgs/by-name/la/lattice-diamond/package.nix b/pkgs/by-name/la/lattice-diamond/package.nix index 462101b67a30..cd312bcb928c 100644 --- a/pkgs/by-name/la/lattice-diamond/package.nix +++ b/pkgs/by-name/la/lattice-diamond/package.nix @@ -10,7 +10,12 @@ zlib, freetype, fontconfig, - xorg, + libxt, + libxrender, + libxext, + libx11, + libsm, + libice, libusb-compat-0_1, coreutils, }: @@ -123,12 +128,12 @@ stdenv.mkDerivation { zlib freetype fontconfig - xorg.libSM - xorg.libICE - xorg.libXrender - xorg.libXext - xorg.libX11 - xorg.libXt + libsm + libice + libxrender + libxext + libx11 + libxt libusb-compat-0_1 ]; diff --git a/pkgs/by-name/la/lazpaint/package.nix b/pkgs/by-name/la/lazpaint/package.nix index c15a99ee8946..bc0099f044cd 100644 --- a/pkgs/by-name/la/lazpaint/package.nix +++ b/pkgs/by-name/la/lazpaint/package.nix @@ -6,7 +6,7 @@ fpc, autoPatchelfHook, libsForQt5, - xorg, + libx11, python3, }: @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ]; runtimeDependencies = [ - xorg.libX11 + libx11 ]; preConfigure = '' diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 5fe8ec84af49..bf3edc36ce0c 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, testers, lazysql, - xorg ? null, + libx11, darwin ? null, }: @@ -26,7 +26,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libx11 ]; passthru.tests.version = testers.testVersion { package = lazysql; diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix index e58c489d0684..4c1b58e89594 100644 --- a/pkgs/by-name/le/legends-of-equestria/package.nix +++ b/pkgs/by-name/le/legends-of-equestria/package.nix @@ -27,7 +27,18 @@ vulkan-loader, libasyncns, pango, - xorg, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxdmcp, + libxcursor, + libxau, + libx11, + libxcb, wayland, }: @@ -66,21 +77,19 @@ let libGL vulkan-loader libasyncns - ] - ++ (with xorg; [ - libX11 + libx11 libxcb - libXau - libXdmcp - libXext - libXcursor - libXrender - libXfixes - libXinerama - libXi - libXrandr - libXScrnSaver - ]); + libxau + libxdmcp + libxext + libxcursor + libxrender + libxfixes + libxinerama + libxi + libxrandr + libxscrnsaver + ]; in stdenv.mkDerivation { inherit pname version; diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix index 8a9dba3b86b8..f49214263c9c 100644 --- a/pkgs/by-name/li/liana/package.nix +++ b/pkgs/by-name/li/liana/package.nix @@ -16,7 +16,10 @@ libxkbcommon, wayland, vulkan-loader, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: let @@ -31,10 +34,10 @@ let wayland libxkbcommon vulkan-loader - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; in rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index bf5f9f89802a..05082cc8beda 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -7,7 +7,9 @@ wrapGAppsHook3, glew, gtk3, - xorg, + libxrandr, + libxi, + libxcursor, nix-update-script, }: @@ -47,9 +49,9 @@ buildDotnetModule rec { runtimeDeps = [ # For Avalonia UI glew - xorg.libXrandr - xorg.libXi - xorg.libXcursor + libxrandr + libxi + libxcursor # For file dialogs gtk3 ]; diff --git a/pkgs/by-name/li/libcaca/package.nix b/pkgs/by-name/li/libcaca/package.nix index 848f7c7d3060..d79906f49a86 100644 --- a/pkgs/by-name/li/libcaca/package.nix +++ b/pkgs/by-name/li/libcaca/package.nix @@ -4,7 +4,8 @@ fetchFromGitHub, autoreconfHook, imlib2, - xorg, + libxext, + libx11, ncurses, pkg-config, zlib, @@ -33,8 +34,8 @@ stdenv.mkDerivation rec { (imlib2.override { inherit x11Support; }) ] ++ lib.optionals x11Support [ - xorg.libX11 - xorg.libXext + libx11 + libxext ]; outputs = [ diff --git a/pkgs/by-name/li/libclxclient/package.nix b/pkgs/by-name/li/libclxclient/package.nix index bb15eb70e46e..6c1175caab5e 100644 --- a/pkgs/by-name/li/libclxclient/package.nix +++ b/pkgs/by-name/li/libclxclient/package.nix @@ -5,7 +5,7 @@ libclthreads, libX11, libXft, - xorg, + xorgproto, pkg-config, }: @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { libclthreads libX11 libXft - xorg.xorgproto + xorgproto ]; nativeBuildInputs = [ pkg-config ]; - env.NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/include -I${libXft.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${xorgproto}/include -I${libXft.dev}/include"; patchPhase = '' cd source diff --git a/pkgs/by-name/li/libcosmicAppHook/package.nix b/pkgs/by-name/li/libcosmicAppHook/package.nix index 976b14013620..7ea4f42df493 100644 --- a/pkgs/by-name/li/libcosmicAppHook/package.nix +++ b/pkgs/by-name/li/libcosmicAppHook/package.nix @@ -15,7 +15,10 @@ cosmic-settings, libGL, libxkbcommon, - xorg, + libxi, + libxcursor, + libx11, + libxcb, wayland, vulkan-loader, @@ -36,10 +39,10 @@ makeSetupHook { [ libGL libxkbcommon - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libxcb + libx11 + libxcursor + libxi + libxcb ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ wayland diff --git a/pkgs/by-name/li/libgaminggear/package.nix b/pkgs/by-name/li/libgaminggear/package.nix index 504f9e8483bf..5d11ff8a1de0 100644 --- a/pkgs/by-name/li/libgaminggear/package.nix +++ b/pkgs/by-name/li/libgaminggear/package.nix @@ -11,7 +11,8 @@ libnotify, pcre, sqlite, - xorg, + libxdmcp, + libpthread-stubs, harfbuzz, }: @@ -49,8 +50,8 @@ stdenv.mkDerivation rec { libnotify pcre sqlite - xorg.libXdmcp - xorg.libpthreadstubs + libxdmcp + libpthread-stubs ]; cmakeFlags = [ diff --git a/pkgs/by-name/li/libprojectm/package.nix b/pkgs/by-name/li/libprojectm/package.nix index be20e9e286ac..ee3e8c451541 100644 --- a/pkgs/by-name/li/libprojectm/package.nix +++ b/pkgs/by-name/li/libprojectm/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, libGL, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGL - xorg.libX11 + libx11 ]; strictDeps = true; diff --git a/pkgs/by-name/li/libresprite/package.nix b/pkgs/by-name/li/libresprite/package.nix index 14df46eb85e8..3c5735df67c2 100644 --- a/pkgs/by-name/li/libresprite/package.nix +++ b/pkgs/by-name/li/libresprite/package.nix @@ -17,7 +17,7 @@ libX11, pixman, tinyxml-2, - xorg, + libxi, zlib, SDL2, SDL2_image, @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { # no v8 due to missing libplatform and libbase ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - xorg.libXi + libxi ]; cmakeFlags = [ diff --git a/pkgs/by-name/li/libtas/package.nix b/pkgs/by-name/li/libtas/package.nix index f40f06ea4777..f200e7a760e8 100644 --- a/pkgs/by-name/li/libtas/package.nix +++ b/pkgs/by-name/li/libtas/package.nix @@ -10,7 +10,7 @@ ffmpeg, lua5_4, qt5, - xorg, + libxi, file, binutils, makeDesktopItem, @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { } \ --suffix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ - xorg.libXi + libxi ffmpeg.lib ] } \ diff --git a/pkgs/by-name/li/libuiohook/package.nix b/pkgs/by-name/li/libuiohook/package.nix index 2ae4b266cbdb..bc192a1f6cef 100644 --- a/pkgs/by-name/li/libuiohook/package.nix +++ b/pkgs/by-name/li/libuiohook/package.nix @@ -9,7 +9,14 @@ libxcb, libxkbcommon, xinput, - xorg, + libxt, + libxtst, + libxi, + libxinerama, + libxext, + libxdmcp, + libxau, + libxkbfile, }: stdenv.mkDerivation rec { @@ -28,24 +35,20 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) ( - [ - libX11 - libxcb - libxkbcommon - xinput - ] - ++ (with xorg; [ - libXau - libXdmcp - libXi - libXinerama - libXt - libXtst - libXext - libxkbfile - ]) - ); + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libX11 + libxcb + libxkbcommon + xinput + libxau + libxdmcp + libxi + libxinerama + libxt + libxtst + libxext + libxkbfile + ]; outputs = [ "out" diff --git a/pkgs/by-name/li/libvdpau/package.nix b/pkgs/by-name/li/libvdpau/package.nix index 7fe2666c81d6..d1c177d5307b 100644 --- a/pkgs/by-name/li/libvdpau/package.nix +++ b/pkgs/by-name/li/libvdpau/package.nix @@ -3,7 +3,9 @@ stdenv, fetchurl, pkg-config, - xorg, + libxext, + libx11, + xorgproto, mesa, meson, ninja, @@ -29,12 +31,12 @@ stdenv.mkDerivation rec { ninja pkg-config ]; - buildInputs = with xorg; [ + buildInputs = [ xorgproto - libXext + libxext ]; - propagatedBuildInputs = [ xorg.libX11 ]; + propagatedBuildInputs = [ libx11 ]; mesonFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-Dmoduledir=${mesa.driverLink}/lib/vdpau" diff --git a/pkgs/by-name/li/libxkbcommon_8/package.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix index 40ebb5c6cecb..899b321079e7 100644 --- a/pkgs/by-name/li/libxkbcommon_8/package.nix +++ b/pkgs/by-name/li/libxkbcommon_8/package.nix @@ -14,7 +14,7 @@ libX11, # To enable the "interactive-wayland" subcommand of xkbcli. This is the # wayland equivalent of `xev` on X11. - xorg, + xvfb, withWaylandTools ? stdenv.hostPlatform.isLinux, wayland, wayland-protocols, @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { bison doxygen ] - ++ lib.optional stdenv.isLinux xorg.xvfb + ++ lib.optional stdenv.isLinux xvfb ++ lib.optional withWaylandTools wayland-scanner; buildInputs = [ diff --git a/pkgs/by-name/li/libxklavier/package.nix b/pkgs/by-name/li/libxklavier/package.nix index 3b722344ba69..2c0dff5adffb 100644 --- a/pkgs/by-name/li/libxklavier/package.nix +++ b/pkgs/by-name/li/libxklavier/package.nix @@ -8,7 +8,11 @@ gtk-doc, xkeyboard_config, libxml2, - xorg, + libxi, + libx11, + libice, + xkbcomp, + libxkbfile, docbook_xsl, glib, isocodes, @@ -43,12 +47,12 @@ stdenv.mkDerivation rec { ++ lib.optionals withDoc [ "devdoc" ]; # TODO: enable xmodmap support, needs xmodmap DB - propagatedBuildInputs = with xorg; [ - libX11 - libXi + propagatedBuildInputs = [ + libx11 + libxi xkeyboard_config libxml2 - libICE + libice glib libxkbfile isocodes @@ -69,7 +73,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb" - "--with-xkb-bin-base=${xorg.xkbcomp}/bin" + "--with-xkb-bin-base=${xkbcomp}/bin" "--disable-xmodmap-support" "${if withDoc then "--enable-gtk-doc" else "--disable-gtk-doc"}" ]; diff --git a/pkgs/by-name/li/lightburn/package.nix b/pkgs/by-name/li/lightburn/package.nix index df15a74ba638..1b4e5bd9de1e 100644 --- a/pkgs/by-name/li/lightburn/package.nix +++ b/pkgs/by-name/li/lightburn/package.nix @@ -12,7 +12,8 @@ e2fsprogs, makeDesktopItem, copyDesktopItems, - xorg, + libx11, + libxcb, libGL, alsa-lib, freetype, @@ -43,8 +44,8 @@ stdenv.mkDerivation rec { cups libgpg-error e2fsprogs - xorg.libX11 - xorg.libxcb + libx11 + libxcb libGL alsa-lib freetype diff --git a/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix b/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix index d322188ed60c..91bbedc0e5dd 100644 --- a/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix @@ -8,7 +8,9 @@ dbus, pcre, libepoxy, - xorg, + libxdmcp, + libx11, + libpthread-stubs, at-spi2-core, libxklavier, libxkbcommon, @@ -51,15 +53,15 @@ stdenv.mkDerivation { pcre libepoxy libgee - xorg.libX11 + libx11 lightdm - xorg.libXdmcp + libxdmcp gdk-pixbuf clutter-gtk libxklavier at-spi2-core libxkbcommon - xorg.libpthreadstubs + libpthread-stubs librsvg ]; diff --git a/pkgs/by-name/li/livecaptions/package.nix b/pkgs/by-name/li/livecaptions/package.nix index b7eb32470863..baba732e7b2a 100644 --- a/pkgs/by-name/li/livecaptions/package.nix +++ b/pkgs/by-name/li/livecaptions/package.nix @@ -13,7 +13,7 @@ onnxruntime, libadwaita, libpulseaudio, - xorg, + libx11, }: let aprilAsr = fetchFromGitHub { @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { onnxruntime libadwaita libpulseaudio - xorg.libX11 + libx11 ]; postUnpack = '' diff --git a/pkgs/by-name/lo/lobster/package.nix b/pkgs/by-name/lo/lobster/package.nix index 929fd261d3a8..9336e9a24af8 100644 --- a/pkgs/by-name/lo/lobster/package.nix +++ b/pkgs/by-name/lo/lobster/package.nix @@ -8,7 +8,8 @@ # Linux deps libGL, - xorg, + libxext, + libx11, }: @@ -34,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL - xorg.libX11 - xorg.libXext + libx11 + libxext ]; preConfigure = '' diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index 501b333f9cdb..dc0edbaed248 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -21,7 +21,8 @@ doxygen, ncurses, graphviz, - xorg, + libxi, + libx11, gmp, libspatialindex, leveldb, @@ -113,8 +114,8 @@ stdenv.mkDerivation (finalAttrs: { (if useSdl3 then sdl3 else SDL2) ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin) [ - xorg.libX11 - xorg.libXi + libx11 + libxi ] ++ lib.optionals buildServer [ leveldb diff --git a/pkgs/by-name/lu/lutgen-studio/package.nix b/pkgs/by-name/lu/lutgen-studio/package.nix index 6634596aee62..da2c379170d5 100644 --- a/pkgs/by-name/lu/lutgen-studio/package.nix +++ b/pkgs/by-name/lu/lutgen-studio/package.nix @@ -9,7 +9,10 @@ libxkbcommon, openssl, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, nix-update-script, }: @@ -47,10 +50,10 @@ rustPlatform.buildRustPackage rec { libxkbcommon openssl wayland - xorg.libXcursor - xorg.libXrandr - xorg.libXi - xorg.libX11 + libxcursor + libxrandr + libxi + libx11 ]; in '' diff --git a/pkgs/by-name/lu/lutris-unwrapped/package.nix b/pkgs/by-name/lu/lutris-unwrapped/package.nix index 19a28e40ba6c..a06c8fb92384 100644 --- a/pkgs/by-name/lu/lutris-unwrapped/package.nix +++ b/pkgs/by-name/lu/lutris-unwrapped/package.nix @@ -33,7 +33,8 @@ libstrangle, fluidsynth, xorgserver, - xorg, + xkbcomp, + setxkbmap, util-linux, pkg-config, desktop-file-utils, @@ -54,8 +55,8 @@ let libstrangle fluidsynth xorgserver - xorg.setxkbmap - xorg.xkbcomp + setxkbmap + xkbcomp # bypass mount suid wrapper which does not work in fhsenv util-linux ]; diff --git a/pkgs/by-name/lu/lutris/package.nix b/pkgs/by-name/lu/lutris/package.nix index 28035da8dce6..7798d2c7ed17 100644 --- a/pkgs/by-name/lu/lutris/package.nix +++ b/pkgs/by-name/lu/lutris/package.nix @@ -25,28 +25,28 @@ let adwaita-icon-theme ]; xorgDeps = - pkgs: with pkgs.xorg; [ - libX11 - libXrender - libXrandr + pkgs: with pkgs; [ + libx11 + libxrender + libxrandr libxcb - libXmu - libpthreadstubs - libXext - libXdmcp - libXxf86vm - libXinerama - libSM - libXv - libXaw - libXi - libXcursor - libXcomposite - libXfixes - libXtst - libXScrnSaver - libICE - libXt + libxmu + libpthread-stubs + libxext + libxdmcp + libxxf86vm + libxinerama + libsm + libxv + libxaw + libxi + libxcursor + libxcomposite + libxfixes + libxtst + libxscrnsaver + libice + libxt ]; gstreamerDeps = pkgs: with pkgs.gst_all_1; [ @@ -177,7 +177,7 @@ buildFHSEnv { flex # WINE - xorg.xrandr + xrandr perl which p7zip diff --git a/pkgs/by-name/lv/lv2lint/package.nix b/pkgs/by-name/lv/lv2lint/package.nix index 96204f473a26..33bea76728d8 100644 --- a/pkgs/by-name/lv/lv2lint/package.nix +++ b/pkgs/by-name/lv/lv2lint/package.nix @@ -9,7 +9,7 @@ lilv, curl, elfutils, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { lilv curl elfutils - xorg.libX11 + libx11 ]; mesonFlags = [ diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix index 7185edc7935e..be37edf31f4b 100644 --- a/pkgs/by-name/ly/LycheeSlicer/package.nix +++ b/pkgs/by-name/ly/LycheeSlicer/package.nix @@ -3,7 +3,7 @@ fetchurl, makeDesktopItem, lib, - xorg, + libxshmfence, wayland, wayland-protocols, }: @@ -42,7 +42,7 @@ appimageTools.wrapType2 { ''; extraPkgs = _: [ - xorg.libxshmfence + libxshmfence wayland wayland-protocols ]; diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix index ba447952895b..5119ca1660ad 100644 --- a/pkgs/by-name/ly/ly/package.nix +++ b/pkgs/by-name/ly/ly/package.nix @@ -1,16 +1,20 @@ { - stdenv, - lib, - fetchFromGitea, - linux-pam, - libxcb, - makeBinaryWrapper, - zig_0_15, callPackage, + fetchFromGitea, + lib, + libxcb, + linux-pam, + makeBinaryWrapper, nixosTests, + stdenv, + versionCheckHook, x11Support ? true, + zig_0_15, }: +let + zig = zig_0_15; +in stdenv.mkDerivation (finalAttrs: { pname = "ly"; version = "1.3.1"; @@ -25,8 +29,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper - zig_0_15 + zig ]; + buildInputs = [ linux-pam ] @@ -35,22 +40,31 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' ln -s ${ callPackage ./deps.nix { - zig = zig_0_15; + inherit zig; } } $ZIG_GLOBAL_CACHE_DIR/p ''; + zigBuildFlags = [ "-Denable_x11_support=${lib.boolToString x11Support}" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.tests = { inherit (nixosTests) ly; }; meta = { description = "TUI display manager"; - license = lib.licenses.wtfpl; + longDescription = '' + Ly is a lightweight TUI (ncurses-like) display manager for Linux + and BSD, designed with portability in mind (e.g. it does not + require systemd to run). + ''; homepage = "https://codeberg.org/fairyglade/ly"; - maintainers = [ ]; - platforms = lib.platforms.linux; + license = lib.licenses.wtfpl; mainProgram = "ly"; + maintainers = with lib.maintainers; [ yiyu ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix index 80e647ad4191..9595a29433eb 100644 --- a/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/pkgs/by-name/ma/magic-vlsi/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchFromGitHub, - git, + fetchpatch, + gitMinimal, python3, m4, cairo, @@ -16,21 +17,35 @@ fixDarwinDylibNames, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "magic-vlsi"; version = "8.3.573"; src = fetchFromGitHub { owner = "RTimothyEdwards"; repo = "magic"; - tag = version; - sha256 = "sha256-P5qfMsn3DGHjeF7zsZWeG9j38C6j5UEwUqGyjaEVO1E="; + tag = finalAttrs.version; + hash = "sha256-P5qfMsn3DGHjeF7zsZWeG9j38C6j5UEwUqGyjaEVO1E="; leaveDotGit = true; }; + patches = [ + (fetchpatch { + name = "fix-buffer-overflow-runstats.patch"; + url = "https://github.com/RTimothyEdwards/magic/commit/6a07bc172b4bdae8bc22f51905194cdd427912cc.patch"; + hash = "sha256-QPVl+SfUWj51u/G+EjTCVQZdG7tTdOlEFN/hS7E1Ojg="; + }) + + (fetchpatch { + name = "neuer-fix-name.patch"; + url = "https://github.com/RTimothyEdwards/magic/commit/a70ca249c3a4e7a256a4482bd887452267c8cd52.patch"; + hash = "sha256-sNQDz4/hBtwJeDrOCe+LfJkuaB0zRzX7w1aDv8ZD7Pw="; + }) + ]; + nativeBuildInputs = [ python3 - git + gitMinimal ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames @@ -97,4 +112,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/ma/maiko/package.nix b/pkgs/by-name/ma/maiko/package.nix index 831dde3c7a5f..3114dafc8c87 100644 --- a/pkgs/by-name/ma/maiko/package.nix +++ b/pkgs/by-name/ma/maiko/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; installPhase = '' runHook preInstall @@ -32,6 +32,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://interlisp.org/"; changelog = "https://github.com/Interlisp/maiko/releases"; license = lib.licenses.mit; - inherit (xorg.libX11.meta) platforms; + inherit (libx11.meta) platforms; }; }) diff --git a/pkgs/by-name/ma/mailspring/linux.nix b/pkgs/by-name/ma/mailspring/linux.nix index db2be8ddefcf..2164a10122fd 100644 --- a/pkgs/by-name/ma/mailspring/linux.nix +++ b/pkgs/by-name/ma/mailspring/linux.nix @@ -18,7 +18,11 @@ nss, openssl, udev, - xorg, + libxtst, + libxscrnsaver, + libxdamage, + libxshmfence, + libxkbfile, libgbm, libdrm, libappindicator, @@ -46,11 +50,11 @@ stdenv.mkDerivation (finalAttrs: { libkrb5 libsecret nss - xorg.libxkbfile - xorg.libXdamage - xorg.libXScrnSaver - xorg.libXtst - xorg.libxshmfence + libxkbfile + libxdamage + libxscrnsaver + libxtst + libxshmfence libgbm libdrm ]; diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix index a272bb06e9b4..e27e971ca820 100644 --- a/pkgs/by-name/ma/marktext/package.nix +++ b/pkgs/by-name/ma/marktext/package.nix @@ -8,7 +8,9 @@ nodejs, electron, python3, - xorg, + libx11, + xorgproto, + libxkbfile, fontconfig, node-gyp-build, ripgrep, @@ -58,10 +60,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libsecret - xorg.libX11 - xorg.libxkbfile + libx11 + libxkbfile fontconfig - xorg.xorgproto + xorgproto ]; postPatch = '' diff --git a/pkgs/by-name/ma/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix index 9f335c07e569..3c38de14a67f 100644 --- a/pkgs/by-name/ma/mathematica/generic.nix +++ b/pkgs/by-name/ma/mathematica/generic.nix @@ -45,7 +45,22 @@ xcbutilimage, xcbutilkeysyms, xkeyboard_config, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxmu, + libxi, + libxinerama, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxcb, zlib, # options cudaSupport, @@ -115,25 +130,23 @@ stdenv.mkDerivation { xcbutilimage xcbutilkeysyms xkeyboard_config - ] - ++ (with xorg; [ - libICE - libSM - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXinerama - libXmu - libXrandr - libXrender - libXtst + libice + libsm + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxinerama + libxmu + libxrandr + libxrender + libxtst libxcb - ]) + ] ++ lib.optional cudaSupport cudaEnv; wrapProgramFlags = [ diff --git a/pkgs/by-name/mc/mcp-language-server/package.nix b/pkgs/by-name/mc/mcp-language-server/package.nix new file mode 100644 index 000000000000..3bd9a71552ad --- /dev/null +++ b/pkgs/by-name/mc/mcp-language-server/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: +buildGoModule rec { + pname = "mcp-language-server"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "isaacphi"; + repo = "mcp-language-server"; + rev = "v${version}"; + hash = "sha256-T0wuPSShJqVW+CcQHQuZnh3JOwqUxAKv1OCHwZMr7KM="; + }; + + subPackages = [ "." ]; + + proxyVendor = true; + + vendorHash = "sha256-niDJB3QhZjz9qIGSjUEcghRpEbPUgsSuK52ncZ21DS8="; + + meta = { + description = "Model Context Protocol server to interact with language servers"; + license = lib.licenses.bsd3; + homepage = "https://github.com/isaacphi/mcp-language-server"; + mainProgram = "mcp-language-server"; + maintainers = with lib.maintainers; [ + fayash + ]; + }; +} diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix index d1516cdda61c..41ca23a21ebb 100644 --- a/pkgs/by-name/mc/mcpelauncher-client/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix @@ -9,7 +9,9 @@ zlib, libpng, libglvnd, - xorg, + libxtst, + libxi, + libx11, libevdev, curl, pulseaudio, @@ -68,9 +70,9 @@ clangStdenv.mkDerivation (finalAttrs: { zlib libpng libglvnd - xorg.libX11 - xorg.libXi - xorg.libXtst + libx11 + libxi + libxtst libevdev curl pulseaudio diff --git a/pkgs/by-name/me/mediagoblin/package.nix b/pkgs/by-name/me/mediagoblin/package.nix index 6c6269d9ce22..649d98b3ea33 100644 --- a/pkgs/by-name/me/mediagoblin/package.nix +++ b/pkgs/by-name/me/mediagoblin/package.nix @@ -7,7 +7,7 @@ gst_all_1, poppler-utils, python3, - xorg, + lndir, }: let @@ -76,7 +76,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection python3.pkgs.babel - xorg.lndir + lndir ]; build-system = with python.pkgs; [ diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix index 91b2b7c1a877..d4ff02faf708 100644 --- a/pkgs/by-name/me/megaglest/package.nix +++ b/pkgs/by-name/me/megaglest/package.nix @@ -21,7 +21,10 @@ libpng, fontconfig, freetype, - xorg, + libxext, + libx11, + libsm, + libice, makeWrapper, bash, which, @@ -37,10 +40,10 @@ let name = "megaglest-lib-env"; paths = [ SDL2 - xorg.libSM - xorg.libICE - xorg.libX11 - xorg.libXext + libsm + libice + libx11 + libxext xercesc openal libvorbis @@ -117,7 +120,7 @@ stdenv.mkDerivation { buildInputs = [ curl SDL2 - xorg.libX11 + libx11 xercesc openal lua diff --git a/pkgs/by-name/me/megapixels/package.nix b/pkgs/by-name/me/megapixels/package.nix index 31d55d2dcd30..f24c692dca1c 100644 --- a/pkgs/by-name/me/megapixels/package.nix +++ b/pkgs/by-name/me/megapixels/package.nix @@ -13,7 +13,7 @@ libepoxy, libmegapixels, libpulseaudio, - xorg, + libxrandr, zbar, tiffSupport ? true, libraw, @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { libepoxy libmegapixels libpulseaudio - xorg.libXrandr + libxrandr zbar ]; diff --git a/pkgs/by-name/me/megasync/package.nix b/pkgs/by-name/me/megasync/package.nix index cf951fb801b5..dab7f505ec8f 100644 --- a/pkgs/by-name/me/megasync/package.nix +++ b/pkgs/by-name/me/megasync/package.nix @@ -27,7 +27,7 @@ readline, sqlite, wget, - xorg, + xrdb, zlib, nix-update-script, @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { ]; preFixup = '' - qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ xorg.xrdb ]}) + qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ xrdb ]}) ''; passthru = { diff --git a/pkgs/by-name/me/melmatcheq-lv2/package.nix b/pkgs/by-name/me/melmatcheq-lv2/package.nix index 82423408c7cd..427a6c5250d4 100644 --- a/pkgs/by-name/me/melmatcheq-lv2/package.nix +++ b/pkgs/by-name/me/melmatcheq-lv2/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, xorgproto, cairo, lv2, @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 xorgproto cairo lv2 diff --git a/pkgs/by-name/me/menyoki/package.nix b/pkgs/by-name/me/menyoki/package.nix index e590c11abcc6..b5b5d8e8d0a0 100644 --- a/pkgs/by-name/me/menyoki/package.nix +++ b/pkgs/by-name/me/menyoki/package.nix @@ -7,7 +7,8 @@ stdenv, withSixel ? false, libsixel, - xorg, + libxrandr, + libx11, withSki ? true, }: @@ -28,13 +29,10 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional withSixel libsixel - ++ lib.optionals stdenv.hostPlatform.isLinux ( - with xorg; - [ - libX11 - libXrandr - ] - ); + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libx11 + libxrandr + ]; buildNoDefaultFeatures = !withSki; buildFeatures = lib.optional withSixel "sixel"; diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix index 74bc821b8073..42e95fd6c4f7 100644 --- a/pkgs/by-name/me/metacity/package.nix +++ b/pkgs/by-name/me/metacity/package.nix @@ -7,7 +7,10 @@ gnome, gsettings-desktop-schemas, gtk3, - xorg, + libxres, + libxpresent, + libxdamage, + libx11, libcanberra-gtk3, libgtop, libstartup_notification, @@ -33,10 +36,10 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libXres - xorg.libXpresent - xorg.libXdamage - xorg.libX11 + libxres + libxpresent + libxdamage + libx11 glib gsettings-desktop-schemas gtk3 diff --git a/pkgs/by-name/mi/microsoft-identity-broker/package.nix b/pkgs/by-name/mi/microsoft-identity-broker/package.nix index ac38570b14c7..55e854c1cb75 100644 --- a/pkgs/by-name/mi/microsoft-identity-broker/package.nix +++ b/pkgs/by-name/mi/microsoft-identity-broker/package.nix @@ -10,7 +10,7 @@ nixosTests, bash, glib, - xorg, + libxtst, alsa-lib, }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - xorg.libXtst + libxtst alsa-lib ]; diff --git a/pkgs/by-name/mi/minivmac/package.nix b/pkgs/by-name/mi/minivmac/package.nix index 0253073a3511..663a3cf47515 100644 --- a/pkgs/by-name/mi/minivmac/package.nix +++ b/pkgs/by-name/mi/minivmac/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, buildPackages, alsa-lib, - xorg, + libx11, }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hash = "sha256-iiEE0ioXh3keKUPfAB+YcE1iggGLpxT9N8LSVFDhttE="; }; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/by-name/mk/mkbrr/package.nix b/pkgs/by-name/mk/mkbrr/package.nix index d4fe40a0f7b2..fdeb094c4b09 100644 --- a/pkgs/by-name/mk/mkbrr/package.nix +++ b/pkgs/by-name/mk/mkbrr/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "mkbrr"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "mkbrr"; tag = "v${finalAttrs.version}"; - hash = "sha256-EL+pYQCrP6pPa7cDBhuVv+X+PuiGz9OuqWbNC3PfEG0="; + hash = "sha256-5oyzeinRjR09GEvLMGdCDH+UGYWPu1Qs8dXs/nIlwjs="; }; vendorHash = "sha256-mbcbACOKMohBw0SH5gH06CTkHtJk3WmbAqpcO0qMFOs="; diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix index 22b87f1a4e5d..a9a63fad183b 100644 --- a/pkgs/by-name/mo/mochi/package.nix +++ b/pkgs/by-name/mo/mochi/package.nix @@ -5,7 +5,7 @@ fetchzip, lib, stdenvNoCC, - xorg, + libxshmfence, }: let @@ -22,7 +22,7 @@ let appimageContents = appimageTools.extractType2 { inherit pname version src; }; - extraPkgs = pkgs: [ xorg.libxshmfence ]; + extraPkgs = pkgs: [ libxshmfence ]; extraInstallCommands = '' install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/ diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix index baf52dc3f9c0..7772da261cd1 100644 --- a/pkgs/by-name/mo/modrinth-app/package.nix +++ b/pkgs/by-name/mo/modrinth-app/package.nix @@ -25,7 +25,12 @@ symlinkJoin, udev, wrapGAppsHook3, - xorg, + libxxf86vm, + libxrandr, + libxext, + libxcursor, + libx11, + xrandr, }: symlinkJoin { @@ -52,11 +57,11 @@ symlinkJoin { # glfw libGL - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXrandr - xorg.libXxf86vm + libx11 + libxcursor + libxext + libxrandr + libxxf86vm # lwjgl (lib.getLib stdenv.cc.cc) @@ -79,7 +84,7 @@ symlinkJoin { gappsWrapperArgs+=( --prefix PATH : ${lib.makeSearchPath "bin/java" jdks} ${lib.optionalString stdenv.hostPlatform.isLinux '' - --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} + --prefix PATH : ${lib.makeBinPath [ xrandr ]} --set LD_LIBRARY_PATH $runtimeDependencies ''} ) diff --git a/pkgs/by-name/mo/molden/package.nix b/pkgs/by-name/mo/molden/package.nix index 38f529d426e0..860a25cedf71 100644 --- a/pkgs/by-name/mo/molden/package.nix +++ b/pkgs/by-name/mo/molden/package.nix @@ -5,7 +5,8 @@ which, gfortran, libGLU, - xorg, + libxmu, + libx11, }: stdenv.mkDerivation rec { @@ -21,8 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ gfortran libGLU - xorg.libX11 - xorg.libXmu + libx11 + libxmu ]; patches = [ ./dont_register_file_types.patch ]; diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index ca8716e4fb57..cfd62c808d71 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -8,7 +8,19 @@ makeWrapper, runtimeShell, gtk3, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxkbfile, glib, cairo, pango, @@ -90,19 +102,19 @@ let pango stdenv.cc.cc systemd - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxkbfile - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxkbfile + libxshmfence (lib.getLib stdenv.cc.cc) ]; in diff --git a/pkgs/by-name/mo/moonlight-embedded/package.nix b/pkgs/by-name/mo/moonlight-embedded/package.nix index eb92a97cc0f4..6ebea089c47f 100644 --- a/pkgs/by-name/mo/moonlight-embedded/package.nix +++ b/pkgs/by-name/mo/moonlight-embedded/package.nix @@ -11,7 +11,8 @@ SDL2, ffmpeg, pkg-config, - xorg, + libpthread-stubs, + libxcb, libvdpau, libpulseaudio, libcec, @@ -51,11 +52,11 @@ stdenv.mkDerivation rec { udev SDL2 ffmpeg - xorg.libxcb + libxcb libvdpau libpulseaudio libcec - xorg.libpthreadstubs + libpthread-stubs curl expat avahi diff --git a/pkgs/by-name/mo/mousetweaks/package.nix b/pkgs/by-name/mo/mousetweaks/package.nix index adef94490f6c..e5dc9f4f8c95 100644 --- a/pkgs/by-name/mo/mousetweaks/package.nix +++ b/pkgs/by-name/mo/mousetweaks/package.nix @@ -8,7 +8,10 @@ gnome, gsettings-desktop-schemas, wrapGAppsHook3, - xorg, + libxtst, + libxfixes, + libxcursor, + libx11, }: stdenv.mkDerivation rec { @@ -29,10 +32,10 @@ stdenv.mkDerivation rec { glib gtk3 gsettings-desktop-schemas - xorg.libX11 - xorg.libXtst - xorg.libXfixes - xorg.libXcursor + libx11 + libxtst + libxfixes + libxcursor ]; passthru = { diff --git a/pkgs/by-name/mq/mqttx/package.nix b/pkgs/by-name/mq/mqttx/package.nix index b05448f26df2..8e6caa95094f 100644 --- a/pkgs/by-name/mq/mqttx/package.nix +++ b/pkgs/by-name/mq/mqttx/package.nix @@ -35,7 +35,7 @@ in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: [ pkgs.xorg.libxshmfence ]; + extraPkgs = pkgs: [ pkgs.libxshmfence ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop diff --git a/pkgs/by-name/mr/mricron/package.nix b/pkgs/by-name/mr/mricron/package.nix index d79f59bced84..0a02ff058b2a 100644 --- a/pkgs/by-name/mr/mricron/package.nix +++ b/pkgs/by-name/mr/mricron/package.nix @@ -15,7 +15,7 @@ makeDesktopItem, pango, unzip, - xorg, + libx11, zlib, }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { glib gdk-pixbuf pango - xorg.libX11 + libx11 zlib ]; diff --git a/pkgs/by-name/ms/mslicer/package.nix b/pkgs/by-name/ms/mslicer/package.nix index 08743270ee8d..8ea8d7a216e5 100644 --- a/pkgs/by-name/ms/mslicer/package.nix +++ b/pkgs/by-name/ms/mslicer/package.nix @@ -7,7 +7,10 @@ rustPlatform, vulkan-loader, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -28,10 +31,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libxkbcommon vulkan-loader wayland - xorg.libXcursor - xorg.libXrandr - xorg.libXi - xorg.libX11 + libxcursor + libxrandr + libxi + libx11 ]; # Force linking to libEGL, which is always dlopen()ed, and to diff --git a/pkgs/by-name/mu/mudlet/package.nix b/pkgs/by-name/mu/mudlet/package.nix index 90cc8791a155..e7b7e0e26883 100644 --- a/pkgs/by-name/mu/mudlet/package.nix +++ b/pkgs/by-name/mu/mudlet/package.nix @@ -168,7 +168,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ wyvie pstn - cpu felixalbrigtsen ]; platforms = with lib.platforms; linux ++ darwin; diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix index 95c04f48d5c5..f249d6ad4d31 100644 --- a/pkgs/by-name/mu/muffin/package.nix +++ b/pkgs/by-name/mu/muffin/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "6.6.2"; + version = "6.6.3"; outputs = [ "out" @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = "muffin"; rev = version; - hash = "sha256-UqN1KFGhjjn0NquOAqYILEn2MPqimTyWbi6dJEALYy8="; + hash = "sha256-PNL6PAZinds+kqCUCesJkTS+93juhm35sPE7RFUdxeU="; }; patches = [ diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index ed6174c7df68..0f129ae4e6cb 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -20,7 +20,19 @@ libgbm, libGL, wayland, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxcb, autoPatchelfHook, systemd, libnotify, @@ -49,19 +61,19 @@ let libappindicator libnotify libgbm - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxcb + libxshmfence nspr nss systemd diff --git a/pkgs/by-name/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix index 5eeeae31c7ea..c1eb6b9a6203 100644 --- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix +++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix @@ -21,7 +21,13 @@ nspr, nss, pango, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, writeScript, }: let @@ -58,13 +64,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { nspr nss pango - xorg.libX11 - xorg.libXcomposite - xorg.libxcb - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr + libx11 + libxcomposite + libxcb + libxdamage + libxext + libxfixes + libxrandr ]; dontBuild = true; diff --git a/pkgs/by-name/mu/multivnc/package.nix b/pkgs/by-name/mu/multivnc/package.nix index a17e323628c1..8428293895d8 100644 --- a/pkgs/by-name/mu/multivnc/package.nix +++ b/pkgs/by-name/mu/multivnc/package.nix @@ -17,7 +17,8 @@ libsepol, libthai, libdatrie, - xorg, + libxtst, + libxdmcp, lerc, libxkbcommon, libepoxy, @@ -84,8 +85,8 @@ stdenv.mkDerivation { lerc libxkbcommon libepoxy - xorg.libXdmcp - xorg.libXtst + libxdmcp + libxtst ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/nc/ncview/package.nix b/pkgs/by-name/nc/ncview/package.nix index 9845006113ae..5259aa000d99 100644 --- a/pkgs/by-name/nc/ncview/package.nix +++ b/pkgs/by-name/nc/ncview/package.nix @@ -6,7 +6,11 @@ libpng, udunits, netcdf, - xorg, + libxt, + libxaw, + libx11, + libsm, + libice, }: stdenv.mkDerivation (finalAttrs: { @@ -29,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { libpng netcdf udunits - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXaw - xorg.libXt + libice + libsm + libx11 + libxaw + libxt ]; meta = { diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix index e3de241ad2d6..31e79e2fbc1a 100644 --- a/pkgs/by-name/ne/neothesia/package.nix +++ b/pkgs/by-name/ne/neothesia/package.nix @@ -9,7 +9,10 @@ makeWrapper, libxkbcommon, vulkan-loader, - xorg, + libxrender, + libxi, + libxcursor, + libx11, }: let version = "0.3.1"; @@ -49,10 +52,10 @@ rustPlatform.buildRustPackage { wayland libxkbcommon vulkan-loader - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrender + libx11 + libxcursor + libxi + libxrender ] }" diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index e0cff9bcdd65..168457b35776 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -16,7 +16,11 @@ cctools, SDL2, fontconfig, - xorg, + libxrandr, + libxi, + libxext, + libxcursor, + libx11, stdenv, libglvnd, libxkbcommon, @@ -87,11 +91,11 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: { [ libglvnd libxkbcommon - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXrandr - xorg.libXi + libx11 + libxcursor + libxext + libxrandr + libxi ] ++ lib.optionals enableWayland [ wayland ] ); diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix index babe467c9ccd..1272a7e2fed0 100644 --- a/pkgs/by-name/ne/netgen/package.nix +++ b/pkgs/by-name/ne/netgen/package.nix @@ -17,7 +17,7 @@ zlib, tcl, tk, - xorg, + libxmu, libjpeg, ffmpeg, catch2, @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { tcl tk libGLU - xorg.libXmu + libxmu libjpeg ffmpeg mpi diff --git a/pkgs/by-name/ne/neuron/package.nix b/pkgs/by-name/ne/neuron/package.nix index b836deae90c9..9b3d54ccbe30 100644 --- a/pkgs/by-name/ne/neuron/package.nix +++ b/pkgs/by-name/ne/neuron/package.nix @@ -3,7 +3,9 @@ stdenv, fetchFromGitHub, readline, - xorg, + libxext, + libxcomposite, + libx11, mpi, cmake, bison, @@ -42,9 +44,9 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = optionals useIv [ - xorg.libX11.dev - xorg.libXcomposite.dev - xorg.libXext.dev + libx11.dev + libxcomposite.dev + libxext.dev ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix index 10d30d052747..32dc1d833dce 100644 --- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix +++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix @@ -8,7 +8,12 @@ makeDesktopItem, nss, cairo, - xorg, + libxrandr, + libxfixes, + libxdamage, + libxcursor, + libxcomposite, + libx11, libxkbcommon, alsa-lib, at-spi2-core, @@ -91,15 +96,13 @@ let libgbm libGL libglvnd - ] - ++ (with xorg; [ - libX11 - libXcomposite - libXdamage - libXrandr - libXfixes - libXcursor - ]); + libx11 + libxcomposite + libxdamage + libxrandr + libxfixes + libxcursor + ]; # Required to launch the application and proceed past the zygote_linux fork() process # Fixes `Zygote could not fork` diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index c9eceb90d7b8..ab08d86b3f62 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.44.1"; + version = "2.44.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = "nfpm"; rev = "v${version}"; - hash = "sha256-zgj+cwgTyCzg1s3ta0sUDvwNdQJrlhCmuI2Qgqrf28Q="; + hash = "sha256-xmOB9AWesWEx4alon4h/83d15BZdxUVVO/KWutejCpw="; }; - vendorHash = "sha256-8Kt/TdL75Cs34Su7Pf2MSZaIrjpP/oFZygGdMZlxpAk="; + vendorHash = "sha256-tEuNOBBUnJNjk1Mao8A7KtuPIdkxsmj+yp8fuovOK0s="; ldflags = [ "-s" diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix index 07089ee9d8ca..be4b5791d0b8 100644 --- a/pkgs/by-name/ni/ninjas2/package.nix +++ b/pkgs/by-name/ni/ninjas2/package.nix @@ -5,7 +5,7 @@ libjack2, libGL, pkg-config, - xorg, + libx11, libsndfile, libsamplerate, }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 - xorg.libX11 + libx11 libGL libsndfile libsamplerate diff --git a/pkgs/by-name/ni/nitrotpm-tools/package.nix b/pkgs/by-name/ni/nitrotpm-tools/package.nix index 2ac90fe24fd0..64f9ce8f15b9 100644 --- a/pkgs/by-name/ni/nitrotpm-tools/package.nix +++ b/pkgs/by-name/ni/nitrotpm-tools/package.nix @@ -41,7 +41,10 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/aws/NitroTPM-Tools"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ arianvp ]; + maintainers = with lib.maintainers; [ + arianvp + mariusknaust + ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/no/nordpass/package.nix b/pkgs/by-name/no/nordpass/package.nix index bece26ceeea9..babc43777c02 100644 --- a/pkgs/by-name/no/nordpass/package.nix +++ b/pkgs/by-name/no/nordpass/package.nix @@ -3,7 +3,21 @@ lib, stdenv, squashfsTools, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxshmfence, + libxcb, alsa-lib, freetype, glib, @@ -70,21 +84,21 @@ let pango stdenv.cc.cc systemd - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libxshmfence - xorg.libXtst + libice + libsm + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxscrnsaver + libxshmfence + libxtst zlib ]; diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix index 6ecd51425d85..0cc6a14f03db 100644 --- a/pkgs/by-name/no/normcap/package.nix +++ b/pkgs/by-name/no/normcap/package.nix @@ -7,7 +7,7 @@ leptonica, wl-clipboard, libnotify, - xorg, + xvfb, makeDesktopItem, copyDesktopItems, }: @@ -112,7 +112,7 @@ ps.buildPythonApplication rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ ps.pytest-xvfb - xorg.xvfb + xvfb ]; preCheck = '' diff --git a/pkgs/by-name/nu/numworks-epsilon/package.nix b/pkgs/by-name/nu/numworks-epsilon/package.nix index d8a48ec84af1..772c3e7a164e 100644 --- a/pkgs/by-name/nu/numworks-epsilon/package.nix +++ b/pkgs/by-name/nu/numworks-epsilon/package.nix @@ -5,7 +5,7 @@ libpng, libjpeg, freetype, - xorg, + libxext, python3, imagemagick, gcc-arm-embedded, @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { libpng libjpeg freetype - xorg.libXext + libxext python3 imagemagick gcc-arm-embedded diff --git a/pkgs/by-name/nx/nx-libs/package.nix b/pkgs/by-name/nx/nx-libs/package.nix index 616ab0ee164c..de0f1b09400a 100644 --- a/pkgs/by-name/nx/nx-libs/package.nix +++ b/pkgs/by-name/nx/nx-libs/package.nix @@ -11,7 +11,21 @@ libxml2, pkg-config, which, - xorg, + xkeyboard-config, + libxtst, + libxrandr, + libxpm, + libxinerama, + libxfont_2, + libxext, + libxdmcp, + libxdamage, + libxcomposite, + font-util, + xkbcomp, + pixman, + imake, + gccmakedep, libtirpc, }: stdenv.mkDerivation rec { @@ -38,26 +52,26 @@ stdenv.mkDerivation rec { libtool pkg-config which - xorg.gccmakedep - xorg.imake + gccmakedep + imake ]; buildInputs = [ libjpeg_turbo libpng libxml2 - xorg.fontutil - xorg.libXcomposite - xorg.libXdamage - xorg.libXdmcp - xorg.libXext - xorg.libXfont2 - xorg.libXinerama - xorg.libXpm - xorg.libXrandr - xorg.libXtst - xorg.pixman - xorg.xkbcomp - xorg.xkeyboardconfig + font-util + libxcomposite + libxdamage + libxdmcp + libxext + libxfont_2 + libxinerama + libxpm + libxrandr + libxtst + pixman + xkbcomp + xkeyboard-config libtirpc ]; diff --git a/pkgs/by-name/nz/nzportable/fteqw.nix b/pkgs/by-name/nz/nzportable/fteqw.nix index 8be5ef62f08e..1c1bd95072e9 100644 --- a/pkgs/by-name/nz/nzportable/fteqw.nix +++ b/pkgs/by-name/nz/nzportable/fteqw.nix @@ -14,7 +14,14 @@ zlib, gnutls, libGL, - xorg, + libxxf86vm, + libxxf86dga, + libxscrnsaver, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, alsa-lib, libjpeg, libogg, @@ -61,11 +68,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGL - xorg.libxcb - xorg.libX11 - xorg.libXrandr - xorg.libXcursor - xorg.libXScrnSaver + libxcb + libx11 + libxrandr + libxcursor + libxscrnsaver dbus fontconfig libjpeg @@ -114,12 +121,12 @@ stdenv.mkDerivation (finalAttrs: { addDriverRunpath.driverLink # gl/gl_vidlinuxglx.c - xorg.libX11 - xorg.libXrandr - xorg.libXxf86vm - xorg.libXxf86dga - xorg.libXi - xorg.libXcursor + libx11 + libxrandr + libxxf86vm + libxxf86dga + libxi + libxcursor libGL libvorbis diff --git a/pkgs/by-name/od/odamex/package.nix b/pkgs/by-name/od/odamex/package.nix index 83ceb829e46e..8811c7ce19ac 100644 --- a/pkgs/by-name/od/odamex/package.nix +++ b/pkgs/by-name/od/odamex/package.nix @@ -31,7 +31,8 @@ wayland-scanner, waylandpp, wxGTK32, - xorg, + libx11, + xorgproto, zstd, nix-update-script, @@ -95,8 +96,8 @@ stdenv.mkDerivation (finalAttrs: { libsepol ] ++ lib.optionals withX11 [ - xorg.libX11 - xorg.xorgproto + libx11 + xorgproto ] ++ lib.optionals withWayland [ libxkbcommon diff --git a/pkgs/by-name/og/ogre-next/package.nix b/pkgs/by-name/og/ogre-next/package.nix index 99e21f9fc2ac..8e0eb1b4c5aa 100644 --- a/pkgs/by-name/og/ogre-next/package.nix +++ b/pkgs/by-name/og/ogre-next/package.nix @@ -9,7 +9,11 @@ pkg-config, SDL2, - xorg, + libxt, + libxrandr, + libxaw, + libx11, + libxcb, libGL, zlib, freetype, @@ -54,11 +58,11 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL - xorg.libX11 - xorg.libXaw - xorg.libXrandr - xorg.libXt - xorg.libxcb + libx11 + libxaw + libxrandr + libxt + libxcb ]; # TODO: Figure out Vulkan plugin deps diff --git a/pkgs/by-name/om/omnissa-horizon-client/package.nix b/pkgs/by-name/om/omnissa-horizon-client/package.nix index 2ed97fb3eba2..4ed8fe92d48d 100644 --- a/pkgs/by-name/om/omnissa-horizon-client/package.nix +++ b/pkgs/by-name/om/omnissa-horizon-client/package.nix @@ -102,17 +102,17 @@ let pixman udev omnissaHorizonClientFiles - xorg.libX11 - xorg.libXau - xorg.libXcursor - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libxkbfile - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst + libx11 + libxau + libxcursor + libxext + libxi + libxinerama + libxkbfile + libxrandr + libxrender + libxscrnsaver + libxtst zlib libxml2_13 diff --git a/pkgs/by-name/on/onagre/package.nix b/pkgs/by-name/on/onagre/package.nix index fff99134399e..43053020e80f 100644 --- a/pkgs/by-name/on/onagre/package.nix +++ b/pkgs/by-name/on/onagre/package.nix @@ -8,7 +8,10 @@ freetype, expat, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, libxkbcommon, pop-launcher, vulkan-loader, @@ -36,10 +39,10 @@ rustPlatform.buildRustPackage { buildInputs = [ expat freetype - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; postFixup = diff --git a/pkgs/by-name/on/onboard/package.nix b/pkgs/by-name/on/onboard/package.nix index 196243d55289..1e6c9fbc3d36 100644 --- a/pkgs/by-name/on/onboard/package.nix +++ b/pkgs/by-name/on/onboard/package.nix @@ -26,7 +26,8 @@ procps, python3, wrapGAppsHook3, - xorg, + libxtst, + libxkbfile, yelp, }: @@ -92,8 +93,8 @@ python3.pkgs.buildPythonApplication rec { libxkbcommon mousetweaks udev - xorg.libXtst - xorg.libxkbfile + libxtst + libxkbfile ] ++ lib.optional atspiSupport at-spi2-core; diff --git a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix index 560763fb7024..482374cbdd0d 100644 --- a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix +++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix @@ -35,7 +35,18 @@ qt5, wrapGAppsHook3, xkeyboard_config, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, }: let @@ -106,18 +117,18 @@ let qt5.qtdeclarative qt5.qtsvg qt5.qtwayland - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxscrnsaver + libxtst ]; dontWrapQtApps = true; @@ -150,7 +161,7 @@ let gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QTCOMPOSE "${libx11.out}/share/X11/locale" \ --set QT_QPA_PLATFORM "xcb" # the bundled version of qt does not support wayland ) diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index f8086641cb98..1afa20c3e3e8 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -11,7 +11,7 @@ stdenv, vulkan-headers, vulkan-loader, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { libGL vulkan-headers vulkan-loader - xorg.libX11 + libx11 ]; cmakeFlags = [ diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index e3311a3f7ac8..9a6a026f4aad 100644 --- a/pkgs/by-name/op/opengamepadui/package.nix +++ b/pkgs/by-name/op/opengamepadui/package.nix @@ -17,7 +17,6 @@ udev, upower, vulkan-loader, - xorg, withDebug ? false, }: diff --git a/pkgs/by-name/op/openmeters/package.nix b/pkgs/by-name/op/openmeters/package.nix index 959d7b780b25..ff65fab8e719 100644 --- a/pkgs/by-name/op/openmeters/package.nix +++ b/pkgs/by-name/op/openmeters/package.nix @@ -10,7 +10,10 @@ freetype, libglvnd, libxkbcommon, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "openmeters"; @@ -43,10 +46,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libglvnd libxkbcommon wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ] }' $out/bin/openmeters ''; diff --git a/pkgs/by-name/op/openroad/package.nix b/pkgs/by-name/op/openroad/package.nix index 881a512fc389..84ef0b8b61cf 100644 --- a/pkgs/by-name/op/openroad/package.nix +++ b/pkgs/by-name/op/openroad/package.nix @@ -37,7 +37,7 @@ tclPackages, yosys, zlib, - xorg, + libx11, llvmPackages, }: @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { zlib yaml-cpp ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; postPatch = '' diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index b584019221ff..5e6d54e1a958 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -38,7 +38,7 @@ wayland, wayland-protocols, wrapGAppsHook3, - xorg, + libxdmcp, mimalloc, opencsg, ctestCheckHook, @@ -106,7 +106,7 @@ clangStdenv.mkDerivation rec { qtmultimedia ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ - xorg.libXdmcp + libxdmcp libICE libSM wayland diff --git a/pkgs/by-name/op/opensoldat/package.nix b/pkgs/by-name/op/opensoldat/package.nix index d9028a931ed0..e9496e4aa5ce 100644 --- a/pkgs/by-name/op/opensoldat/package.nix +++ b/pkgs/by-name/op/opensoldat/package.nix @@ -10,7 +10,7 @@ physfs, openal, gamenetworkingsockets, - xorg, + libx11, autoPatchelfHook, cmake, python3, @@ -80,10 +80,10 @@ stdenv.mkDerivation rec { physfs openal gamenetworkingsockets - xorg.libX11 + libx11 ]; # TODO(@sternenseemann): set proper rpath via cmake, so we don't need autoPatchelfHook - runtimeDependencies = [ xorg.libX11 ]; + runtimeDependencies = [ libx11 ]; # make sure opensoldat{,server} find their game archive, # let them write their state and configuration files diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix index 1c6bb47812a3..87c68e669c23 100644 --- a/pkgs/by-name/op/opensubdiv/package.nix +++ b/pkgs/by-name/op/opensubdiv/package.nix @@ -5,7 +5,12 @@ fetchFromGitHub, cmake, pkg-config, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, libGLU, libGL, glew, @@ -48,12 +53,12 @@ stdenv.mkDerivation (finalAttrs: { libGL # FIXME: these are not actually needed, but the configure script wants them. glew - xorg.libX11 - xorg.libXrandr - xorg.libXxf86vm - xorg.libXcursor - xorg.libXinerama - xorg.libXi + libx11 + libxrandr + libxxf86vm + libxcursor + libxinerama + libxi ] ++ lib.optionals (openclSupport && stdenv.hostPlatform.isLinux) [ ocl-icd diff --git a/pkgs/by-name/op/opensurge/package.nix b/pkgs/by-name/op/opensurge/package.nix index 9b3294882af6..7cf3a69e8aa0 100644 --- a/pkgs/by-name/op/opensurge/package.nix +++ b/pkgs/by-name/op/opensurge/package.nix @@ -8,7 +8,7 @@ libglvnd, surgescript, physfs, - xorg, + libx11, versionCheckHook, nix-update-script, }: @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { libglvnd physfs surgescript - xorg.libX11 + libx11 ]; cmakeFlags = [ diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index 347232c44f90..25d97942744b 100644 --- a/pkgs/by-name/op/openturns/package.nix +++ b/pkgs/by-name/op/openturns/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openturns"; - version = "1.25.1"; + version = "1.26"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${finalAttrs.version}"; - hash = "sha256-TwM6RvXG4+IBNxH2Ajg9atcaOGlC4kzusH8+6VbI6m4="; + hash = "sha256-2z4tTTvDpc+AsPbiL528Y5zNf62v1u4nVaUpk22d+wo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix index 9920ed2b1447..6a166a566048 100644 --- a/pkgs/by-name/op/openvscode-server/package.nix +++ b/pkgs/by-name/op/openvscode-server/package.nix @@ -14,7 +14,8 @@ node-gyp, libsecret, libkrb5, - xorg, + libx11, + libxkbfile, ripgrep, cctools, nixosTests, @@ -109,11 +110,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] - ++ (with xorg; [ - libX11 + ++ [ + libx11 libxkbfile libkrb5 - ]) + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 03e490f8e0b4..be7edd5c9f3c 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -38,7 +38,7 @@ onetbb, webkitgtk_4_1, wxGTK31, - xorg, + libx11, libnoise, withSystemd ? stdenv.hostPlatform.isLinux, }: @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { onetbb webkitgtk_4_1 wxGTK' - xorg.libX11 + libx11 opencv.cxxdev libnoise ] diff --git a/pkgs/by-name/or/oreo-cursors-plus/package.nix b/pkgs/by-name/or/oreo-cursors-plus/package.nix index 4dc565c2c300..a60a55364d42 100644 --- a/pkgs/by-name/or/oreo-cursors-plus/package.nix +++ b/pkgs/by-name/or/oreo-cursors-plus/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, ruby, inkscape, - xorg, + xcursorgen, writeText, cursorsConf ? null, # If set to a string, overwrites contents of './cursors.conf' }: @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = lib.optionals (cursorsConf != null) [ ruby inkscape - xorg.xcursorgen + xcursorgen ]; # './cursors.conf' contains definitions of cursor variations to generate. diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index 732921de1468..aa66ba58665c 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -13,7 +13,7 @@ lttng-ust, numactl, libglvnd, - xorg, + libxi, udev, vulkan-loader, nix-update-script, @@ -54,7 +54,7 @@ buildDotnetModule rec { libglvnd # needed for the window to actually appear - xorg.libXi + libxi # needed to avoid in runtime.log: # [verbose]: SDL error log [debug]: Failed loading udev_device_get_action: /nix/store/*-osu-lazer-*/lib/osu-lazer/runtimes/linux-x64/native/libSDL2.so: undefined symbol: _udev_device_get_action diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 50ec4711c028..24690fe25769 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -27,7 +27,7 @@ pkg-config, symlinkJoin, nltk-data, - xorg, + lndir, }: let version = "2.20.5"; @@ -167,7 +167,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gettext - xorg.lndir + lndir ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/pa/par-lang/package.nix b/pkgs/by-name/pa/par-lang/package.nix index fa7a961ae617..4975a2fd685e 100644 --- a/pkgs/by-name/pa/par-lang/package.nix +++ b/pkgs/by-name/pa/par-lang/package.nix @@ -8,7 +8,10 @@ libGL, libxkbcommon, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, makeDesktopItem, copyDesktopItems, nix-update-script, @@ -40,10 +43,10 @@ rustPlatform.buildRustPackage { libGL libxkbcommon wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; in lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/pa/partio/package.nix b/pkgs/by-name/pa/partio/package.nix index 6175342bda90..f029f6aa557d 100644 --- a/pkgs/by-name/pa/partio/package.nix +++ b/pkgs/by-name/pa/partio/package.nix @@ -10,7 +10,8 @@ zlib, swig, doxygen, - xorg, + libxmu, + libxi, python3, }: @@ -41,8 +42,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib swig - xorg.libXi - xorg.libXmu + libxi + libxmu ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libglut diff --git a/pkgs/by-name/pa/pax-britannica/package.nix b/pkgs/by-name/pa/pax-britannica/package.nix index 510a96269f10..c19106bdb402 100644 --- a/pkgs/by-name/pa/pax-britannica/package.nix +++ b/pkgs/by-name/pa/pax-britannica/package.nix @@ -9,7 +9,8 @@ libGL, libGLU, alsa-lib, - xorg, + libxrandr, + libx11, glfw2, glfw3, useGlfw3 ? false, @@ -68,8 +69,8 @@ stdenv.mkDerivation { libGL libGLU alsa-lib - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr (if useGlfw3 then glfw3 else glfw2) ]; makeFlags = diff --git a/pkgs/by-name/pc/pcb/package.nix b/pkgs/by-name/pc/pcb/package.nix index 7a21f53684aa..52b789f3077d 100644 --- a/pkgs/by-name/pc/pcb/package.nix +++ b/pkgs/by-name/pc/pcb/package.nix @@ -19,7 +19,8 @@ tk, gnome2, gd, - xorg, + libxrender, + libxmu, }: stdenv.mkDerivation rec { @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 dbus - xorg.libXrender + libxrender freetype fontconfig libGLU @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { tk gnome2.gtkglext gd - xorg.libXmu + libxmu ]; configureFlags = [ diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix index 17e66ab4253a..01a32227eeff 100644 --- a/pkgs/by-name/pe/peazip/package.nix +++ b/pkgs/by-name/pe/peazip/package.nix @@ -5,7 +5,7 @@ qt6Packages, fpc, lazarus, - xorg, + libx11, runCommand, _7zz, brotli, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libX11 + libx11 ] ++ (with qt6Packages; [ qtbase diff --git a/pkgs/by-name/pe/pencil/package.nix b/pkgs/by-name/pe/pencil/package.nix index 544122a42127..0c198934c8f6 100644 --- a/pkgs/by-name/pe/pencil/package.nix +++ b/pkgs/by-name/pe/pencil/package.nix @@ -23,7 +23,18 @@ nspr, nss, pango, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, systemd, }: let @@ -47,18 +58,18 @@ let nspr nss pango - xorg.libX11 - xorg.libxcb - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst + libx11 + libxcb + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst (lib.getLib stdenv.cc.cc) stdenv.cc.cc ]; diff --git a/pkgs/by-name/ph/phoc/package.nix b/pkgs/by-name/ph/phoc/package.nix index 60b8fea9239a..3e1e736268b7 100644 --- a/pkgs/by-name/ph/phoc/package.nix +++ b/pkgs/by-name/ph/phoc/package.nix @@ -20,7 +20,7 @@ libdrm, libxkbcommon, wlroots_0_19, - xorg, + libxcb-wm, nix-update-script, nixosTests, testers, @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { json-glib wayland finalAttrs.wlroots - xorg.xcbutilwm + libxcb-wm gmobile ]; diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix index b61d8d6d0983..a02e5cce49cd 100644 --- a/pkgs/by-name/ph/phoenixd/package.nix +++ b/pkgs/by-name/ph/phoenixd/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "phoenixd"; - version = "0.7.1"; + version = "0.7.2"; src = let @@ -28,10 +28,10 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip"; hash = selectSystem { - aarch64-darwin = "sha256-WCXmXBqMQxovBYg9QtgOy/76tu3TeJ91ERusZZRHPhY="; - x86_64-darwin = "sha256-g23VWjZyt7V1YVoaHi/6M7m/SO7nOr56zt9M5j1t5hU="; - x86_64-linux = "sha256-m0Ibi1LG6PtdaGFgfhS7UOIhuFprDdJlj6SLzjTW8HY="; - aarch64-linux = "sha256-UuWoD4WsQA009CcdXLhIfs5VBlCqvX7yOVWyKZxJnlQ="; + aarch64-darwin = "sha256-OOoEgZLa+wZ8CXDH64TxvLBZ2r5WLyq6HERIyeEerf0="; + x86_64-darwin = "sha256-HPpgqmoiw3TCT4Q/+GJRv1AgHI0wtHThSPTSVAsPQcE="; + x86_64-linux = "sha256-T0Xhc4tzZRIDx16sbrOXeCZjRlTdeITghhfLHrU6nBY="; + aarch64-linux = "sha256-w7zaqDd4zYM0gva6l8d6tJ+/jpJuWERQ2aHaKOBKJAM="; }; }; diff --git a/pkgs/by-name/ph/photon-rss/package.nix b/pkgs/by-name/ph/photon-rss/package.nix index f07b91e0cd5c..1313c537a328 100644 --- a/pkgs/by-name/ph/photon-rss/package.nix +++ b/pkgs/by-name/ph/photon-rss/package.nix @@ -2,7 +2,7 @@ buildGoModule, fetchFromSourcehut, lib, - xorg, + libx11, }: buildGoModule { @@ -16,7 +16,7 @@ buildGoModule { sha256 = "sha256-2RSGLWfthcChd5YhDSBfLSch6wuTUv1Sh1f7flgzQwc="; }; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; proxyVendor = true; diff --git a/pkgs/by-name/pi/picocrypt-ng/package.nix b/pkgs/by-name/pi/picocrypt-ng/package.nix index f74102afedb4..b3515af297db 100644 --- a/pkgs/by-name/pi/picocrypt-ng/package.nix +++ b/pkgs/by-name/pi/picocrypt-ng/package.nix @@ -6,7 +6,7 @@ copyDesktopItems, makeDesktopItem, - xorg, + libxxf86vm, glfw, gtk3, pkg-config, @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { ++ glfw.propagatedBuildInputs or [ ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk3 - xorg.libXxf86vm + libxxf86vm ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix index b9085ca4be4b..cfa8906fdd91 100644 --- a/pkgs/by-name/pi/picocrypt/package.nix +++ b/pkgs/by-name/pi/picocrypt/package.nix @@ -6,7 +6,7 @@ copyDesktopItems, makeDesktopItem, - xorg, + libxxf86vm, glfw, gtk3, pkg-config, @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { ++ glfw.propagatedBuildInputs or [ ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk3 - xorg.libXxf86vm + libxxf86vm ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index d14537418401..4f8bf78409e6 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "pik"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "jacek-kurlit"; repo = "pik"; rev = version; - hash = "sha256-M3zje2UX03go7i9/06jXb8N2imx4VnZp6PHakJB3oZM="; + hash = "sha256-pDfqqQcYrK78OylwOiKc/Orul03MjdZxEHhpr8obm84="; }; - cargoHash = "sha256-ulMgapYkfTfynNW3XfiC/jo4GWGJ4HS9TCnXAGqs7Ac="; + cargoHash = "sha256-/2E5VZt2/xWtPy4Zpo8lVn4sXR4Gq6+NJkKpNM7hOVg="; passthru.tests.version = testers.testVersion { package = pik; }; diff --git a/pkgs/by-name/pi/pinball/package.nix b/pkgs/by-name/pi/pinball/package.nix index 58a4618543a4..a92b3c0951cb 100644 --- a/pkgs/by-name/pi/pinball/package.nix +++ b/pkgs/by-name/pi/pinball/package.nix @@ -9,7 +9,7 @@ SDL2, SDL2_image, SDL2_mixer, - xorg, + libsm, }: stdenv.mkDerivation { @@ -37,7 +37,7 @@ stdenv.mkDerivation { SDL2 SDL2_image SDL2_mixer - xorg.libSM + libsm ]; strictDeps = true; diff --git a/pkgs/by-name/pi/pixinsight/package.nix b/pkgs/by-name/pi/pixinsight/package.nix index 4a3b74a2eaae..d7900f55fdee 100644 --- a/pkgs/by-name/pi/pixinsight/package.nix +++ b/pkgs/by-name/pi/pixinsight/package.nix @@ -27,7 +27,15 @@ brotli, libxkbcommon, libxcb, - xorg, + libxtst, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + xrandr, + libxkbfile, wayland, libudev0-shim, bubblewrap, @@ -150,18 +158,16 @@ let brotli libxkbcommon libxcb - ] - ++ (with pkgs.xorg; [ - libX11 - libXdamage + libx11 + libxdamage xrandr - libXtst - libXcomposite - libXext - libXfixes - libXrandr + libxtst + libxcomposite + libxext + libxfixes + libxrandr libxkbfile - ]); + ]; profile = '' export QT_QPA_PLATFORM_PLUGIN_PATH=/opt/PixInsight/bin/lib/qt-plugins/platforms diff --git a/pkgs/by-name/pl/planetary_annihilation/package.nix b/pkgs/by-name/pl/planetary_annihilation/package.nix index a7fdf350e117..93c098f1140a 100644 --- a/pkgs/by-name/pl/planetary_annihilation/package.nix +++ b/pkgs/by-name/pl/planetary_annihilation/package.nix @@ -18,7 +18,13 @@ gdk-pixbuf, curl, systemd, - xorg, + libxrender, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, requireFile, }: @@ -50,17 +56,17 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${ lib.makeLibraryPath [ stdenv.cc.cc - xorg.libXdamage - xorg.libXfixes + libxdamage + libxfixes gtk2 glib stdenv.cc.libc "$out" - xorg.libXext + libxext pango udev - xorg.libX11 - xorg.libXcomposite + libx11 + libxcomposite alsa-lib atk nspr @@ -71,7 +77,7 @@ stdenv.mkDerivation rec { freetype gnome2.GConf gdk-pixbuf - xorg.libXrender + libxrender ] }:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" "$out/host/CoherentUI_Host" @@ -79,8 +85,8 @@ stdenv.mkDerivation rec { lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc - xorg.libX11 - xorg.libXcursor + libx11 + libxcursor gtk2 glib curl @@ -93,9 +99,9 @@ stdenv.mkDerivation rec { lib.makeLibraryPath [ stdenv.cc.cc curl - xorg.libX11 + libx11 stdenv.cc.libc - xorg.libXcursor + libxcursor "$out" ] }:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" $f diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index eab8dbafedad..66a26c9534bc 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -29,7 +29,14 @@ vulkan-loader, wrapGAppsHook3, xdg-utils, - xorg, + libxtst, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, }: stdenv.mkDerivation rec { pname = "plasticity"; @@ -77,14 +84,14 @@ stdenv.mkDerivation rec { systemd libglvnd vulkan-loader # may help with nvidia users - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libXtst + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxtst ]; dontUnpack = true; diff --git a/pkgs/by-name/pl/plasticscm-client-gui/package.nix b/pkgs/by-name/pl/plasticscm-client-gui/package.nix index 59008bb453c5..8e3a57b9e488 100644 --- a/pkgs/by-name/pl/plasticscm-client-gui/package.nix +++ b/pkgs/by-name/pl/plasticscm-client-gui/package.nix @@ -50,11 +50,11 @@ buildFHSEnv { # Undocumented dependencies discovered from testing gtk3 - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXcursor - xorg.libXi + libice + libsm + libx11 + libxcursor + libxi ] ++ extraLibs pkgs; diff --git a/pkgs/by-name/pl/playonlinux/package.nix b/pkgs/by-name/pl/playonlinux/package.nix index 392ad5b1d38d..7fc0b612e470 100644 --- a/pkgs/by-name/pl/playonlinux/package.nix +++ b/pkgs/by-name/pl/playonlinux/package.nix @@ -22,7 +22,7 @@ which, curl, jq, - xorg, + libx11, libGL, steam-run, # needed for avoiding crash on file selector @@ -66,7 +66,7 @@ let libs = pkgs: lib.makeLibraryPath [ - xorg.libX11 + libx11 libGL ]; @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib - xorg.libX11 + libx11 libGL python gsettings-desktop-schemas diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix index a3a12c8e3598..063b03389c52 100644 --- a/pkgs/by-name/pl/plex-desktop/package.nix +++ b/pkgs/by-name/pl/plex-desktop/package.nix @@ -21,7 +21,18 @@ stdenv, writeShellScript, xkeyboard_config, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxtst, + libxrender, + libxrandr, + libxinerama, + libxdamage, + libxcomposite, + xrandr, + libxshmfence, }: let pname = "plex-desktop"; @@ -75,18 +86,18 @@ let minizip nss stdenv.cc.cc - xorg.libXcomposite - xorg.libXdamage - xorg.libXinerama - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxshmfence - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.xrandr + libxcomposite + libxdamage + libxinerama + libxrandr + libxrender + libxtst + libxshmfence + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm + xrandr ]; strictDeps = true; diff --git a/pkgs/by-name/pl/plex-htpc/package.nix b/pkgs/by-name/pl/plex-htpc/package.nix index 9c7332c7c405..a6b568ec99e1 100644 --- a/pkgs/by-name/pl/plex-htpc/package.nix +++ b/pkgs/by-name/pl/plex-htpc/package.nix @@ -20,7 +20,18 @@ stdenv, writeShellScript, xkeyboard_config, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxtst, + libxrender, + libxrandr, + libxinerama, + libxdamage, + libxcomposite, + xrandr, + libxshmfence, }: let pname = "plex-htpc"; @@ -65,18 +76,18 @@ let minizip nss stdenv.cc.cc - xorg.libXcomposite - xorg.libXdamage - xorg.libXinerama - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxshmfence - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.xrandr + libxcomposite + libxdamage + libxinerama + libxrandr + libxrender + libxtst + libxshmfence + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm + xrandr ]; strictDeps = true; diff --git a/pkgs/by-name/pl/plplot/package.nix b/pkgs/by-name/pl/plplot/package.nix index eae33774a01e..f02b15363704 100644 --- a/pkgs/by-name/pl/plplot/package.nix +++ b/pkgs/by-name/pl/plplot/package.nix @@ -7,7 +7,7 @@ enableWX ? false, wxGTK32, enableXWin ? false, - xorg, + libx11, enablePNG ? false, cairo, pango, @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { buildInputs = lib.optional enableWX wxGTK32 - ++ lib.optional enableXWin xorg.libX11 + ++ lib.optional enableXWin libx11 ++ lib.optionals enablePNG [ cairo pango ]; passthru = { - inherit (xorg) libX11; + libX11 = libx11; inherit enableWX enableXWin diff --git a/pkgs/by-name/pl/plymouth/package.nix b/pkgs/by-name/pl/plymouth/package.nix index 89607cd1bf3a..c9d0456f10c6 100644 --- a/pkgs/by-name/pl/plymouth/package.nix +++ b/pkgs/by-name/pl/plymouth/package.nix @@ -17,7 +17,7 @@ libxkbcommon, pango, systemd, - xorg, + xkeyboard-config, fontconfig, }: @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon pango systemd - xorg.xkeyboardconfig + xkeyboard-config ]; mesonFlags = diff --git a/pkgs/by-name/po/polylith/package.nix b/pkgs/by-name/po/polylith/package.nix index d44661da525a..3035accd8ac5 100644 --- a/pkgs/by-name/po/polylith/package.nix +++ b/pkgs/by-name/po/polylith/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "polylith"; - version = "0.3.30"; + version = "0.3.32"; src = fetchurl { url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar"; - sha256 = "sha256-G64sbV671fY+k/tYy8Kq/cAGXLzbZY1g+HyzOw29D24="; + sha256 = "sha256-bfF7YXGA6StGF1jZor/TZQ6tNU28Z8kcaiPdkmjljx4="; }; dontUnpack = true; diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 66d31aa27b7d..5e5ed57a7eb7 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -34,11 +34,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.81.2"; + version = "0.81.3"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-e0ONaZ2nk+LMxwPO3PQSke0wP2bit+dTPsmRdnOli4o="; + hash = "sha256-EADMAO5F8yrOFruGRd9JtRPywwUbaJ0qQa7RyCYHp8M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index b05500495092..149d9332e612 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -18,7 +18,10 @@ patchelf, openssl, stdenv, - xorg, + libxdamage, + libxcomposite, + libx11, + libxkbfile, }: let pname = "positron-bin"; @@ -57,10 +60,10 @@ stdenv.mkDerivation { nss stdenv.cc.cc openssl - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libxkbfile + libx11 + libxcomposite + libxdamage + libxkbfile ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ blas diff --git a/pkgs/by-name/po/posting/package.nix b/pkgs/by-name/po/posting/package.nix index cf897cd5022a..9aa6faded42c 100644 --- a/pkgs/by-name/po/posting/package.nix +++ b/pkgs/by-name/po/posting/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, python3Packages, - xorg, + xrdb, }: python3Packages.buildPythonApplication rec { pname = "posting"; @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { # Required for x resources themes buildInputs = [ - xorg.xrdb + xrdb ]; dependencies = diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix index 196ae0419a16..441f1a224a49 100644 --- a/pkgs/by-name/po/postman/linux.nix +++ b/pkgs/by-name/po/postman/linux.nix @@ -38,7 +38,8 @@ nss, pango, udev, - xorg, + libxshmfence, + libxcb, bintools, makeDesktopItem, # It's unknown which version of openssl that postman expects but it seems that @@ -140,8 +141,8 @@ stdenv.mkDerivation { nss pango udev - xorg.libxcb - xorg.libxshmfence + libxcb + libxshmfence ] }" $file done diff --git a/pkgs/by-name/po/powertop/package.nix b/pkgs/by-name/po/powertop/package.nix index 7c8aafec28e6..4c7550fa4ca7 100644 --- a/pkgs/by-name/po/powertop/package.nix +++ b/pkgs/by-name/po/powertop/package.nix @@ -12,7 +12,7 @@ pkg-config, powertop, testers, - xorg, + xset, zlib, }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/main.cpp --replace-fail "/sbin/modprobe" "modprobe" - substituteInPlace src/calibrate/calibrate.cpp --replace-fail "/usr/bin/xset" "${lib.getExe xorg.xset}" + substituteInPlace src/calibrate/calibrate.cpp --replace-fail "/usr/bin/xset" "${lib.getExe xset}" substituteInPlace src/tuning/bluetooth.cpp --replace-fail "/usr/bin/hcitool" "hcitool" ''; diff --git a/pkgs/by-name/pr/prl-tools/package.nix b/pkgs/by-name/pr/prl-tools/package.nix index 8617058f3d8f..7b7b719a530d 100644 --- a/pkgs/by-name/pr/prl-tools/package.nix +++ b/pkgs/by-name/pr/prl-tools/package.nix @@ -19,13 +19,18 @@ undmg, util-linux, wayland, - xorg, + libxrandr, + libxi, + libxinerama, + libxext, + libxcomposite, + libx11, }: let libPath = lib.concatStringsSep ":" [ "${glib.out}/lib" - "${xorg.libXrandr}/lib" + "${libxrandr}/lib" "${wayland.out}/lib" ]; scriptPath = lib.concatStringsSep ":" [ @@ -66,18 +71,18 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fuse glib - xorg.libX11 - xorg.libXcomposite - xorg.libXext - xorg.libXrandr - xorg.libXi - xorg.libXinerama + libx11 + libxcomposite + libxext + libxrandr + libxi + libxinerama ]; runtimeDependencies = [ dbus glib - xorg.libXrandr + libxrandr ]; unpackPhase = '' diff --git a/pkgs/by-name/pr/profont/package.nix b/pkgs/by-name/pr/profont/package.nix index 92cc650efcf9..a21877cf9ca4 100644 --- a/pkgs/by-name/pr/profont/package.nix +++ b/pkgs/by-name/pr/profont/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchzip, - xorg, + mkfontscale, }: stdenv.mkDerivation { @@ -29,7 +29,7 @@ stdenv.mkDerivation { dontBuild = true; - nativeBuildInputs = [ xorg.mkfontscale ]; + nativeBuildInputs = [ mkfontscale ]; installPhase = '' mkdir -p "$out/share/fonts/misc" diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix index fd00f5e4c14c..3ea5cc734695 100644 --- a/pkgs/by-name/pu/publii/package.nix +++ b/pkgs/by-name/pu/publii/package.nix @@ -23,7 +23,8 @@ pango, udev, xdg-utils, - xorg, + libx11, + libxcb, }: stdenv.mkDerivation rec { @@ -62,8 +63,8 @@ stdenv.mkDerivation rec { musl nss pango - xorg.libX11 - xorg.libxcb + libx11 + libxcb ]; unpackPhase = '' diff --git a/pkgs/by-name/pu/pugl/package.nix b/pkgs/by-name/pu/pugl/package.nix index 2af38bb31d1b..0c868d5b997a 100644 --- a/pkgs/by-name/pu/pugl/package.nix +++ b/pkgs/by-name/pu/pugl/package.nix @@ -4,7 +4,10 @@ meson, fetchFromGitHub, pkg-config, - xorg, + libxrandr, + libxext, + libxcursor, + libx11, libGL, cairo, glslang, @@ -45,13 +48,13 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libX11 - xorg.libXcursor - xorg.libXrandr + libx11 + libxcursor + libxrandr libGL vulkan-loader vulkan-headers - xorg.libXext + libxext cairo ]; diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index fe56d2b32d66..4c01157127b3 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -18,7 +18,15 @@ libgbm, nss, nspr, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxshmfence, + libxkbfile, + libxcb, libdrm, libsecret, libxkbcommon, @@ -62,16 +70,16 @@ let nss nspr libdrm - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxshmfence libxkbcommon - xorg.libxkbfile + libxkbfile pango stdenv.cc.cc systemd @@ -102,7 +110,7 @@ stdenv.mkDerivation { buildInputs = [ gtk3 - xorg.libxkbfile + libxkbfile ]; dontBuild = true; diff --git a/pkgs/by-name/pw/pw-viz/package.nix b/pkgs/by-name/pw/pw-viz/package.nix index 0ec5f14bec1d..069b2578a2e2 100644 --- a/pkgs/by-name/pw/pw-viz/package.nix +++ b/pkgs/by-name/pw/pw-viz/package.nix @@ -10,7 +10,10 @@ libxkbcommon, pipewire, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage rec { @@ -37,10 +40,10 @@ rustPlatform.buildRustPackage rec { pipewire rustPlatform.bindgenHook wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; postFixup = '' diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix index 5677c6e288c4..8f8e29ad5ae4 100644 --- a/pkgs/by-name/qq/qq/package.nix +++ b/pkgs/by-name/qq/qq/package.nix @@ -17,7 +17,7 @@ libpulseaudio, libGL, nss, - xorg, + libxdamage, systemd, stdenv, undmg, @@ -113,7 +113,7 @@ else libgbm nss vips - xorg.libXdamage + libxdamage ]; dontWrapGApps = true; diff --git a/pkgs/by-name/qq/qqmusic/package.nix b/pkgs/by-name/qq/qqmusic/package.nix index c242c0532c72..a87050b702cd 100644 --- a/pkgs/by-name/qq/qqmusic/package.nix +++ b/pkgs/by-name/qq/qqmusic/package.nix @@ -27,7 +27,18 @@ pango, pciutils, udev, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, }: ################################################################################ # Mostly based on qqmusic-bin package from AUR: @@ -69,18 +80,18 @@ stdenv.mkDerivation (finalAttrs: { pango pciutils udev - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxscrnsaver + libxtst ]; unpackPhase = '' diff --git a/pkgs/by-name/qu/quartus-prime-lite/package.nix b/pkgs/by-name/qu/quartus-prime-lite/package.nix index 6322fc3a99b4..1e43f5fce8c6 100644 --- a/pkgs/by-name/qu/quartus-prime-lite/package.nix +++ b/pkgs/by-name/qu/quartus-prime-lite/package.nix @@ -50,19 +50,19 @@ buildFHSEnv rec { )) # quartus requirements glib - xorg.libICE - xorg.libSM - xorg.libXau - xorg.libXdmcp - xorg.libXScrnSaver + libice + libsm + libxau + libxdmcp + libxscrnsaver libudev0-shim bzip2 brotli expat dbus # qsys requirements - xorg.libXtst - xorg.libXi + libxtst + libxi dejavu_fonts gnumake ]; @@ -78,7 +78,7 @@ buildFHSEnv rec { # This seems ugly - can we override `libpng = libpng12` for all `pkgs`? freetype = pkgs.freetype.override { libpng = libpng12; }; fontconfig = pkgs.fontconfig.override { inherit freetype; }; - libXft = pkgs.xorg.libXft.override { inherit freetype fontconfig; }; + libXft = pkgs.libxft.override { inherit freetype fontconfig; }; in [ # questa requirements @@ -89,9 +89,9 @@ buildFHSEnv rec { # common requirements freetype fontconfig - xorg.libX11 - xorg.libXext - xorg.libXrender + libx11 + libxext + libxrender libxcrypt-legacy ]; diff --git a/pkgs/by-name/qu/quickshell/package.nix b/pkgs/by-name/qu/quickshell/package.nix index dbbe5f9ce567..ec536d246093 100644 --- a/pkgs/by-name/qu/quickshell/package.nix +++ b/pkgs/by-name/qu/quickshell/package.nix @@ -14,7 +14,7 @@ wayland, wayland-protocols, wayland-scanner, - xorg, + libxcb, libdrm, libgbm, pipewire, @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { libgbm breakpad jemalloc - xorg.libxcb + libxcb pam pipewire ]; diff --git a/pkgs/by-name/ra/raccoin/package.nix b/pkgs/by-name/ra/raccoin/package.nix index 1ed96a8ca165..f2d8963a4609 100644 --- a/pkgs/by-name/ra/raccoin/package.nix +++ b/pkgs/by-name/ra/raccoin/package.nix @@ -13,7 +13,10 @@ freetype, alsa-lib, libGL, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, openssl, nix-update-script, withWayland ? true, @@ -51,10 +54,10 @@ rustPlatform.buildRustPackage (finalAttrs: { wayland ] ++ lib.optionals withX11 [ - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; # upstream has no tests @@ -74,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: { libxkbcommon openssl ] - ++ lib.optional withX11 xorg.libX11 + ++ lib.optional withX11 libx11 ) }" \ $out/bin/raccoin diff --git a/pkgs/by-name/ra/radeontools/package.nix b/pkgs/by-name/ra/radeontools/package.nix index 4fa12b3ceb61..a7f4ebccbe1e 100644 --- a/pkgs/by-name/ra/radeontools/package.nix +++ b/pkgs/by-name/ra/radeontools/package.nix @@ -5,7 +5,7 @@ autoreconfHook, pciutils, pkg-config, - xorg, + libpciaccess, }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config ]; - buildInputs = [ xorg.libpciaccess ]; + buildInputs = [ libpciaccess ]; meta = { description = "Lowlevel tools to tweak register and dump state on radeon GPUs"; diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix index a0464109488d..81bd053a8391 100644 --- a/pkgs/by-name/ra/rapidraw/package.nix +++ b/pkgs/by-name/ra/rapidraw/package.nix @@ -16,7 +16,14 @@ libappindicator, cairo, pango, - xorg, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxcursor, + libx11, + libxcb, libxkbcommon, vulkan-loader, libjpeg, @@ -77,14 +84,14 @@ rustPlatform.buildRustPackage (finalAttrs: { gdk-pixbuf cairo pango - xorg.libX11 - xorg.libXi - xorg.libXcursor - xorg.libXext - xorg.libXrandr - xorg.libXrender - xorg.libxcb - xorg.libXfixes + libx11 + libxi + libxcursor + libxext + libxrandr + libxrender + libxcb + libxfixes libxkbcommon vulkan-loader libjpeg diff --git a/pkgs/by-name/re/react-native-debugger/package.nix b/pkgs/by-name/re/react-native-debugger/package.nix index 56afb1b73ee2..b6062f32d77f 100644 --- a/pkgs/by-name/re/react-native-debugger/package.nix +++ b/pkgs/by-name/re/react-native-debugger/package.nix @@ -4,7 +4,18 @@ fetchurl, unzip, cairo, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, gdk-pixbuf, fontconfig, pango, @@ -52,18 +63,18 @@ let libxkbcommon libgbm - xorg.libX11 - xorg.libXcursor - xorg.libXtst - xorg.libxcb - xorg.libXext - xorg.libXi - xorg.libXdamage - xorg.libXrandr - xorg.libXcomposite - xorg.libXfixes - xorg.libXrender - xorg.libXScrnSaver + libx11 + libxcursor + libxtst + libxcb + libxext + libxi + libxdamage + libxrandr + libxcomposite + libxfixes + libxrender + libxscrnsaver ]; in stdenv.mkDerivation rec { diff --git a/pkgs/by-name/re/recaf-launcher/package.nix b/pkgs/by-name/re/recaf-launcher/package.nix index c828c98e2dd2..94e6edfa275c 100644 --- a/pkgs/by-name/re/recaf-launcher/package.nix +++ b/pkgs/by-name/re/recaf-launcher/package.nix @@ -20,15 +20,15 @@ buildFHSEnv { jar openjdk25 - xorg.libX11 + libx11 at-spi2-atk cairo gdk-pixbuf glib gtk3 pango - xorg.libXtst - xorg.libX11 + libxtst + libx11 xorg_sys_opengl ]; diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix index 889fc1f69b05..ba8dce36df48 100644 --- a/pkgs/by-name/re/restish/package.nix +++ b/pkgs/by-name/re/restish/package.nix @@ -5,7 +5,11 @@ fetchFromGitHub, restish, testers, - xorg, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, }: buildGoModule rec { @@ -22,11 +26,11 @@ buildGoModule rec { vendorHash = "sha256-5+N6iL9wD5J/E6H5qn1InQR8bbuAlTOzPQn0sawVbrI="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr + libx11 + libxcursor + libxi + libxinerama + libxrandr ]; ldflags = [ diff --git a/pkgs/by-name/ri/ringboard/package.nix b/pkgs/by-name/ri/ringboard/package.nix index 0ba46a48be6b..baa518846b6c 100644 --- a/pkgs/by-name/ri/ringboard/package.nix +++ b/pkgs/by-name/ri/ringboard/package.nix @@ -6,7 +6,10 @@ libxkbcommon, libGL, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, makeWrapper, displayServer ? "x11", nixosTests, @@ -43,10 +46,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libGL ] ++ lib.optionals (displayServer == "x11") [ - xorg.libXcursor - xorg.libXrandr - xorg.libXi - xorg.libX11 + libxcursor + libxrandr + libxi + libx11 ] ++ lib.optionals (displayServer == "wayland") [ wayland diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index b3ea8c3a235c..fb5e4b50300b 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -15,7 +15,7 @@ libgpg-error, nettle, openssl, - xorg, + libxcb, nix-update-script, }: @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { libgpg-error nettle openssl - xorg.libxcb + libxcb ]; checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/rl/rlaunch/package.nix b/pkgs/by-name/rl/rlaunch/package.nix index ec3db0778c74..5ce9d370b7a8 100644 --- a/pkgs/by-name/rl/rlaunch/package.nix +++ b/pkgs/by-name/rl/rlaunch/package.nix @@ -2,7 +2,9 @@ lib, fetchFromGitHub, rustPlatform, - xorg, + libxinerama, + libxft, + libx11, }: rustPlatform.buildRustPackage rec { @@ -21,14 +23,11 @@ rustPlatform.buildRustPackage rec { # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. postFixup = '' patchelf --set-rpath ${ - lib.makeLibraryPath ( - with xorg; - [ - libX11 - libXft - libXinerama - ] - ) + lib.makeLibraryPath [ + libx11 + libxft + libxinerama + ] } $out/bin/rlaunch ''; diff --git a/pkgs/by-name/rn/rnnoise-plugin/package.nix b/pkgs/by-name/rn/rnnoise-plugin/package.nix index 04224a747f7e..a9138481c50c 100644 --- a/pkgs/by-name/rn/rnnoise-plugin/package.nix +++ b/pkgs/by-name/rn/rnnoise-plugin/package.nix @@ -8,7 +8,8 @@ pcre, pkg-config, webkitgtk_4_1, - xorg, + libxrandr, + libx11, }: stdenv.mkDerivation rec { pname = "rnnoise-plugin"; @@ -42,8 +43,8 @@ stdenv.mkDerivation rec { freetype gtk3-x11 pcre - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr ] ++ lib.optionals stdenv.hostPlatform.isLinux [ webkitgtk_4_1 diff --git a/pkgs/by-name/ro/robo3t/package.nix b/pkgs/by-name/ro/robo3t/package.nix index 908532859156..f3e026f013fd 100644 --- a/pkgs/by-name/ro/robo3t/package.nix +++ b/pkgs/by-name/ro/robo3t/package.nix @@ -5,7 +5,13 @@ curlWithGnuTls, zlib, glib, - xorg, + libxrender, + libxi, + libxext, + libx11, + libsm, + libice, + libxcb, dbus, fontconfig, libGL, @@ -49,13 +55,13 @@ stdenv.mkDerivation rec { stdenv.cc.cc zlib glib - xorg.libXi - xorg.libxcb - xorg.libXrender - xorg.libX11 - xorg.libSM - xorg.libICE - xorg.libXext + libxi + libxcb + libxrender + libx11 + libsm + libice + libxext dbus fontconfig freetype diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index 1871c71f61be..6e64db1d9e9f 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -25,7 +25,10 @@ llvm_20, lsof, lz4, - xorg, + libxpm, + libxft, + libxext, + libx11, xz, man, openssl, @@ -116,10 +119,10 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGLU libGL - xorg.libX11 - xorg.libXpm - xorg.libXft - xorg.libXext + libx11 + libxpm + libxft + libxext ]; preConfigure = '' diff --git a/pkgs/by-name/rt/rtabmap/package.nix b/pkgs/by-name/rt/rtabmap/package.nix index 51561509629c..53eb9990375e 100644 --- a/pkgs/by-name/rt/rtabmap/package.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -14,7 +14,9 @@ opencv, pcl, liblapack, - xorg, + libxt, + libsm, + libice, libusb1, yaml-cpp, libnabo, @@ -61,9 +63,9 @@ stdenv.mkDerivation (finalAttrs: { opencv.cxxdev pcl' liblapack - xorg.libSM - xorg.libICE - xorg.libXt + libsm + libice + libxt ## Optional libusb1 diff --git a/pkgs/by-name/ru/runelite/package.nix b/pkgs/by-name/ru/runelite/package.nix index 883d5945183a..0d4e0a721e8c 100644 --- a/pkgs/by-name/ru/runelite/package.nix +++ b/pkgs/by-name/ru/runelite/package.nix @@ -6,7 +6,7 @@ maven, jdk17, jre, - xorg, + libxxf86vm, gitUpdater, libGL, }: @@ -53,7 +53,7 @@ maven.buildMavenPackage rec { makeWrapper ${jre}/bin/java $out/bin/runelite \ --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ - xorg.libXxf86vm + libxxf86vm libGL ] }" \ diff --git a/pkgs/by-name/ru/runescape/package.nix b/pkgs/by-name/ru/runescape/package.nix index 16aaec3a34a7..f45dbb9458dc 100644 --- a/pkgs/by-name/ru/runescape/package.nix +++ b/pkgs/by-name/ru/runescape/package.nix @@ -14,13 +14,12 @@ libpulseaudio, libSM, libXxf86vm, - libX11, + libx11, openssl_1_1, pango, SDL2, wrapGAppsHook3, xdg-utils, - xorg, xorg_sys_opengl, zlib, }: @@ -51,7 +50,7 @@ let gtk2-x11 libSM libXxf86vm - libX11 + libx11 openssl_1_1 pango zlib @@ -126,12 +125,12 @@ buildFHSEnv { libpulseaudio libSM libXxf86vm - libX11 + libx11 openssl_1_1 pango SDL2 xdg-utils - xorg.libX11 + libx11 xorg_sys_opengl zlib ]; diff --git a/pkgs/by-name/ru/rusty-path-of-building/package.nix b/pkgs/by-name/ru/rusty-path-of-building/package.nix index 67dffb8f31bf..4da250b7f62c 100644 --- a/pkgs/by-name/ru/rusty-path-of-building/package.nix +++ b/pkgs/by-name/ru/rusty-path-of-building/package.nix @@ -13,7 +13,9 @@ libxkbcommon, vulkan-loader, wayland, - xorg, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage rec { pname = "rusty-path-of-building"; @@ -66,9 +68,9 @@ rustPlatform.buildRustPackage rec { libxkbcommon vulkan-loader wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi + libx11 + libxcursor + libxi ] } diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix index 4ce2c02cd5ce..6bb7a8add975 100644 --- a/pkgs/by-name/ru/rusty-psn/package.nix +++ b/pkgs/by-name/ru/rusty-psn/package.nix @@ -11,7 +11,11 @@ gtk3, freetype, openssl, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, libGL, libxkbcommon, wayland, @@ -51,12 +55,12 @@ rustPlatform.buildRustPackage rec { gtk3 freetype openssl - xorg.libxcb - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXi - xorg.libxcb + libxcb + libx11 + libxcursor + libxrandr + libxi + libxcb libGL libxkbcommon wayland diff --git a/pkgs/by-name/rx/rx/package.nix b/pkgs/by-name/rx/rx/package.nix index 73a0a9de8053..234a3b4ea11f 100644 --- a/pkgs/by-name/rx/rx/package.nix +++ b/pkgs/by-name/rx/rx/package.nix @@ -6,7 +6,12 @@ makeWrapper, cmake, pkg-config, - xorg ? null, + libxrandr, + libxi, + libxinerama, + libxext, + libxcursor, + libx11, libGL ? null, }: @@ -29,18 +34,15 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux ( - with xorg; - [ - # glfw-sys dependencies: - libX11 - libXrandr - libXinerama - libXcursor - libXi - libXext - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + # glfw-sys dependencies: + libx11 + libxrandr + libxinerama + libxcursor + libxi + libxext + ]; # FIXME: GLFW (X11) requires DISPLAY env variable for all tests doCheck = false; diff --git a/pkgs/by-name/ry/rymdport/package.nix b/pkgs/by-name/ry/rymdport/package.nix index 931b52226870..f0f8ff50cc1e 100644 --- a/pkgs/by-name/ry/rymdport/package.nix +++ b/pkgs/by-name/ry/rymdport/package.nix @@ -4,7 +4,13 @@ fetchFromGitHub, pkg-config, libGL, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxext, + libxcursor, + libx11, }: buildGoModule rec { @@ -24,15 +30,15 @@ buildGoModule rec { pkg-config ]; - buildInputs = with xorg; [ + buildInputs = [ libGL - libX11 - libXcursor - libXext - libXi - libXinerama - libXrandr - libXxf86vm + libx11 + libxcursor + libxext + libxi + libxinerama + libxrandr + libxxf86vm ]; postInstall = '' diff --git a/pkgs/by-name/s0/s0ix-selftest-tool/package.nix b/pkgs/by-name/s0/s0ix-selftest-tool/package.nix index 92f8fca93469..cc36bc17e22b 100644 --- a/pkgs/by-name/s0/s0ix-selftest-tool/package.nix +++ b/pkgs/by-name/s0/s0ix-selftest-tool/package.nix @@ -14,7 +14,7 @@ stdenv, unstableGitUpdater, util-linux, - xorg, + xset, xxd, }: @@ -30,7 +30,7 @@ let pciutils powertop util-linux - xorg.xset + xset xxd ]; in diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix index cb8665cc7711..523f863c1d3d 100644 --- a/pkgs/by-name/sa/saber/package.nix +++ b/pkgs/by-name/sa/saber/package.nix @@ -7,7 +7,7 @@ orc, webkitgtk_4_1, autoPatchelfHook, - xorg, + libxmu, jdk, zlib, runCommand, @@ -49,7 +49,7 @@ flutter338.buildFlutterApplication { libunwind orc webkitgtk_4_1 - xorg.libXmu + libxmu jdk ]; diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix index d4fefc1961f3..cb8932ce1fa3 100644 --- a/pkgs/by-name/sa/safecloset/package.nix +++ b/pkgs/by-name/sa/safecloset/package.nix @@ -3,7 +3,7 @@ rustPlatform, fetchFromGitHub, stdenv, - xorg, + libxcb, }: rustPlatform.buildRustPackage rec { @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-BSWUWB8OrdmDtU+cGCVp75hakpdd9G3cs9ythDn4nnY="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libxcb + libxcb ]; checkFlags = [ diff --git a/pkgs/by-name/sa/saleae-logic-2/package.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix index 44fa021d0b0b..116ee9e316df 100644 --- a/pkgs/by-name/sa/saleae-logic-2/package.nix +++ b/pkgs/by-name/sa/saleae-logic-2/package.nix @@ -41,16 +41,16 @@ appimageTools.wrapType2 { wget unzip glib - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrender + libxtst nss nspr dbus @@ -60,8 +60,8 @@ appimageTools.wrapType2 { atk cairo expat - xorg.libXrandr - xorg.libXScrnSaver + libxrandr + libxscrnsaver alsa-lib at-spi2-core cups diff --git a/pkgs/by-name/sa/sauerbraten/package.nix b/pkgs/by-name/sa/sauerbraten/package.nix index 93e8af7faf7a..e5004773ee3c 100644 --- a/pkgs/by-name/sa/sauerbraten/package.nix +++ b/pkgs/by-name/sa/sauerbraten/package.nix @@ -12,7 +12,7 @@ SDL2, SDL2_image, SDL2_mixer, - xorg, + libx11, zlib, makeDesktopItem, @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { SDL2 SDL2_image SDL2_mixer - xorg.libX11 + libx11 zlib ]; diff --git a/pkgs/by-name/sc/scilab-bin/package.nix b/pkgs/by-name/sc/scilab-bin/package.nix index 3c6fd4251f41..9371ace75235 100644 --- a/pkgs/by-name/sc/scilab-bin/package.nix +++ b/pkgs/by-name/sc/scilab-bin/package.nix @@ -7,7 +7,15 @@ autoPatchelfHook, alsa-lib, ncurses5, - xorg, + libxxf86vm, + libxtst, + libxrender, + libxrandr, + libxi, + libxft, + libxext, + libxcursor, + libx11, }: let @@ -88,18 +96,16 @@ let alsa-lib ncurses5 stdenv.cc.cc - ] - ++ (with xorg; [ - libX11 - libXcursor - libXext - libXft - libXi - libXrandr - libXrender - libXtst - libXxf86vm - ]); + libx11 + libxcursor + libxext + libxft + libxi + libxrandr + libxrender + libxtst + libxxf86vm + ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix index e67a07584be4..0231c0568eed 100644 --- a/pkgs/by-name/sc/screen-pipe/package.nix +++ b/pkgs/by-name/sc/screen-pipe/package.nix @@ -10,7 +10,7 @@ sqlite, stdenv, alsa-lib, - xorg, + libxcb, }: rustPlatform.buildRustPackage rec { pname = "screen-pipe"; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - xorg.libxcb + libxcb ]; buildFeatures = lib.optional stdenv.hostPlatform.isDarwin "metal"; diff --git a/pkgs/by-name/sc/screenkey/package.nix b/pkgs/by-name/sc/screenkey/package.nix index 0fbb9d3d2d49..9a909ebf2c92 100644 --- a/pkgs/by-name/sc/screenkey/package.nix +++ b/pkgs/by-name/sc/screenkey/package.nix @@ -2,7 +2,8 @@ lib, fetchFromGitLab, wrapGAppsHook3, - xorg, + libxtst, + libx11, gobject-introspection, gtk3, libappindicator-gtk3, @@ -60,8 +61,8 @@ python3.pkgs.buildPythonApplication rec { # Fix CDLL python calls for non absolute paths of xorg libraries postPatch = '' substituteInPlace Screenkey/xlib.py \ - --replace-fail libX11.so.6 ${lib.getLib xorg.libX11}/lib/libX11.so.6 \ - --replace-fail libXtst.so.6 ${lib.getLib xorg.libXtst}/lib/libXtst.so.6 + --replace-fail libX11.so.6 ${lib.getLib libx11}/lib/libX11.so.6 \ + --replace-fail libXtst.so.6 ${lib.getLib libxtst}/lib/libXtst.so.6 ''; meta = { diff --git a/pkgs/by-name/se/seamly2d/package.nix b/pkgs/by-name/se/seamly2d/package.nix index 038e8e2104ca..bbfc260e16d6 100644 --- a/pkgs/by-name/se/seamly2d/package.nix +++ b/pkgs/by-name/se/seamly2d/package.nix @@ -9,7 +9,9 @@ xvfb-run, fontconfig, freetype, - xorg, + libxrender, + libxi, + libxcb, python3, git, }: @@ -37,9 +39,9 @@ stdenv.mkDerivation rec { libsForQt5.qtsvg libgbm freetype - xorg.libXi - xorg.libXrender - xorg.libxcb + libxi + libxrender + libxcb ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/segger-jlink/qt4-bundled.nix b/pkgs/by-name/se/segger-jlink/qt4-bundled.nix index 1afaf09c4358..e3cc217895f9 100644 --- a/pkgs/by-name/se/segger-jlink/qt4-bundled.nix +++ b/pkgs/by-name/se/segger-jlink/qt4-bundled.nix @@ -5,7 +5,12 @@ version, autoPatchelfHook, fontconfig, - xorg, + libxrandr, + libxfixes, + libxcursor, + libx11, + libsm, + libice, }: stdenv.mkDerivation { @@ -19,12 +24,12 @@ stdenv.mkDerivation { buildInputs = [ (lib.getLib stdenv.cc.cc) fontconfig - xorg.libXrandr - xorg.libXfixes - xorg.libXcursor - xorg.libSM - xorg.libICE - xorg.libX11 + libxrandr + libxfixes + libxcursor + libsm + libice + libx11 ]; dontConfigure = true; diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index 77af7df62157..a6141295fdda 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; tag = version; - hash = "sha256-0ch5qIsjOZFhmwm3SkNulecCtPl1xWS4NHyPU0BRit4="; + hash = "sha256-g0CRuupd8KyKWsBKOvNXZ7grrzJuREuYP4bz66SvpbU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index fd6b64e8ea70..24e7cea50f6b 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -34,7 +34,11 @@ udev, vulkan-loader, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, zlib, # tests @@ -52,9 +56,9 @@ let ); runtimePaths = lib.makeLibraryPath ( lib.optionals (stdenv.hostPlatform.isLinux) [ - xorg.libXcursor - xorg.libXrandr - xorg.libXi + libxcursor + libxrandr + libxi libxkbcommon vulkan-loader wayland @@ -65,13 +69,13 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "servo"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; tag = "v${finalAttrs.version}"; - hash = "sha256-XMDt3q3LgKtGCgwuf/+0ZF2EfkUENM+mp4icZAyqGiw="; + hash = "sha256-KKZDz0NTIEx1NpTjDtrZdZD2RLxtZYarwn54RbPPeCA="; # Breaks reproducibility depending on whether the picked commit # has other ref-names or not, which may change over time, i.e. with # "ref-names: HEAD -> main" as long this commit is the branch HEAD @@ -81,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-FR9/5aZ7e2ekYYCFQMr55JXuJScqjDKb4o+w6nNr4yo="; + cargoHash = "sha256-huQ3dq5tTLN53fOhj458aH00jFnt6CWZQhJ9MogktJM="; # set `HOME` to a temp dir for write access # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) @@ -127,8 +131,8 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland - xorg.libX11 - xorg.libxcb + libx11 + libxcb udev vulkan-loader ]; diff --git a/pkgs/by-name/sf/sfizz-ui/package.nix b/pkgs/by-name/sf/sfizz-ui/package.nix index 68b30ee36caa..fbcd0224466c 100644 --- a/pkgs/by-name/sf/sfizz-ui/package.nix +++ b/pkgs/by-name/sf/sfizz-ui/package.nix @@ -4,7 +4,15 @@ fetchFromGitHub, libjack2, libsndfile, - xorg, + libxcb-util, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxcb-cursor, + libxdmcp, + libxau, + libx11, + libxcb, freetype, libxkbcommon, cairo, @@ -45,15 +53,15 @@ stdenv.mkDerivation (finalAttrs: { libvorbis libxkbcommon pango - xorg.libX11 - xorg.libXau - xorg.libxcb - xorg.libXdmcp - xorg.xcbutil - xorg.xcbutilcursor - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil + libx11 + libxau + libxcb + libxdmcp + libxcb-util + libxcb-cursor + libxcb-image + libxcb-keysyms + libxcb-render-util zenity ]; diff --git a/pkgs/by-name/sf/sfizz/package.nix b/pkgs/by-name/sf/sfizz/package.nix index 931331a559b0..764a6e239fd4 100644 --- a/pkgs/by-name/sf/sfizz/package.nix +++ b/pkgs/by-name/sf/sfizz/package.nix @@ -4,7 +4,15 @@ fetchFromGitHub, libjack2, libsndfile, - xorg, + libxcb-util, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxcb-cursor, + libxdmcp, + libxau, + libx11, + libxcb, freetype, libxkbcommon, cairo, @@ -39,15 +47,15 @@ stdenv.mkDerivation (finalAttrs: { libogg libvorbis libopus - xorg.libX11 - xorg.libxcb - xorg.libXau - xorg.libXdmcp - xorg.xcbutil - xorg.xcbutilcursor - xorg.xcbutilrenderutil - xorg.xcbutilkeysyms - xorg.xcbutilimage + libx11 + libxcb + libxau + libxdmcp + libxcb-util + libxcb-cursor + libxcb-render-util + libxcb-keysyms + libxcb-image libxkbcommon cairo glib diff --git a/pkgs/by-name/sh/shadershark/package.nix b/pkgs/by-name/sh/shadershark/package.nix index 76967ac90caf..617099efd266 100644 --- a/pkgs/by-name/sh/shadershark/package.nix +++ b/pkgs/by-name/sh/shadershark/package.nix @@ -3,7 +3,7 @@ lib, fetchhg, libepoxy, - xorg, + libx11, libGLU, glm, pkg-config, @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libepoxy - xorg.libX11 + libx11 libGLU glm imagemagick diff --git a/pkgs/by-name/sh/shticker-book-unwritten/package.nix b/pkgs/by-name/sh/shticker-book-unwritten/package.nix index 786e7fc1bff8..658926290fae 100644 --- a/pkgs/by-name/sh/shticker-book-unwritten/package.nix +++ b/pkgs/by-name/sh/shticker-book-unwritten/package.nix @@ -17,9 +17,9 @@ buildFHSEnv { libglvnd libpulseaudio shticker-book-unwritten-unwrapped - xorg.libX11 - xorg.libXcursor - xorg.libXext + libx11 + libxcursor + libxext ]; runScript = "shticker_book_unwritten"; diff --git a/pkgs/by-name/si/sidequest/package.nix b/pkgs/by-name/si/sidequest/package.nix index 9bc2341ac105..48f318d1e4bd 100644 --- a/pkgs/by-name/si/sidequest/package.nix +++ b/pkgs/by-name/si/sidequest/package.nix @@ -20,7 +20,14 @@ nss, nspr, libdrm, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxkbfile, + libxcb, libxkbcommon, libxshmfence, pango, @@ -93,16 +100,16 @@ let nss nspr libdrm - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxshmfence libxkbcommon - xorg.libxkbfile + libxkbfile pango (lib.getLib stdenv.cc.cc) systemd diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix index 47902c4911cf..4fd493934f35 100644 --- a/pkgs/by-name/si/signal-desktop-bin/generic.nix +++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix @@ -23,7 +23,8 @@ fontconfig, dbus, libX11, - xorg, + libxshmfence, + libxcb, libXi, libXcursor, libXdamage, @@ -187,8 +188,8 @@ stdenv.mkDerivation rec { nss pango systemdLibs - xorg.libxcb - xorg.libxshmfence + libxcb + libxshmfence ]; runtimeDependencies = [ diff --git a/pkgs/by-name/si/siji/package.nix b/pkgs/by-name/si/siji/package.nix index ce144d22d0e8..288b7e8446df 100644 --- a/pkgs/by-name/si/siji/package.nix +++ b/pkgs/by-name/si/siji/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, libfaketime, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation { @@ -19,8 +20,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ libfaketime - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale ]; buildPhase = '' diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix index 835a68bd266b..e78e793b8252 100644 --- a/pkgs/by-name/si/sitespeed-io/package.nix +++ b/pkgs/by-name/si/sitespeed-io/package.nix @@ -10,7 +10,7 @@ procps, python3, versionCheckHook, - xorg, + xorg-server, nix-update-script, # chromedriver is more efficient than geckodriver, but is available on less platforms. @@ -85,7 +85,7 @@ buildNpmPackage (finalAttrs: { ])) ffmpeg-headless imagemagick_light - xorg.xorgserver + xorg-server procps coreutils ] diff --git a/pkgs/by-name/sl/slack/linux.nix b/pkgs/by-name/sl/slack/linux.nix index 03f6f10b21d0..dcd57b9145c3 100644 --- a/pkgs/by-name/sl/slack/linux.nix +++ b/pkgs/by-name/sl/slack/linux.nix @@ -40,7 +40,19 @@ systemd, wayland, xdg-utils, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxkbfile, }: stdenv.mkDerivation rec { inherit @@ -83,19 +95,19 @@ stdenv.mkDerivation rec { stdenv.cc.cc systemd wayland - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxkbfile - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxkbfile + libxshmfence ] + ":${lib.getLib stdenv.cc.cc}/lib64"; diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix index 6de031572e4d..6eecc81e51bd 100644 --- a/pkgs/by-name/sl/slimserver/package.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -99,6 +99,9 @@ perlPackages.buildPerlPackage rec { rm -rf CPAN/XML/Parser{,.pm} rm -rf CPAN/YAML/XS{,.pm} + # there's also a copy of AudioScan in lib... + rm -rf lib/Audio + ${lib.optionalString (!enableUnfreeFirmware) '' # remove unfree firmware rm -rf Firmware diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix index ff24feebaa9b..f149fc0cd211 100644 --- a/pkgs/by-name/sl/slint-lsp/package.nix +++ b/pkgs/by-name/sl/slint-lsp/package.nix @@ -7,7 +7,10 @@ cmake, fontconfig, libGL, - xorg, + libxi, + libxcursor, + libx11, + libxcb, libxkbcommon, wayland, versionCheckHook, @@ -27,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: { rpathLibs = [ fontconfig libGL - xorg.libxcb - xorg.libX11 - xorg.libXcursor - xorg.libXi + libxcb + libx11 + libxcursor + libxi ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon @@ -42,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pkg-config fontconfig ]; - buildInputs = finalAttrs.rpathLibs ++ [ xorg.libxcb.dev ]; + buildInputs = finalAttrs.rpathLibs ++ [ libxcb.dev ]; # Tests requires `i_slint_backend_testing` which is only a dev dependency doCheck = false; diff --git a/pkgs/by-name/sm/smlfmt/package.nix b/pkgs/by-name/sm/smlfmt/package.nix index cfe0692d79ec..e00962e84a42 100644 --- a/pkgs/by-name/sm/smlfmt/package.nix +++ b/pkgs/by-name/sm/smlfmt/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "smlfmt"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "shwestrick"; repo = "smlfmt"; rev = "v${version}"; - hash = "sha256-QdpEsypkCzR/OwllKFLjz3/JvzV0OlGiqXUnS7iGD5A="; + hash = "sha256-k3sAz1auKJpta1RdLX3ugSrc9ibVQJOCOPVmTYS/AZY="; }; nativeBuildInputs = [ mlton ]; diff --git a/pkgs/by-name/sn/snake4/package.nix b/pkgs/by-name/sn/snake4/package.nix index 6b5d948edb2a..53a8c232c93e 100644 --- a/pkgs/by-name/sn/snake4/package.nix +++ b/pkgs/by-name/sn/snake4/package.nix @@ -4,7 +4,11 @@ fetchurl, shhmsg, shhopt, - xorg, + libxt, + libxpm, + libxext, + libxaw, + libx11, }: stdenv.mkDerivation rec { @@ -16,14 +20,14 @@ stdenv.mkDerivation rec { sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9"; }; - buildInputs = with xorg; [ + buildInputs = [ shhmsg shhopt - libX11 - libXt - libXpm - libXaw - libXext + libx11 + libxt + libxpm + libxaw + libxext ]; preInstall = '' diff --git a/pkgs/by-name/sn/snd/package.nix b/pkgs/by-name/sn/snd/package.nix index 781af960372a..140231f348dc 100644 --- a/pkgs/by-name/sn/snd/package.nix +++ b/pkgs/by-name/sn/snd/package.nix @@ -7,7 +7,10 @@ fftw, gsl, motif, - xorg, + libxt, + libxpm, + libxft, + libxext, }: stdenv.mkDerivation rec { @@ -31,12 +34,12 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ (with xorg; [ - libXext - libXft - libXpm - libXt - ]); + ++ [ + libxext + libxft + libxpm + libxt + ]; configureFlags = [ "--with-motif" diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix index d092483c5c25..d6082f9bd407 100644 --- a/pkgs/by-name/sn/sniffnet/package.nix +++ b/pkgs/by-name/sn/sniffnet/package.nix @@ -14,7 +14,10 @@ expat, fontconfig, vulkan-loader, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, # wrapper libxkbcommon, @@ -48,10 +51,10 @@ rustPlatform.buildRustPackage (finalAttrs: { expat fontconfig vulkan-loader - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook @@ -78,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --add-rpath ${ lib.makeLibraryPath [ vulkan-loader - xorg.libX11 + libx11 libxkbcommon wayland ] diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix index 6a1f172e7617..fe3ec8fc3282 100644 --- a/pkgs/by-name/sn/snippetexpandergui/package.nix +++ b/pkgs/by-name/sn/snippetexpandergui/package.nix @@ -5,7 +5,7 @@ wails, scdoc, installShellFiles, - xorg, + libx11, gtk3, # webkitgtk_4_0, snippetexpanderd, @@ -31,7 +31,7 @@ buildGoModule rec { ]; buildInputs = [ - xorg.libX11 + libx11 gtk3 # webkitgtk_4_0 snippetexpanderd diff --git a/pkgs/by-name/sn/snippetexpanderx/package.nix b/pkgs/by-name/sn/snippetexpanderx/package.nix index 973833c95526..f460b97e231a 100644 --- a/pkgs/by-name/sn/snippetexpanderx/package.nix +++ b/pkgs/by-name/sn/snippetexpanderx/package.nix @@ -12,7 +12,7 @@ gtk3, ibus, libgee, - xorg, + libx11, snippetexpanderd, }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { gtk3 ibus libgee - xorg.libX11 + libx11 snippetexpanderd ]; diff --git a/pkgs/by-name/sn/snippetpixie/package.nix b/pkgs/by-name/sn/snippetpixie/package.nix index 68ed6474a69c..e4bbde3ba65f 100644 --- a/pkgs/by-name/sn/snippetpixie/package.nix +++ b/pkgs/by-name/sn/snippetpixie/package.nix @@ -21,7 +21,7 @@ ibus, json-glib, pantheon, - xorg, + libxtst, }: stdenv.mkDerivation rec { @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { dbus ibus json-glib - xorg.libXtst + libxtst pantheon.granite ]; diff --git a/pkgs/by-name/sn/snowemu/package.nix b/pkgs/by-name/sn/snowemu/package.nix index 91d3ff01103c..1679896fe118 100644 --- a/pkgs/by-name/sn/snowemu/package.nix +++ b/pkgs/by-name/sn/snowemu/package.nix @@ -6,7 +6,10 @@ makeDesktopItem, SDL2, pkg-config, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, wayland, libxkbcommon, libGL, @@ -32,10 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ SDL2.dev - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXi + libx11 + libxcursor + libxrandr + libxi ]; postInstall = '' diff --git a/pkgs/by-name/so/socalabs-sid/package.nix b/pkgs/by-name/so/socalabs-sid/package.nix index 31cdba5fd795..bc9a6d7dcdaf 100644 --- a/pkgs/by-name/so/socalabs-sid/package.nix +++ b/pkgs/by-name/so/socalabs-sid/package.nix @@ -7,7 +7,14 @@ alsa-lib, copyDesktopItems, makeDesktopItem, - xorg, + libxtst, + libxrandr, + libxinerama, + libxdmcp, + libxcursor, + libxcomposite, + libx11, + xvfb, freetype, expat, libGL, @@ -71,14 +78,14 @@ stdenv.mkDerivation { buildInputs = [ alsa-lib - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXinerama - xorg.libXrandr - xorg.libXtst - xorg.libXdmcp - xorg.xvfb + libx11 + libxcomposite + libxcursor + libxinerama + libxrandr + libxtst + libxdmcp + xvfb libGL libjack2 libsysprof-capture diff --git a/pkgs/by-name/so/sointu/package.nix b/pkgs/by-name/so/sointu/package.nix index 0d54cdda4cff..b3e096f0e104 100644 --- a/pkgs/by-name/so/sointu/package.nix +++ b/pkgs/by-name/so/sointu/package.nix @@ -10,7 +10,9 @@ libxkbcommon, vulkan-headers, wayland, - xorg, + libxfixes, + libxcursor, + libx11, }: buildGoModule rec { @@ -35,9 +37,9 @@ buildGoModule rec { libxkbcommon vulkan-headers wayland - xorg.libX11 - xorg.libXcursor - xorg.libXfixes + libx11 + libxcursor + libxfixes ]; proxyVendor = true; diff --git a/pkgs/by-name/so/solvespace/package.nix b/pkgs/by-name/so/solvespace/package.nix index 589da2f5d793..b42755b4347b 100644 --- a/pkgs/by-name/so/solvespace/package.nix +++ b/pkgs/by-name/so/solvespace/package.nix @@ -26,7 +26,9 @@ pangomm, pcre, util-linuxMinimal, # provides libmount - xorg, + libxtst, + libxdmcp, + libpthread-stubs, zlib, }: @@ -70,9 +72,9 @@ stdenv.mkDerivation rec { pangomm pcre util-linuxMinimal - xorg.libpthreadstubs - xorg.libXdmcp - xorg.libXtst + libpthread-stubs + libxdmcp + libxtst zlib ]; diff --git a/pkgs/by-name/so/sommelier/package.nix b/pkgs/by-name/so/sommelier/package.nix index 21bf11036ed5..42cebc1332df 100644 --- a/pkgs/by-name/so/sommelier/package.nix +++ b/pkgs/by-name/so/sommelier/package.nix @@ -11,7 +11,7 @@ libxkbcommon, libgbm, pixman, - xorg, + libxcb, wayland, gtest, }: @@ -40,7 +40,7 @@ stdenv.mkDerivation { libgbm pixman wayland - xorg.libxcb + libxcb ]; preConfigure = '' diff --git a/pkgs/by-name/sp/spleen/package.nix b/pkgs/by-name/sp/spleen/package.nix index eadf8cfa3791..51a925edc585 100644 --- a/pkgs/by-name/sp/spleen/package.nix +++ b/pkgs/by-name/sp/spleen/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchurl, - xorg, + mkfontscale, }: stdenvNoCC.mkDerivation rec { @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-i0fFbxpuuFj7z540UwVXQEsC+7NFXjjmT7hEc/0MNy8="; }; - nativeBuildInputs = [ xorg.mkfontscale ]; + nativeBuildInputs = [ mkfontscale ]; dontBuild = true; diff --git a/pkgs/by-name/sp/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix index a706ca4117a5..4cd35891eed7 100644 --- a/pkgs/by-name/sp/spotify/linux.nix +++ b/pkgs/by-name/sp/spotify/linux.nix @@ -3,7 +3,21 @@ lib, stdenv, squashfsTools, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxshmfence, + libxcb, alsa-lib, makeShellWrapper, wrapGAppsHook3, @@ -79,21 +93,21 @@ let pango stdenv.cc.cc systemd - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libxshmfence - xorg.libXtst + libice + libsm + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxscrnsaver + libxshmfence + libxtst zlib ]; in diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index 47bbcc9a3a69..af8b1332cef4 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -3,7 +3,6 @@ buildGoModule, fetchFromGitHub, stdenv, - xorg, testers, src-cli, }: diff --git a/pkgs/by-name/st/stardust-xr-server/package.nix b/pkgs/by-name/st/stardust-xr-server/package.nix index 66acec53769f..fa2a6700256b 100644 --- a/pkgs/by-name/st/stardust-xr-server/package.nix +++ b/pkgs/by-name/st/stardust-xr-server/package.nix @@ -11,7 +11,8 @@ libgbm, openxr-loader, pkg-config, - xorg, + libxfixes, + libx11, }: rustPlatform.buildRustPackage rec { @@ -39,8 +40,8 @@ rustPlatform.buildRustPackage rec { libxkbcommon libgbm openxr-loader - xorg.libX11 - xorg.libXfixes + libx11 + libxfixes ]; CPM_SOURCE_CACHE = "./build"; diff --git a/pkgs/by-name/st/starsector/package.nix b/pkgs/by-name/st/starsector/package.nix index 9c4cec38b960..0d2cde228e2e 100644 --- a/pkgs/by-name/st/starsector/package.nix +++ b/pkgs/by-name/st/starsector/package.nix @@ -6,7 +6,8 @@ openal, openjdk17, stdenv, - xorg, + libxxf86vm, + xrandr, copyDesktopItems, makeDesktopItem, writeScript, @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libXxf86vm + libxxf86vm openal libGL ]; @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${ lib.makeBinPath [ openjdk - xorg.xrandr + xrandr ] } \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \ diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix index 8bcfe77a47fa..797248ff35af 100644 --- a/pkgs/by-name/st/staruml/package.nix +++ b/pkgs/by-name/st/staruml/package.nix @@ -8,7 +8,18 @@ gtk3, glib, systemd, - xorg, + libxtst, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxcb, nss, nspr, atk, @@ -75,17 +86,17 @@ stdenv.mkDerivation (finalAttrs: { lib.makeLibraryPath [ glib gtk3 - xorg.libXdamage - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg.libxshmfence + libxdamage + libx11 + libxcb + libxcomposite + libxcursor + libxext + libxfixes + libxi + libxrender + libxtst + libxshmfence libxkbcommon nss nspr @@ -95,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf pango cairo - xorg.libXrandr + libxrandr expat libdrm libgbm diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix index f1cd1abe3fef..254bf591334d 100644 --- a/pkgs/by-name/st/steam/package.nix +++ b/pkgs/by-name/st/steam/package.nix @@ -65,7 +65,7 @@ let # crashes on startup if it can't find libX11 locale files (pkgs.runCommand "xorg-locale" { } '' mkdir -p $out - ln -s ${xorg.libX11}/share $out/share + ln -s ${libx11}/share $out/share '') ] ++ extraPkgs pkgs; diff --git a/pkgs/by-name/st/steamtinkerlaunch/package.nix b/pkgs/by-name/st/steamtinkerlaunch/package.nix index 74defb2222a0..e6f25ff7f7d3 100644 --- a/pkgs/by-name/st/steamtinkerlaunch/package.nix +++ b/pkgs/by-name/st/steamtinkerlaunch/package.nix @@ -14,7 +14,9 @@ wget, writeShellApplication, xdotool, - xorg, + xwininfo, + xrandr, + xprop, yad, }: @@ -70,9 +72,9 @@ stdenvNoCC.mkDerivation { util-linux wget xdotool - xorg.xprop - xorg.xrandr - xorg.xwininfo + xprop + xrandr + xwininfo yad ]; name = "stl-head"; diff --git a/pkgs/by-name/st/stepmania/package.nix b/pkgs/by-name/st/stepmania/package.nix index a447ebb62b07..096d4dbb807c 100644 --- a/pkgs/by-name/st/stepmania/package.nix +++ b/pkgs/by-name/st/stepmania/package.nix @@ -16,7 +16,7 @@ libpulseaudio, libvorbis, udev, - xorg, + libxtst, zlib, }: @@ -72,7 +72,7 @@ stdenv.mkDerivation { libpulseaudio libvorbis udev - xorg.libXtst + libxtst zlib ]; diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix index ac6dca9e4e36..4e542ddbdf3b 100644 --- a/pkgs/by-name/st/stm32cubemx/package.nix +++ b/pkgs/by-name/st/stm32cubemx/package.nix @@ -130,13 +130,13 @@ buildFHSEnv { nspr nss pango - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr libgcrypt openssl udev diff --git a/pkgs/by-name/st/stone-phaser/package.nix b/pkgs/by-name/st/stone-phaser/package.nix index 7dbadf290a6c..6abff3937a6f 100644 --- a/pkgs/by-name/st/stone-phaser/package.nix +++ b/pkgs/by-name/st/stone-phaser/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, cairo, libGL, lv2, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 cairo libGL lv2 diff --git a/pkgs/by-name/st/stumpish/package.nix b/pkgs/by-name/st/stumpish/package.nix index a6ac190c07d1..9e0876bfd404 100644 --- a/pkgs/by-name/st/stumpish/package.nix +++ b/pkgs/by-name/st/stumpish/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, gnused, ncurses, - xorg, + xprop, rlwrap, }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { buildInputs = [ gnused - xorg.xprop + xprop rlwrap ncurses ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation { patches = [ (replaceVars ./paths.patch { sed = "${gnused}/bin/sed"; - xprop = "${xorg.xprop}/bin/xprop"; + xprop = "${xprop}/bin/xprop"; rlwrap = "${rlwrap}/bin/rlwrap"; tput = "${ncurses}/bin/tput"; }) diff --git a/pkgs/by-name/st/styluslabs-write/package.nix b/pkgs/by-name/st/styluslabs-write/package.nix index be176963d0bc..8449e563bd33 100644 --- a/pkgs/by-name/st/styluslabs-write/package.nix +++ b/pkgs/by-name/st/styluslabs-write/package.nix @@ -4,7 +4,9 @@ stdenv, pkg-config, SDL2, - xorg, + libxi, + libxcursor, + libx11, libGL, roboto, imagemagick, @@ -57,9 +59,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 - xorg.libX11 - xorg.libXi - xorg.libXcursor + libx11 + libxi + libxcursor libGL ]; diff --git a/pkgs/by-name/su/sub-store-frontend/package.nix b/pkgs/by-name/su/sub-store-frontend/package.nix index e43b97d22ecb..1ba07eaf8971 100644 --- a/pkgs/by-name/su/sub-store-frontend/package.nix +++ b/pkgs/by-name/su/sub-store-frontend/package.nix @@ -13,13 +13,13 @@ buildNpmPackage (finalAttrs: { pname = "sub-store-frontend"; - version = "2.16.8"; + version = "2.16.11"; src = fetchFromGitHub { owner = "sub-store-org"; repo = "Sub-Store-Front-End"; tag = finalAttrs.version; - hash = "sha256-VC9dGG1NCY2rQJNtUyeBusAdrDyW6h1/7hDlb502eqs="; + hash = "sha256-fPJuWyVjs3Lbd2P4U6r9qb2yvTSYPtqtJoDyP2kRm9c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/su/sub-store/package.nix b/pkgs/by-name/su/sub-store/package.nix index c749c5fd5fe5..8698d1995912 100644 --- a/pkgs/by-name/su/sub-store/package.nix +++ b/pkgs/by-name/su/sub-store/package.nix @@ -15,13 +15,13 @@ buildNpmPackage (finalAttrs: { pname = "sub-store"; - version = "2.21.11"; + version = "2.21.15"; src = fetchFromGitHub { owner = "sub-store-org"; repo = "Sub-Store"; tag = finalAttrs.version; - hash = "sha256-JYXNeswcM5dmchAxOoIlvqjzsuO2DwjJ/WqAJMTrIpQ="; + hash = "sha256-QCmjK/shsys8rYdWhG4XE7FIeqdPcethOLuAd/69yrw="; }; sourceRoot = "${finalAttrs.src.name}/backend"; diff --git a/pkgs/by-name/su/sublime/package.nix b/pkgs/by-name/su/sublime/package.nix index 3f8137f7a783..071b89b45353 100644 --- a/pkgs/by-name/su/sublime/package.nix +++ b/pkgs/by-name/su/sublime/package.nix @@ -3,7 +3,7 @@ lib, stdenv, glib, - xorg, + libx11, cairo, gtk2, makeDesktopItem, @@ -11,7 +11,7 @@ let libPath = lib.makeLibraryPath [ glib - xorg.libX11 + libx11 gtk2 cairo ]; diff --git a/pkgs/by-name/su/sumo/package.nix b/pkgs/by-name/su/sumo/package.nix index 64540c343c97..f773b03caa54 100644 --- a/pkgs/by-name/su/sumo/package.nix +++ b/pkgs/by-name/su/sumo/package.nix @@ -26,7 +26,12 @@ stdenv, swig, xercesc, - xorg, + libxrender, + libxrandr, + libxft, + libxfixes, + libxext, + libxcursor, zlib, }: @@ -70,16 +75,14 @@ stdenv.mkDerivation rec { xercesc zlib python3 - ] - ++ (with xorg; [ libX11 - libXcursor - libXext - libXfixes - libXft - libXrandr - libXrender - ]); + libxcursor + libxext + libxfixes + libxft + libxrandr + libxrender + ]; meta = { description = "SUMO traffic simulator"; diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix index 71ba7020c52d..732652569acb 100644 --- a/pkgs/by-name/su/sunshine/package.nix +++ b/pkgs/by-name/su/sunshine/package.nix @@ -11,7 +11,12 @@ avahi, libevdev, libpulseaudio, - xorg, + libxtst, + libxrandr, + libxi, + libxfixes, + libxdmcp, + libx11, libxcb, openssl, libopus, @@ -130,12 +135,12 @@ stdenv'.mkDerivation (finalAttrs: { avahi libevdev libpulseaudio - xorg.libX11 + libx11 libxcb - xorg.libXfixes - xorg.libXrandr - xorg.libXtst - xorg.libXi + libxfixes + libxrandr + libxtst + libxi openssl libopus boost @@ -153,7 +158,7 @@ stdenv'.mkDerivation (finalAttrs: { libsepol libthai libdatrie - xorg.libXdmcp + libxdmcp libxkbcommon libepoxy libva @@ -175,7 +180,7 @@ stdenv'.mkDerivation (finalAttrs: { runtimeDependencies = [ avahi libgbm - xorg.libXrandr + libxrandr libxcb libglvnd ]; diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 0255ab6d3dbd..a670ee66e996 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -18,7 +18,7 @@ let in buildNpmPackage rec { pname = "super-productivity"; - version = "16.9.4"; + version = "17.0.2"; inherit nodejs; @@ -26,7 +26,7 @@ buildNpmPackage rec { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-XCpExMXWLvRFagi453T9g00hsNZtOKGQ9Qmp+KHE5aQ="; + hash = "sha256-3NbWdKWLSqPyZfZmLzrkqwA/yEI4quhfnvtIhgbRPFA="; postFetch = '' find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \; @@ -69,7 +69,7 @@ buildNpmPackage rec { dontInstall = true; outputHashMode = "recursive"; - hash = "sha256-s/TfHMAol3rfq/4mSMQLDaukL1HHHAdc/1rkuj7s8+A="; + hash = "sha256-mWx0pNxTthqSeSwNM8BrsAf/hzbsclEqMFxGicKosZw="; } ); diff --git a/pkgs/by-name/su/supermodel/package.nix b/pkgs/by-name/su/supermodel/package.nix index f78444742fe2..a28bb4e50d13 100644 --- a/pkgs/by-name/su/supermodel/package.nix +++ b/pkgs/by-name/su/supermodel/package.nix @@ -4,7 +4,7 @@ libGLU, SDL2, SDL2_net, - xorg, + libx11, stdenv, zlib, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation { libGLU SDL2 SDL2_net - xorg.libX11 + libx11 zlib ]; diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 5a5f76a7e5db..454106b06ba2 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -7,7 +7,13 @@ copyDesktopItems, pkg-config, desktopToDarwinBundle, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxext, + libxcursor, + libx11, wayland, wayland-protocols, libxkbcommon, @@ -45,15 +51,15 @@ buildGoModule rec { mpv-unwrapped ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libXxf86vm - xorg.libX11 + libxxf86vm + libx11 ] ++ lib.optionals (stdenv.hostPlatform.isLinux && !waylandSupport) [ - xorg.libXrandr - xorg.libXinerama - xorg.libXcursor - xorg.libXi - xorg.libXext + libxrandr + libxinerama + libxcursor + libxi + libxext ] ++ lib.optionals (stdenv.hostPlatform.isLinux && waylandSupport) [ wayland diff --git a/pkgs/by-name/su/surf-display/package.nix b/pkgs/by-name/su/surf-display/package.nix index 82abc8d1a26e..83aced3a52a7 100644 --- a/pkgs/by-name/su/surf-display/package.nix +++ b/pkgs/by-name/su/surf-display/package.nix @@ -8,7 +8,8 @@ matchbox, xdotool, unclutter, - xorg, + xmodmap, + xkbutils, pulseaudio, xprintidle-ng, }: @@ -32,8 +33,8 @@ stdenv.mkDerivation rec { pulseaudio xprintidle-ng xdotool - xorg.xmodmap - xorg.xkbutils + xmodmap + xkbutils unclutter ]; diff --git a/pkgs/by-name/su/surf/package.nix b/pkgs/by-name/su/surf/package.nix index 471e69f60623..58353944c9d2 100644 --- a/pkgs/by-name/su/surf/package.nix +++ b/pkgs/by-name/su/surf/package.nix @@ -12,7 +12,7 @@ libsoup_2_4, # webkitgtk_4_0, webkitgtk_4_1, - xorg, + xprop, dmenu, findutils, gnused, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { preFixup = let depsPath = lib.makeBinPath [ - xorg.xprop + xprop dmenu findutils gnused diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix index d2d30a4d7d03..02ffe3e53ee1 100644 --- a/pkgs/by-name/sv/svp/package.nix +++ b/pkgs/by-name/sv/svp/package.nix @@ -14,7 +14,7 @@ libmediainfo, libusb1, vapoursynth, - xorg, + libx11, systemdLibs, openssl, p7zip, @@ -53,7 +53,7 @@ let libmediainfo libusb1 vapoursynth - xorg.libX11 + libx11 systemdLibs openssl ]; diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 630ac7193c03..c24592fecc8f 100644 --- a/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -27,7 +27,7 @@ # Used by the NixOS module: isNixOS ? false, enableXWayland ? true, - xorg, + libxcb-wm, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, trayEnabled ? systemdSupport, @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { (wlroots_0_19.override { inherit (finalAttrs) enableXWayland; }) ] ++ lib.optionals finalAttrs.enableXWayland [ - xorg.xcbutilwm + libxcb-wm ]; mesonFlags = diff --git a/pkgs/by-name/sw/switchres/package.nix b/pkgs/by-name/sw/switchres/package.nix index ae5937fb3b4d..fa276b63eab2 100644 --- a/pkgs/by-name/sw/switchres/package.nix +++ b/pkgs/by-name/sw/switchres/package.nix @@ -3,7 +3,9 @@ lib, pkg-config, fetchFromGitHub, - xorg, + libxrandr, + libx11, + xorgproto, libdrm, SDL2, }: @@ -24,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libXrandr - xorg.xorgproto + libxrandr + xorgproto libdrm SDL2 ]; @@ -34,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { runHook prePatch substituteInPlace ./custom_video_xrandr.cpp \ - --replace-fail libX11.so ${xorg.libX11}/lib/libX11.so \ - --replace-fail libXrandr.so ${xorg.libXrandr}/lib/libXrandr.so + --replace-fail libX11.so ${libx11}/lib/libX11.so \ + --replace-fail libXrandr.so ${libxrandr}/lib/libXrandr.so substituteInPlace ./custom_video_drmkms.cpp \ --replace-fail libdrm.so ${libdrm}/lib/libdrm.so \ diff --git a/pkgs/by-name/sx/sx/package.nix b/pkgs/by-name/sx/sx/package.nix index 2ba36a610c82..0d3dbd791f57 100644 --- a/pkgs/by-name/sx/sx/package.nix +++ b/pkgs/by-name/sx/sx/package.nix @@ -5,7 +5,8 @@ makeDesktopItem, patsh, coreutils, - xorg, + xorg-server, + xauth, nixosTests, }: @@ -26,8 +27,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildInputs = [ coreutils # needed for cross - xorg.xauth - xorg.xorgserver + xauth + xorg-server ]; postInstall = '' diff --git a/pkgs/by-name/sx/sxcs/package.nix b/pkgs/by-name/sx/sxcs/package.nix index 50a99f5342be..e85531c41077 100644 --- a/pkgs/by-name/sx/sxcs/package.nix +++ b/pkgs/by-name/sx/sxcs/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchFromGitea, - xorg, + libxcursor, + libx11, installShellFiles, }: @@ -19,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - xorg.libX11 - xorg.libXcursor + libx11 + libxcursor ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sy/sylk/package.nix b/pkgs/by-name/sy/sylk/package.nix index 2ff7d56aefc2..f96678b48724 100644 --- a/pkgs/by-name/sy/sylk/package.nix +++ b/pkgs/by-name/sy/sylk/package.nix @@ -2,7 +2,7 @@ appimageTools, fetchurl, lib, - xorg, + libxshmfence, }: appimageTools.wrapType2 rec { @@ -15,7 +15,7 @@ appimageTools.wrapType2 rec { }; extraPkgs = pkgs: [ - xorg.libxshmfence + libxshmfence ]; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/sy/systeroid/package.nix b/pkgs/by-name/sy/systeroid/package.nix index 6a934a616e64..7c80808ac652 100644 --- a/pkgs/by-name/sy/systeroid/package.nix +++ b/pkgs/by-name/sy/systeroid/package.nix @@ -3,7 +3,7 @@ rustPlatform, fetchFromGitHub, linux-doc, - xorg, + libxcb, }: rustPlatform.buildRustPackage rec { @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Gce7DqhGD0CeBTPEqKhzdQ3IIHA6kjoWrejj4V8gT1I="; buildInputs = [ - xorg.libxcb + libxcb ]; # tries to access /sys/ diff --git a/pkgs/by-name/ta/tableplus/linux.nix b/pkgs/by-name/ta/tableplus/linux.nix index 7d5e1f3fdaee..7835f46faabd 100644 --- a/pkgs/by-name/ta/tableplus/linux.nix +++ b/pkgs/by-name/ta/tableplus/linux.nix @@ -11,7 +11,13 @@ libxkbcommon, stdenv, wrapGAppsHook3, - xorg, + libxrender, + libxrandr, + libxi, + libxext, + libxcursor, + libx11, + libxcb, }: stdenv.mkDerivation (finalAttrs: { @@ -36,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { libgee libsecret libxkbcommon - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libxcb + libx11 + libxcursor + libxext + libxi + libxrandr + libxrender + libxcb ]; unpackPhase = '' diff --git a/pkgs/by-name/ta/tacentview/package.nix b/pkgs/by-name/ta/tacentview/package.nix index 2901b81e21f3..7a6dace1725f 100644 --- a/pkgs/by-name/ta/tacentview/package.nix +++ b/pkgs/by-name/ta/tacentview/package.nix @@ -8,7 +8,8 @@ ninja, stdenv, tacent, - xorg, + libx11, + libxcb, zenity, }: @@ -33,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ stdenv.cc.cc.lib tacent - xorg.libX11 - xorg.libxcb + libx11 + libxcb zenity ]; diff --git a/pkgs/by-name/ta/tailscale-gui/package.nix b/pkgs/by-name/ta/tailscale-gui/package.nix new file mode 100644 index 000000000000..214d6a6d3137 --- /dev/null +++ b/pkgs/by-name/ta/tailscale-gui/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenvNoCC, + fetchurl, + xar, + cpio, + pbzx, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "tailscale-gui"; + version = "1.92.3"; + + src = fetchurl { + url = "https://pkgs.tailscale.com/stable/Tailscale-${finalAttrs.version}-macos.pkg"; + hash = "sha256-K5tJHyFhqnxV4KHzr7YOHRoH33vk+dq+EVWyUo88nuI="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ + xar + cpio + pbzx + ]; + + installPhase = '' + runHook preInstall + xar -xf $src + cd Distribution.pkg + pbzx -n Payload | cpio -i + + mkdir -p $out/Applications/Tailscale.app + mkdir -p $out/bin + + cp -R Contents $out/Applications/Tailscale.app/ + ln -s "$out/Applications/Tailscale.app/Contents/MacOS/Tailscale" "$out/bin/tailscale" + + runHook postInstall + ''; + + meta = { + description = "Tailscale GUI client for macOS"; + homepage = "https://tailscale.com"; + changelog = "https://tailscale.com/changelog#client"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ anish ]; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/ta/talhelper/package.nix b/pkgs/by-name/ta/talhelper/package.nix index 4b11a555908a..46e6d5219c14 100644 --- a/pkgs/by-name/ta/talhelper/package.nix +++ b/pkgs/by-name/ta/talhelper/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "talhelper"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = "budimanjojo"; repo = "talhelper"; tag = "v${finalAttrs.version}"; - hash = "sha256-2CuMGYzJV1kfOjAl9eniyzIUJGAeg32Jro5f8Y5m7cs="; + hash = "sha256-nTdNpOloiX1yxZnjdD1CmZz0J73Mi/JaMyJzDopnPKk="; }; vendorHash = "sha256-AkCUKg5oA2XvvDtE0m9fQdeqowx5A1SnnimF7F/CORg="; diff --git a/pkgs/by-name/ta/tamsyn/package.nix b/pkgs/by-name/ta/tamsyn/package.nix index a8019b47d0de..a857176ee1a8 100644 --- a/pkgs/by-name/ta/tamsyn/package.nix +++ b/pkgs/by-name/ta/tamsyn/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, fontforge, - xorg, + mkfontscale, }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ fontforge - xorg.mkfontscale + mkfontscale ]; unpackPhase = '' diff --git a/pkgs/by-name/ta/tamzen/package.nix b/pkgs/by-name/ta/tamzen/package.nix index dbec84fbc981..260e180a2a1c 100644 --- a/pkgs/by-name/ta/tamzen/package.nix +++ b/pkgs/by-name/ta/tamzen/package.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, - xorg, + mkfontscale, lib, stdenv, }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-W5Wqsm5rpzzcbJl2lv6ORAznaAwLcmJ2S6Qo2zIoq9I="; }; - nativeBuildInputs = [ xorg.mkfontscale ]; + nativeBuildInputs = [ mkfontscale ]; installPhase = '' install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc" diff --git a/pkgs/by-name/ta/tau-hydrogen/package.nix b/pkgs/by-name/ta/tau-hydrogen/package.nix index dcbb912ca118..e4fbc333a48e 100644 --- a/pkgs/by-name/ta/tau-hydrogen/package.nix +++ b/pkgs/by-name/ta/tau-hydrogen/package.nix @@ -5,7 +5,7 @@ meson, ninja, librsvg, - xorg, + xcursorgen, }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja librsvg - xorg.xcursorgen + xcursorgen ]; meta = { diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix index 7a3a4902d640..63b3d9eee392 100644 --- a/pkgs/by-name/ta/tauon/package.nix +++ b/pkgs/by-name/ta/tauon/package.nix @@ -17,7 +17,7 @@ librsvg, libsamplerate, libvorbis, - xorg, + libxcursor, mpg123, opusfile, pango, @@ -139,7 +139,7 @@ python3Packages.buildPythonApplication rec { libopenmpt pulseaudio ] - ++ lib.optional stdenv.hostPlatform.isLinux xorg.libXcursor + ++ lib.optional stdenv.hostPlatform.isLinux libxcursor ) }" "--prefix PYTHONPATH : $out/share/tauon" diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 4162bf025d27..35e5f0b7ec09 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "2.6.19"; + version = "2.7.0"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-LWoMMfvIZ0+t1kzhv9uOLj7kTTFp3gzHOT1j+wYN1mM="; + hash = "sha256-WGxbUekGJ8P5D0WrI6ZC1z5ZQneH+ruo6CDQWOmsKzM="; }; - npmDepsHash = "sha256-Bc/l8cKxN/wc4SVDJw0E32W2pErBuHIOopYfqSaLuyo="; + npmDepsHash = "sha256-VBvQbAiZ7aOIQB6ab9zzIarPU8BVlIbZeKZdJ6vL+LQ="; nativeBuildInputs = [ makeWrapper @@ -91,7 +91,7 @@ buildNpmPackage rec { ] } \ --add-flags "$out/share/teams-for-linux/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix index 20b054a85dd1..62f2db8b663e 100644 --- a/pkgs/by-name/te/teamspeak6-client/package.nix +++ b/pkgs/by-name/te/teamspeak6-client/package.nix @@ -26,7 +26,12 @@ pipewire, udev, libGL, - xorg, + libxtst, + libxscrnsaver, + libxfixes, + libxdamage, + libx11, + libxshmfence, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -59,12 +64,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { libvdpau nss pipewire - xorg.libX11 - xorg.libXScrnSaver - xorg.libXdamage - xorg.libXfixes - xorg.libxshmfence - xorg.libXtst + libx11 + libxscrnsaver + libxdamage + libxfixes + libxshmfence + libxtst ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix index eaa5c5a373d8..e0993a11282e 100644 --- a/pkgs/by-name/te/ted/package.nix +++ b/pkgs/by-name/te/ted/package.nix @@ -5,7 +5,10 @@ pkg-config, zlib, pcre, - xorg, + libxpm, + libx11, + libsm, + libice, libjpeg, libtiff, libpng, @@ -87,10 +90,10 @@ stdenv.mkDerivation rec { buildInputs = [ zlib pcre - xorg.libX11 - xorg.libICE - xorg.libSM - xorg.libXpm + libx11 + libice + libsm + libxpm libjpeg libtiff libpng diff --git a/pkgs/by-name/te/terminus_font/package.nix b/pkgs/by-name/te/terminus_font/package.nix index 8aa2810fb211..92075da3104c 100644 --- a/pkgs/by-name/te/terminus_font/package.nix +++ b/pkgs/by-name/te/terminus_font/package.nix @@ -4,7 +4,7 @@ fetchurl, python3, bdftopcf, - xorg, + mkfontscale, }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ python3 bdftopcf - xorg.mkfontscale + mkfontscale ]; strictDeps = true; diff --git a/pkgs/by-name/te/tetraproc/package.nix b/pkgs/by-name/te/tetraproc/package.nix index c1462b81e838..5c2e7b266414 100644 --- a/pkgs/by-name/te/tetraproc/package.nix +++ b/pkgs/by-name/te/tetraproc/package.nix @@ -13,7 +13,11 @@ libclxclient, libsndfile, libxcb, - xorg, + libxrender, + libxft, + libxdmcp, + libxau, + libx11, }: stdenv.mkDerivation rec { @@ -37,11 +41,11 @@ stdenv.mkDerivation rec { libsndfile freetype libxcb - xorg.libX11 - xorg.libXau - xorg.libXdmcp - xorg.libXft - xorg.libXrender + libx11 + libxau + libxdmcp + libxft + libxrender ]; makeFlags = [ diff --git a/pkgs/by-name/te/tetrd/package.nix b/pkgs/by-name/te/tetrd/package.nix index e7694d7ec5f4..ee7b6897f1b9 100644 --- a/pkgs/by-name/te/tetrd/package.nix +++ b/pkgs/by-name/te/tetrd/package.nix @@ -9,7 +9,9 @@ libevent, libvpx, libxslt, - xorg, + libxtst, + libxscrnsaver, + libxdamage, minizip, nss, re2, @@ -45,9 +47,9 @@ stdenv.mkDerivation rec { libevent libvpx libxslt - xorg.libXScrnSaver - xorg.libXdamage - xorg.libXtst + libxscrnsaver + libxdamage + libxtst minizip nss re2 diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix index eff9b716e5c4..e0b9aa71b427 100644 --- a/pkgs/by-name/te/tev/package.nix +++ b/pkgs/by-name/te/tev/package.nix @@ -15,7 +15,11 @@ wayland, wayland-protocols, wayland-scanner, - xorg, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, }: stdenv.mkDerivation rec { @@ -61,11 +65,11 @@ stdenv.mkDerivation rec { wayland wayland-protocols wayland-scanner - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr + libx11 + libxcursor + libxi + libxinerama + libxrandr ]; cmakeFlags = [ diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix index f6e62e79d4f0..1d5eaa922dfc 100644 --- a/pkgs/by-name/ti/tigervnc/package.nix +++ b/pkgs/by-name/ti/tigervnc/package.nix @@ -2,7 +2,26 @@ lib, stdenv, fetchFromGitHub, - xorg, + xorg-server, + util-macros, + tab-window-manager, + libxtst, + libxrandr, + libxi, + libxft, + libxfont_2, + libxext, + libxdamage, + libx11, + libsm, + libice, + font-util, + xsetroot, + xorgproto, + xkbcomp, + xauth, + libxkbfile, + libpciaccess, xkeyboard_config, zlib, libjpeg_turbo, @@ -68,10 +87,10 @@ stdenv.mkDerivation (finalAttrs: { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast" export CXXFLAGS="$CXXFLAGS -fpermissive" # Build Xvnc - tar xf ${xorg.xorgserver.src} + tar xf ${xorg-server.src} cp -R xorg*/* unix/xserver pushd unix/xserver - version=$(echo ${xorg.xorgserver.name} | sed 's/.*-\([0-9]\+\).[0-9]\+.*/\1/g') + version=$(echo ${xorg-server.name} | sed 's/.*-\([0-9]\+\).[0-9]\+.*/\1/g') patch -p1 < "$source_top/unix/xserver$version.patch" autoreconf -vfi ./configure $configureFlags --disable-devel-docs --disable-docs \ @@ -87,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { --enable-install-libxf86config \ --prefix="$out" --disable-unit-tests \ --with-xkb-path=${xkeyboard_config}/share/X11/xkb \ - --with-xkb-bin-directory=${xorg.xkbcomp}/bin \ + --with-xkb-bin-directory=${xkbcomp}/bin \ --with-xkb-output=$out/share/X11/xkb/compiled make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../.. -j$NIX_BUILD_CORES popd @@ -105,15 +124,12 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/vncserver \ --prefix PATH : ${ - lib.makeBinPath ( - with xorg; - [ - xterm - twm - xsetroot - xauth - ] - ) + lib.makeBinPath [ + xterm + tab-window-manager + xsetroot + xauth + ] } '' + lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -134,29 +150,28 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg ] ++ lib.optionals stdenv.hostPlatform.isLinux ( - with xorg; [ nettle pam perl xorgproto - utilmacros - libXtst - libXext - libX11 - libXext - libICE - libXi - libSM - libXft + util-macros + libxtst + libxext + libx11 + libxext + libice + libxi + libsm + libxft libxkbfile - libXfont2 + libxfont_2 libpciaccess libGLU - libXrandr - libXdamage + libxrandr + libxdamage ] - ++ xorg.xorgserver.buildInputs + ++ xorg-server.buildInputs ); nativeBuildInputs = [ @@ -166,18 +181,17 @@ stdenv.mkDerivation (finalAttrs: { automake ] ++ lib.optionals stdenv.hostPlatform.isLinux ( - with xorg; [ - fontutil + font-util libtool makeWrapper - utilmacros + util-macros zlib ] - ++ xorg.xorgserver.nativeBuildInputs + ++ xorg-server.nativeBuildInputs ); - propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux xorg.xorgserver.propagatedBuildInputs; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux xorg-server.propagatedBuildInputs; passthru.tests.tigervnc = nixosTests.tigervnc; diff --git a/pkgs/by-name/to/tomboy-ng/package.nix b/pkgs/by-name/to/tomboy-ng/package.nix index dea1e31daba6..9a061507e249 100644 --- a/pkgs/by-name/to/tomboy-ng/package.nix +++ b/pkgs/by-name/to/tomboy-ng/package.nix @@ -12,7 +12,7 @@ gtk2, gdk-pixbuf, at-spi2-atk, - xorg, + libx11, libnotify, nix-update-script, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { gtk2 gdk-pixbuf at-spi2-atk - xorg.libX11 + libx11 libnotify ]; diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix index 45f99736fe84..4007e2c0b2bd 100644 --- a/pkgs/by-name/to/tome4/package.nix +++ b/pkgs/by-name/to/tome4/package.nix @@ -14,7 +14,8 @@ SDL2, SDL2_image, SDL2_ttf, - xorg, + libx11, + xorgproto, nix-update-script, }: @@ -73,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: { openal libpng libvorbis - xorg.libX11 - xorg.xorgproto + libx11 + xorgproto ] ++ sdlInputs; diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix index 6c1a139026e9..ca98e4c126bc 100644 --- a/pkgs/by-name/to/touchegg/package.nix +++ b/pkgs/by-name/to/touchegg/package.nix @@ -8,7 +8,13 @@ libinput, pugixml, cairo, - xorg, + libxtst, + libxrandr, + libxi, + libxdmcp, + libx11, + libpthread-stubs, + libxcb, gtk3-x11, pkg-config, cmake, @@ -60,16 +66,14 @@ stdenv.mkDerivation (finalAttrs: { pugixml cairo gtk3-x11 - ] - ++ (with xorg; [ - libX11 - libXtst - libXrandr - libXi - libXdmcp - libpthreadstubs + libx11 + libxtst + libxrandr + libxi + libxdmcp + libpthread-stubs libxcb - ]); + ]; env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix index a19ed8864e20..1963260b1c63 100644 --- a/pkgs/by-name/tr/tradingview/package.nix +++ b/pkgs/by-name/tr/tradingview/package.nix @@ -19,7 +19,9 @@ sqlite, systemd, wayland, - xorg, + libxext, + libx11, + libxcb, }: stdenv.mkDerivation (finalAttrs: { @@ -54,9 +56,9 @@ stdenv.mkDerivation (finalAttrs: { sqlite systemd wayland - xorg.libxcb - xorg.libX11 - xorg.libXext + libxcb + libx11 + libxext ]; unpackPhase = '' diff --git a/pkgs/by-name/tr/transito/package.nix b/pkgs/by-name/tr/transito/package.nix index f9f6842447fe..cb00fb1f4e25 100644 --- a/pkgs/by-name/tr/transito/package.nix +++ b/pkgs/by-name/tr/transito/package.nix @@ -7,7 +7,10 @@ vulkan-headers, libxkbcommon, wayland, - xorg, + libxfixes, + libxcursor, + libx11, + libxcb, libGL, sqlite, }: @@ -29,10 +32,10 @@ buildGoModule rec { vulkan-headers libxkbcommon wayland - xorg.libX11 - xorg.libXcursor - xorg.libXfixes - xorg.libxcb + libx11 + libxcursor + libxfixes + libxcb libGL sqlite ]; diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 924e193225c1..0efd23432ec7 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.87.5"; + version = "2.89.11"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-0lsDNXdZTmhH+rODGi4qVjX8dQNypkiVnqGoYvENbQM="; + hash = "sha256-RyIzWZScUmG3bApAazIlJ3M3KkOLFAC9JKAXFNkJyYA="; }; postPatch = '' diff --git a/pkgs/by-name/tr/trillian-im/package.nix b/pkgs/by-name/tr/trillian-im/package.nix index cdb45ac0fd0d..c86079475646 100644 --- a/pkgs/by-name/tr/trillian-im/package.nix +++ b/pkgs/by-name/tr/trillian-im/package.nix @@ -12,7 +12,7 @@ libnotify, libsecret, pangomm, - xorg, + libxscrnsaver, libpulseaudio, librsvg, libzip, @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libnotify libsecret pangomm - xorg.libXScrnSaver + libxscrnsaver libpulseaudio librsvg libzip diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix index e525a62894c8..d5cc9fd2c8cc 100644 --- a/pkgs/by-name/ts/ts_query_ls/package.nix +++ b/pkgs/by-name/ts/ts_query_ls/package.nix @@ -6,7 +6,7 @@ }: let pname = "ts_query_ls"; - version = "3.12.0"; + version = "3.15.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,12 +15,12 @@ rustPlatform.buildRustPackage { owner = "ribru17"; repo = "ts_query_ls"; rev = "v${version}"; - hash = "sha256-eb/3lY9qd+xWn1QEmDCxRY95ZWHSYxmOHq/mTFqiNiA="; + hash = "sha256-m3jtaVYy/mNhM584asctI9ZUdaHvPr3ULRHYmmyKsLA="; }; nativeBuildInputs = [ cmake ]; - cargoHash = "sha256-Y7OvSrFfQ71xufqNlJ5YNTKs00zzKCgCX+OOffTAkJw="; + cargoHash = "sha256-XHMVga5tdWv+yT0vhFd6RQ2N740Zkb3e76wqIc1hbnE="; meta = { description = "LSP implementation for Tree-sitter's query files"; diff --git a/pkgs/by-name/tt/ttygif/package.nix b/pkgs/by-name/tt/ttygif/package.nix index 81b76298d728..93ec84f151f4 100644 --- a/pkgs/by-name/tt/ttygif/package.nix +++ b/pkgs/by-name/tt/ttygif/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, makeWrapper, imagemagick, - xorg, + xwd, }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${ lib.makeBinPath [ imagemagick - xorg.xwd + xwd ] } ''; diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 3cf3af9a0052..91d470a706da 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -26,6 +26,7 @@ appimageTools.wrapType2 rec { '' install -Dm 444 ${appimageContents}/tutanota-desktop.desktop -t $out/share/applications install -Dm 444 ${appimageContents}/tutanota-desktop.png -t $out/share/pixmaps + cp -r ${appimageContents}/usr/share/icons/. $out/share/icons substituteInPlace $out/share/applications/tutanota-desktop.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/by-name/tv/tvbrowser/test.nix b/pkgs/by-name/tv/tvbrowser/test.nix index d7dc2033f6c5..9948e6c86fac 100644 --- a/pkgs/by-name/tv/tvbrowser/test.nix +++ b/pkgs/by-name/tv/tvbrowser/test.nix @@ -4,14 +4,14 @@ tvbrowser, runCommand, writeShellApplication, - xorg, + xwininfo, }: let testScript = writeShellApplication { name = "tvbrowser-test-script"; runtimeInputs = [ - xorg.xwininfo + xwininfo tvbrowser ]; text = '' diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix index d05f154aa131..9fc4f0484ce2 100644 --- a/pkgs/by-name/ty/typora/package.nix +++ b/pkgs/by-name/ty/typora/package.nix @@ -86,15 +86,13 @@ let libGL expat libxkbcommon - ]) - ++ (with pkgs.xorg; [ - libX11 - libXcursor - libXrandr - libXcomposite - libXdamage - libXext - libXfixes + libx11 + libxcursor + libxrandr + libxcomposite + libxdamage + libxext + libxfixes libxcb ]); runScript = '' diff --git a/pkgs/by-name/uc/ucs-fonts/package.nix b/pkgs/by-name/uc/ucs-fonts/package.nix index f1908ed4c39c..5ea323440107 100644 --- a/pkgs/by-name/uc/ucs-fonts/package.nix +++ b/pkgs/by-name/uc/ucs-fonts/package.nix @@ -4,7 +4,8 @@ fetchurl, bdftopcf, libfaketime, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation { @@ -31,8 +32,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ bdftopcf libfaketime - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale ]; buildPhase = '' diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index 231e2dc9cec3..e1d2843c3f93 100644 --- a/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/pkgs/by-name/ue/ueberzugpp/package.nix @@ -28,7 +28,8 @@ wayland-protocols, wayland-scanner, enableX11 ? stdenv.hostPlatform.isLinux, - xorg, + libxcb-image, + libx11, cudaSupport ? config.cudaSupport, cudaPackages, }: @@ -84,8 +85,8 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols ] ++ lib.optionals enableX11 [ - xorg.libX11 - xorg.xcbutilimage + libx11 + libxcb-image ] # Required by opencv when cudaSupport is enabled ++ lib.optionals cudaSupport [ diff --git a/pkgs/by-name/uh/uhhyou-plugins/package.nix b/pkgs/by-name/uh/uhhyou-plugins/package.nix index 392b83f2aaf2..f24ffa197b58 100644 --- a/pkgs/by-name/uh/uhhyou-plugins/package.nix +++ b/pkgs/by-name/uh/uhhyou-plugins/package.nix @@ -10,7 +10,7 @@ freetype, libxcb, xcbutil, - xorg, + libxcb-cursor, xcbutilkeysyms, libxkbcommon, libX11, @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { freetype libxcb xcbutil - xorg.xcbutilcursor + libxcb-cursor xcbutilkeysyms libxkbcommon libX11 diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index c68cc0dd19b2..1f9730cc737f 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -15,7 +15,10 @@ libGL, libxkbcommon, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, windowSupport ? false, runCommand, @@ -62,10 +65,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libGL libxkbcommon wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; in lib.optionalString (runtimeDependencies != [ ] && stdenv.hostPlatform.isLinux) '' diff --git a/pkgs/by-name/un/uni-vga/package.nix b/pkgs/by-name/un/uni-vga/package.nix index 021ed73ccc3a..a2b8a12da10f 100644 --- a/pkgs/by-name/un/uni-vga/package.nix +++ b/pkgs/by-name/un/uni-vga/package.nix @@ -6,7 +6,8 @@ kbd, bdftopcf, libfaketime, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation { @@ -20,8 +21,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ bdftopcf libfaketime - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale ] ++ lib.optionals stdenv.hostPlatform.isLinux [ perl diff --git a/pkgs/by-name/un/unicon-lang/package.nix b/pkgs/by-name/un/unicon-lang/package.nix index a689939af577..acfa781ad979 100644 --- a/pkgs/by-name/un/unicon-lang/package.nix +++ b/pkgs/by-name/un/unicon-lang/package.nix @@ -6,7 +6,7 @@ fetchFromGitHub, coreutils, libpng, - xorg, + libxft, freetype, zlib, libjpeg, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { libX11 libjpeg libpng - xorg.libXft + libxft freetype # ssl openssl diff --git a/pkgs/by-name/un/unifont/package.nix b/pkgs/by-name/un/unifont/package.nix index c8d96f349836..910d12abca5a 100644 --- a/pkgs/by-name/un/unifont/package.nix +++ b/pkgs/by-name/un/unifont/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchurl, - xorg, + mkfontscale, + fonttosfnt, libfaketime, }: @@ -27,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ libfaketime - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale ]; dontUnpack = true; diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix index 8fac9d1b9186..1836ab96b8af 100644 --- a/pkgs/by-name/un/unityhub/package.nix +++ b/pkgs/by-name/un/unityhub/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { with pkgs; [ # Unity Hub binary dependencies - xorg.libXrandr + libxrandr xdg-utils # GTK filepicker @@ -67,14 +67,14 @@ stdenv.mkDerivation rec { dbus at-spi2-core pango - xorg.libXcomposite - xorg.libXext - xorg.libXdamage - xorg.libXfixes - xorg.libxcb - xorg.libxshmfence - xorg.libXScrnSaver - xorg.libXtst + libxcomposite + libxext + libxdamage + libxfixes + libxcb + libxshmfence + libxscrnsaver + libxtst # Unity Hub additional dependencies libva @@ -92,8 +92,8 @@ stdenv.mkDerivation rec { # Unity Editor dependencies libglvnd # provides ligbl - xorg.libX11 - xorg.libXcursor + libx11 + libxcursor glib gdk-pixbuf libxml2_13 @@ -106,8 +106,8 @@ stdenv.mkDerivation rec { vulkan-loader # Unity Bug Reporter specific dependencies - xorg.libICE - xorg.libSM + libice + libsm # Fonts used by built-in and third party editor tools corefonts diff --git a/pkgs/by-name/un/universal-android-debloater/package.nix b/pkgs/by-name/un/universal-android-debloater/package.nix index f2f7f3a7cb1d..98d89876bd7c 100644 --- a/pkgs/by-name/un/universal-android-debloater/package.nix +++ b/pkgs/by-name/un/universal-android-debloater/package.nix @@ -15,7 +15,10 @@ rustPlatform, wayland, writableTmpDirAsHomeHook, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -56,10 +59,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libglvnd libxkbcommon wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ] } --suffix PATH : ${lib.makeBinPath [ android-tools ]} ''; diff --git a/pkgs/by-name/un/unixbench/package.nix b/pkgs/by-name/un/unixbench/package.nix index e625fc800cea..7ce16c0d8a2a 100644 --- a/pkgs/by-name/un/unixbench/package.nix +++ b/pkgs/by-name/un/unixbench/package.nix @@ -6,7 +6,9 @@ pandoc, installShellFiles, perl, - xorg, + libxext, + libx11, + x11perf, libGLX, coreutils, unixtools, @@ -52,8 +54,8 @@ stdenv.mkDerivation rec { perl ] ++ lib.optionals withGL [ - xorg.libX11 - xorg.libXext + libx11 + libxext libGLX ]; @@ -66,7 +68,7 @@ stdenv.mkDerivation rec { gawk ] ++ lib.optionals withX11perf [ - xorg.x11perf + x11perf ]; makeFlags = [ diff --git a/pkgs/by-name/ur/urdf-viz/package.nix b/pkgs/by-name/ur/urdf-viz/package.nix index 39feb4ca582e..1f1eee83da39 100644 --- a/pkgs/by-name/ur/urdf-viz/package.nix +++ b/pkgs/by-name/ur/urdf-viz/package.nix @@ -4,7 +4,11 @@ rustPlatform, stdenv, libGL, - xorg, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, lib, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -39,21 +43,21 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ stdenv.cc.cc.lib libGL - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXinerama - xorg.libXi + libx11 + libxcursor + libxrandr + libxinerama + libxi ]; # Tell autopatchelf about the dependency that is linked through dlopen runtimeDependencies = [ libGL - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXinerama - xorg.libXi + libx11 + libxcursor + libxrandr + libxinerama + libxi ]; meta = { diff --git a/pkgs/by-name/uw/uw-ttyp0/package.nix b/pkgs/by-name/uw/uw-ttyp0/package.nix index 18405b0b978e..1822608048a9 100644 --- a/pkgs/by-name/uw/uw-ttyp0/package.nix +++ b/pkgs/by-name/uw/uw-ttyp0/package.nix @@ -5,7 +5,8 @@ perl, bdftopcf, bdf2psf, - xorg, + mkfontscale, + fonttosfnt, targetsDat ? null, variantsDat ? null, }: @@ -23,8 +24,8 @@ stdenv.mkDerivation rec { perl bdftopcf bdf2psf - xorg.fonttosfnt - xorg.mkfontdir + fonttosfnt + mkfontscale ]; # configure sizes, encodings and variants diff --git a/pkgs/by-name/ux/uxn11/package.nix b/pkgs/by-name/ux/uxn11/package.nix index 535bc15e21b7..4d0cfe99e821 100644 --- a/pkgs/by-name/ux/uxn11/package.nix +++ b/pkgs/by-name/ux/uxn11/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromSourcehut, - xorg, + libx11, }: stdenv.mkDerivation { @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; buildInputs = [ - xorg.libX11 + libx11 ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -32,6 +32,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; mainProgram = "uxn11"; maintainers = with lib.maintainers; [ jleightcap ]; - inherit (xorg.libX11.meta) platforms; + inherit (libx11.meta) platforms; }; } diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index a1f8e679595c..556e9fe5f4c3 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -14,7 +14,13 @@ lttng-ust_2_12, krb5, bash, - xorg, + libxrandr, + libxi, + libxext, + libxcursor, + libx11, + libsm, + libice, nix-update-script, }: @@ -72,14 +78,14 @@ buildDotnetModule (finalAttrs: { (lib.getLib stdenv.cc.cc) ]; - runtimeDeps = with xorg; [ - libX11 - libXrandr - libXi - libICE - libSM - libXcursor - libXext + runtimeDeps = [ + libx11 + libxrandr + libxi + libice + libsm + libxcursor + libxext ]; desktopItems = [ diff --git a/pkgs/by-name/va/vampire/package.nix b/pkgs/by-name/va/vampire/package.nix index ee354e8af38e..bd7f48dd99c6 100644 --- a/pkgs/by-name/va/vampire/package.nix +++ b/pkgs/by-name/va/vampire/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vampire"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "vprover"; repo = "vampire"; tag = "v${finalAttrs.version}"; - hash = "sha256-jRzVh1KirWi9GpOkzSGoIBUExDN1rV0b3AGwa6gWb3I="; + hash = "sha256-Ka9HmicIf7b5VN9nbiCW604ZZrGpJuP57RPTzOnwJbU="; fetchSubmodules = true; }; @@ -42,20 +42,6 @@ stdenv.mkDerivation (finalAttrs: { rm -rf z3 ''; - installPhase = '' - runHook preInstall - - # some versions place the binary at ./ while others at bin/ - if test -n "$(find . -maxdepth 1 -name 'vampire*' -print -quit)" - then - install -m0755 -D vampire* $out/bin/vampire - else - install -m0755 -D bin/vampire* $out/bin/vampire - fi - - runHook postInstall - ''; - meta = { homepage = "https://vprover.github.io/"; description = "Vampire Theorem Prover"; diff --git a/pkgs/by-name/va/vanilla-dmz/package.nix b/pkgs/by-name/va/vanilla-dmz/package.nix index eb728e3877df..e7097a329208 100644 --- a/pkgs/by-name/va/vanilla-dmz/package.nix +++ b/pkgs/by-name/va/vanilla-dmz/package.nix @@ -2,7 +2,7 @@ stdenvNoCC, lib, fetchzip, - xorg, + xcursorgen, hicolor-icon-theme, }: @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec { }; buildInputs = [ - xorg.xcursorgen + xcursorgen ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch b/pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch deleted file mode 100644 index f6fb777e186e..000000000000 --- a/pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/converter.js b/src/converter.js -index af7b4c3..20da407 100644 ---- a/src/converter.js -+++ b/src/converter.js -@@ -1,4 +1,4 @@ --import open from 'open'; -+const open = import('open'); - - const os = require("os"); - const path = require('path'); -@@ -9,9 +9,9 @@ const rpc = require('./weh-rpc'); - - const exec_dir = path.dirname(process.execPath); - --const ffmpeg = findExecutableFullPath("ffmpeg", exec_dir); --const ffprobe = findExecutableFullPath("ffprobe", exec_dir); --const filepicker = findExecutableFullPath("filepicker", exec_dir); -+const ffmpeg = "@ffmpeg@/bin/ffmpeg"; -+const ffprobe = "@ffmpeg@/bin/ffprobe"; -+const filepicker = "@filepicker@"; - - if (!fileExistsSync(ffmpeg)) { - logger.error("ffmpeg not found. Install ffmpeg and make sure it's in your path."); -diff --git a/src/main.js b/src/main.js -index 47b92de..e2e9402 100644 ---- a/src/main.js -+++ b/src/main.js -@@ -1,4 +1,4 @@ --const config = require('config.json'); -+const config = require('./config.json'); - const converter = require('./converter'); - const os = require("os"); - -diff --git a/src/native-autoinstall.js b/src/native-autoinstall.js -index 556a22b..c729568 100644 ---- a/src/native-autoinstall.js -+++ b/src/native-autoinstall.js -@@ -1,7 +1,7 @@ - const os = require("os"); - const path = require("path"); - const { spawn, exec } = require('child_process'); --const config = require('config.json'); -+const config = require('./config.json'); - - let fs; - if (process.versions.node.startsWith("10")) { \ No newline at end of file diff --git a/pkgs/by-name/vd/vdhcoapp/filepicker.nix b/pkgs/by-name/vd/vdhcoapp/filepicker.nix deleted file mode 100644 index 16f02454d81b..000000000000 --- a/pkgs/by-name/vd/vdhcoapp/filepicker.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - atk, - gtk3, - glib, -}: - -rustPlatform.buildRustPackage rec { - pname = "filepicker"; - version = "1.0.1"; - - src = fetchFromGitHub { - owner = "paulrouget"; - repo = "static-filepicker"; - rev = "v${version}"; - hash = "sha256-7sRzf3SA9RSBf4O36olXgka8c6Bufdb0qsuTofVe55s="; - }; - - cargoHash = "sha256-HUNBGG1+LsjaDsJS4p5aAdCRyltylQUtdydGSoUdNgo="; - - buildInputs = [ - atk - gtk3 - glib - ]; - - nativeBuildInputs = [ - pkg-config - ]; - - meta = { - description = "File picker used by VDHCoApp"; - homepage = "https://github.com/paulrouget/static-filepicker"; - license = lib.licenses.gpl2; - mainProgram = "filepicker"; - maintainers = with lib.maintainers; [ hannesgith ]; - }; -} diff --git a/pkgs/by-name/vd/vdhcoapp/package.nix b/pkgs/by-name/vd/vdhcoapp/package.nix deleted file mode 100644 index 8fdb802f1d75..000000000000 --- a/pkgs/by-name/vd/vdhcoapp/package.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildNpmPackage, - nodejs, - ffmpeg, - callPackage, - replaceVars, - makeWrapper, - toml2json, - jq, -}: -buildNpmPackage rec { - pname = "vdhcoapp"; - version = "2.0.19"; - - src = fetchFromGitHub { - owner = "aclap-dev"; - repo = "vdhcoapp"; - rev = "v${version}"; - hash = "sha256-8xeZvqpRq71aShVogiwlVD3gQoPGseNOmz5E3KbsZxU="; - }; - - sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-E032U2XZdyTER6ROkBosOTn7bweDXHl8voC3BQEz8Wg="; - dontNpmBuild = true; - - nativeBuildInputs = [ - makeWrapper - toml2json - jq - ]; - - patches = [ - (replaceVars ./ffmpeg-filepicker.patch { - inherit ffmpeg; - filepicker = lib.getExe (callPackage ./filepicker.nix { }); - }) - ]; - - postPatch = '' - # Cannot use patch, setting placeholder here - substituteInPlace src/native-autoinstall.js \ - --replace process.execPath "\"${placeholder "out"}/bin/vdhcoapp\"" - ''; - - preBuild = '' - toml2json --pretty ../config.toml > src/config.json - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/opt/vdhcoapp - cp -r . "$out/opt/vdhcoapp" - - makeWrapper ${nodejs}/bin/node $out/bin/vdhcoapp \ - --add-flags $out/opt/vdhcoapp/src/main.js - - generateManifest() { - type=$1 - outputFolder=$2 - mkdir -p $outputFolder - manifestName=$(jq -r '.meta.id' src/config.json).json - jq '.store.'$type'.manifest * (.meta | with_entries(select (.key == "description")) * {"name": .id}) * {"path" : "${placeholder "out"}/bin/vdhcoapp"}' src/config.json > $outputFolder/$manifestName - } - - generateManifest google $out/etc/opt/chrome/native-messaging-hosts - generateManifest google $out/etc/chromium/native-messaging-hosts - generateManifest mozilla $out/lib/mozilla/native-messaging-hosts - generateManifest google $out/etc/opt/edge/native-messaging-hosts - - runHook postInstall - ''; - - meta = { - description = "Companion application for the Video DownloadHelper browser add-on"; - homepage = "https://www.downloadhelper.net/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ hannesgith ]; - mainProgram = "vdhcoapp"; - }; -} diff --git a/pkgs/by-name/ve/vesta-viewer/package.nix b/pkgs/by-name/ve/vesta-viewer/package.nix index 6ee005925662..ebf984923f23 100644 --- a/pkgs/by-name/ve/vesta-viewer/package.nix +++ b/pkgs/by-name/ve/vesta-viewer/package.nix @@ -14,7 +14,8 @@ libgcc, gtk3, gtk2, - xorg, + libxxf86vm, + libxtst, temurin-jre-bin, }: @@ -48,11 +49,9 @@ let gtk3 gtk2 temurin-jre-bin - ] - ++ (with xorg; [ - libXxf86vm - libXtst - ]); + libxxf86vm + libxtst + ]; src = fetchzip { url = "https://jp-minerals.org/vesta/archives/${version}/VESTA-gtk3.tar.bz2"; diff --git a/pkgs/by-name/vi/viber/package.nix b/pkgs/by-name/vi/viber/package.nix index fb2461304b5a..a54b302a4d62 100644 --- a/pkgs/by-name/vi/viber/package.nix +++ b/pkgs/by-name/vi/viber/package.nix @@ -55,7 +55,25 @@ twolame, wavpack, wayland, - xorg, + xkeyboard-config, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxcb, xvidcore, zlib, zstd, @@ -133,24 +151,24 @@ stdenv.mkDerivation (finalAttrs: { twolame wavpack wayland - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - xorg.libxcb - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm + libice + libsm + libx11 + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxscrnsaver + libxtst + libxcb + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm xvidcore zlib zstd @@ -172,8 +190,8 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper $out/opt/viber/Viber $out/bin/viber \ --set QT_QPA_PLATFORM "xcb" \ --set QT_PLUGIN_PATH "$out/opt/viber/plugins" \ - --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb" \ + --set QTCOMPOSE "${libx11.out}/share/X11/locale" \ --set QML2_IMPORT_PATH "$out/opt/viber/qml" mv $out/usr/share $out/share diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index dcf83259e794..fd811f550877 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -18,7 +18,9 @@ vulkan-loader, wayland, winetricks, - xorg, + libxfixes, + libxcursor, + libx11, symlinkJoin, nix-update-script, }: @@ -158,9 +160,9 @@ buildGoModule (finalAttrs: { wayland wine winetricks - xorg.libX11 - xorg.libXcursor - xorg.libXfixes + libx11 + libxcursor + libxfixes ]; postPatch = '' diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index fc7026083f22..5d71254e704e 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -17,14 +17,15 @@ libpulseaudio, dotnet-runtime_8, x11Support ? true, - xorg ? null, + libxi, + libxcursor, + libx11, waylandSupport ? false, wayland ? null, libxkbcommon ? null, }: assert x11Support || waylandSupport; -assert x11Support -> xorg != null; assert waylandSupport -> wayland != null; assert waylandSupport -> libxkbcommon != null; @@ -55,9 +56,9 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio ] ++ lib.optionals x11Support [ - xorg.libX11 - xorg.libXi - xorg.libXcursor + libx11 + libxi + libxcursor ] ++ lib.optionals waylandSupport [ wayland diff --git a/pkgs/by-name/vi/visp/package.nix b/pkgs/by-name/vi/visp/package.nix index 5dbf50e4e4a1..6cec848b1bc8 100644 --- a/pkgs/by-name/vi/visp/package.nix +++ b/pkgs/by-name/vi/visp/package.nix @@ -24,7 +24,7 @@ stdenv, texliveSmall, v4l-utils, - xorg, + libpthread-stubs, zbar, zlib, }: @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { openblas opencv python3Packages.numpy - xorg.libpthreadstubs + libpthread-stubs zbar zlib ] diff --git a/pkgs/by-name/vi/vital/package.nix b/pkgs/by-name/vi/vital/package.nix index 1b271c81ad39..1d131fb5104b 100644 --- a/pkgs/by-name/vi/vital/package.nix +++ b/pkgs/by-name/vi/vital/package.nix @@ -8,7 +8,9 @@ alsa-lib, libjack2, curl, - xorg, + libx11, + libsm, + libice, libGL, freetype, zenity, @@ -56,9 +58,9 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib (lib.getLib stdenv.cc.cc) libGL - xorg.libSM - xorg.libICE - xorg.libX11 + libsm + libice + libx11 freetype libjack2 ]; diff --git a/pkgs/by-name/vk/vk-messenger/package.nix b/pkgs/by-name/vk/vk-messenger/package.nix index 750d270dad2b..7dfd160d7656 100644 --- a/pkgs/by-name/vk/vk-messenger/package.nix +++ b/pkgs/by-name/vk/vk-messenger/package.nix @@ -5,7 +5,10 @@ rpmextract, undmg, autoPatchelfHook, - xorg, + libxtst, + libxscrnsaver, + libxdamage, + libxkbfile, gtk3, nss, alsa-lib, @@ -61,18 +64,15 @@ let autoPatchelfHook wrapGAppsHook3 ]; - buildInputs = - (with xorg; [ - libXdamage - libXtst - libXScrnSaver - libxkbfile - ]) - ++ [ - gtk3 - nss - alsa-lib - ]; + buildInputs = [ + libxdamage + libxtst + libxscrnsaver + libxkbfile + gtk3 + nss + alsa-lib + ]; runtimeDependencies = [ (lib.getLib udev) diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix index 58580035c7ac..ef330235d743 100644 --- a/pkgs/by-name/vl/vlang/package.nix +++ b/pkgs/by-name/vl/vlang/package.nix @@ -8,7 +8,10 @@ makeWrapper, upx, boehmgc, - xorg, + libxdmcp, + libxau, + libx11, + xorgproto, binaryen, }: @@ -76,10 +79,10 @@ stdenv.mkDerivation { binaryen ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXau - xorg.libXdmcp - xorg.xorgproto + libx11 + libxau + libxdmcp + xorgproto ]; makeFlags = [ diff --git a/pkgs/by-name/vm/vmware-workstation/package.nix b/pkgs/by-name/vm/vmware-workstation/package.nix index d21eb8b0f67e..d4dab6885e6b 100644 --- a/pkgs/by-name/vm/vmware-workstation/package.nix +++ b/pkgs/by-name/vm/vmware-workstation/package.nix @@ -19,7 +19,21 @@ libxcrypt-legacy, libGL, numactl, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxinerama, + libxft, + libxfixes, + libxext, + libxdmcp, + libxdamage, + libxcursor, + libxcomposite, + libxau, + libx11, kmod, python3, autoPatchelfHook, @@ -106,21 +120,21 @@ stdenv.mkDerivation (finalAttrs: { libxcrypt-legacy libGL numactl - xorg.libX11 - xorg.libXau - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXdmcp - xorg.libXext - xorg.libXfixes - xorg.libXft - xorg.libXinerama - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst + libx11 + libxau + libxcomposite + libxcursor + libxdamage + libxdmcp + libxext + libxfixes + libxft + libxinerama + libxi + libxrandr + libxrender + libxscrnsaver + libxtst ]; installPhase = '' @@ -229,8 +243,8 @@ stdenv.mkDerivation (finalAttrs: { --add-needed ${libpulseaudio}/lib/libpulse.so.0 \ --add-needed ${libGL}/lib/libEGL.so.1 \ --add-needed ${numactl}/lib/libnuma.so.1 \ - --add-needed ${xorg.libX11}/lib/libX11.so.6 \ - --add-needed ${xorg.libXi}/lib/libXi.so.6 \ + --add-needed ${libx11}/lib/libX11.so.6 \ + --add-needed ${libxi}/lib/libXi.so.6 \ --add-needed ${libGL}/lib/libGL.so.1 \ $out/lib/vmware/bin/$binary done diff --git a/pkgs/by-name/vo/volctl/package.nix b/pkgs/by-name/vo/volctl/package.nix index cb0bc1c98c37..84cf73f9473a 100644 --- a/pkgs/by-name/vo/volctl/package.nix +++ b/pkgs/by-name/vo/volctl/package.nix @@ -8,7 +8,7 @@ glib, gtk3, pango, - xorg, + libxfixes, }: python3Packages.buildPythonApplication rec { @@ -25,8 +25,8 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace volctl/xwrappers.py \ - --replace 'libXfixes.so' "${xorg.libXfixes}/lib/libXfixes.so" \ - --replace 'libXfixes.so.3' "${xorg.libXfixes}/lib/libXfixes.so.3" + --replace 'libXfixes.so' "${libxfixes}/lib/libXfixes.so" \ + --replace 'libXfixes.so.3' "${libxfixes}/lib/libXfixes.so.3" ''; preBuild = '' diff --git a/pkgs/by-name/vo/voxinput/package.nix b/pkgs/by-name/vo/voxinput/package.nix index 59fa986aad54..02f324c509fe 100644 --- a/pkgs/by-name/vo/voxinput/package.nix +++ b/pkgs/by-name/vo/voxinput/package.nix @@ -6,7 +6,12 @@ libpulseaudio, dotool, libGL, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, libxkbcommon, wayland, lib, @@ -38,12 +43,12 @@ buildGoModule (finalAttrs: { dotool libGL - xorg.libX11.dev - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXxf86vm + libx11.dev + libxcursor + libxi + libxinerama + libxrandr + libxxf86vm libxkbcommon wayland ]; diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index 7687eb10141b..85574bd97d63 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -14,7 +14,10 @@ vulkan-loader, wayland, xdg-utils, - xorg, + libxi, + libxcursor, + libx11, + libxcb, zlib, makeWrapper, waylandSupport ? false, @@ -62,10 +65,10 @@ let stdenv.cc.libc vulkan-loader xdg-utils - xorg.libX11 - xorg.libxcb - xorg.libXcursor - xorg.libXi + libx11 + libxcb + libxcursor + libxi ] ++ lib.optionals waylandSupport [ wayland ]; diff --git a/pkgs/by-name/wa/wasabiwallet/package.nix b/pkgs/by-name/wa/wasabiwallet/package.nix index 9142a698c3e0..c345e1b1c665 100644 --- a/pkgs/by-name/wa/wasabiwallet/package.nix +++ b/pkgs/by-name/wa/wasabiwallet/package.nix @@ -8,7 +8,9 @@ lttng-ust_2_12, fontconfig, openssl, - xorg, + libx11, + libsm, + libice, zlib, }: @@ -19,9 +21,9 @@ let fontconfig.lib openssl (lib.getLib stdenv.cc.cc) - xorg.libX11 - xorg.libICE - xorg.libSM + libx11 + libice + libsm zlib ]; in diff --git a/pkgs/by-name/wa/wasistlos/package.nix b/pkgs/by-name/wa/wasistlos/package.nix index 3b5ae22e2e00..f8ad1c8468b8 100644 --- a/pkgs/by-name/wa/wasistlos/package.nix +++ b/pkgs/by-name/wa/wasistlos/package.nix @@ -23,7 +23,8 @@ pkg-config, webkitgtk_4_1, wrapGAppsHook3, - xorg, + libxtst, + libxdmcp, }: stdenv.mkDerivation (finalAttrs: { @@ -65,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: { pcre2 sqlite webkitgtk_4_1 - xorg.libXdmcp - xorg.libXtst + libxdmcp + libxtst ]; meta = { diff --git a/pkgs/by-name/wa/watchgha/package.nix b/pkgs/by-name/wa/watchgha/package.nix index e28f2ef0fe2b..45ae401e410f 100644 --- a/pkgs/by-name/wa/watchgha/package.nix +++ b/pkgs/by-name/wa/watchgha/package.nix @@ -5,13 +5,13 @@ }: python3Packages.buildPythonApplication rec { pname = "watchgha"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; src = fetchPypi { inherit version; pname = "watchgha"; - hash = "sha256-D8Asyd2BGjPYWrAqnXRDMKgZVKC5euzBdbgw6EiEC4I="; + hash = "sha256-EWk/h5eusjgowj6C6h8RgAxkgqju4Ni3A/wWaeDQ3GQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/wa/waywall/package.nix b/pkgs/by-name/wa/waywall/package.nix index 8224a4f7b5bf..1b035e5ee40b 100644 --- a/pkgs/by-name/wa/waywall/package.nix +++ b/pkgs/by-name/wa/waywall/package.nix @@ -14,7 +14,7 @@ wayland, wayland-protocols, wayland-scanner, - xorg, + libxcb, xwayland, }: stdenv.mkDerivation (finalAttrs: { @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { luajit wayland wayland-protocols - xorg.libxcb + libxcb xwayland ]; diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix index 6ba234a39bbc..6d9bd5fe990d 100644 --- a/pkgs/by-name/we/weasis/package.nix +++ b/pkgs/by-name/we/weasis/package.nix @@ -8,7 +8,9 @@ makeDesktopItem, makeBinaryWrapper, libGL, - xorg, + libxxf86vm, + libxrender, + libx11, }: let @@ -24,12 +26,10 @@ let runtimeDeps = [ libGL - ] - ++ (with xorg; [ - libX11 - libXrender - libXxf86vm - ]); + libx11 + libxrender + libxxf86vm + ]; in stdenv.mkDerivation (finalAttrs: { pname = "weasis"; diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index e31016fafabb..7970ca56c2c5 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -6,7 +6,23 @@ dpkg, nss, nspr, - xorg, + libxt, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxft, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxshmfence, + libxcb, pango, zlib, atkmm, @@ -63,7 +79,7 @@ let preferLocalBuild = true; }; - wechat-uos-runtime = with xorg; [ + wechat-uos-runtime = [ stdenv.cc.cc stdenv.cc.libc pango @@ -72,23 +88,23 @@ let xcbutilimage xcbutilkeysyms xcbutilrenderutil - libX11 - libXt - libXext - libSM - libICE + libx11 + libxt + libxext + libsm + libice libxcb libxkbcommon libxshmfence - libXi - libXft - libXcursor - libXfixes - libXScrnSaver - libXcomposite - libXdamage - libXtst - libXrandr + libxi + libxft + libxcursor + libxfixes + libxscrnsaver + libxcomposite + libxdamage + libxtst + libxrandr libnotify atk atkmm @@ -105,7 +121,7 @@ let libva freetype fontconfig - libXrender + libxrender libuuid expat glib diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix index 8ef0693d9fc5..a7be0cc5fe42 100644 --- a/pkgs/by-name/we/wemeet/package.nix +++ b/pkgs/by-name/we/wemeet/package.nix @@ -6,7 +6,13 @@ autoPatchelfHook, makeWrapper, nss, - xorg, + libxtst, + libxrandr, + libxext, + libxdamage, + libx11, + libsm, + libice, desktop-file-utils, libpulseaudio, libgcrypt, @@ -68,9 +74,9 @@ let libsForQt5.qtwayland opencv4WithoutCuda pipewire - xorg.libXdamage - xorg.libXrandr - xorg.libX11 + libxdamage + libxrandr + libx11 ]; dontWrapQtApps = true; @@ -100,7 +106,7 @@ let buildInputs = [ openssl libpulseaudio - xorg.libX11 + libx11 ]; buildPhase = '' @@ -140,7 +146,7 @@ let nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 ]; buildPhase = '' @@ -195,10 +201,10 @@ stdenv.mkDerivation { buildInputs = [ nss - xorg.libX11 - xorg.libSM - xorg.libICE - xorg.libXtst + libx11 + libsm + libice + libxtst desktop-file-utils libpulseaudio libgcrypt @@ -273,7 +279,7 @@ stdenv.mkDerivation { "--set QT_STYLE_OVERRIDE fusion" "--set IBUS_USE_PORTAL 1" "--set XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" - "--prefix LD_LIBRARY_PATH : $out/app/wemeet/lib:$out/translations:${xorg.libXext}/lib:${xorg.libXdamage}/lib:${opencv4WithoutCuda}/lib:${xorg.libXrandr}/lib" + "--prefix LD_LIBRARY_PATH : $out/app/wemeet/lib:$out/translations:${libxext}/lib:${libxdamage}/lib:${opencv4WithoutCuda}/lib:${libxrandr}/lib" "--prefix PATH : $out/app/wemeet/bin" "--prefix QT_PLUGIN_PATH : $out/app/wemeet/plugins" ]; diff --git a/pkgs/by-name/we/weylus/package.nix b/pkgs/by-name/we/weylus/package.nix index 252b48e911af..914e48afda06 100644 --- a/pkgs/by-name/we/weylus/package.nix +++ b/pkgs/by-name/we/weylus/package.nix @@ -9,7 +9,17 @@ x264, libva, gst_all_1, - xorg, + libxv, + libxtst, + libxrender, + libxrandr, + libxi, + libxinerama, + libxft, + libxfixes, + libxext, + libxcursor, + libxcomposite, libdrm, pkg-config, pango, @@ -42,17 +52,17 @@ rustPlatform.buildRustPackage { dbus libva gst_all_1.gst-plugins-base - xorg.libXext - xorg.libXft - xorg.libXinerama - xorg.libXcursor - xorg.libXrender - xorg.libXfixes - xorg.libXtst - xorg.libXrandr - xorg.libXcomposite - xorg.libXi - xorg.libXv + libxext + libxft + libxinerama + libxcursor + libxrender + libxfixes + libxtst + libxrandr + libxcomposite + libxi + libxv pango libdrm wayland diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix index 34ee0d635bbf..d231133c3e74 100644 --- a/pkgs/by-name/we/wezterm/package.nix +++ b/pkgs/by-name/we/wezterm/package.nix @@ -160,7 +160,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; mainProgram = "wezterm"; maintainers = with lib.maintainers; [ - mimame SuperSandro2000 ]; }; diff --git a/pkgs/by-name/wg/wgpu-native/examples.nix b/pkgs/by-name/wg/wgpu-native/examples.nix index 71619d101641..4e58304514b6 100644 --- a/pkgs/by-name/wg/wgpu-native/examples.nix +++ b/pkgs/by-name/wg/wgpu-native/examples.nix @@ -8,7 +8,8 @@ wgpu-native, glfw, wayland, - xorg, + libxrandr, + libx11, vulkan-loader, version, @@ -41,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr ]; runtimeInputs = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/wi/wiliwili/package.nix b/pkgs/by-name/wi/wiliwili/package.nix index c2d6343c7710..32b5f62a86da 100644 --- a/pkgs/by-name/wi/wiliwili/package.nix +++ b/pkgs/by-name/wi/wiliwili/package.nix @@ -13,7 +13,11 @@ libffi, wayland, egl-wayland, - xorg, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -47,11 +51,11 @@ stdenv.mkDerivation (finalAttrs: { libffi # needed for wayland wayland egl-wayland - xorg.libX11 - xorg.libXrandr - xorg.libXinerama - xorg.libXcursor - xorg.libXi + libx11 + libxrandr + libxinerama + libxcursor + libxi ]; cmakeFlags = [ diff --git a/pkgs/by-name/wi/winbox4/build-from-zip.nix b/pkgs/by-name/wi/winbox4/build-from-zip.nix index 2511666ef38f..9e2773396c7e 100644 --- a/pkgs/by-name/wi/winbox4/build-from-zip.nix +++ b/pkgs/by-name/wi/winbox4/build-from-zip.nix @@ -15,7 +15,11 @@ stdenvNoCC, unzip, writeShellApplication, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxcb, zlib, metaCommon ? { }, }: @@ -44,11 +48,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { freetype libGL libxkbcommon - xorg.libxcb - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm + libxcb + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm zlib ]; diff --git a/pkgs/by-name/wi/windterm/package.nix b/pkgs/by-name/wi/windterm/package.nix index 1d7188b37bec..e99250c70a85 100644 --- a/pkgs/by-name/wi/windterm/package.nix +++ b/pkgs/by-name/wi/windterm/package.nix @@ -10,7 +10,12 @@ glib, alsa-lib, pulseaudio, - xorg, + libxcb-util, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxtst, + libxcb, gtk3, atk, pango, @@ -40,12 +45,12 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libxcb - xorg.xcbutil - xorg.libXtst - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil + libxcb + libxcb-util + libxtst + libxcb-image + libxcb-keysyms + libxcb-render-util libsForQt5.qtbase libsForQt5.qtmultimedia gst_all_1.gst-plugins-base diff --git a/pkgs/by-name/wi/wired/package.nix b/pkgs/by-name/wi/wired/package.nix index dd13a9e2bfc1..37fd5e7a5b44 100644 --- a/pkgs/by-name/wi/wired/package.nix +++ b/pkgs/by-name/wi/wired/package.nix @@ -6,7 +6,11 @@ dbus, pango, cairo, - xorg, + libxscrnsaver, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage rec { @@ -29,11 +33,11 @@ rustPlatform.buildRustPackage rec { dbus pango cairo - xorg.libXScrnSaver - xorg.libXcursor - xorg.libXrandr - xorg.libX11 - xorg.libXi + libxscrnsaver + libxcursor + libxrandr + libx11 + libxi ]; postInstall = '' diff --git a/pkgs/by-name/wk/wkhtmltopdf/package.nix b/pkgs/by-name/wk/wkhtmltopdf/package.nix index e9e5f34133eb..28c9e3f58362 100644 --- a/pkgs/by-name/wk/wkhtmltopdf/package.nix +++ b/pkgs/by-name/wk/wkhtmltopdf/package.nix @@ -13,7 +13,8 @@ fontconfig, stdenv, xar, - xorg, + libxrender, + libxext, }: let @@ -50,8 +51,8 @@ let ]; buildInputs = [ - xorg.libXext - xorg.libXrender + libxext + libxrender freetype openssl diff --git a/pkgs/by-name/wm/wmutils-opt/package.nix b/pkgs/by-name/wm/wmutils-opt/package.nix index 90267bf8c43e..19e9948b930d 100644 --- a/pkgs/by-name/wm/wmutils-opt/package.nix +++ b/pkgs/by-name/wm/wmutils-opt/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, libxcb, - xorg, + libxcb-util, }: stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ libxcb - xorg.xcbutil + libxcb-util ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/wo/wolf-shaper/package.nix b/pkgs/by-name/wo/wolf-shaper/package.nix index f573a8dedccd..c51199dc68d2 100644 --- a/pkgs/by-name/wo/wolf-shaper/package.nix +++ b/pkgs/by-name/wo/wolf-shaper/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, libjack2, lv2, - xorg, + libx11, liblo, libGL, libXcursor, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjack2 lv2 - xorg.libX11 + libx11 liblo libGL libXcursor diff --git a/pkgs/by-name/wo/wonderdraft/package.nix b/pkgs/by-name/wo/wonderdraft/package.nix index b684bc23d9ae..39dc08400cfc 100644 --- a/pkgs/by-name/wo/wonderdraft/package.nix +++ b/pkgs/by-name/wo/wonderdraft/package.nix @@ -3,7 +3,11 @@ stdenv, requireFile, dpkg, - xorg, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, libGL, alsa-lib, pulseaudio, @@ -39,11 +43,11 @@ stdenv.mkDerivation rec { preFixup = let libPath = lib.makeLibraryPath [ - xorg.libXcursor - xorg.libXinerama - xorg.libXrandr - xorg.libX11 - xorg.libXi + libxcursor + libxinerama + libxrandr + libx11 + libxi libGL alsa-lib pulseaudio diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix index 7271e7da5e37..29684bc9b139 100644 --- a/pkgs/by-name/wo/wootility/package.nix +++ b/pkgs/by-name/wo/wootility/package.nix @@ -39,7 +39,7 @@ appimageTools.wrapType2 { extraPkgs = pkgs: with pkgs; [ - xorg.libxkbfile + libxkbfile ]; meta = { diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix index f925c1685956..06d38f5b561f 100644 --- a/pkgs/by-name/wo/wox/package.nix +++ b/pkgs/by-name/wo/wox/package.nix @@ -13,7 +13,8 @@ buildGoModule, pkg-config, autoPatchelfHook, - xorg, + libxtst, + libx11, libxkbcommon, libayatana-appindicator, gtk3, @@ -170,8 +171,8 @@ buildGoModule { ]; buildInputs = [ - xorg.libX11 - xorg.libXtst + libx11 + libxtst libxkbcommon libayatana-appindicator gtk3 diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix index e2e05298aaa6..d2d2c5d24d51 100644 --- a/pkgs/by-name/wp/wpsoffice-cn/package.nix +++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix @@ -22,7 +22,9 @@ unixODBC, libmysqlclient, libsForQt5, - xorg, + libxv, + libxtst, + libxdamage, # wpsoffice runtime dependencies cups, dbus, @@ -145,9 +147,9 @@ else libusb1 unixODBC libsForQt5.qtbase - xorg.libXdamage - xorg.libXtst - xorg.libXv + libxdamage + libxtst + libxv ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/wp/wpsoffice/package.nix b/pkgs/by-name/wp/wpsoffice/package.nix index 5f1243d51d7b..09194f9491e7 100644 --- a/pkgs/by-name/wp/wpsoffice/package.nix +++ b/pkgs/by-name/wp/wpsoffice/package.nix @@ -12,7 +12,9 @@ libtiff, udev, gtk3, - xorg, + libxv, + libxtst, + libxdamage, cups, pango, runCommandLocal, @@ -74,9 +76,9 @@ stdenv.mkDerivation rec { udev gtk3 libsForQt5.qt5.qtbase - xorg.libXdamage - xorg.libXtst - xorg.libXv + libxdamage + libxtst + libxv ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 04a2486fbbdf..745040d45a32 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -11,7 +11,7 @@ cacert, llvmPackages, musl, - xorg, + libx11, jq, moreutils, nix-update-script, @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; - version = "4.59.3"; + version = "4.60.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-sdk"; rev = "wrangler@${finalAttrs.version}"; - hash = "sha256-DKKngT58p8x+Qzl550468JDOQuymQmzPwkLL/iB7Aa4="; + hash = "sha256-lRdQrUgEr7KS/05BXZW7h3JS91d3gM8w+RLlaLC98RU="; }; pnpmDeps = fetchPnpmDeps { @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ musl # not used, but requires extra work to remove - xorg.libX11 # for the clipboardy package + libx11 # for the clipboardy package ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/wr/wrangler_1/package.nix b/pkgs/by-name/wr/wrangler_1/package.nix index d118b615be61..f6e1237ed760 100644 --- a/pkgs/by-name/wr/wrangler_1/package.nix +++ b/pkgs/by-name/wr/wrangler_1/package.nix @@ -41,6 +41,9 @@ rustPlatform.buildRustPackage rec { description = "CLI tool designed for folks who are interested in using Cloudflare Workers"; mainProgram = "wrangler"; homepage = "https://github.com/cloudflare/wrangler"; + knownVulnerabilities = [ + "CVE-2026-0933: Malicious backdoor via a command injection allowing unauthorized remote code execution" + ]; license = with lib.licenses; [ asl20 # or mit diff --git a/pkgs/by-name/wt/wtk/package.nix b/pkgs/by-name/wt/wtk/package.nix index a66ab691fd09..4bf6b5fc370b 100644 --- a/pkgs/by-name/wt/wtk/package.nix +++ b/pkgs/by-name/wt/wtk/package.nix @@ -3,7 +3,11 @@ stdenv, requireFile, unzip, - xorg, + libxt, + libxpm, + libx11, + libsm, + libice, }: stdenv.mkDerivation rec { @@ -21,11 +25,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; libraries = [ - xorg.libXpm - xorg.libXt - xorg.libX11 - xorg.libICE - xorg.libSM + libxpm + libxt + libx11 + libice + libsm stdenv.cc.cc ]; diff --git a/pkgs/by-name/wx/wxmacmolplt/package.nix b/pkgs/by-name/wx/wxmacmolplt/package.nix index b43d356a0c1e..5e8c968fa687 100644 --- a/pkgs/by-name/wx/wxmacmolplt/package.nix +++ b/pkgs/by-name/wx/wxmacmolplt/package.nix @@ -6,7 +6,7 @@ libGL, libGLU, pkg-config, - xorg, + libx11, autoreconfHook, wrapGAppsHook4, }: @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { wxGTK32 libGL libGLU - xorg.libX11 - xorg.libX11.dev + libx11 + libx11.dev ]; configureFlags = [ "LDFLAGS=-lGL" ]; diff --git a/pkgs/by-name/x-/x-create-mouse-void/package.nix b/pkgs/by-name/x-/x-create-mouse-void/package.nix index bfa49b5ca45a..254e92734cb5 100644 --- a/pkgs/by-name/x-/x-create-mouse-void/package.nix +++ b/pkgs/by-name/x-/x-create-mouse-void/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - xorg, + libx11, fetchFromGitHub, }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "151pv4gmzz9g6nd1xw94hmawlb5z8rgs1jb3x1zpvn3znd7f355c"; }; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/x1/x11_ssh_askpass/package.nix b/pkgs/by-name/x1/x11_ssh_askpass/package.nix index f7753cc30706..758ee40a3b5b 100644 --- a/pkgs/by-name/x1/x11_ssh_askpass/package.nix +++ b/pkgs/by-name/x1/x11_ssh_askpass/package.nix @@ -5,7 +5,10 @@ fetchDebianPatch, autoreconfHook, pkg-config, - xorg, + libxt, + libx11, + libsm, + libice, }: stdenv.mkDerivation rec { @@ -38,10 +41,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libX11 - xorg.libXt - xorg.libICE - xorg.libSM + libx11 + libxt + libice + libsm ]; meta = { diff --git a/pkgs/by-name/x1/x11docker/package.nix b/pkgs/by-name/x1/x11docker/package.nix index cbd6ac36c245..b7a21a2fdeec 100644 --- a/pkgs/by-name/x1/x11docker/package.nix +++ b/pkgs/by-name/x1/x11docker/package.nix @@ -4,7 +4,12 @@ fetchFromGitHub, makeWrapper, nx-libs, - xorg, + xrandr, + xinit, + xhost, + xdpyinfo, + xauth, + libxcvt, getopt, gnugrep, gawk, @@ -46,18 +51,18 @@ stdenv.mkDerivation { mount iproute2 nx-libs - xorg.xdpyinfo - xorg.xhost - xorg.xinit + xdpyinfo + xhost + xinit python3 jq - xorg.libxcvt + libxcvt wmctrl xdotool xclip xpra - xorg.xrandr - xorg.xauth + xrandr + xauth weston xwayland ] diff --git a/pkgs/by-name/x1/x11spice/package.nix b/pkgs/by-name/x1/x11spice/package.nix index 3aa2b7f19871..1e3d42e4dc31 100644 --- a/pkgs/by-name/x1/x11spice/package.nix +++ b/pkgs/by-name/x1/x11spice/package.nix @@ -4,7 +4,9 @@ fetchFromGitLab, autoreconfHook, pkg-config, - xorg, + libxcb-util, + util-macros, + libxcb, gtk2, spice, spice-protocol, @@ -28,9 +30,9 @@ stdenv.mkDerivation { ]; buildInputs = [ - xorg.libxcb - xorg.xcbutil - xorg.utilmacros + libxcb + libxcb-util + util-macros gtk2 spice spice-protocol diff --git a/pkgs/by-name/x1/x11vnc/package.nix b/pkgs/by-name/x1/x11vnc/package.nix index 903076a5762f..c46c337048b2 100644 --- a/pkgs/by-name/x1/x11vnc/package.nix +++ b/pkgs/by-name/x1/x11vnc/package.nix @@ -5,7 +5,18 @@ openssl, zlib, libjpeg, - xorg, + libxtst, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxdamage, + libx11, + xorgproto, + xdpyinfo, + xauth, coreutils, libvncserver, autoreconfHook, @@ -29,19 +40,19 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libXfixes - xorg.xorgproto + libxfixes + xorgproto openssl - xorg.libXdamage + libxdamage zlib - xorg.libX11 + libx11 libjpeg - xorg.libXtst - xorg.libXinerama - xorg.libXrandr - xorg.libXext - xorg.libXi - xorg.libXrender + libxtst + libxinerama + libxrandr + libxext + libxi + libxrender libvncserver ]; @@ -50,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '"/bin/su"' '"/run/wrappers/bin/su"' \ --replace-fail '"/bin/true"' '"${coreutils}/bin/true"' - sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h + sed -i -e '/#!\/bin\/sh/a"PATH=${xdpyinfo}\/bin:${xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h # Xdummy script is currently broken, so we avoid building it. This removes everything Xdummy-related from the affected Makefile sed -i '/if HAVE_X11/,/endif/d' misc/Makefile.am diff --git a/pkgs/by-name/x2/x2goserver/package.nix b/pkgs/by-name/x2/x2goserver/package.nix index 482303c7dafb..bcad5aded4b3 100644 --- a/pkgs/by-name/x2/x2goserver/package.nix +++ b/pkgs/by-name/x2/x2goserver/package.nix @@ -14,7 +14,14 @@ gnused, gnugrep, findutils, - xorg, + font-util, + xwininfo, + xrandr, + xmodmap, + xkbcomp, + xinit, + xauth, + setxkbmap, net-tools, iproute2, bc, @@ -86,14 +93,14 @@ let pwgen openssh sshfs - xorg.xauth - xorg.xinit - xorg.xrandr - xorg.xmodmap - xorg.xwininfo - xorg.fontutil - xorg.xkbcomp - xorg.setxkbmap + xauth + xinit + xrandr + xmodmap + xwininfo + font-util + xkbcomp + setxkbmap ]; in stdenv.mkDerivation { diff --git a/pkgs/by-name/x2/x2vnc/package.nix b/pkgs/by-name/x2/x2vnc/package.nix index 1fb4dedfa83a..5496cbfb2474 100644 --- a/pkgs/by-name/x2/x2vnc/package.nix +++ b/pkgs/by-name/x2/x2vnc/package.nix @@ -2,7 +2,10 @@ lib, stdenv, fetchurl, - xorg, + libxrandr, + libxext, + libx11, + xorgproto, }: stdenv.mkDerivation rec { @@ -16,11 +19,11 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-std=gnu89"; - buildInputs = with xorg; [ - libX11 + buildInputs = [ + libx11 xorgproto - libXext - libXrandr + libxext + libxrandr ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix index e941332d231a..e2d6fba185fd 100644 --- a/pkgs/by-name/xa/xapp/package.nix +++ b/pkgs/by-name/xa/xapp/package.nix @@ -6,7 +6,7 @@ libgnomekbd, gdk-pixbuf, cairo, - xorg, + libxkbfile, meson, ninja, pkg-config, @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { )) libgnomekbd gdk-pixbuf - xorg.libxkbfile + libxkbfile python3.pkgs.pygobject3 # for .pc file mate.mate-panel # for gobject-introspection dbus diff --git a/pkgs/by-name/xa/xastir/package.nix b/pkgs/by-name/xa/xastir/package.nix index 5291e5565ff6..4daf9abf5022 100644 --- a/pkgs/by-name/xa/xastir/package.nix +++ b/pkgs/by-name/xa/xastir/package.nix @@ -10,7 +10,8 @@ gnused, libgeotiff, libtiff, - xorg, + libxt, + libxpm, motif, pcre2, perl, @@ -43,8 +44,8 @@ stdenv.mkDerivation rec { db libgeotiff libtiff - xorg.libXpm - xorg.libXt + libxpm + libxt motif pcre2 perl diff --git a/pkgs/by-name/xa/xautoclick/package.nix b/pkgs/by-name/xa/xautoclick/package.nix index 7462d85f1499..e1d90009050c 100644 --- a/pkgs/by-name/xa/xautoclick/package.nix +++ b/pkgs/by-name/xa/xautoclick/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, - xorg, + libxtst, pkg-config, cmake, libevdev, @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libevdev - xorg.libXtst + libxtst ] ++ lib.optionals gtkSupport [ gtk3 diff --git a/pkgs/by-name/xc/xcircuit/package.nix b/pkgs/by-name/xc/xcircuit/package.nix index eeaba907926d..eb919d73a5bd 100644 --- a/pkgs/by-name/xc/xcircuit/package.nix +++ b/pkgs/by-name/xc/xcircuit/package.nix @@ -10,7 +10,11 @@ ngspice, tcl, tk, - xorg, + libxt, + libxpm, + libx11, + libsm, + libice, zlib, }: @@ -43,14 +47,14 @@ stdenv.mkDerivation { ./declare-missing-prototype.patch ]; - buildInputs = with xorg; [ + buildInputs = [ cairo ghostscript - libSM - libXt - libICE - libX11 - libXpm + libsm + libxt + libice + libx11 + libxpm tcl tk zlib diff --git a/pkgs/by-name/xc/xcur2png/package.nix b/pkgs/by-name/xc/xcur2png/package.nix index be8a849c45f6..863fd2ec4e32 100644 --- a/pkgs/by-name/xc/xcur2png/package.nix +++ b/pkgs/by-name/xc/xcur2png/package.nix @@ -5,7 +5,9 @@ fetchpatch, pkg-config, libpng, - xorg, + libxcursor, + libx11, + xorgproto, }: stdenv.mkDerivation rec { @@ -43,9 +45,9 @@ stdenv.mkDerivation rec { buildInputs = [ libpng - xorg.libX11 - xorg.libXcursor - xorg.xorgproto + libx11 + libxcursor + xorgproto ]; meta = { diff --git a/pkgs/by-name/xd/xdg-launch/package.nix b/pkgs/by-name/xd/xdg-launch/package.nix index 819931913e7a..3f15b25238b4 100644 --- a/pkgs/by-name/xd/xdg-launch/package.nix +++ b/pkgs/by-name/xd/xdg-launch/package.nix @@ -9,7 +9,8 @@ perl, pkg-config, glib, - xorg, + libxrandr, + libx11, }: stdenv.mkDerivation rec { pname = "xdg-launch"; @@ -34,8 +35,8 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; buildInputs = [ - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr glib # can be optional ]; diff --git a/pkgs/by-name/xd/xdummy/package.nix b/pkgs/by-name/xd/xdummy/package.nix index d9c27616e29b..2b1c85ee105f 100644 --- a/pkgs/by-name/xd/xdummy/package.nix +++ b/pkgs/by-name/xd/xdummy/package.nix @@ -1,7 +1,15 @@ { writeText, writeScriptBin, - xorg, + xorg-server, + xf86-video-dummy, + font-misc-misc, + font-cursor-misc, + font-bh-lucidatypewriter-75dpi, + font-bh-lucidatypewriter-100dpi, + font-bh-100dpi, + font-adobe-75dpi, + font-adobe-100dpi, xkeyboard_config, runtimeShell, unfreeFonts ? false, @@ -26,17 +34,17 @@ let EndSection Section "Files" - ModulePath "${xorg.xorgserver.out}/lib/xorg/modules" - ModulePath "${xorg.xf86videodummy}/lib/xorg/modules" + ModulePath "${xorg-server.out}/lib/xorg/modules" + ModulePath "${xf86-video-dummy}/lib/xorg/modules" XkbDir "${xkeyboard_config}/share/X11/xkb" - FontPath "${xorg.fontadobe75dpi}/share/fonts/X11/75dpi" - FontPath "${xorg.fontadobe100dpi}/share/fonts/X11/100dpi" - FontPath "${xorg.fontmiscmisc}/share/fonts/X11/misc" - FontPath "${xorg.fontcursormisc}/share/fonts/X11/misc" + FontPath "${font-adobe-75dpi}/share/fonts/X11/75dpi" + FontPath "${font-adobe-100dpi}/share/fonts/X11/100dpi" + FontPath "${font-misc-misc}/share/fonts/X11/misc" + FontPath "${font-cursor-misc}/share/fonts/X11/misc" ${lib.optionalString unfreeFonts '' - FontPath "${xorg.fontbhlucidatypewriter75dpi}/share/fonts/X11/75dpi" - FontPath "${xorg.fontbhlucidatypewriter100dpi}/share/fonts/X11/100dpi" - FontPath "${xorg.fontbh100dpi}/share/fonts/X11/100dpi" + FontPath "${font-bh-lucidatypewriter-75dpi}/share/fonts/X11/75dpi" + FontPath "${font-bh-lucidatypewriter-100dpi}/share/fonts/X11/100dpi" + FontPath "${font-bh-100dpi}/share/fonts/X11/100dpi" ''} EndSection @@ -85,7 +93,7 @@ let in writeScriptBin "xdummy" '' #!${runtimeShell} - exec ${xorg.xorgserver.out}/bin/Xorg \ + exec ${xorg-server.out}/bin/Xorg \ -noreset \ -logfile /dev/null \ "$@" \ diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix index 6f3707578f4a..0dadb842df93 100644 --- a/pkgs/by-name/xe/xenia-canary/package.nix +++ b/pkgs/by-name/xe/xenia-canary/package.nix @@ -19,14 +19,14 @@ }: llvmPackages_20.stdenv.mkDerivation { pname = "xenia-canary"; - version = "0-unstable-2026-01-10"; + version = "0-unstable-2026-01-25"; src = fetchFromGitHub { owner = "xenia-canary"; repo = "xenia-canary"; fetchSubmodules = true; - rev = "81656a97299c6fd01ea44e45e11af309c9f99b95"; - hash = "sha256-UFDcS1AVNjxTBwSVKVDkL6sqyZ0bjzdvMii1pve9mxE="; + rev = "67d80958c9d1ff926b9098be7f830c1937921d9a"; + hash = "sha256-gKw85Lm31vEJSDurh9CaqYQhuQyAZ/Ey5ineGnVijxQ="; }; dontConfigure = true; diff --git a/pkgs/by-name/xe/xephem/package.nix b/pkgs/by-name/xe/xephem/package.nix index edaec00e8670..f57ce374bcce 100644 --- a/pkgs/by-name/xe/xephem/package.nix +++ b/pkgs/by-name/xe/xephem/package.nix @@ -9,7 +9,9 @@ motif, openssl, groff, - xorg, + libxt, + libxmu, + libxext, }: stdenv.mkDerivation rec { @@ -32,9 +34,9 @@ stdenv.mkDerivation rec { buildInputs = [ motif openssl - xorg.libXmu - xorg.libXext - xorg.libXt + libxmu + libxext + libxt ]; patches = [ diff --git a/pkgs/by-name/xf/xf86-input-joystick/package.nix b/pkgs/by-name/xf/xf86-input-joystick/package.nix index d0cb2023196d..81df0d68b440 100644 --- a/pkgs/by-name/xf/xf86-input-joystick/package.nix +++ b/pkgs/by-name/xf/xf86-input-joystick/package.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ ]; pkgConfigModules = [ "xorg-joystick" ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputjoystick.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-input-joystick.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xf86-input-void/package.nix b/pkgs/by-name/xf/xf86-input-void/package.nix index c52742e08170..03749b3da67e 100644 --- a/pkgs/by-name/xf/xf86-input-void/package.nix +++ b/pkgs/by-name/xf/xf86-input-void/package.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-input-void.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xf86-video-suncg6/package.nix b/pkgs/by-name/xf/xf86-video-suncg6/package.nix index 22569598238e..18dc2e1457e1 100644 --- a/pkgs/by-name/xf/xf86-video-suncg6/package.nix +++ b/pkgs/by-name/xf/xf86-video-suncg6/package.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.hpndSellVariant; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-video-suncg6.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xf86-video-sunffb/package.nix b/pkgs/by-name/xf/xf86-video-sunffb/package.nix index 7210e22cc6c7..823adb0d851f 100644 --- a/pkgs/by-name/xf/xf86-video-sunffb/package.nix +++ b/pkgs/by-name/xf/xf86-video-sunffb/package.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-video-sunffb.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xf86-video-sunleo/package.nix b/pkgs/by-name/xf/xf86-video-sunleo/package.nix index 57ddb2ac63cd..3b2b97d04693 100644 --- a/pkgs/by-name/xf/xf86-video-sunleo/package.nix +++ b/pkgs/by-name/xf/xf86-video-sunleo/package.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-video-sunleo.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xfe/package.nix b/pkgs/by-name/xf/xfe/package.nix index 3bfa2f758773..24d2187bb817 100644 --- a/pkgs/by-name/xf/xfe/package.nix +++ b/pkgs/by-name/xf/xfe/package.nix @@ -12,7 +12,8 @@ intltool, file, libpng, - xorg, + libxft, + libx11, }: stdenv.mkDerivation rec { @@ -37,8 +38,8 @@ stdenv.mkDerivation rec { libpng fontconfig freetype - xorg.libX11 - xorg.libXft + libx11 + libxft ]; preConfigure = '' diff --git a/pkgs/by-name/xi/xidlehook/package.nix b/pkgs/by-name/xi/xidlehook/package.nix index 5a15922e7a64..7c4134448272 100644 --- a/pkgs/by-name/xi/xidlehook/package.nix +++ b/pkgs/by-name/xi/xidlehook/package.nix @@ -4,7 +4,9 @@ rustPlatform, fetchFromGitLab, python3, - xorg, + libxscrnsaver, + libx11, + libxcb, libpulseaudio, pkg-config, patchelf, @@ -27,9 +29,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-U1kjOWrFEp1pZnbawW2MCtC4UN7ELD/kcYWfEmn94Pg="; buildInputs = [ - xorg.libX11 - xorg.libxcb - xorg.libXScrnSaver + libx11 + libxcb + libxscrnsaver libpulseaudio ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/xi/xinput-calibrator/package.nix b/pkgs/by-name/xi/xinput-calibrator/package.nix index af2c8a1a8a0f..448bfffed48c 100644 --- a/pkgs/by-name/xi/xinput-calibrator/package.nix +++ b/pkgs/by-name/xi/xinput-calibrator/package.nix @@ -6,7 +6,9 @@ pkg-config, meson, ninja, - xorg, + libxrandr, + libxi, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -29,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libX11 - xorg.libXi - xorg.libXrandr + libx11 + libxi + libxrandr ]; meta = { diff --git a/pkgs/by-name/xj/xjadeo/package.nix b/pkgs/by-name/xj/xjadeo/package.nix index 2e6205de3867..5648c4366718 100644 --- a/pkgs/by-name/xj/xjadeo/package.nix +++ b/pkgs/by-name/xj/xjadeo/package.nix @@ -12,7 +12,8 @@ libXv, pkg-config, portmidi, - xorg, + libxpm, + libxext, }: stdenv.mkDerivation (finalAttrs: { @@ -35,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg libjack2 libX11 - xorg.libXext - xorg.libXpm + libxext + libxpm # The following are recommended in the README, but are seemingly # unnecessary for a successful build. That said, the result of including # these in the build process is possibly required at runtime in some cases, diff --git a/pkgs/by-name/xl/xlayoutdisplay/package.nix b/pkgs/by-name/xl/xlayoutdisplay/package.nix index 6719948ad142..79edc6725677 100644 --- a/pkgs/by-name/xl/xlayoutdisplay/package.nix +++ b/pkgs/by-name/xl/xlayoutdisplay/package.nix @@ -3,7 +3,9 @@ stdenv, fetchFromGitHub, pkg-config, - xorg, + libxrandr, + libxcursor, + libx11, boost, gtest, }: @@ -20,10 +22,10 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = with xorg; [ - libX11 - libXrandr - libXcursor + buildInputs = [ + libx11 + libxrandr + libxcursor boost ]; nativeCheckInputs = [ gtest ]; diff --git a/pkgs/by-name/xl/xlife/package.nix b/pkgs/by-name/xl/xlife/package.nix index 45e297643afe..40fc03671927 100644 --- a/pkgs/by-name/xl/xlife/package.nix +++ b/pkgs/by-name/xl/xlife/package.nix @@ -2,7 +2,9 @@ lib, stdenv, fetchsvn, - xorg, + libx11, + imake, + gccmakedep, }: stdenv.mkDerivation { @@ -15,11 +17,11 @@ stdenv.mkDerivation { sha256 = "1gadlcp32s179kd7ypxr8cymd6s060p6z4c2vnx94i8bmiw3nn8h"; }; - nativeBuildInputs = with xorg; [ + nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; hardeningDisable = [ "format" ]; installPhase = '' diff --git a/pkgs/by-name/xl/xlogo/package.nix b/pkgs/by-name/xl/xlogo/package.nix index ea6d02a00263..546a8f2b8b9a 100644 --- a/pkgs/by-name/xl/xlogo/package.nix +++ b/pkgs/by-name/xl/xlogo/package.nix @@ -2,7 +2,12 @@ lib, stdenv, fetchFromGitLab, - xorg, + libxt, + libxmu, + libxext, + libxaw, + libx11, + libsm, autoreconfHook, pkg-config, util-macros, @@ -30,12 +35,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-appdefaultdir=$out/share/X11/app-defaults" ]; buildInputs = [ - xorg.libX11 - xorg.libXext - xorg.libSM - xorg.libXmu - xorg.libXaw - xorg.libXt + libx11 + libxext + libsm + libxmu + libxaw + libxt ]; meta = { diff --git a/pkgs/by-name/xm/xmind/package.nix b/pkgs/by-name/xm/xmind/package.nix index fafd6faf69af..cfa43153261a 100644 --- a/pkgs/by-name/xm/xmind/package.nix +++ b/pkgs/by-name/xm/xmind/package.nix @@ -17,7 +17,14 @@ libxkbcommon, alsa-lib, expat, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxkbfile, + libxcb, libgbm, systemd, libGL, @@ -39,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ (lib.getLib stdenv.cc.cc) - xorg.libX11 - xorg.libXext - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXfixes - xorg.libXrandr - xorg.libxkbfile + libx11 + libxext + libxcb + libxcomposite + libxdamage + libxfixes + libxrandr + libxkbfile glib at-spi2-atk cairo diff --git a/pkgs/by-name/xm/xmonad_log_applet/package.nix b/pkgs/by-name/xm/xmonad_log_applet/package.nix index 069d5e9a9604..35ee0988a8f2 100644 --- a/pkgs/by-name/xm/xmonad_log_applet/package.nix +++ b/pkgs/by-name/xm/xmonad_log_applet/package.nix @@ -7,7 +7,7 @@ glib, dbus-glib, desktopSupport ? "gnomeflashback", - xorg, + libxcb-wm, gtk2, gtk3, gnome-panel, @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus-glib - xorg.xcbutilwm + libxcb-wm ] ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 diff --git a/pkgs/by-name/xm/xmousepasteblock/package.nix b/pkgs/by-name/xm/xmousepasteblock/package.nix index 79e165bff593..4304632e50e6 100644 --- a/pkgs/by-name/xm/xmousepasteblock/package.nix +++ b/pkgs/by-name/xm/xmousepasteblock/package.nix @@ -1,5 +1,7 @@ { - xorg, + libxi, + libxext, + libx11, lib, stdenv, libev, @@ -20,10 +22,10 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; - buildInputs = with xorg; [ - libX11 - libXext - libXi + buildInputs = [ + libx11 + libxext + libxi libev ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/xm/xmrig/package.nix b/pkgs/by-name/xm/xmrig/package.nix index d433bf0fd070..f555bf950c2e 100644 --- a/pkgs/by-name/xm/xmrig/package.nix +++ b/pkgs/by-name/xm/xmrig/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.24.0"; + version = "6.25.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-AbiTInOMHZ/YOUyl8IMU62ETZtbSTUqaP4vCJKAOCYM="; + hash = "sha256-X34djxUeSDwopwsipgrdFFFUP+tQ/uCNvupYzbegkEE="; }; patches = [ diff --git a/pkgs/by-name/xn/xneur/package.nix b/pkgs/by-name/xn/xneur/package.nix index 20231a0d4f49..4cbda825a2b9 100644 --- a/pkgs/by-name/xn/xneur/package.nix +++ b/pkgs/by-name/xn/xneur/package.nix @@ -13,7 +13,10 @@ gst_all_1, libnotify, pcre, - xorg, + libxtst, + libxi, + libxext, + libx11, xosd, }: @@ -42,10 +45,10 @@ stdenv.mkDerivation { gst_all_1.gstreamer libnotify pcre - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXtst + libx11 + libxext + libxi + libxtst xosd ]; diff --git a/pkgs/by-name/xo/xob/package.nix b/pkgs/by-name/xo/xob/package.nix index 7d154259a796..6a8cc7f4dd83 100644 --- a/pkgs/by-name/xo/xob/package.nix +++ b/pkgs/by-name/xo/xob/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, pkg-config, - xorg, + libxrender, + libx11, libconfig, }: @@ -20,8 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 - xorg.libXrender + libx11 + libxrender libconfig ]; diff --git a/pkgs/by-name/xo/xorg_sys_opengl/package.nix b/pkgs/by-name/xo/xorg_sys_opengl/package.nix index aa5ff17b17fc..ddb1b4e7fe8b 100644 --- a/pkgs/by-name/xo/xorg_sys_opengl/package.nix +++ b/pkgs/by-name/xo/xorg_sys_opengl/package.nix @@ -9,7 +9,8 @@ { lib, stdenv, - xorg, + libxxf86vm, + libxext, expat, libdrm, }: @@ -19,8 +20,8 @@ stdenv.mkDerivation { version = "3"; builder = ./builder.sh; neededLibs = map (p: p.out) [ - xorg.libXxf86vm - xorg.libXext + libxxf86vm + libxext expat libdrm stdenv.cc.cc diff --git a/pkgs/by-name/xo/xosd-xft/package.nix b/pkgs/by-name/xo/xosd-xft/package.nix index 73a71fee2062..bf44b4f28692 100644 --- a/pkgs/by-name/xo/xosd-xft/package.nix +++ b/pkgs/by-name/xo/xosd-xft/package.nix @@ -5,7 +5,9 @@ versionCheckHook, nix-update-script, pkg-config, - xorg, + libxrandr, + libxinerama, + libxft, }: stdenv.mkDerivation (finalAttrs: { @@ -22,10 +24,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = with xorg; [ - libXft - libXrandr - libXinerama + buildInputs = [ + libxft + libxrandr + libxinerama ]; nativeInstallCheckInputs = [ diff --git a/pkgs/by-name/xp/xplugd/package.nix b/pkgs/by-name/xp/xplugd/package.nix index ea8042e9ac69..1d7cea09fc74 100644 --- a/pkgs/by-name/xp/xplugd/package.nix +++ b/pkgs/by-name/xp/xplugd/package.nix @@ -1,7 +1,10 @@ { lib, stdenv, - xorg, + libxrandr, + libxi, + libxext, + libx11, pkg-config, fetchFromGitHub, autoreconfHook, @@ -18,11 +21,11 @@ stdenv.mkDerivation rec { sha256 = "11vjr69prrs4ir9c267zwq4g9liipzrqi0kmw1zg95dbn7r7zmql"; }; - buildInputs = with xorg; [ - libX11 - libXi - libXrandr - libXext + buildInputs = [ + libx11 + libxi + libxrandr + libxext ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix index b2344e9477aa..0d0c56017985 100644 --- a/pkgs/by-name/xp/xpra/package.nix +++ b/pkgs/by-name/xp/xpra/package.nix @@ -41,7 +41,19 @@ libyuv, xauth, xdg-utils, - xorg, + xkeyboard-config, + xf86-video-dummy, + libxtst, + libxres, + libxrender, + libxrandr, + libxi, + libxfixes, + libxdamage, + libxcomposite, + libx11, + xorgproto, + libxkbfile, xorgserver, xxHash, clang, @@ -53,7 +65,7 @@ let inherit (python3.pkgs) cython buildPythonApplication; - xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: { + xf86videodummy = xf86-video-dummy.overrideDerivation (p: { patches = [ # patch provided by Xpra upstream ./0002-Constant-DPI.patch @@ -126,57 +138,55 @@ effectiveBuildPythonApplication rec { ] ++ lib.optional withNvenc cudatoolkit; - buildInputs = - with xorg; - [ - libX11 - libXcomposite - libXdamage - libXfixes - libXi - libxkbfile - libXrandr - libXrender - libXres - libXtst - xorgproto - ] - ++ (with gst_all_1; [ - gst-libav - gst-vaapi - gst-plugins-ugly - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gstreamer - ]) - ++ [ - atk.out - cairo - cython - ffmpeg - gdk-pixbuf - glib - gtk3 - libappindicator - librsvg - libvpx - libwebp - lz4 - pam - pango - x264 - x265 - libavif - openh264 - libyuv - xxHash - systemd - ] - ++ lib.optional withNvenc [ - nvencHeaders - nvjpegHeaders - ]; + buildInputs = [ + libx11 + libxcomposite + libxdamage + libxfixes + libxi + libxkbfile + libxrandr + libxrender + libxres + libxtst + xorgproto + ] + ++ (with gst_all_1; [ + gst-libav + gst-vaapi + gst-plugins-ugly + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gstreamer + ]) + ++ [ + atk.out + cairo + cython + ffmpeg + gdk-pixbuf + glib + gtk3 + libappindicator + librsvg + libvpx + libwebp + lz4 + pam + pango + x264 + x265 + libavif + openh264 + libyuv + xxHash + systemd + ] + ++ lib.optional withNvenc [ + nvencHeaders + nvjpegHeaders + ]; propagatedBuildInputs = with python3.pkgs; @@ -238,7 +248,7 @@ effectiveBuildPythonApplication rec { "''${gappsWrapperArgs[@]}" --set XPRA_INSTALL_PREFIX "$out" --set XPRA_COMMAND "$out/bin/xpra" - --set XPRA_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" + --set XPRA_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb" --set XORG_CONFIG_PREFIX "" --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib --prefix PATH : ${ diff --git a/pkgs/by-name/xp/xprintidle/package.nix b/pkgs/by-name/xp/xprintidle/package.nix index e02794af1927..8928cf4db061 100644 --- a/pkgs/by-name/xp/xprintidle/package.nix +++ b/pkgs/by-name/xp/xprintidle/package.nix @@ -5,7 +5,9 @@ meson, ninja, pkg-config, - xorg, + libxscrnsaver, + libxext, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -26,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libXScrnSaver - xorg.libX11 - xorg.libXext + libxscrnsaver + libx11 + libxext ]; meta = { diff --git a/pkgs/by-name/xq/xquartz/package.nix b/pkgs/by-name/xq/xquartz/package.nix index 3a5163fcff20..a3a33b92d458 100644 --- a/pkgs/by-name/xq/xquartz/package.nix +++ b/pkgs/by-name/xq/xquartz/package.nix @@ -5,7 +5,61 @@ makeFontsConf, gnused, writeScript, - xorg, + xorg-server, + tab-window-manager, + libxpm, + font-alias, + font-util, + font-misc-misc, + font-cursor-misc, + font-bh-lucidatypewriter-75dpi, + font-bh-lucidatypewriter-100dpi, + font-bh-100dpi, + font-encodings, + xwud, + xwininfo, + xwd, + xvinfo, + xset, + xsetroot, + xrefresh, + xrdb, + xrandr, + xpr, + xprop, + xmodmap, + xmessage, + xlsclients, + xlsatoms, + xkill, + xkbutils, + xkbevd, + xkbcomp, + xinput, + xinit, + xhost, + xgamma, + xfs, + xeyes, + xev, + xdriinfo, + xdpyinfo, + xdm, + xcursorgen, + xcmsdb, + xclock, + xbacklight, + xauth, + x11perf, + smproxy, + setxkbmap, + sessreg, + mkfontscale, + makedepend, + luit, + lndir, + iceauth, + bdftopcf, bashInteractive, xterm, xcbuild, @@ -81,13 +135,13 @@ let ttf_bitstream_vera freefont_ttf liberation_ttf - xorg.fontmiscmisc - xorg.fontcursormisc + font-misc-misc + font-cursor-misc ] ++ lib.optionals unfreeFonts [ - xorg.fontbhlucidatypewriter100dpi - xorg.fontbhlucidatypewriter75dpi - xorg.fontbh100dpi + font-bh-lucidatypewriter-100dpi + font-bh-lucidatypewriter-75dpi + font-bh-100dpi ] ++ extraFontDirs; fontsConf = makeFontsConf { @@ -97,10 +151,15 @@ let ]; }; fonts = import ./system-fonts.nix { - inherit stdenv xorg fontDirs; + inherit + stdenv + font-alias + mkfontscale + fontDirs + ; }; # any X related programs expected to be available via $PATH - pkgs = with xorg; [ + pkgs = [ # non-xorg quartz-wm xterm @@ -109,18 +168,18 @@ let xlsfonts xfontsel bdftopcf - fontutil + font-util iceauth - libXpm + libxpm lndir luit makedepend - mkfontdir + mkfontscale mkfontscale sessreg setxkbmap smproxy - twm + tab-window-manager x11perf xauth xbacklight @@ -159,7 +218,7 @@ let in stdenv.mkDerivation { pname = "xquartz"; - version = lib.getVersion xorg.xorgserver; + version = lib.getVersion xorg-server; nativeBuildInputs = [ makeWrapper ]; @@ -168,9 +227,9 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' - cp -rT ${xorg.xinit} $out + cp -rT ${xinit} $out chmod -R u+w $out - cp -rT ${xorg.xorgserver} $out + cp -rT ${xorg-server} $out chmod -R u+w $out cp ${installer} $out/bin/xquartz-install @@ -181,10 +240,10 @@ stdenv.mkDerivation { cp ${fontsConf} $fontsConfPath substituteInPlace $out/bin/startx \ - --replace "bindir=${xorg.xinit}/bin" "bindir=$out/bin" \ - --replace 'defaultserver=${xorg.xorgserver}/bin/X' "defaultserver=$out/bin/Xquartz" \ - --replace "${xorg.xinit}" "$out" \ - --replace "${xorg.xorgserver}" "$out" \ + --replace "bindir=${xinit}/bin" "bindir=$out/bin" \ + --replace 'defaultserver=${xorg-server}/bin/X' "defaultserver=$out/bin/Xquartz" \ + --replace "${xinit}" "$out" \ + --replace "${xorg-server}" "$out" \ --replace "eval xinit" "eval $out/bin/xinit" \ --replace "sysclientrc=/etc/X11/xinit/xinitrc" "sysclientrc=$out/etc/X11/xinit/xinitrc" @@ -203,16 +262,16 @@ stdenv.mkDerivation { EOF substituteInPlace $out/etc/X11/xinit/xinitrc \ - --replace ${xorg.xinit} $out \ - --replace xmodmap ${xorg.xmodmap}/bin/xmodmap \ - --replace xrdb ${xorg.xrdb}/bin/xrdb + --replace ${xinit} $out \ + --replace xmodmap ${xmodmap}/bin/xmodmap \ + --replace xrdb ${xrdb}/bin/xrdb mkdir -p $out/etc/X11/xinit/xinitrc.d cp ${./10-fontdir.sh} $out/etc/X11/xinit/xinitrc.d/10-fontdir.sh substituteInPlace $out/etc/X11/xinit/xinitrc.d/10-fontdir.sh \ --subst-var-by "SYSTEM_FONTS" "${fonts}/share/X11-fonts/" \ - --subst-var-by "XSET" "${xorg.xset}/bin/xset" + --subst-var-by "XSET" "${xset}/bin/xset" cp ${./98-user.sh} $out/etc/X11/xinit/xinitrc.d/98-user.sh @@ -222,15 +281,15 @@ stdenv.mkDerivation { chmod +x $out/etc/X11/xinit/xinitrc.d/99-quartz-wm.sh substituteInPlace $out/etc/X11/xinit/privileged_startx.d/20-font_cache \ - --replace ${xorg.xinit} $out + --replace ${xinit} $out cp ${./font_cache} $out/bin/font_cache substituteInPlace $out/bin/font_cache \ --subst-var-by "shell" "${stdenv.shell}" \ --subst-var-by "PATH" "$out/bin" \ - --subst-var-by "ENCODINGSDIR" "${xorg.encodings}/share/fonts/X11/encodings" \ - --subst-var-by "MKFONTDIR" "${xorg.mkfontdir}/bin/mkfontdir" \ - --subst-var-by "MKFONTSCALE" "${xorg.mkfontscale}/bin/mkfontscale" \ + --subst-var-by "ENCODINGSDIR" "${font-encodings}/share/fonts/X11/encodings" \ + --subst-var-by "MKFONTDIR" "${mkfontscale}/bin/mkfontdir" \ + --subst-var-by "MKFONTSCALE" "${mkfontscale}/bin/mkfontscale" \ --subst-var-by "FC_CACHE" "${fontconfig.bin}/bin/fc-cache" \ --subst-var-by "FONTCONFIG_FILE" "$fontsConfPath" ''; diff --git a/pkgs/by-name/xq/xquartz/system-fonts.nix b/pkgs/by-name/xq/xquartz/system-fonts.nix index 6f32a0295725..308b44fdb5fc 100644 --- a/pkgs/by-name/xq/xquartz/system-fonts.nix +++ b/pkgs/by-name/xq/xquartz/system-fonts.nix @@ -1,14 +1,15 @@ { stdenv, - xorg, + font-alias, + mkfontscale, fontDirs, }: stdenv.mkDerivation { name = "xquartz-system-fonts"; buildInputs = [ - xorg.mkfontdir - xorg.mkfontscale + mkfontscale + mkfontscale ]; buildCommand = '' for i in ${toString fontDirs} ; do @@ -32,6 +33,6 @@ stdenv.mkDerivation { rm -f fonts.dir fonts.scale fonts.alias mkfontdir mkfontscale - cat $( find ${xorg.fontalias}/ -name fonts.alias) >fonts.alias + cat $( find ${font-alias}/ -name fonts.alias) >fonts.alias ''; } diff --git a/pkgs/by-name/xr/xrdp/package.nix b/pkgs/by-name/xr/xrdp/package.nix index db77a0f8e008..6009ad304576 100644 --- a/pkgs/by-name/xr/xrdp/package.nix +++ b/pkgs/by-name/xr/xrdp/package.nix @@ -17,7 +17,11 @@ libjpeg, libopus, nasm, - xorg, + xorg-server, + libxrandr, + libxfixes, + libx11, + xauth, lame, pixman, libjpeg_turbo, @@ -48,7 +52,7 @@ let ]; buildInputs = [ - xorg.xorgserver + xorg-server libdrm ]; @@ -109,13 +113,13 @@ let pam pixman systemd - xorg.libX11 - xorg.libXfixes - xorg.libXrandr + libx11 + libxfixes + libxrandr ]; postPatch = '' - substituteInPlace sesman/sesexec/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q" + substituteInPlace sesman/sesexec/xauth.c --replace "xauth -q" "${xauth}/bin/xauth -q" substituteInPlace configure.ac --replace /usr/include/ "" ''; @@ -163,9 +167,9 @@ let cat >> $out/etc/xrdp/sesman.ini <' xtserv.c sed -i '35i#include ' xtbot.c ''; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/by-name/xv/xv/package.nix b/pkgs/by-name/xv/xv/package.nix index a0c78180e6aa..3902d3f52657 100644 --- a/pkgs/by-name/xv/xv/package.nix +++ b/pkgs/by-name/xv/xv/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - xorg, + libxt, + libx11, libpng, libwebp, libtiff, @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - xorg.libX11 - xorg.libXt + libx11 + libxt libpng libwebp libtiff diff --git a/pkgs/by-name/xw/xwayland-run/package.nix b/pkgs/by-name/xw/xwayland-run/package.nix index 7b3d1e4d3f12..8bd914fe0ced 100644 --- a/pkgs/by-name/xw/xwayland-run/package.nix +++ b/pkgs/by-name/xw/xwayland-run/package.nix @@ -5,7 +5,7 @@ ninja, python3, weston, - xorg, + xauth, xwayland, withCage ? false, cage, @@ -56,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { --prefix PATH : ${ lib.makeBinPath [ xwayland - xorg.xauth + xauth ] } wrapProgram $out/bin/xwfb-run \ @@ -65,7 +65,7 @@ python3.pkgs.buildPythonApplication rec { compositors ++ [ xwayland - xorg.xauth + xauth ] ) } diff --git a/pkgs/by-name/xw/xwinwrap/package.nix b/pkgs/by-name/xw/xwinwrap/package.nix index 5ba8a90abd50..39e56baeaab9 100644 --- a/pkgs/by-name/xw/xwinwrap/package.nix +++ b/pkgs/by-name/xw/xwinwrap/package.nix @@ -2,7 +2,9 @@ lib, stdenv, fetchbzr, - xorg, + libxrender, + libxext, + libx11, }: stdenv.mkDerivation rec { @@ -16,9 +18,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ - xorg.libX11 - xorg.libXext - xorg.libXrender + libx11 + libxext + libxrender ]; buildPhase = diff --git a/pkgs/by-name/yd/ydotool/package.nix b/pkgs/by-name/yd/ydotool/package.nix index bcbe83b73bca..dfa24842a6da 100644 --- a/pkgs/by-name/yd/ydotool/package.nix +++ b/pkgs/by-name/yd/ydotool/package.nix @@ -6,7 +6,7 @@ cmake, scdoc, util-linux, - xorg, + xinput, nixosTests, }: @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace Daemon/ydotoold.c \ - --replace "/usr/bin/xinput" "${xorg.xinput}/bin/xinput" + --replace "/usr/bin/xinput" "${xinput}/bin/xinput" substituteInPlace Daemon/ydotool.service.in \ --replace "/usr/bin/kill" "${util-linux}/bin/kill" ''; diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix index 454f52d306b8..902e3f3b75c5 100644 --- a/pkgs/by-name/yo/yoshimi/package.nix +++ b/pkgs/by-name/yo/yoshimi/package.nix @@ -17,7 +17,7 @@ pcre, pkg-config, readline, - xorg, + libpthread-stubs, zlib, }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { minixml pcre readline - xorg.libpthreadstubs + libpthread-stubs zlib ]; diff --git a/pkgs/by-name/yo/youtube-tui/package.nix b/pkgs/by-name/yo/youtube-tui/package.nix index c4508c1cde15..d5010b41531c 100644 --- a/pkgs/by-name/yo/youtube-tui/package.nix +++ b/pkgs/by-name/yo/youtube-tui/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pkg-config, openssl, - xorg, + libxcb, stdenv, python3, makeBinaryWrapper, @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - xorg.libxcb + libxcb libsixel mpv ]; diff --git a/pkgs/by-name/yu/yudit/package.nix b/pkgs/by-name/yu/yudit/package.nix index e7131c8c54d0..4fb8cbd24ba9 100644 --- a/pkgs/by-name/yu/yudit/package.nix +++ b/pkgs/by-name/yu/yudit/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - xorg.libX11 + libx11 ]; meta = { diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 47b5fb2e12c4..d12ccac8c903 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -19,7 +19,7 @@ libxkbcommon, wayland, libglvnd, - xorg, + libxcb, stdenv, makeFontsConf, vulkan-loader, @@ -106,7 +106,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.220.3"; + version = "0.220.6"; outputs = [ "out" @@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-BxGNgJxwX7qY4chi5xaJ8RZnmo80v+9QeZOPTUpsHBc="; + hash = "sha256-jwSh2QkQpShDvTurJPPvt4khGaNQmoVbJyiLcccp2PU="; }; postPatch = '' @@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-pjHJkvdZn5JoL9LSdnmpov8/mGZQKzM5lC4u7MZEsQ4="; + cargoHash = "sha256-KWsxxAPz1BoO/fKiRG6cpXB8IBGC+n4ZdommcTauXdQ="; nativeBuildInputs = [ cmake @@ -170,7 +170,7 @@ rustPlatform.buildRustPackage (finalAttrs: { alsa-lib libxkbcommon wayland - xorg.libxcb + libxcb # required by livekit: libGL libX11 diff --git a/pkgs/by-name/ze/zepp-simulator/package.nix b/pkgs/by-name/ze/zepp-simulator/package.nix index 3c814ba95562..6e565b6c33dc 100644 --- a/pkgs/by-name/ze/zepp-simulator/package.nix +++ b/pkgs/by-name/ze/zepp-simulator/package.nix @@ -21,7 +21,7 @@ libepoxy, libpng, libaio, - xorg, + libx11, libvterm, vte, gsasl, @@ -86,7 +86,7 @@ stdenv.mkDerivation { libepoxy libpng libaio - xorg.libX11 + libx11 libvterm vte gsasl diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 433fd2acb869..802f7d5a1751 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -196,21 +196,21 @@ let pkgs.udev pkgs.util-linux pkgs.wayland - pkgs.xorg.libX11 - pkgs.xorg.libXcomposite - pkgs.xorg.libXdamage - pkgs.xorg.libXext - pkgs.xorg.libXfixes - pkgs.xorg.libXrandr - pkgs.xorg.libXrender - pkgs.xorg.libXtst - pkgs.xorg.libxcb - pkgs.xorg.libxshmfence - pkgs.xorg.xcbutilcursor - pkgs.xorg.xcbutilimage - pkgs.xorg.xcbutilkeysyms - pkgs.xorg.xcbutilrenderutil - pkgs.xorg.xcbutilwm + pkgs.libx11 + pkgs.libxcomposite + pkgs.libxdamage + pkgs.libxext + pkgs.libxfixes + pkgs.libxrandr + pkgs.libxrender + pkgs.libxtst + pkgs.libxcb + pkgs.libxshmfence + pkgs.libxcb-cursor + pkgs.libxcb-image + pkgs.libxcb-keysyms + pkgs.libxcb-render-util + pkgs.libxcb-wm pkgs.zlib ] ++ lib.optionals pulseaudioSupport [ diff --git a/pkgs/by-name/zo/zoom-us/test.nix b/pkgs/by-name/zo/zoom-us/test.nix index ecfc2170f91c..57cc2047312f 100644 --- a/pkgs/by-name/zo/zoom-us/test.nix +++ b/pkgs/by-name/zo/zoom-us/test.nix @@ -4,14 +4,14 @@ zoom-us, runCommand, writeShellApplication, - xorg, + xwininfo, }: let testScript = writeShellApplication { name = "zoom-us-test-script"; runtimeInputs = [ - xorg.xwininfo + xwininfo zoom-us ]; text = '' diff --git a/pkgs/by-name/zo/zoom/package.nix b/pkgs/by-name/zo/zoom/package.nix index 4f1c9f4cc498..d121947920be 100644 --- a/pkgs/by-name/zo/zoom/package.nix +++ b/pkgs/by-name/zo/zoom/package.nix @@ -6,7 +6,11 @@ expat, fontconfig, freetype, - xorg, + libxrender, + libxext, + libx11, + libsm, + libice, }: # !!! assert freetype == xorg.freetype @@ -25,11 +29,11 @@ stdenv.mkDerivation rec { expat fontconfig freetype - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXext - xorg.libXrender + libice + libsm + libx11 + libxext + libxrender ]; env.NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline"; diff --git a/pkgs/by-name/zo/zotero-beta/package.nix b/pkgs/by-name/zo/zotero-beta/package.nix index 321c9521450b..fd2fadf23788 100644 --- a/pkgs/by-name/zo/zotero-beta/package.nix +++ b/pkgs/by-name/zo/zotero-beta/package.nix @@ -12,7 +12,16 @@ glib, gtk3, libGL, - xorg, + libxtst, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, libgbm, pango, pciutils, @@ -44,16 +53,16 @@ stdenv.mkDerivation rec { glib gtk3 libGL - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXtst - xorg.libxcb + libx11 + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxtst + libxcb libgbm pango pciutils diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix index 9b7368510194..ce80634d8e71 100644 --- a/pkgs/by-name/zo/zotero/linux.nix +++ b/pkgs/by-name/zo/zotero/linux.nix @@ -15,7 +15,16 @@ gtk3, libGL, libva, - xorg, + libxtst, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, libgbm, pango, pciutils, @@ -51,16 +60,16 @@ stdenv.mkDerivation rec { gtk3 libGL libva - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXtst - xorg.libxcb + libx11 + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxtst + libxcb libgbm pango pciutils diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index af90b8dd0e41..aa80c27297ad 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -8,7 +8,7 @@ qtbase, qtwayland, qt5, - xorg, + libxcb, useQt6 ? false, }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libxcb + libxcb ] ++ lib.optionals (!useQt6) [ qt5.qtx11extras diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index ae8d23c92e1f..881a374ff21a 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -53,7 +53,20 @@ wayland-protocols, wayland-scanner, writeText, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + xorgproto, + libxcb, zlib, directoryListingUpdater, }: @@ -97,9 +110,9 @@ stdenv.mkDerivation rec { systemd udev wayland-protocols - xorg.libX11 - xorg.libXcursor - xorg.xorgproto + libx11 + libxcursor + xorgproto zlib # still missing parent icon themes: RAVE-X, Faenza ]; @@ -133,17 +146,17 @@ stdenv.mkDerivation rec { poppler util-linux wayland - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb + libxscrnsaver + libxcomposite + libxdamage + libxext + libxfixes + libxi + libxinerama + libxrandr + libxrender + libxtst + libxcb ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 3c05aba8f87b..e37414a46b9a 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -14,7 +14,8 @@ libGLU, libGL, pango, - xorg, + libxmu, + libx11, }: stdenv.mkDerivation { @@ -47,8 +48,8 @@ stdenv.mkDerivation { libGLU libGL pango - xorg.libX11 - xorg.libXmu + libx11 + libxmu ]; preConfigure = '' diff --git a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix index 499ce79a8ac9..8571b0ac462b 100644 --- a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix @@ -5,7 +5,8 @@ replaceVars, glib, gettext, - xorg, + xwininfo, + xprop, }: stdenv.mkDerivation rec { @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { patches = [ (replaceVars ./fix-paths.patch { - xprop = "${xorg.xprop}/bin/xprop"; - xwininfo = "${xorg.xwininfo}/bin/xwininfo"; + xprop = "${xprop}/bin/xprop"; + xwininfo = "${xwininfo}/bin/xwininfo"; }) ]; diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index 03bae0e92b59..c237e67668ed 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -12,7 +12,11 @@ qtsvg, qttools, qtx11extras, - xorg, + libxcb-wm, + libxcb-image, + libxdamage, + libxcursor, + libxcb, xscreensaver, wrapGAppsHook3, }: @@ -43,11 +47,11 @@ mkDerivation rec { qtmultimedia qtsvg qtx11extras - xorg.libXcursor - xorg.libXdamage - xorg.libxcb - xorg.xcbutilimage - xorg.xcbutilwm + libxcursor + libxdamage + libxcb + libxcb-image + libxcb-wm xscreensaver ]; diff --git a/pkgs/desktops/mate/caja/with-extensions.nix b/pkgs/desktops/mate/caja/with-extensions.nix index 6a380e6b377b..30724613c9d3 100644 --- a/pkgs/desktops/mate/caja/with-extensions.nix +++ b/pkgs/desktops/mate/caja/with-extensions.nix @@ -3,7 +3,7 @@ lib, glib, wrapGAppsHook3, - xorg, + lndir, caja, cajaExtensions, extensions ? [ ], @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ glib wrapGAppsHook3 - xorg.lndir + lndir ]; buildInputs = diff --git a/pkgs/desktops/mate/mate-panel/with-applets.nix b/pkgs/desktops/mate/mate-panel/with-applets.nix index 9e81c5715ee6..b63e6d7a886b 100644 --- a/pkgs/desktops/mate/mate-panel/with-applets.nix +++ b/pkgs/desktops/mate/mate-panel/with-applets.nix @@ -3,7 +3,7 @@ lib, glib, wrapGAppsHook3, - xorg, + lndir, marco, mate-panel, panelApplets, @@ -51,7 +51,7 @@ stdenv.mkDerivation { mkdir -p $out for i in $(cat $pathsPath); do - ${xorg.lndir}/bin/lndir -silent $i $out + ${lndir}/bin/lndir -silent $i $out done runHook postInstall diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix index 277c91bbe7c5..27587ee2caf5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix @@ -16,7 +16,8 @@ libgudev, libwacom, switchboard, - xorg, + libxi, + libx11, }: stdenv.mkDerivation rec { @@ -47,8 +48,8 @@ stdenv.mkDerivation rec { libgudev libwacom switchboard - xorg.libX11 - xorg.libXi + libx11 + libxi ]; passthru = { diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index 309d40b029af..b4f06ce9cfa3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -3,7 +3,7 @@ glib, lib, stdenv, - xorg, + lndir, switchboard, switchboardPlugs, plugs, @@ -51,7 +51,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out for i in $(cat $pathsPath); do - ${xorg.lndir}/bin/lndir -silent $i $out + ${lndir}/bin/lndir -silent $i $out done dbus_file="share/dbus-1/services/io.elementary.settings.service" diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index d6d778900eb3..2f1604a628d3 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -13,7 +13,7 @@ libxml2, wingpanel, libgee, - xorg, + xkeyboard-config, libgnomekbd, ibus, }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ibus libgee wingpanel - xorg.xkeyboardconfig + xkeyboard-config ]; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index 73f21f000920..cb089c3cd0c5 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -3,7 +3,7 @@ wrapGAppsHook3, glib, stdenv, - xorg, + lndir, wingpanel, wingpanelIndicators, switchboard-with-plugs, @@ -49,7 +49,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out for i in $(cat $pathsPath); do - ${xorg.lndir}/bin/lndir -silent $i $out + ${lndir}/bin/lndir -silent $i $out done ''; diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index e3428ab4db01..a5ebe0633133 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -14,7 +14,7 @@ gtk4, pantheon-wayland, systemd, - xorg, + libx11, }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { gtk4 pantheon-wayland systemd - xorg.libX11 + libx11 ]; mesonFlags = [ diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 44e306b83f41..4e0c60b91527 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -71,7 +71,7 @@ in }; ezxdisp = old: - (addToBuildInputsWithPkgConfig pkgs.xorg.libX11 old) + (addToBuildInputsWithPkgConfig pkgs.libx11 old) // { env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-function-declaration" @@ -193,7 +193,7 @@ in ); uuid-lib = addToBuildInputs pkgs.libuuid; ws-client = addToBuildInputs pkgs.zlib; - xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; + xlib = addToPropagatedBuildInputs pkgs.libx11; yaml = addToBuildInputs pkgs.libyaml; zlib = addToBuildInputs pkgs.zlib; zmq = addToBuildInputs pkgs.zeromq; diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix index c26fa0a73d2d..a425f8fce636 100644 --- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix +++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix @@ -6,7 +6,7 @@ { lib, runCommand, - xorg, + lndir, cacert, unzip, @@ -44,7 +44,7 @@ in runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}" { nativeBuildInputs = [ - xorg.lndir + lndir flutter' unzip ]; diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index 36b2e538bf46..41cf9a49fb72 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -19,7 +19,18 @@ patchelf, gn, openbox, - xorg, + xorg-server, + libxxf86vm, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxcursor, + libx11, + xorgproto, + libxcb, libglvnd, libepoxy, wayland, @@ -114,17 +125,17 @@ stdenv.mkDerivation (finalAttrs: { harfbuzz pango cairo - xorg.libxcb - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXrender - xorg.libXinerama - xorg.libXi - xorg.libXext - xorg.libXfixes - xorg.libXxf86vm - xorg.xorgproto + libxcb + libx11 + libxcursor + libxrandr + libxrender + libxinerama + libxi + libxext + libxfixes + libxxf86vm + xorgproto zlib ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ @@ -156,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE"; nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ - xorg.xorgserver + xorg-server openbox ]; diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index eb1d3d5410ee..d65b4775fae4 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -14,7 +14,11 @@ runCommandCC, setJavaClassPath, unzip, - xorg, + libxtst, + libxrender, + libxi, + libxext, + libx11, zlib, # extra params extraCLibs ? [ ], @@ -42,7 +46,11 @@ let "runCommandCC" "setJavaClassPath" "unzip" - "xorg" + "libxtst" + "libxrender" + "libxi" + "libxext" + "libx11" "zlib" "extraCLibs" "gtkSupport" @@ -128,11 +136,11 @@ let alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig (lib.getLib stdenv.cc.cc) # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst + libx11 + libxext + libxi + libxrender + libxtst ]; postInstall = diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 33afe257fc60..947649f56685 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -28,9 +28,9 @@ let "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0="; "22.1.0-rc1".officialRelease.sha256 = "sha256-uyLW+z4rp4iL25eNfGF7BbvE91smx+XqFDH+GEnvd7c="; "23.0.0-git".gitRelease = { - rev = "2a8a694b508df2fa519283afa0211f4cd04cab6c"; - rev-version = "22.0.0-unstable-2026-01-18"; - sha256 = "sha256-Ut0PPwL8kqRxSw4sjVSnreG8AlKqi48o4Yb2jWj2zHA="; + rev = "eae75353f70b01363bab9383da6b4dd4324d13a3"; + rev-version = "23.0.0-unstable-2026-01-25"; + sha256 = "sha256-04oX8cMoyXmqtwqMW2/xbtIhUQlgcM9AOO2bnhfx0zs="; }; } // llvmVersions; diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix index f0cff1818e0e..e65b74b6cc5b 100644 --- a/pkgs/development/compilers/opensmalltalk-vm/default.nix +++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix @@ -15,7 +15,8 @@ openssl, pango, pkg-config, - xorg, + libxrandr, + libx11, }: let buildVM = @@ -91,8 +92,8 @@ let libuuid openssl pango - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr ]; postInstall = '' diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 30715cfaffd6..201cd7c7bbf2 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -23,7 +23,7 @@ libuuid, openssl, pango, - xorg, + libx11, squeakImageHash ? null, squeakSourcesHash ? null, squeakSourcesVersion ? null, @@ -124,7 +124,7 @@ stdenv.mkDerivation { libuuid openssl pango - xorg.libX11 + libx11 ]; postUnpack = '' diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index f9e78dc80a01..8fe6a9f59b3a 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -17,7 +17,11 @@ fontconfig, freetype, libffi, - xorg, + libxtst, + libxrender, + libxi, + libxext, + libx11, zlib, # runtime dependencies cups, @@ -63,11 +67,11 @@ let fontconfig freetype (lib.getLib stdenv.cc.cc) # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst + libx11 + libxext + libxi + libxrender + libxtst zlib ] ++ lib.optional stdenv.hostPlatform.isAarch32 libffi; diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix index c5e99ae91acc..11ba01f75b58 100644 --- a/pkgs/development/compilers/zulu/common.nix +++ b/pkgs/development/compilers/zulu/common.nix @@ -14,7 +14,12 @@ fontconfig, freetype, zlib, - xorg, + libxxf86vm, + libxtst, + libxrender, + libxi, + libxext, + libx11, # runtime dependencies cups, # runtime dependencies for GTK+ Look and Feel @@ -96,12 +101,12 @@ let fontconfig freetype stdenv.cc.cc # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg.libXxf86vm + libx11 + libxext + libxi + libxrender + libxtst + libxxf86vm zlib ] ++ lib.optionals (stdenv.hostPlatform.isLinux && enableJavaFX) runtimeDependencies; diff --git a/pkgs/development/cuda-modules/packages/nsight_systems.nix b/pkgs/development/cuda-modules/packages/nsight_systems.nix index f043d5887e51..895fd5853341 100644 --- a/pkgs/development/cuda-modules/packages/nsight_systems.nix +++ b/pkgs/development/cuda-modules/packages/nsight_systems.nix @@ -14,7 +14,10 @@ rdma-core, ucx, wayland, - xorg, + libxtst, + libxrandr, + libxdamage, + libxcursor, }: let # NOTE(@connorbaker): nsight_systems doesn't support Jetson, so no need for case splitting on aarch64-linux. @@ -119,10 +122,10 @@ buildRedist ( rdma-core ucx wayland - xorg.libXcursor - xorg.libXdamage - xorg.libXrandr - xorg.libXtst + libxcursor + libxdamage + libxrandr + libxtst ] # NOTE(@connorbaker): Seems to be required only for aarch64-linux. ++ lib.optionals (backendStdenv.hostPlatform.isAarch64 && cudaAtLeast "11.8") [ diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index 0d1b3509555f..56054899cba4 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -19,7 +19,12 @@ # Packages needed for Teensyduino upx, fontconfig, - xorg, + libxxf86vm, + libxinerama, + libxft, + libxext, + libx11, + libsm, gcc, atk, glib, @@ -74,12 +79,12 @@ let libusb-compat-0_1 pango udev - xorg.libSM - xorg.libX11 - xorg.libXext - xorg.libXft - xorg.libXinerama - xorg.libXxf86vm + libsm + libx11 + libxext + libxft + libxinerama + libxxf86vm zlib ]; teensy_architecture = diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6c9ffbb57081..497f5367aadf 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -590,9 +590,9 @@ builtins.intersectAttrs super { testDepends = drv.testDepends or [ ] ++ map lib.getBin [ - pkgs.xorg.xorgserver - pkgs.xorg.xprop - pkgs.xorg.xrandr + pkgs.xorg-server + pkgs.xprop + pkgs.xrandr pkgs.xdummy pkgs.xterm pkgs.dbus @@ -723,7 +723,7 @@ builtins.intersectAttrs super { pcap = addExtraLibrary pkgs.libpcap super.pcap; # https://github.com/NixOS/nixpkgs/issues/53336 - greenclip = addExtraLibrary pkgs.xorg.libXdmcp super.greenclip; + greenclip = addExtraLibrary pkgs.libxdmcp super.greenclip; # The cabal files for these libraries do not list the required system dependencies. libjwt-typed = addExtraLibrary pkgs.libjwt super.libjwt-typed; @@ -1997,13 +1997,13 @@ builtins.intersectAttrs super { ; webkit2gtk3-javascriptcore = lib.pipe super.webkit2gtk3-javascriptcore [ - (addBuildDepend pkgs.xorg.libXtst) + (addBuildDepend pkgs.libxtst) (addBuildDepend pkgs.lerc) (overrideCabal { __onlyPropagateKnownPkgConfigModules = true; }) ]; gi-webkit2 = lib.pipe super.gi-webkit2 [ - (addBuildDepend pkgs.xorg.libXtst) + (addBuildDepend pkgs.libxtst) (addBuildDepend pkgs.lerc) (overrideCabal { __onlyPropagateKnownPkgConfigModules = true; }) ]; diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index c333fa9064f1..b79ff9af9bbe 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -15,7 +15,7 @@ let overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args; }; - mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope; + mkScope = scope: pkgs // pkgs.gnome2 // scope; idrisPackages = self: diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 1ab41c655cad..5d6b0f3eb699 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -41,7 +41,7 @@ unixODBC, wrapGAppsHook3, wxGTK32, - xorg, + libx11, zlib, }: let @@ -59,7 +59,7 @@ let libGL libGLU wxGTK32 - xorg.libX11 + libx11 wrapGAppsHook3 ]; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index ef0ba19d8071..fe0375b5e35c 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -19,7 +19,7 @@ autoconf, automake, libtool, - xorg, + libx11, }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ SDL2 - xorg.libX11 # SDl2 optional depend, for SDL_syswm.h + libx11 # SDl2 optional depend, for SDL_syswm.h libGLU libGL openal diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/development/interpreters/love/11.nix index e3ea4d9a6656..2fe0d4bedc31 100644 --- a/pkgs/development/interpreters/love/11.nix +++ b/pkgs/development/interpreters/love/11.nix @@ -18,7 +18,7 @@ libtheora, which, libtool, - xorg, + libx11, cmake, }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { libtool ] ++ lib.optionals stdenv.isLinux [ - xorg.libX11 # SDL2 optional depend, for SDL_syswm.h + libx11 # SDL2 optional depend, for SDL_syswm.h libGLU libGL ]; diff --git a/pkgs/development/interpreters/python/conda/default.nix b/pkgs/development/interpreters/python/conda/default.nix index 06421ff9b63a..a9c466b39ed2 100644 --- a/pkgs/development/interpreters/python/conda/default.nix +++ b/pkgs/development/interpreters/python/conda/default.nix @@ -5,25 +5,24 @@ # When installing a conda binary package, just extend # the `buildInputs` with `condaAutopatchLibs`. condaPatchelfLibs = map (p: p.lib or p) ( + with pkgs; [ - pkgs.alsa-lib - pkgs.cups - pkgs.gcc-unwrapped - pkgs.libGL + alsa-lib + cups + gcc-unwrapped + libGL + libsm + libice + libx11 + libxau + libxdamage + libxi + libxrender + libxrandr + libxcomposite + libxcursor + libxtst + libxscrnsaver ] - ++ (with pkgs.xorg; [ - libSM - libICE - libX11 - libXau - libXdamage - libXi - libXrender - libXrandr - libXcomposite - libXcursor - libXtst - libXScrnSaver - ]) ); } diff --git a/pkgs/development/interpreters/python/manylinux/default.nix b/pkgs/development/interpreters/python/manylinux/default.nix index 4b7110bab413..4b31ae915d17 100644 --- a/pkgs/development/interpreters/python/manylinux/default.nix +++ b/pkgs/development/interpreters/python/manylinux/default.nix @@ -54,11 +54,11 @@ let "libutil.so.1" = glibc; "libpthread.so.0" = glibc; "libresolv.so.2" = glibc; - "libX11.so.6" = xorg.libX11; - "libXext.so.6" = xorg.libXext; - "libXrender.so.1" = xorg.libXrender; - "libICE.so.6" = xorg.libICE; - "libSM.so.6" = xorg.libSM; + "libX11.so.6" = libx11; + "libXext.so.6" = libxext; + "libXrender.so.1" = libxrender; + "libICE.so.6" = libice; + "libSM.so.6" = libsm; "libGL.so.1" = libGL; "libgobject-2.0.so.0" = glib; "libgthread-2.0.so.0" = glib; diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index 67ad4ff31d6a..0327e2ee36f8 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -50,7 +50,7 @@ then eval fixupPhase ${lib.concatMapStrings (output: '' mkdir -p ${"$" + "${output}"} - ${lib.getExe buildPackages.xorg.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"} + ${lib.getExe buildPackages.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"} '') overriddenUnwrappedGir.outputs} cp $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped @@ -109,7 +109,7 @@ else eval fixupPhase ${lib.concatMapStrings (output: '' mkdir -p ${"$" + "${output}"} - ${lib.getExe buildPackages.xorg.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"} + ${lib.getExe buildPackages.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"} '') overriddenUnwrappedGir.outputs} ''; }) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 7d3ddf3b296a..b95e7110c6c0 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -47,7 +47,11 @@ enableJack ? true, libjack2, enableX11 ? stdenv.hostPlatform.isLinux, - xorg, + libxtst, + libxi, + libxfixes, + libxext, + libxdamage, ncurses, enableWayland ? stdenv.hostPlatform.isLinux, wayland, @@ -161,11 +165,11 @@ stdenv.mkDerivation (finalAttrs: { libraspberrypi ] ++ lib.optionals enableX11 [ - xorg.libXext - xorg.libXfixes - xorg.libXdamage - xorg.libXtst - xorg.libXi + libxext + libxfixes + libxdamage + libxtst + libxi ] ++ lib.optionals gtkSupport [ # for gtksink diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index e40b0164f474..dd98ca848a7f 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -13,7 +13,13 @@ wayland-scanner, libdrm, udev, - xorg, + libxv, + libxrandr, + libxext, + libx11, + libsm, + libice, + libxcb, libGLU, libGL, gstreamer, @@ -63,13 +69,13 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols libdrm udev - xorg.libX11 - xorg.libxcb - xorg.libXext - xorg.libXv - xorg.libXrandr - xorg.libSM - xorg.libICE + libx11 + libxcb + libxext + libxv + libxrandr + libsm + libice nasm libvpx ] diff --git a/pkgs/development/libraries/intel-oneapi/base.nix b/pkgs/development/libraries/intel-oneapi/base.nix index c110ab2331e6..45f2292f9bfd 100644 --- a/pkgs/development/libraries/intel-oneapi/base.nix +++ b/pkgs/development/libraries/intel-oneapi/base.nix @@ -10,7 +10,14 @@ pkg-config, libdrm, elfutils, - xorg, + libxxf86vm, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, glib, nss, nspr, @@ -86,14 +93,14 @@ intel-oneapi.mkIntelOneApi (finalAttrs: { fontconfig glib freetype - xorg.libX11 - xorg.libXxf86vm - xorg.libXext - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXfixes - xorg.libXrandr + libx11 + libxxf86vm + libxext + libxcb + libxcomposite + libxdamage + libxfixes + libxrandr nss dbus cups @@ -134,13 +141,13 @@ intel-oneapi.mkIntelOneApi (finalAttrs: { libdrm elfutils zlib - xorg.libX11 - xorg.libXext - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXfixes - xorg.libXrandr + libx11 + libxext + libxcb + libxcomposite + libxdamage + libxfixes + libxrandr glib nss dbus diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index eb2967931480..50d2b42978f7 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -34,7 +34,7 @@ qtsvg, qttools, qtx11extras, - xorg, + libsm, }: mkDerivation { @@ -61,7 +61,7 @@ mkDerivation { networkmanager qtsvg qtx11extras - xorg.libSM + libsm ]; propagatedBuildInputs = [ kauth diff --git a/pkgs/development/libraries/libwnck/2.nix b/pkgs/development/libraries/libwnck/2.nix index 5a15b05cee6a..73d79128de05 100644 --- a/pkgs/development/libraries/libwnck/2.nix +++ b/pkgs/development/libraries/libwnck/2.nix @@ -5,7 +5,8 @@ pkg-config, gtk2, intltool, - xorg, + libxres, + libx11, }: stdenv.mkDerivation rec { @@ -30,8 +31,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtk2 - xorg.libX11 - xorg.libXres + libx11 + libxres ]; # ?another optional: startup-notification diff --git a/pkgs/development/libraries/mesa/darwin.nix b/pkgs/development/libraries/mesa/darwin.nix index ae83293ff650..83f3e16bf4ad 100644 --- a/pkgs/development/libraries/mesa/darwin.nix +++ b/pkgs/development/libraries/mesa/darwin.nix @@ -11,7 +11,10 @@ ninja, pkg-config, python3Packages, - xorg, + libxfixes, + libxext, + libx11, + libxcb, zlib, }: let @@ -45,10 +48,10 @@ stdenv.mkDerivation { buildInputs = [ libxml2 # should be propagated from libllvm llvmPackages.libllvm - xorg.libX11 - xorg.libXext - xorg.libXfixes - xorg.libxcb + libx11 + libxext + libxfixes + libxcb zlib ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index bd4c07d70cfd..9bab63c9a711 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -39,7 +39,14 @@ wayland-protocols, wayland-scanner, xcbutilkeysyms, - xorg, + libxxf86vm, + libxrandr, + libxfixes, + libxext, + libx11, + xorgproto, + libxshmfence, + libxcb, zstd, enablePatentEncumberedCodecs ? true, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, @@ -254,45 +261,43 @@ stdenv.mkDerivation { strictDeps = true; - buildInputs = - with xorg; - [ - directx-headers - elfutils - expat - spirv-tools - libdisplay-info - libdrm - libgbm - libglvnd - libpng - libunwind - libva-minimal - libX11 - libxcb - libXext - libXfixes - libXrandr - libxshmfence - libXxf86vm - llvmPackages.clang - llvmPackages.clang-unwrapped - llvmPackages.libclc - llvmPackages.libllvm - lm_sensors - python3Packages.python # for shebang - spirv-llvm-translator - udev - vulkan-loader - wayland - wayland-protocols - xcbutilkeysyms - xorgproto - zstd - ] - ++ lib.optionals withValgrind [ - valgrind-light - ]; + buildInputs = [ + directx-headers + elfutils + expat + spirv-tools + libdisplay-info + libdrm + libgbm + libglvnd + libpng + libunwind + libva-minimal + libx11 + libxcb + libxext + libxfixes + libxrandr + libxshmfence + libxxf86vm + llvmPackages.clang + llvmPackages.clang-unwrapped + llvmPackages.libclc + llvmPackages.libllvm + lm_sensors + python3Packages.python # for shebang + spirv-llvm-translator + udev + vulkan-loader + wayland + wayland-protocols + xcbutilkeysyms + xorgproto + zstd + ] + ++ lib.optionals withValgrind [ + valgrind-light + ]; depsBuildBuild = [ pkg-config diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 730f6fb1f865..5883fd20ef30 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -57,7 +57,9 @@ roc-toolkit, x11Support ? true, libcanberra, - xorg, + libxfixes, + libx11, + libxcb, libmysofa, ffadoSupport ? x11Support @@ -166,9 +168,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals x11Support [ libcanberra - xorg.libX11 - xorg.libxcb - xorg.libXfixes + libx11 + libxcb + libxfixes ] ++ lib.optionals bluezSupport [ bluez diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 37252077c6df..61aac879b93f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -20,7 +20,11 @@ pkgsBuildTarget, pkgsBuildBuild, - xorg, + libxdamage, + libxcomposite, + xrandr, + libxkbfile, + libpciaccess, libXcursor, libXScrnSaver, libXrandr, @@ -377,16 +381,16 @@ qtModule ( pciutils # X11 libs - xorg.xrandr + xrandr libXScrnSaver libXcursor libXrandr - xorg.libpciaccess + libpciaccess libXtst - xorg.libXcomposite - xorg.libXdamage + libxcomposite + libxdamage libdrm - xorg.libxkbfile + libxkbfile ] ++ lib.optionals pipewireSupport [ diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index eb0564226cbf..cdbe8f0740d1 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -13,7 +13,9 @@ cmake, ninja, libproxy, - xorg, + libxcb-cursor, + libxtst, + libxdmcp, zstd, double-conversion, util-linux, @@ -156,9 +158,9 @@ stdenv.mkDerivation rec { xcbutilkeysyms xcbutilrenderutil xcbutilwm - xorg.libXdmcp - xorg.libXtst - xorg.xcbutilcursor + libxdmcp + libxtst + libxcb-cursor libepoxy ] ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index 9f2271ceace4..659812c57b63 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -15,7 +15,12 @@ python3, which, nodejs, - xorg, + libxext, + libxdamage, + libxcomposite, + xrandr, + libxkbfile, + libpciaccess, libXcursor, libXScrnSaver, libXrandr, @@ -254,19 +259,19 @@ qtModule { pciutils # X11 libs - xorg.xrandr + xrandr libXScrnSaver libXcursor libXrandr - xorg.libpciaccess + libpciaccess libXtst - xorg.libXcomposite - xorg.libXdamage + libxcomposite + libxdamage libdrm - xorg.libxkbfile + libxkbfile libxshmfence libXi - xorg.libXext + libxext # Pipewire pipewire diff --git a/pkgs/development/libraries/qwlroots/default.nix b/pkgs/development/libraries/qwlroots/default.nix index eab87539f1d9..49a105281e05 100644 --- a/pkgs/development/libraries/qwlroots/default.nix +++ b/pkgs/development/libraries/qwlroots/default.nix @@ -14,7 +14,8 @@ libgbm, vulkan-loader, libinput, - xorg, + libxcb-errors, + libxdmcp, seatd, wlroots, }: @@ -45,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: { libgbm vulkan-loader libinput - xorg.libXdmcp - xorg.xcbutilerrors + libxdmcp + libxcb-errors seatd ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 2b5b24356104..5178cae8a87f 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -22,7 +22,7 @@ wayland-scanner, libwebp, enchant, - xorg, + libx11, libxkbcommon, libavif, libepoxy, @@ -186,7 +186,7 @@ clangStdenv.mkDerivation (finalAttrs: { libseccomp libmanette wayland - xorg.libX11 + libx11 ] ++ lib.optionals systemdSupport [ systemdLibs diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a68aec6d590b..93bf068e47cf 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -15,7 +15,11 @@ pixman, libcap, libgbm, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-image, + libxcb-errors, + libx11, hwdata, seatd, vulkan-loader, @@ -88,11 +92,11 @@ let vulkan-loader wayland wayland-protocols - xorg.libX11 - xorg.xcbutilerrors - xorg.xcbutilimage - xorg.xcbutilrenderutil - xorg.xcbutilwm + libx11 + libxcb-errors + libxcb-image + libxcb-render-util + libxcb-wm ] ++ lib.optional finalAttrs.enableXWayland xwayland ++ extraBuildInputs; diff --git a/pkgs/development/misc/msp430/newlib.nix b/pkgs/development/misc/msp430/newlib.nix index 323c26c8d3a7..b7a88a99de17 100644 --- a/pkgs/development/misc/msp430/newlib.nix +++ b/pkgs/development/misc/msp430/newlib.nix @@ -1,6 +1,6 @@ { stdenvNoCC, - xorg, + lndir, newlib, msp430GccSupport, }: @@ -15,9 +15,9 @@ stdenvNoCC.mkDerivation { buildCommand = '' mkdir $out - ${xorg.lndir}/bin/lndir -silent $newlib $out - ${xorg.lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir} - ${xorg.lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir} + ${lndir}/bin/lndir -silent $newlib $out + ${lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir} + ${lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir} ''; passthru = { diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 6fc9ae8c759a..154b51d34da4 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -39,19 +39,19 @@ deployAndroidPackage { waylandpp.lib ] ) - ++ (with pkgs.xorg; [ - libX11 - libXext - libXdamage - libXfixes + ++ (with pkgs; [ + libx11 + libxext + libxdamage + libxfixes libxcb - libXcomposite - libXcursor - libXi - libXrender - libXtst - libICE - libSM + libxcomposite + libxcursor + libxi + libxrender + libxtst + libice + libsm libxkbfile libxshmfence ]) @@ -80,7 +80,7 @@ deployAndroidPackage { ] } \ --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ - --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale + --set QTCOMPOSE ${pkgs.libx11.out}/share/X11/locale '') + '' mkdir -p $out/bin diff --git a/pkgs/development/mobile/androidenv/extras.nix b/pkgs/development/mobile/androidenv/extras.nix index fd98f1f2af84..79acca606d14 100644 --- a/pkgs/development/mobile/androidenv/extras.nix +++ b/pkgs/development/mobile/androidenv/extras.nix @@ -31,8 +31,8 @@ deployAndroidPackage { lib.makeLibraryPath ( with pkgs; [ - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr ] ) } diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index 0ed6bc86b544..f46ffe5b9f0e 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -24,19 +24,17 @@ deployAndroidPackage { fontconfig fontconfig.lib stdenv.cc.cc.libgcc or null # fix for https://github.com/NixOS/nixpkgs/issues/226357 - ]) - ++ (with pkgs.xorg; [ - libX11 - libXrender - libXext + libx11 + libxrender + libxext ]) ++ lib.optionals (os == "linux" && stdenv.isx86_64) ( with pkgsi686Linux; [ glibc - xorg.libX11 - xorg.libXrender - xorg.libXext + libx11 + libxrender + libxext fontconfig.lib freetype zlib @@ -66,8 +64,8 @@ deployAndroidPackage { lib.makeLibraryPath ( with pkgs; [ - xorg.libX11 - xorg.libXtst + libx11 + libxtst ] ) } diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index a9bc5972f19d..c273d70b2c75 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -10,7 +10,7 @@ ocaml, version ? if lib.versionAtLeast ocaml.version "5.4" then - "1.24.0" + "1.25.0" else if lib.versionAtLeast ocaml.version "5.3" then "1.23.1" else if lib.versionAtLeast ocaml.version "5.2" then @@ -28,6 +28,11 @@ let params = { + "1.25.0" = { + name = "lsp"; + minimalOCamlVersion = "5.3"; + sha256 = "sha256-4xXSvvP4lwmtJXCEaSeZblT/ja/OJRGIgWq5fO8h8CA="; + }; "1.24.0" = { name = "lsp"; minimalOCamlVersion = "5.3"; @@ -82,7 +87,7 @@ let ."${version}"; in -buildDunePackage rec { +buildDunePackage { pname = "jsonrpc"; inherit version; src = fetchurl { diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 15366a975b03..6b42d1ca8cd5 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -25,7 +25,7 @@ ocaml, version ? if lib.versionAtLeast ocaml.version "5.4" then - "1.24.0" + "1.25.0" else if lib.versionAtLeast ocaml.version "5.3" then "1.23.1" else if lib.versionAtLeast ocaml.version "5.2" then @@ -45,7 +45,7 @@ let inherit version; }; in -buildDunePackage rec { +buildDunePackage { pname = "lsp"; inherit (jsonrpc_v) version src; minimalOCamlVersion = if lib.versionAtLeast version "1.7.0" then "4.12" else "4.06"; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 9b74a4e7590d..5cc1eb03a29e 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,14 +26,14 @@ buildPythonPackage (finalAttrs: { pname = "aioesphomeapi"; - version = "43.13.0"; + version = "43.14.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${finalAttrs.version}"; - hash = "sha256-ffpXmZcDd0L1wY+S3pzkenlart9jSRSeeJdwd2GGu2w="; + hash = "sha256-SuJNGRaXWq7KDMshq46oKSVD+1eVUqOhy9D/R3OLeys="; }; build-system = [ diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index a26fdf313b66..0950409b3c55 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -16,9 +16,9 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioguardian"; - version = "2025.02.0"; + version = "2026.01.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; repo = "aioguardian"; - tag = version; - hash = "sha256-RoVD2O/OAk4l96kYEq7ZM/2QuckcPxDluf1MT4HdKc4="; + tag = finalAttrs.version; + hash = "sha256-p0rSN00CxTJsoo5iD3jsnTPUIl3G/fDc6tMjj0H0MuE="; }; postPatch = '' @@ -71,8 +71,8 @@ buildPythonPackage rec { Guardian line of water valves and sensors from Elexa. ''; homepage = "https://github.com/bachya/aioguardian"; - changelog = "https://github.com/bachya/aioguardian/releases/tag/${version}"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/bachya/aioguardian/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix index ed80ce2ada10..28d54f7a2520 100644 --- a/pkgs/development/python-modules/aiohomematic/default.nix +++ b/pkgs/development/python-modules/aiohomematic/default.nix @@ -5,25 +5,26 @@ fetchFromGitHub, freezegun, orjson, + pydantic, pydevccu, pytest-asyncio, pytest-socket, + pytest-xdist, pytestCheckHook, python-slugify, setuptools, - voluptuous, }: buildPythonPackage rec { pname = "aiohomematic"; - version = "2026.1.38"; + version = "2026.1.50"; pyproject = true; src = fetchFromGitHub { owner = "SukramJ"; repo = "aiohomematic"; tag = version; - hash = "sha256-2Rf6WRMs/m55/kdq7yEmLkf4ptlOhfyRnvNT4XqelPs="; + hash = "sha256-/KUfbBjcV6WirzlIs8J8fvLXXTaT3ypEzqe9X0borq4="; }; build-system = [ setuptools ]; @@ -31,14 +32,15 @@ buildPythonPackage rec { dependencies = [ aiohttp orjson + pydantic python-slugify - voluptuous ]; nativeCheckInputs = [ freezegun pydevccu pytest-asyncio + pytest-xdist pytest-socket pytestCheckHook ]; diff --git a/pkgs/development/python-modules/airos/default.nix b/pkgs/development/python-modules/airos/default.nix index 821e77483f54..d589d703e3ad 100644 --- a/pkgs/development/python-modules/airos/default.nix +++ b/pkgs/development/python-modules/airos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: { pname = "airos"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.13"; @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { owner = "CoMPaTech"; repo = "python-airos"; tag = "v${finalAttrs.version}"; - hash = "sha256-tzdWcqXi0dcTKNAdhTOGz89spf+29qORjyyBGB/eD8U="; + hash = "sha256-d8SmV+vDik7rIElVwPUkWdRtHyqLLLNJCkphNzdD6W4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix index 4fe0608dc154..175a63c4bc7f 100644 --- a/pkgs/development/python-modules/beets/default.nix +++ b/pkgs/development/python-modules/beets/default.nix @@ -27,6 +27,7 @@ lib, stdenv, buildPythonPackage, + pythonAtLeast, fetchFromGitHub, # build-system @@ -119,6 +120,8 @@ buildPythonPackage (finalAttrs: { hash = "sha256-H3jcEHyK13+RHVlV4zp+8M3LZ0Jc2FdmAbLpekGozLA="; }; pyproject = true; + # Waiting for https://github.com/beetbox/beets/pull/6267 + disabled = pythonAtLeast "3.14"; patches = [ # Bash completion fix for Nix diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index 7c3f3e36e7bc..dc930a565b93 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -7,7 +7,6 @@ buildPythonPackage, cython, fetchFromGitHub, - fetchpatch, habluetooth, lru-dict, poetry-core, @@ -18,26 +17,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bleak-esphome"; - version = "3.4.0"; + version = "3.4.1"; pyproject = true; src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "bleak-esphome"; - tag = "v${version}"; - hash = "sha256-BFF4SqJxrQ+aaFtrNqS9fNqTV2Q+pOu5FFdYKeHkKj8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-unVo56W/zS8qgU3AC9nxosfO5jlx8zgYoTZZehkcBiQ="; }; - patches = [ - (fetchpatch { - name = "bleak-2.0.0-compat.patch"; - url = "https://github.com/Bluetooth-Devices/bleak-esphome/commit/a186eca427d1c0924ce29cbb46cde876e0c6e246.patch"; - hash = "sha256-QPyN/k/xG03rZqYbexzN1GJaAqOe5FqfrDJ2fjiIkJs="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "setuptools>=75.8.2" setuptools @@ -77,8 +68,8 @@ buildPythonPackage rec { meta = { description = "Bleak backend of ESPHome"; homepage = "https://github.com/bluetooth-devices/bleak-esphome"; - changelog = "https://github.com/bluetooth-devices/bleak-esphome/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/bluetooth-devices/bleak-esphome/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 60dc896af747..2f97f988ad51 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -4,13 +4,10 @@ fetchPypi, autopage, cmd2, - importlib-metadata, openstackdocstheme, pbr, prettytable, - pyparsing, pyyaml, - setuptools, stevedore, sphinxHook, callPackage, @@ -18,17 +15,17 @@ buildPythonPackage rec { pname = "cliff"; - version = "4.10.0"; + version = "4.13.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jB9baCdBoDsMRgfILor0HU6cKFkCRkZWL4bN6ylZqG0="; + hash = "sha256-t5zAssGfbG54yCvZI+BnhQNdd8sNKhpIMinwooNvDKc="; }; build-system = [ openstackdocstheme - setuptools + pbr sphinxHook ]; @@ -37,10 +34,7 @@ buildPythonPackage rec { dependencies = [ autopage cmd2 - importlib-metadata - pbr prettytable - pyparsing pyyaml stevedore ]; diff --git a/pkgs/development/python-modules/coloraide/default.nix b/pkgs/development/python-modules/coloraide/default.nix index ca0e879f3a85..2fbe4ca62e78 100644 --- a/pkgs/development/python-modules/coloraide/default.nix +++ b/pkgs/development/python-modules/coloraide/default.nix @@ -7,7 +7,7 @@ typing-extensions, }: let - version = "6.2"; + version = "7.0"; in buildPythonPackage { pname = "coloraide"; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "facelessuser"; repo = "coloraide"; tag = version; - hash = "sha256-WWqHYeFqdVAgBIiBgr5o8URI+ZyMIn7efnbTyelJgII="; + hash = "sha256-RjccFdsI7VAVieyVR2XbMTuG2SgPGCLzxjPrJ5G7tIo="; }; build-system = [ diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 87bf7d225fa7..7a8482db6ec4 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -14,16 +14,16 @@ text-unidecode, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "commoncode"; - version = "32.4.0"; + version = "32.4.2"; pyproject = true; src = fetchFromGitHub { owner = "nexB"; repo = "commoncode"; - tag = "v${version}"; - hash = "sha256-k9E/Yz6G3IHJPf3BlscZNSL4Qk9WyGU3vXA+U+GwWA0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-A2FE+qhLQahuAtptP3hCnIUgh7j61Wf02avO6DM0b5E="; }; dontConfigure = true; @@ -66,8 +66,8 @@ buildPythonPackage rec { meta = { description = "Set of common utilities, originally split from ScanCode"; homepage = "https://github.com/nexB/commoncode"; - changelog = "https://github.com/nexB/commoncode/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/nexB/commoncode/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix index 31e4b94387b1..da2a8d11f986 100644 --- a/pkgs/development/python-modules/container-inspector/default.nix +++ b/pkgs/development/python-modules/container-inspector/default.nix @@ -10,23 +10,23 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "container-inspector"; - version = "33.0.1"; + version = "33.1.0"; pyproject = true; src = fetchFromGitHub { owner = "nexB"; repo = "container-inspector"; - tag = "v${version}"; - hash = "sha256-bXJ4UIDVhiU0DurEeRiyLlSUrNRgwoMqAxXxGb/CcJs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uwfqPh4e5zNO0K5rKZ2pxgOkX/KF9pzCsKdYbQuw9MA="; }; dontConfigure = true; build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ attrs click dockerfile-parse @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Suite of analysis utilities and command line tools for container images"; homepage = "https://github.com/nexB/container-inspector"; - changelog = "https://github.com/nexB/container-inspector/releases/tag/v${version}"; - license = with lib.licenses; [ asl20 ]; + changelog = "https://github.com/nexB/container-inspector/releases/tag/v${finalAttrs.src.tag}"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 6c100197bb55..de9878a2d797 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "cyclopts"; - version = "4.4.4"; + version = "4.5.1"; pyproject = true; src = fetchFromGitHub { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${finalAttrs.version}"; - hash = "sha256-DX/mh1vgoSQoqzKRQg+NcCjfPPwy8WDJG7AfMYtPUSA="; + hash = "sha256-m1VKwyGTKEnXplc2Gxmgdol8XaWadc6LC29KzCamdvQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/cyvest/default.nix b/pkgs/development/python-modules/cyvest/default.nix new file mode 100644 index 000000000000..c5915560d69f --- /dev/null +++ b/pkgs/development/python-modules/cyvest/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + click, + fetchFromGitHub, + logurich, + pydantic, + pytest-cov-stub, + pytestCheckHook, + pyvis, + rich, + typing-extensions, + uv-build, +}: + +buildPythonPackage (finalAttrs: { + pname = "cyvest"; + version = "5.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PakitoSec"; + repo = "cyvest"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OvAnhasc4iZtfi8olQ4rLaokcaC/b5rYdPPMn2pVYTA="; + }; + + pythonRelaxDeps = [ "pydantic" ]; + + build-system = [ uv-build ]; + + dependencies = [ + click + logurich + pydantic + rich + typing-extensions + ]; + + optional-dependencies = { + visualization = [ + pyvis + ]; + }; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "cyvest" ]; + + meta = { + description = "Cybersecurity Investigation Model"; + homepage = "https://github.com/PakitoSec/cyvest"; + changelog = "https://github.com/PakitoSec/cyvest/releases/tag/v${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/development/python-modules/dirigera/default.nix b/pkgs/development/python-modules/dirigera/default.nix index dc6af39b87a1..8ba2ac807ae2 100644 --- a/pkgs/development/python-modules/dirigera/default.nix +++ b/pkgs/development/python-modules/dirigera/default.nix @@ -9,16 +9,16 @@ websocket-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dirigera"; - version = "1.2.5"; + version = "1.2.6"; pyproject = true; src = fetchFromGitHub { owner = "Leggin"; repo = "dirigera"; - tag = version; - hash = "sha256-xFiAhlNbl20MPFNkl8J4vx+KgvINYS3P5EAQxc620/k="; + tag = "v${finalAttrs.version}"; + hash = "sha256-5pfzmaIkIEtxDtkhG1lOLSTjWahEDgQKLJKbAG5rBjE="; }; build-system = [ setuptools ]; @@ -36,9 +36,9 @@ buildPythonPackage rec { meta = { description = "Module for controlling the IKEA Dirigera Smart Home Hub"; homepage = "https://github.com/Leggin/dirigera"; - changelog = "https://github.com/Leggin/dirigera/releases/tag/${src.tag}"; + changelog = "https://github.com/Leggin/dirigera/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "generate-token"; }; -} +}) diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix index fa672cce0bc4..5ca74c336437 100644 --- a/pkgs/development/python-modules/dragonfly/default.nix +++ b/pkgs/development/python-modules/dragonfly/default.nix @@ -19,7 +19,7 @@ werkzeug, wmctrl, xdotool, - xorg, + xprop, }: buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { --replace-fail 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' substituteInPlace dragonfly/windows/x11_window.py \ --replace-fail 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' \ - --replace-fail 'xprop = "xprop"'${" "}'xprop = "${xorg.xprop}/bin/xprop"' \ + --replace-fail 'xprop = "xprop"'${" "}'xprop = "${xprop}/bin/xprop"' \ --replace-fail 'wmctrl = "wmctrl"'${" "}'wmctrl = "${wmctrl}/bin/wmctrl"' ''; diff --git a/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix b/pkgs/development/python-modules/ec2instanceconnectcli/default.nix similarity index 100% rename from pkgs/tools/virtualization/ec2instanceconnectcli/default.nix rename to pkgs/development/python-modules/ec2instanceconnectcli/default.nix diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index d8a54d45292e..c9ef82a7b10e 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -18,16 +18,16 @@ voluptuous, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "env-canada"; - version = "0.12.2"; + version = "0.12.4"; pyproject = true; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; - tag = "v${version}"; - hash = "sha256-mv4InXpnNUix+JnupU93o8yeWDqBLschBvCgxlrvlGA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-2ajvBGgYf5xhygv2h9RzkhkedXm+6QJmPczLJ42hqMA="; }; build-system = [ setuptools ]; @@ -72,8 +72,8 @@ buildPythonPackage rec { meta = { description = "Python library to get Environment Canada weather data"; homepage = "https://github.com/michaeldavie/env_canada"; - changelog = "https://github.com/michaeldavie/env_canada/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/michaeldavie/env_canada/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix index 6b618e177384..b47440fb8f86 100644 --- a/pkgs/development/python-modules/ghapi/default.nix +++ b/pkgs/development/python-modules/ghapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "ghapi"; - version = "1.0.9"; + version = "1.0.10"; pyproject = true; src = fetchFromGitHub { owner = "fastai"; repo = "ghapi"; tag = finalAttrs.version; - hash = "sha256-gBwOxWHjGyTrAKpG7BVoO7eQJw3fcLMXaF7CbAwMOj8="; + hash = "sha256-2x9uiULYniFVpUNgRie4i49xEqtYfq/9u/07eozw0WQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/development/python-modules/google-compute-engine/default.nix similarity index 100% rename from pkgs/tools/virtualization/google-compute-engine/default.nix rename to pkgs/development/python-modules/google-compute-engine/default.nix diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 0ce762382a81..e5992995c23d 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -12,7 +12,8 @@ pytest-timeout, pytest-xvfb, i3, - xorg, + xvfb, + xdpyinfo, }: buildPythonPackage rec { @@ -52,8 +53,8 @@ buildPythonPackage rec { pytest-timeout pytest-xvfb i3 - xorg.xdpyinfo - xorg.xvfb + xdpyinfo + xvfb ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index 4af6b9bedc73..7acf802dcf86 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -29,7 +29,7 @@ prometheus-client, polib, python, - xorg, + lndir, }: buildPythonPackage rec { @@ -95,7 +95,7 @@ buildPythonPackage rec { { nativeBuildInputs = [ pkgs.brotli - xorg.lndir + lndir ]; } '' diff --git a/pkgs/development/python-modules/logurich/default.nix b/pkgs/development/python-modules/logurich/default.nix new file mode 100644 index 000000000000..98f7b34876a0 --- /dev/null +++ b/pkgs/development/python-modules/logurich/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + click, + fetchFromGitHub, + loguru, + pytestCheckHook, + rich, + uv-build, +}: + +buildPythonPackage (finalAttrs: { + pname = "logurich"; + version = "0.7.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PakitoSec"; + repo = "logurich"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+Ez1tS/kDguq8mQImiu2/h64YsBCTVv4b4sT/tJaD7E="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.20,<0.10.0" "uv_build" + ''; + + build-system = [ uv-build ]; + + dependencies = [ + loguru + rich + ]; + + optional-dependencies = { + click = [ + click + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "logurich" ]; + + meta = { + description = "Logger that combine loguru and rich"; + homepage = "https://github.com/PakitoSec/logurich"; + changelog = "https://github.com/PakitoSec/logurich/releases/tag/v${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/tools/networking/maubot/default.nix b/pkgs/development/python-modules/maubot/default.nix similarity index 100% rename from pkgs/tools/networking/maubot/default.nix rename to pkgs/development/python-modules/maubot/default.nix diff --git a/pkgs/tools/networking/maubot/plugins/default.nix b/pkgs/development/python-modules/maubot/plugins/default.nix similarity index 100% rename from pkgs/tools/networking/maubot/plugins/default.nix rename to pkgs/development/python-modules/maubot/plugins/default.nix diff --git a/pkgs/tools/networking/maubot/plugins/generated.json b/pkgs/development/python-modules/maubot/plugins/generated.json similarity index 100% rename from pkgs/tools/networking/maubot/plugins/generated.json rename to pkgs/development/python-modules/maubot/plugins/generated.json diff --git a/pkgs/tools/networking/maubot/plugins/generated.nix b/pkgs/development/python-modules/maubot/plugins/generated.nix similarity index 100% rename from pkgs/tools/networking/maubot/plugins/generated.nix rename to pkgs/development/python-modules/maubot/plugins/generated.nix diff --git a/pkgs/tools/networking/maubot/plugins/update.py b/pkgs/development/python-modules/maubot/plugins/update.py similarity index 97% rename from pkgs/tools/networking/maubot/plugins/update.py rename to pkgs/development/python-modules/maubot/plugins/update.py index 6fd10652c5fd..cf154d809968 100755 --- a/pkgs/tools/networking/maubot/plugins/update.py +++ b/pkgs/development/python-modules/maubot/plugins/update.py @@ -213,8 +213,8 @@ def main(): for plugin_name in os.listdir(directory): process_repo(os.path.join(directory, plugin_name), official) - if os.path.isdir("pkgs/tools/networking/maubot/plugins"): - generated = "pkgs/tools/networking/maubot/plugins/generated.json" + if os.path.isdir("pkgs/development/python-modules/maubot/plugins"): + generated = "pkgs/development/python-modules/maubot/plugins/generated.json" else: script_dir = os.path.dirname(os.path.realpath(__file__)) generated = os.path.join(script_dir, "generated.json") diff --git a/pkgs/tools/networking/maubot/wrapper.nix b/pkgs/development/python-modules/maubot/wrapper.nix similarity index 100% rename from pkgs/tools/networking/maubot/wrapper.nix rename to pkgs/development/python-modules/maubot/wrapper.nix diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index ebafdd8a8a9d..200c31fd54b1 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "msgraph-sdk"; - version = "1.52.0"; + version = "1.53.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-7HLPkyWlslMuYdoQ4K6Zm7YZ+qp93P/fZdxZrb4X6aI="; + hash = "sha256-zBVqH1mPAFhMmGlaI/bYCP4d+Rsu8aH6egi4MVECtYs="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index 4b6c4a548c20..3eea4f44c0fa 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -9,7 +9,9 @@ hatchling, # native dependencies - xorg, + libxrandr, + libxfixes, + libx11, # tests lsof, @@ -32,9 +34,9 @@ buildPythonPackage rec { patches = lib.optionals stdenv.hostPlatform.isLinux [ (replaceVars ./linux-paths.patch { - x11 = "${xorg.libX11}/lib/libX11.so"; - xfixes = "${xorg.libXfixes}/lib/libXfixes.so"; - xrandr = "${xorg.libXrandr}/lib/libXrandr.so"; + x11 = "${libx11}/lib/libX11.so"; + xfixes = "${libxfixes}/lib/libXfixes.so"; + xrandr = "${libxrandr}/lib/libXrandr.so"; }) ]; diff --git a/pkgs/development/python-modules/multiregex/default.nix b/pkgs/development/python-modules/multiregex/default.nix new file mode 100644 index 000000000000..caa7739cc86c --- /dev/null +++ b/pkgs/development/python-modules/multiregex/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyahocorasick, + pytestCheckHook, + setuptools-scm, + setuptools, +}: + +buildPythonPackage rec { + pname = "multiregex"; + version = "2.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "quantco"; + repo = "multiregex"; + tag = version; + hash = "sha256-S10FJwtFNK4CarE2YAcUM38hRYTDL0Vp4B8NqGvJs5M="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ pyahocorasick ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "multiregex" ]; + + meta = { + description = "Quickly match many regexes against a string"; + homepage = "https://github.com/quantco/multiregex"; + changelog = "https://github.com/quantco/multiregex/blob/${src.tag}/CHANGELOG.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index e2dfe466eb77..39635d031e02 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "nomadnet"; - version = "0.9.7"; + version = "0.9.8"; pyproject = true; src = fetchFromGitHub { owner = "markqvist"; repo = "NomadNet"; tag = finalAttrs.version; - hash = "sha256-IDEbyvTX5PLPqDQ8gj5UwNkGCn+5wJx2xkYJ8BIWmWI="; + hash = "sha256-az/AzYGt42PBP8w1Lzo2+/cgmXue/rHY/ohysc34SPI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 73ed4068d829..a0f03b93ba4e 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -8,12 +8,14 @@ oslo-i18n, oslo-utils, pbr, + pythonAtLeast, requests, requests-mock, setuptools, stdenv, stestr, stevedore, + writeText, }: buildPythonPackage rec { @@ -56,15 +58,26 @@ buildPythonPackage rec { stestr ]; - checkPhase = '' - stestr run -e <(echo " - ${lib.optionalString stdenv.hostPlatform.isDarwin '' - osc_lib.tests.test_shell.TestShellCli.test_shell_args_cloud_public - osc_lib.tests.test_shell.TestShellCli.test_shell_args_precedence - osc_lib.tests.test_shell.TestShellCliPrecedence.test_shell_args_precedence_1 - osc_lib.tests.test_shell.TestShellCliPrecedence.test_shell_args_precedence_2 - ''}") - ''; + checkPhase = + let + disabledTests = + lib.optionals stdenv.hostPlatform.isDarwin [ + "osc_lib.tests.test_shell.TestShellCli.test_shell_args_cloud_public" + "osc_lib.tests.test_shell.TestShellCli.test_shell_args_precedence" + "osc_lib.tests.test_shell.TestShellCliPrecedence.test_shell_args_precedence_1" + "osc_lib.tests.test_shell.TestShellCliPrecedence.test_shell_args_precedence_2" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # Disable test incompatible with Python 3.14+ + # See upstream issue: https://bugs.launchpad.net/python-openstackclient/+bug/2138684 + "osc_lib.tests.utils.test_tags.TestTagHelps" + ]; + in + '' + runHook preCheck + stestr run -e <(echo "${lib.concatStringsSep "\n" disabledTests}") + runHook postCheck + ''; pythonImportsCheck = [ "osc_lib" ]; diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index e9244c7bc843..d36546dde389 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -15,9 +15,11 @@ oslo-utils, oslotest, pbr, + pythonAtLeast, setuptools, stdenv, stestr, + writeText, }: buildPythonPackage rec { @@ -64,22 +66,36 @@ buildPythonPackage rec { stestr ]; - checkPhase = '' - echo "nameserver 127.0.0.1" > resolv.conf - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + checkPhase = + let + disabledTests = [ + "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn" + "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn_n" + "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn" + "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn_n" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "oslo_concurrency.tests.unit.test_lockutils.FileBasedLockingTestCase.test_interprocess_nonblocking_external_lock" + "oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally" + "oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally_lock_dir_not_exist" + "oslo_concurrency.tests.unit.test_processutils.PrlimitTestCase.test_stack_size" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # Disable test incompatible with Python 3.14+ + # See proposed change upstream: https://review.opendev.org/c/openstack/oslo.concurrency/+/971765 + "oslo_concurrency.tests.unit.test_lockutils" + ]; + in + '' + runHook preCheck - stestr run -e <(echo " - oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn - oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn_n - oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn - oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn_n - ${lib.optionalString stdenv.hostPlatform.isDarwin '' - oslo_concurrency.tests.unit.test_lockutils.FileBasedLockingTestCase.test_interprocess_nonblocking_external_lock - oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally - oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally_lock_dir_not_exist - oslo_concurrency.tests.unit.test_processutils.PrlimitTestCase.test_stack_size - ''}") - ''; + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + + stestr run -e <(echo "${lib.concatStringsSep "\n" disabledTests}") + + runHook postCheck + ''; pythonImportsCheck = [ "oslo_concurrency" ]; diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 9fe2ee234fc7..7e911d6fa0f4 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "10.1.0"; + version = "10.2.0"; pyproject = true; src = fetchPypi { pname = "oslo_config"; inherit version; - hash = "sha256-k6aPm9UiQhmLQEuweyuB9kQAgESkiC6xtQQkF7mBmzY="; + hash = "sha256-bSghE/L7LuTUDIvs20rDmRfD9EfDuzVav0fw1hge3/w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-metrics/default.nix b/pkgs/development/python-modules/oslo-metrics/default.nix index 9ffca9456e20..bcae5f3b226f 100644 --- a/pkgs/development/python-modules/oslo-metrics/default.nix +++ b/pkgs/development/python-modules/oslo-metrics/default.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { pname = "oslo-metrics"; - version = "0.11.0"; - format = "setuptools"; + version = "0.14.0"; + pyproject = true; src = fetchFromGitea { domain = "opendev.org"; diff --git a/pkgs/development/python-modules/oslo-utils/ctypes.patch b/pkgs/development/python-modules/oslo-utils/ctypes.patch deleted file mode 100644 index bed62535a80f..000000000000 --- a/pkgs/development/python-modules/oslo-utils/ctypes.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/oslo_utils/secretutils.py b/oslo_utils/secretutils.py -index 3183865..83e00e8 100644 ---- a/oslo_utils/secretutils.py -+++ b/oslo_utils/secretutils.py -@@ -46,13 +46,10 @@ def md5(string=b'', usedforsecurity=True): - return hashlib.md5(string, usedforsecurity=usedforsecurity) # nosec - - --if ctypes.util.find_library("crypt"): -- _libcrypt = ctypes.CDLL(ctypes.util.find_library("crypt"), use_errno=True) -- _crypt = _libcrypt.crypt -- _crypt.argtypes = (ctypes.c_char_p, ctypes.c_char_p) -- _crypt.restype = ctypes.c_char_p --else: -- _crypt = None -+_libcrypt = ctypes.CDLL("@crypt@", use_errno=True) -+_crypt = _libcrypt.crypt -+_crypt.argtypes = (ctypes.c_char_p, ctypes.c_char_p) -+_crypt.restype = ctypes.c_char_p - - - def crypt_mksalt(method): diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 9da2e71d149e..167fa70622d9 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -11,7 +11,6 @@ debtcollector, iso8601, netaddr, - netifaces, oslo-i18n, packaging, psutil, @@ -29,7 +28,6 @@ oslotest, pyyaml, qemu-utils, - replaceVars, stdenv, stestr, testscenarios, @@ -37,26 +35,27 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "9.1.0"; + version = "9.2.0"; pyproject = true; src = fetchPypi { pname = "oslo_utils"; inherit version; - hash = "sha256-AcOHXnzKAFtZRlxCn0ZxE7X0sEIRy9U0yawvFSJ207M="; + hash = "sha256-H0IAbea5KRoDBQJfXM24kHEg2I7X68N4ShRyozKASKs="; }; - patches = [ - (replaceVars ./ctypes.patch { - crypt = "${lib.getLib libxcrypt-legacy}/lib/libcrypt${stdenv.hostPlatform.extensions.sharedLibrary}"; - }) - ]; + postPatch = + let + soext = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + substituteInPlace oslo_utils/secretutils.py \ + --replace-fail "ctypes.util.find_library(\"crypt\")" '"${lib.getLib libxcrypt-legacy}/lib/libcrypt${soext}"' - postPatch = '' - # only a small portion of the listed packages are actually needed for running the tests - # so instead of removing them one by one remove everything - rm test-requirements.txt - ''; + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; build-system = [ pbr @@ -67,7 +66,6 @@ buildPythonPackage rec { debtcollector iso8601 netaddr - netifaces oslo-i18n packaging psutil diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 111bf954bef4..2a6a1f2ee37a 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -122,6 +122,8 @@ buildPythonPackage rec { disabledTests = [ # Require network access "test_yaml_unicode_dump" + # FileNotFoundError: Command not found: 'init' + "test_git_cli" ]; patches = [ diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index f3bc0e677c11..cac3470a5c31 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "36.1.0"; + version = "38.0.0"; pyproject = true; src = fetchPypi { pname = "plaid_python"; inherit version; - hash = "sha256-3TQ6jGsf+2ebYnAxRTKs4JrijDf3ojyfS4iBAMAG8FU="; + hash = "sha256-4BbYY8IQvQFs0MVjXflL2sa+pJjebcId14VVRd6nizI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 69ea1c5ee429..c1985e98ff01 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,12 +11,12 @@ buildPythonPackage (finalAttrs: { pname = "publicsuffixlist"; - version = "1.0.2.20260121"; + version = "1.0.2.20260126"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-3CjU0m330GWrQksBe7d9W8PZfAIyzZ80MlDNewgWC78="; + hash = "sha256-FPtBiR2zFyIEWgysjRZM6LkBYk9LKvn0QY1KW0ePYGk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index ef45aadb72cf..eb2acfbc97c9 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -20,7 +20,8 @@ setuptools, tzlocal, wrapGAppsHook3, - xorg, + xset, + setxkbmap, glib, gobject-introspection, }: @@ -64,8 +65,8 @@ buildPythonPackage rec { sed -i -e "s|'i3-nagbar|'${i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py sed -i -e "s|'free|'${procps}/bin/free|" py3status/modules/sysdata.py sed -i -e "s|'sensors|'${lm_sensors}/bin/sensors|" py3status/modules/sysdata.py - sed -i -e "s|'setxkbmap|'${xorg.setxkbmap}/bin/setxkbmap|" py3status/modules/keyboard_layout.py - sed -i -e "s|'xset|'${xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py + sed -i -e "s|'setxkbmap|'${setxkbmap}/bin/setxkbmap|" py3status/modules/keyboard_layout.py + sed -i -e "s|'xset|'${xset}/bin/xset|" py3status/modules/keyboard_layout.py ''; dontWrapGApps = true; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 49adf16e0010..67a6d0d4f8ed 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -5,7 +5,7 @@ setuptools, libGLU, libGL, - xorg, + libx11, numpy, }: @@ -24,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ libGLU libGL - xorg.libX11 + libx11 ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix index d6ac936cfcb9..d323075207e0 100644 --- a/pkgs/development/python-modules/pyeclib/default.nix +++ b/pkgs/development/python-modules/pyeclib/default.nix @@ -1,53 +1,32 @@ { lib, - stdenv, buildPythonPackage, - distutils, fetchFromGitHub, liberasurecode, pytestCheckHook, setuptools, - six, }: buildPythonPackage rec { pname = "pyeclib"; - version = "1.6.4"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "pyeclib"; tag = version; - hash = "sha256-oRitXlQunfqLSKMaSW3E1BnL0otA4UPj/y6bbiN0kPM="; + hash = "sha256-wYzZUtr80KgVTznD0ISy7qhGngm4Xmt8Mauu9lP+2T4="; }; - postPatch = '' - # python's platform.platform() doesn't return "Darwin" (anymore?) - substituteInPlace setup.py \ - --replace-fail '"Darwin"' '"macOS"' - ''; - build-system = [ - distutils setuptools ]; - preBuild = - let - ldLibraryPathEnvName = - if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - in - '' - # required for the custom _find_library function in setup.py - export ${ldLibraryPathEnvName}="${lib.makeLibraryPath [ liberasurecode ]}" - ''; - - dependencies = [ liberasurecode ]; + buildInputs = [ liberasurecode ]; nativeCheckInputs = [ pytestCheckHook - six ]; disabledTests = [ @@ -61,6 +40,7 @@ buildPythonPackage rec { description = "This library provides a simple Python interface for implementing erasure codes"; homepage = "https://github.com/openstack/pyeclib"; license = lib.licenses.bsd2; + mainProgram = "pyeclib-backend"; teams = [ lib.teams.openstack ]; }; } diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index f94dfe9ebdfb..e68d088371d8 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -6,7 +6,13 @@ flit-core, libGL, libGLU, - xorg, + libxxf86vm, + libxrender, + libxrandr, + libxi, + libxinerama, + libxext, + libx11, pytestCheckHook, glibc, gtk2-x11, @@ -55,13 +61,13 @@ buildPythonPackage rec { elif name == 'c': path = '${glibc}/lib/libc${ext}.6' elif name == 'X11': - path = '${xorg.libX11}/lib/libX11${ext}' + path = '${libx11}/lib/libX11${ext}' elif name == 'gdk-x11-2.0': path = '${gtk2-x11}/lib/libgdk-x11-2.0${ext}' elif name == 'gdk_pixbuf-2.0': path = '${gdk-pixbuf}/lib/libgdk_pixbuf-2.0${ext}' elif name == 'Xext': - path = '${xorg.libXext}/lib/libXext${ext}' + path = '${libxext}/lib/libXext${ext}' elif name == 'fontconfig': path = '${fontconfig.lib}/lib/libfontconfig${ext}' elif name == 'freetype': @@ -73,15 +79,15 @@ buildPythonPackage rec { elif name == 'pulse': path = '${libpulseaudio}/lib/libpulse${ext}' elif name == 'Xi': - path = '${xorg.libXi}/lib/libXi${ext}' + path = '${libxi}/lib/libXi${ext}' elif name == 'Xinerama': - path = '${xorg.libXinerama}/lib/libXinerama${ext}' + path = '${libxinerama}/lib/libXinerama${ext}' elif name == 'Xrandr': - path = '${lib.getLib xorg.libXrandr}/lib/libXrandr${ext}' + path = '${lib.getLib libxrandr}/lib/libXrandr${ext}' elif name == 'Xrender': - path = '${lib.getLib xorg.libXrender}/lib/libXrender${ext}' + path = '${lib.getLib libxrender}/lib/libXrender${ext}' elif name == 'Xxf86vm': - path = '${xorg.libXxf86vm}/lib/libXxf86vm${ext}' + path = '${libxxf86vm}/lib/libXxf86vm${ext}' elif name == 'harfbuzz': path = '${harfbuzz}/lib/libharfbuzz${ext}' if path is not None: diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix index 04c8008787f6..2c64e9f2ab8d 100644 --- a/pkgs/development/python-modules/pysmi/default.nix +++ b/pkgs/development/python-modules/pysmi/default.nix @@ -11,16 +11,16 @@ requests, }: -buildPythonPackage rec { - version = "1.6.2"; +buildPythonPackage (finalAttrs: { pname = "pysmi"; + version = "1.6.3"; pyproject = true; src = fetchFromGitHub { owner = "lextudio"; repo = "pysmi"; - tag = "v${version}"; - hash = "sha256-GyG3J6qntEIszXrm1t623+x1cYbhJLbTEQl6N2h2LA0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-TpDrsBGym07JPIcnytyWI7Ebx9RR+7Ia36zOzWMWqPM="; }; build-system = [ flit-core ]; @@ -46,8 +46,8 @@ buildPythonPackage rec { meta = { description = "SNMP MIB parser"; homepage = "https://github.com/lextudio/pysmi"; - changelog = "https://github.com/lextudio/pysmi/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/lextudio/pysmi/blob/${finalAttrs.src.tag}/CHANGES.rst"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index c913bec5c7ca..5cd58cf79a25 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "pyswitchbot"; - version = "0.76.0"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pySwitchbot"; tag = finalAttrs.version; - hash = "sha256-t5ij86Nq5BQONizKRFPeNyleFo7n4RD9pEglLPhS+Gk="; + hash = "sha256-O8bdWAAtNfLo7WBgvKMm0LXCzpFz1MUqAbBJlyUBcPs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 2824ec2ba090..a9f977aefab4 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -77,6 +77,13 @@ buildPythonPackage rec { "tests/test_threaded_socket_manager.py" "tests/test_threaded_stream.py" "tests/test_ws_api.py" + "tests/test_ids.py" + "tests/test_headers.py" + "tests/test_historical_klines.py" + "tests/test_init.py" + "tests/test_streams_options.py" + "tests/test_cryptography.py" + "tests/test_futures.py" ]; pythonImportsCheck = [ "binance" ]; diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 6f55eb6a5c82..93684b2441c7 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -8,10 +8,10 @@ freetype, libGL, libGLU, - libX11, - libXext, - libXi, - libXmu, + libx11, + libxext, + libxi, + libxmu, opencascade-occt, numpy, rapidjson, @@ -39,10 +39,10 @@ stdenv.mkDerivation rec { freetype libGL libGLU - libX11 - libXext - libXmu - libXi + libx11 + libxext + libxmu + libxi fontconfig numpy rapidjson diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 0ba3442edbb3..1072a8f0ae76 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,21 +10,21 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyvicare"; - version = "2.55.1"; + version = "2.56.0"; pyproject = true; src = fetchFromGitHub { owner = "openviess"; repo = "PyViCare"; - tag = version; - hash = "sha256-fKQ0NXUsL8NgmKr8BEoGV2fty39l19fg4B6Eg90X2kI="; + tag = finalAttrs.version; + hash = "sha256-DRCetTR7sFaShau3in0548FoR+rOaG28SGqfAjAVsn4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.1.0"' 'version = "${version}"' + --replace-fail 'version = "0.1.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ poetry-core ]; @@ -43,10 +43,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "PyViCare" ]; meta = { - changelog = "https://github.com/openviess/PyViCare/releases/tag/${src.tag}"; description = "Python Library to access Viessmann ViCare API"; homepage = "https://github.com/somm15/PyViCare"; - license = with lib.licenses; [ asl20 ]; + changelog = "https://github.com/openviess/PyViCare/releases/tag/${finalAttrs.version}"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix index 83a14d52a769..1f76c8690a2a 100644 --- a/pkgs/development/python-modules/pyvirtualdisplay/default.nix +++ b/pkgs/development/python-modules/pyvirtualdisplay/default.nix @@ -4,7 +4,11 @@ buildPythonPackage, fetchPypi, replaceVars, - xorg, + xorg-server, + xvfb, + xmessage, + xdpyinfo, + xauth, # build-system setuptools, @@ -33,8 +37,8 @@ buildPythonPackage rec { patches = lib.optionals stdenv.hostPlatform.isLinux [ (replaceVars ./paths.patch { - xauth = lib.getExe xorg.xauth; - xdpyinfo = lib.getExe xorg.xdpyinfo; + xauth = lib.getExe xauth; + xdpyinfo = lib.getExe xdpyinfo; }) ]; @@ -50,9 +54,9 @@ buildPythonPackage rec { pytest-timeout pytestCheckHook (vncdo.overridePythonAttrs { doCheck = false; }) - xorg.xorgserver - xorg.xmessage - xorg.xvfb + xorg-server + xmessage + xvfb ]; pytestFlags = [ "-v" ]; diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index bfde86cd69ab..ffd1f0fcdf90 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -30,6 +30,7 @@ license-expression, lxml, markupsafe, + multiregex, packageurl-python, packaging, parameter-expansion-patched, @@ -60,12 +61,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.4.1"; + version = "32.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-qZUILeB1lGv0V9Uq81/aOI9pJTtayfZH/O5kwNnpf28="; + pname = "scancode_toolkit"; + inherit version; + hash = "sha256-WXAZCk0aRmKb1UU1ud95mZFHAMC9U+gDRd9w7TZTVSA="; }; dontConfigure = true; @@ -101,6 +103,7 @@ buildPythonPackage rec { license-expression lxml markupsafe + multiregex packageurl-python packaging parameter-expansion-patched @@ -126,9 +129,7 @@ buildPythonPackage rec { xmltodict ]; - nativeBuildInputs = [ - writableTmpDirAsHomeHook - ]; + nativeBuildInputs = [ writableTmpDirAsHomeHook ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index 08458f9bb14e..b3dfe906c11f 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, click, fetchFromGitHub, - fetchpatch, license-expression, ply, pytestCheckHook, @@ -17,27 +16,18 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spdx-tools"; - version = "0.8.3"; + version = "0.8.4"; pyproject = true; src = fetchFromGitHub { owner = "spdx"; repo = "tools-python"; - tag = "v${version}"; - hash = "sha256-r7+RYGoq3LJYN1jYfwzb1r3fc/kL+CPd4pmGATFq8Pw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-loD+YXRCEYRynOKf7Da43SA7JQVYP1IzJe2f7ssJTtI="; }; - patches = [ - # https://github.com/spdx/tools-python/issues/844 - (fetchpatch { - name = "beartype-0.20-compat.patch"; - url = "https://github.com/spdx/tools-python/pull/841/commits/3b13bd5af36a2b78f5c87fdbadc3f2601d2dcd8d.patch"; - hash = "sha256-8sQNGRss4R1olsw+xGps3NICyimBxKv47TaSrCcnVhA="; - }) - ]; - build-system = [ setuptools setuptools-scm @@ -73,8 +63,8 @@ buildPythonPackage rec { meta = { description = "SPDX parser and tools"; homepage = "https://github.com/spdx/tools-python"; - changelog = "https://github.com/spdx/tools-python/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/spdx/tools-python/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 19b1a74da856..639bffac6623 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "stevedore"; - version = "5.4.1"; + version = "5.6.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-MTW1rlD+EoFu8pG6/0IKy3J/zTVhBuPpy/qeWYXNb0s="; + hash = "sha256-8i0VxurUDFu/qcpUqn57SgfVmzauA+0SztGlTPC1GUU="; }; build-system = [ diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix index 2cf48e3b9b13..71d98a4f7849 100644 --- a/pkgs/development/python-modules/ueberzug/default.nix +++ b/pkgs/development/python-modules/ueberzug/default.nix @@ -4,9 +4,9 @@ buildPythonPackage, docopt, fetchPypi, - libX11, - libXext, - libXres, + libx11, + libxext, + libxres, meson-python, meson, pillow, @@ -33,9 +33,9 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libX11 - libXres - libXext + libx11 + libxres + libxext ]; dependencies = [ diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index bdd628a6a0a7..743330ba39a9 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -4,7 +4,9 @@ cffi, fetchPypi, pytestCheckHook, - xorg, + xvfb, + xeyes, + libxcb, }: buildPythonPackage rec { @@ -19,7 +21,7 @@ buildPythonPackage rec { postPatch = '' # Hardcode cairo library path - sed -e 's,ffi\.dlopen(,&"${xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py + sed -e 's,ffi\.dlopen(,&"${libxcb.out}/lib/" + ,' -i xcffib/__init__.py ''; propagatedNativeBuildInputs = [ cffi ]; @@ -28,8 +30,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - xorg.xeyes - xorg.xvfb + xeyes + xvfb ]; preCheck = '' diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 480cfdb0f68e..73c1ff3eca83 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -6,7 +6,9 @@ six, setuptools, setuptools-scm, - xorg, + libx11, + xvfb, + xauth, mock, pytestCheckHook, util-linux, @@ -28,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; propagatedBuildInputs = [ six ]; @@ -38,8 +40,8 @@ buildPythonPackage rec { pytestCheckHook mock util-linux - xorg.xauth - xorg.xvfb + xauth + xvfb ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index e991b6549619..ad02c2a20961 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -5,8 +5,6 @@ replaceVars, ruff, click, - click-default-group, - docformatter, jinja2, toposort, typing-extensions, @@ -18,14 +16,14 @@ buildPythonPackage rec { pname = "xsdata"; - version = "25.7"; + version = "26.1"; pyproject = true; src = fetchFromGitHub { owner = "tefra"; repo = "xsdata"; tag = "v${version}"; - hash = "sha256-npwJlyUYjoYzvwaZZK4PIqhJmTeYGDDfc4T4/ODcx4c="; + hash = "sha256-cMXLRk74y+yHYyIQqlUcMZawNfMXa5L17qhVkTpgEsk="; }; patches = [ @@ -46,8 +44,6 @@ buildPythonPackage rec { optional-dependencies = { cli = [ click - click-default-group - docformatter jinja2 toposort ]; @@ -58,9 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] - ++ optional-dependencies.cli - ++ optional-dependencies.lxml - ++ optional-dependencies.soap; + ++ lib.concatAttrValues optional-dependencies; disabledTestPaths = [ "tests/integration/benchmarks" ]; diff --git a/pkgs/development/python-modules/xsdata/paths.patch b/pkgs/development/python-modules/xsdata/paths.patch index d80383fa31c8..9e63714eb185 100644 --- a/pkgs/development/python-modules/xsdata/paths.patch +++ b/pkgs/development/python-modules/xsdata/paths.patch @@ -1,21 +1,22 @@ diff --git a/xsdata/formats/dataclass/generator.py b/xsdata/formats/dataclass/generator.py -index f30196b1..b7934b3d 100644 +index b9f1b0e9..c1ed4c72 100644 --- a/xsdata/formats/dataclass/generator.py +++ b/xsdata/formats/dataclass/generator.py -@@ -240,14 +240,14 @@ class DataclassGenerator(AbstractGenerator): - """ +@@ -240,7 +240,7 @@ class DataclassGenerator(AbstractGenerator): + ruff_config = Path(__file__).parent.joinpath("ruff.toml") commands = [ [ - "ruff", -+ "@ruff@", - "format", - "--config", - f"line-length={self.config.output.max_line_length}", - *file_paths, - ], - [ -- "ruff", + "@ruff@", "check", "--config", - f"line-length={self.config.output.max_line_length}", + str(ruff_config), +@@ -252,7 +252,7 @@ class DataclassGenerator(AbstractGenerator): + *file_paths, + ], + [ +- "ruff", ++ "@ruff@", + "format", + "--config", + str(ruff_config), diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index 0bb68452cbbe..4a11aeb783a4 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, setuptools, - xorg, + xvfb, pytestCheckHook, }: @@ -21,11 +21,11 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ xorg.xvfb ]; + dependencies = [ xvfb ]; nativeCheckInputs = [ pytestCheckHook - xorg.xvfb + xvfb ]; meta = { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/development/python-modules/youtube-dl/default.nix similarity index 100% rename from pkgs/tools/misc/youtube-dl/default.nix rename to pkgs/development/python-modules/youtube-dl/default.nix diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 5e54e69137c8..928a6fda8aca 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -470,7 +470,7 @@ let libtiff libjpeg cairo.dev - xorg.libXt.dev + libxt.dev fontconfig.lib ]; Cardinal = [ pkgs.which ]; @@ -495,7 +495,7 @@ let cargo rustc ]; - devEMF = with pkgs; [ xorg.libXft.dev ]; + devEMF = with pkgs; [ libxft.dev ]; DEploid = [ pkgs.zlib.dev ]; DEploid_utils = [ pkgs.zlib.dev ]; diversitree = with pkgs; [ @@ -542,7 +542,7 @@ let ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ expat - xorg.libXdmcp + libxdmcp ]; GeneralizedWendland = [ pkgs.gsl ]; ggiraph = [ pkgs.libpng.dev ]; @@ -604,7 +604,7 @@ let mpfr.dev pkg-config ]; - imager = [ pkgs.xorg.libX11.dev ]; + imager = [ pkgs.libx11.dev ]; imbibe = [ pkgs.zlib.dev ]; image_CannyEdges = with pkgs; [ fftw.dev @@ -943,7 +943,7 @@ let ]; tiff = [ pkgs.libtiff.dev ]; tkrplot = with pkgs; [ - xorg.libX11 + libx11 tk.dev ]; topicmodels = [ pkgs.gsl ]; @@ -1175,7 +1175,7 @@ let rgl = with pkgs; [ libGLU libGL - xorg.libX11.dev + libx11.dev freetype.dev libpng.dev ]; @@ -1317,7 +1317,7 @@ let gridGraphics = [ pkgs.which ]; adimpro = with pkgs; [ which - xorg.xdpyinfo + xdpyinfo ]; tfevents = [ pkgs.protobuf ]; rsvg = [ pkgs.librsvg.dev ]; @@ -1541,7 +1541,7 @@ let ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ expat - xorg.libXdmcp + libxdmcp ]; HilbertVisGUI = [ pkgs.gtkmm2.dev ]; textshaping = with pkgs; [ @@ -2459,7 +2459,7 @@ let }); devEMF = old.devEMF.overrideAttrs (attrs: { - NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft.out}/lib -lXft"; + NIX_CFLAGS_LINK = "-L${pkgs.libxft.out}/lib -lXft"; NIX_LDFLAGS = "-lX11"; }); diff --git a/pkgs/development/rocq-modules/mathcomp/default.nix b/pkgs/development/rocq-modules/mathcomp/default.nix index 160febe58cb6..5285a277c810 100644 --- a/pkgs/development/rocq-modules/mathcomp/default.nix +++ b/pkgs/development/rocq-modules/mathcomp/default.nix @@ -7,7 +7,7 @@ ############################################################################ # Compiling a custom version of mathcomp using `mathcomp.override`. # # This is the replacement for the former `mathcomp_ config` function. # -# See the documentation at doc/languages-frameworks/coq.section.md. # +# See the documentation at doc/languages-frameworks/rocq.section.md. # ############################################################################ { diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 78885df50405..14bc45594041 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -64,7 +64,9 @@ libossp_uuid, lxc, libpcap, - xorg, + libxtst, + libxdmcp, + libpthread-stubs, gtk3, lerc, buildRubyGem, @@ -180,8 +182,8 @@ in glib libsysprof-capture pcre2 - xorg.libpthreadstubs - xorg.libXdmcp + libpthread-stubs + libxdmcp ]; }; @@ -192,8 +194,8 @@ in expat libsysprof-capture pcre2 - xorg.libpthreadstubs - xorg.libXdmcp + libpthread-stubs + libxdmcp ]; }; @@ -563,9 +565,9 @@ in libsysprof-capture libthai pcre2 - xorg.libpthreadstubs - xorg.libXdmcp - xorg.libXtst + libpthread-stubs + libxdmcp + libxtst libxkbcommon libepoxy ]; @@ -889,8 +891,8 @@ in harfbuzz libsysprof-capture pcre2 - xorg.libpthreadstubs - xorg.libXdmcp + libpthread-stubs + libxdmcp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux diff --git a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix index 1212bc56d845..9eca47fedb46 100644 --- a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix +++ b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix @@ -4,7 +4,7 @@ tcl, tcllib, tk, - xorg, + libx11, }: tcl.mkTclDerivation rec { @@ -24,7 +24,7 @@ tcl.mkTclDerivation rec { ]; buildInputs = [ - xorg.libX11 + libx11 tcllib ]; diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 419d835e24cd..8d94d41c99a6 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -24,7 +24,14 @@ gdk-pixbuf, nss, nspr, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxkbfile, + libxcb, pango, systemd, pciutils, @@ -101,14 +108,14 @@ let gtk4 nss nspr - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxkbfile + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxkbfile pango pciutils stdenv.cc.cc diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix index b3d1ca7f8cf2..02918284e028 100644 --- a/pkgs/development/tools/electron/chromedriver/generic.nix +++ b/pkgs/development/tools/electron/chromedriver/generic.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, glib, - xorg, + libxcb, nspr, nss, autoPatchelfHook, @@ -65,7 +65,7 @@ let buildInputs = [ (lib.getLib stdenv.cc.cc) glib - xorg.libxcb + libxcb nspr nss ]; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index fed84d634edc..838488ee21c7 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -34,7 +34,18 @@ stdenv, systemd, udev, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, }: let @@ -64,18 +75,18 @@ let nspr nss pango - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxshmfence # libnw-specific (not chromium dependencies) ffmpeg libxcb diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index c7989b5bc6a8..393b89a4acb4 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -10,11 +10,8 @@ let self = runCommand "rust-bindgen-${rust-bindgen-unwrapped.version}" { - #for substituteAll - inherit bash; pname = "rust-bindgen"; inherit (rust-bindgen-unwrapped) version; - unwrapped = rust-bindgen-unwrapped; meta = rust-bindgen-unwrapped.meta // { longDescription = rust-bindgen-unwrapped.meta.longDescription + '' This version of bindgen is wrapped with the required compiler flags @@ -46,9 +43,13 @@ let # if you modify the logic to find the right clang flags, also modify rustPlatform.bindgenHook '' mkdir -p $out/bin - export cincludes="$(< ${clang}/nix-support/cc-cflags) $(< ${clang}/nix-support/libc-cflags)" - export cxxincludes="$(< ${clang}/nix-support/libcxx-cxxflags)" - substituteAll ${./wrapper.sh} $out/bin/bindgen + cincludes="$(< ${clang}/nix-support/cc-cflags) $(< ${clang}/nix-support/libc-cflags)" + cxxincludes="$(< ${clang}/nix-support/libcxx-cxxflags)" + substitute ${./wrapper.sh} $out/bin/bindgen \ + --replace-fail "@bash@" "${bash}" \ + --replace-fail "@cxxincludes@" "$cxxincludes" \ + --replace-fail "@cincludes@" "$cincludes" \ + --replace-fail "@unwrapped@" "${rust-bindgen-unwrapped}" chmod +x $out/bin/bindgen ''; in diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix index 3b5d36592461..17458292b824 100644 --- a/pkgs/development/web/playwright/chromium.nix +++ b/pkgs/development/web/playwright/chromium.nix @@ -31,7 +31,13 @@ stdenv, systemd, vulkan-loader, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, ... }: let @@ -80,13 +86,13 @@ let pango stdenv.cc.cc.lib systemd - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb ]; installPhase = '' diff --git a/pkgs/games/fteqw/default.nix b/pkgs/games/fteqw/default.nix index b6e6415e057e..93ad0c86a695 100644 --- a/pkgs/games/fteqw/default.nix +++ b/pkgs/games/fteqw/default.nix @@ -16,7 +16,9 @@ vulkan-headers, speex, libopus, - xorg, + libxscrnsaver, + libxrandr, + libxcursor, libGL, }@attrs: { @@ -44,9 +46,9 @@ vulkan-loader speex libopus - xorg.libXrandr - xorg.libXcursor - xorg.libXScrnSaver + libxrandr + libxcursor + libxscrnsaver ]; postFixup = '' diff --git a/pkgs/games/fteqw/generic.nix b/pkgs/games/fteqw/generic.nix index a64fd05d9121..3646c4871fa0 100644 --- a/pkgs/games/fteqw/generic.nix +++ b/pkgs/games/fteqw/generic.nix @@ -3,7 +3,7 @@ fetchFromGitHub, stdenv, libopus, - xorg, + libxrandr, pname, releaseFile ? pname, buildFlags, @@ -42,7 +42,7 @@ stdenv.mkDerivation { substituteInPlace ./engine/Makefile \ --replace "I/usr/include/opus" "I${libopus.dev}/include/opus" substituteInPlace ./engine/gl/gl_vidlinuxglx.c \ - --replace 'Sys_LoadLibrary("libXrandr"' 'Sys_LoadLibrary("${xorg.libXrandr}/lib/libXrandr.so"' + --replace 'Sys_LoadLibrary("libXrandr"' 'Sys_LoadLibrary("${libxrandr}/lib/libXrandr.so"' ''; installPhase = '' diff --git a/pkgs/games/openloco/default.nix b/pkgs/games/openloco/default.nix index e64c6f6aa978..d0106e40831b 100644 --- a/pkgs/games/openloco/default.nix +++ b/pkgs/games/openloco/default.nix @@ -11,7 +11,7 @@ pkg-config, yaml-cpp, fmt_11, - xorg, + libx11, }: let sfl-src = fetchFromGitHub { @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { openal yaml-cpp fmt_11 - xorg.libX11 + libx11 ]; meta = { diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index b4a4568967aa..852e9a847c68 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -4,7 +4,8 @@ fetchurl, unzip, patchelf, - xorg, + libxxf86vm, + libxext, openal, }: @@ -27,8 +28,8 @@ let rtdeps = lib.makeLibraryPath [ - xorg.libXxf86vm - xorg.libXext + libxxf86vm + libxext openal ] + ":" diff --git a/pkgs/kde/frameworks/kidletime/default.nix b/pkgs/kde/frameworks/kidletime/default.nix index 1fc517f20585..ccd0b7314aaf 100644 --- a/pkgs/kde/frameworks/kidletime/default.nix +++ b/pkgs/kde/frameworks/kidletime/default.nix @@ -2,7 +2,7 @@ mkKdeDerivation, qtwayland, pkg-config, - xorg, + libxscrnsaver, }: mkKdeDerivation { pname = "kidletime"; @@ -10,6 +10,6 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwayland - xorg.libXScrnSaver + libxscrnsaver ]; } diff --git a/pkgs/kde/gear/colord-kde/default.nix b/pkgs/kde/gear/colord-kde/default.nix index e2ce75a98e77..93b743413471 100644 --- a/pkgs/kde/gear/colord-kde/default.nix +++ b/pkgs/kde/gear/colord-kde/default.nix @@ -2,7 +2,7 @@ mkKdeDerivation, pkg-config, lcms2, - xorg, + libxrandr, }: mkKdeDerivation { pname = "colord-kde"; @@ -10,7 +10,7 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ lcms2 - xorg.libXrandr + libxrandr ]; meta.mainProgram = "colord-kde-icc-importer"; } diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix index 2260feeac62c..70433f128e2e 100644 --- a/pkgs/kde/gear/kio-extras/default.nix +++ b/pkgs/kde/gear/kio-extras/default.nix @@ -13,7 +13,7 @@ taglib, shared-mime-info, libappimage, - xorg, + libxcursor, kio, }: mkKdeDerivation { @@ -37,7 +37,7 @@ mkKdeDerivation { openexr taglib libappimage - xorg.libXcursor + libxcursor ]; postInstall = '' diff --git a/pkgs/kde/gear/kmousetool/default.nix b/pkgs/kde/gear/kmousetool/default.nix index 7eca9ab12c73..3886aa8d9d74 100644 --- a/pkgs/kde/gear/kmousetool/default.nix +++ b/pkgs/kde/gear/kmousetool/default.nix @@ -1,14 +1,14 @@ { mkKdeDerivation, qtmultimedia, - xorg, + libxt, }: mkKdeDerivation { pname = "kmousetool"; extraBuildInputs = [ qtmultimedia - xorg.libXt + libxt ]; meta.mainProgram = "kmousetool"; } diff --git a/pkgs/kde/gear/krfb/default.nix b/pkgs/kde/gear/krfb/default.nix index d2be34808082..a52efeb15511 100644 --- a/pkgs/kde/gear/krfb/default.nix +++ b/pkgs/kde/gear/krfb/default.nix @@ -4,7 +4,7 @@ qtbase, libvncserver, pipewire, - xorg, + libxdamage, }: mkKdeDerivation { pname = "krfb"; @@ -17,6 +17,6 @@ mkKdeDerivation { extraBuildInputs = [ libvncserver pipewire - xorg.libXdamage + libxdamage ]; } diff --git a/pkgs/kde/plasma/kgamma/default.nix b/pkgs/kde/plasma/kgamma/default.nix index 607a04a945ea..98aea358d089 100644 --- a/pkgs/kde/plasma/kgamma/default.nix +++ b/pkgs/kde/plasma/kgamma/default.nix @@ -1,9 +1,9 @@ { mkKdeDerivation, - xorg, + libxxf86vm, }: mkKdeDerivation { pname = "kgamma"; - extraBuildInputs = [ xorg.libXxf86vm ]; + extraBuildInputs = [ libxxf86vm ]; } diff --git a/pkgs/kde/plasma/kwin-x11/default.nix b/pkgs/kde/plasma/kwin-x11/default.nix index 9573bbecb954..b32ccb04f6d5 100644 --- a/pkgs/kde/plasma/kwin-x11/default.nix +++ b/pkgs/kde/plasma/kwin-x11/default.nix @@ -5,7 +5,7 @@ qtsensors, qttools, qtwayland, - xorg, + libxcvt, libcanberra, libdisplay-info, libgbm, @@ -39,6 +39,6 @@ mkKdeDerivation { libcanberra libdisplay-info - xorg.libxcvt + libxcvt ]; } diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index 8b8244c0fdae..eec3047201da 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -7,7 +7,7 @@ qtvirtualkeyboard, qtwayland, libinput, - xorg, + libxcvt, xwayland, libcanberra, libdisplay-info, @@ -59,7 +59,7 @@ mkKdeDerivation { libinput pipewire - xorg.libxcvt + libxcvt # we need to provide this so it knows our xwayland supports new features xwayland ]; diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index 4401a99d7a48..30de7c407e2d 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -13,7 +13,11 @@ breeze, SDL2, xkeyboard_config, - xorg, + xorg-server, + xf86-input-libinput, + xf86-input-evdev, + libxft, + libxcursor, libcanberra, libwacom, libxkbfile, @@ -55,11 +59,11 @@ mkKdeDerivation { libxkbfile xkeyboard_config - xorg.libXcursor - xorg.libXft - xorg.xf86inputlibinput - xorg.xf86inputevdev - xorg.xorgserver + libxcursor + libxft + xf86-input-libinput + xf86-input-evdev + xorg-server ibus ]; diff --git a/pkgs/kde/plasma/plasma-integration/default.nix b/pkgs/kde/plasma/plasma-integration/default.nix index 55c1bb7ee10a..1de1631826fe 100644 --- a/pkgs/kde/plasma/plasma-integration/default.nix +++ b/pkgs/kde/plasma/plasma-integration/default.nix @@ -3,7 +3,7 @@ qtbase, qtwayland, libsForQt5, - xorg, + libxcursor, }: mkKdeDerivation { pname = "plasma-integration"; @@ -63,7 +63,7 @@ mkKdeDerivation { extraBuildInputs = [ qtwayland - xorg.libXcursor + libxcursor ]; # Move Qt5 plugin to Qt5 plugin path diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index ebfa90da040d..71c8699e1484 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -3,7 +3,12 @@ mkKdeDerivation, replaceVars, fontconfig, - xorg, + libxtst, + libxft, + libxcursor, + libsm, + xrdb, + xmessage, lsof, pkg-config, spirv-tools, @@ -26,8 +31,8 @@ mkKdeDerivation { fcMatch = lib.getExe' fontconfig "fc-match"; lsof = lib.getExe lsof; qdbus = lib.getExe' qttools "qdbus"; - xmessage = lib.getExe xorg.xmessage; - xrdb = lib.getExe xorg.xrdb; + xmessage = lib.getExe xmessage; + xrdb = lib.getExe xrdb; # @QtBinariesDir@ only appears in the *removed* lines of the diff QtBinariesDir = null; }) @@ -54,10 +59,10 @@ mkKdeDerivation { libqalculate pipewire - xorg.libSM - xorg.libXcursor - xorg.libXtst - xorg.libXft + libsm + libxcursor + libxtst + libxft gpsd ]; @@ -67,7 +72,7 @@ mkKdeDerivation { # Hardcoded as QStrings, which are UTF-16 so Nix can't pick these up automatically postFixup = '' mkdir -p $out/nix-support - echo "${lsof} ${xorg.xmessage} ${xorg.xrdb}" > $out/nix-support/depends + echo "${lsof} ${xmessage} ${xrdb}" > $out/nix-support/depends ''; passthru.providedSessions = [ diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-libs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-libs.nix index fe15b8e71c56..2f541a0150f8 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-libs.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-libs.nix @@ -2,7 +2,8 @@ mkDerivation, nvidia-driver, autoPatchelfHook, - xorg, + libxext, + libx11, freetype, gtk2, gtk3, @@ -33,8 +34,8 @@ mkDerivation { glib libintl freetype - xorg.libXext - xorg.libX11 + libxext + libx11 ]; env.LOCALBASE = "${builtins.placeholder "out"}"; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/xf86-video-scfb.nix b/pkgs/os-specific/bsd/freebsd/pkgs/xf86-video-scfb.nix index 7bf3e1b28574..fbdae5df0c29 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/xf86-video-scfb.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/xf86-video-scfb.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, - xorg, + xorg-server, pkg-config, }: stdenv.mkDerivation rec { @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { sed -E -i -e "/xf86DisableRandR/d" src/scfb_driver.c ''; - buildInputs = [ xorg.xorgserver ]; + buildInputs = [ xorg-server ]; nativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 611571f016d8..c9ba00d790b0 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -29,7 +29,11 @@ ncurses ? null, x11Support ? true, freetype, - xorg, + libxft, + libxext, + libx11, + libsm, + libice, waylandSupport ? true, pango, wayland, @@ -132,12 +136,12 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals x11Support [ freetype libxfixes - xorg.libICE - xorg.libX11 - xorg.libXext - xorg.libXft - xorg.libXfixes - xorg.libSM + libice + libx11 + libxext + libxft + libxfixes + libsm expat ] ++ lib.optionals waylandSupport [ diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 85c5fb47191c..beebef90db38 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -1,5 +1,5 @@ # Based on recommendations from: -# http://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project#Recommended_settings +# https://kspp.github.io/Recommended_Settings # https://wiki.gentoo.org/wiki/Hardened/Hardened_Kernel_Project # # Dangerous features that can be permanently (for the boot session) disabled at @@ -29,7 +29,7 @@ assert (lib.versionAtLeast version "4.9"); # We set SECURITY_WRITABLE_HOOKS n primarily for documentation purposes; the # config builder fails to detect that it has indeed been unset. SECURITY_SELINUX_DISABLE = whenOlder "6.4" no; # On 6.4: error: unused option: SECURITY_SELINUX_DISABLE - SECURITY_WRITABLE_HOOKS = option no; + SECURITY_WRITABLE_HOOKS = whenOlder "6.4" no; # Perform additional validation of commonly targeted structures. DEBUG_CREDENTIALS = whenOlder "6.6" yes; @@ -56,6 +56,9 @@ assert (lib.versionAtLeast version "4.9"); # Enable init_on_free by default INIT_ON_FREE_DEFAULT_ON = whenAtLeast "5.3" yes; + # Initialize all stack variables on function entry + INIT_STACK_ALL_ZERO = yes; + # Wipe all caller-used registers on exit from a function ZERO_CALL_USED_REGS = whenAtLeast "5.15" yes; @@ -67,8 +70,6 @@ assert (lib.versionAtLeast version "4.9"); GCC_PLUGINS = yes; # Enable gcc plugin options - GCC_PLUGIN_STRUCTLEAK = option yes; # A port of the PaX structleak plugin - GCC_PLUGIN_STRUCTLEAK_BYREF_ALL = option yes; # Also cover structs passed by address GCC_PLUGIN_STACKLEAK = whenAtLeast "4.20" yes; # A port of the PaX stackleak plugin GCC_PLUGIN_RANDSTRUCT = whenOlder "5.19" yes; # A port of the PaX randstruct plugin GCC_PLUGIN_RANDSTRUCT_PERFORMANCE = whenOlder "5.19" yes; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 2c61bac2a476..88d03556f63a 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.12.66"; - hash = "sha256-TjfSGArDcBysHtu6w9fYU1PflStZitIZDFnb6pGeLP0="; + version = "6.12.67"; + hash = "sha256-xUiVE59kiuaVK9/ENxinZMVUBtAxLP5Wiut4r5kCwJo="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "6.18.6"; - hash = "sha256-rz5oGDgZZsBbYqP1Du+gGKUuoDMiKMXsLSxnpASHRjc="; + version = "6.18.7"; + hash = "sha256-kMnJGI0GJ6Cgi5jqrLHRzHI2yE/KEOtBtvgevKnSDO8="; }; }; diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/os-specific/linux/lenovo-legion/app.nix index 472947f1b0dd..ec001847516f 100644 --- a/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - xorg, + libxcb, wrapQtAppsHook, python3, nix-update-script, @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { pillow pyyaml darkdetect - xorg.libxcb + libxcb ]; postPatch = '' diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2ad157561ef5..58a0a259a5e4 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -101,11 +101,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "580.94.13"; + version = "580.94.16"; persistencedVersion = "580.95.05"; settingsVersion = "580.95.05"; - sha256_64bit = "sha256-Hg9LOxG1n2cupWUIi/miGf67y/vvzQEsOtni8KzGx40="; - openSha256 = "sha256-vDXx6cH/02TAaM7pWrJdTFw65GmydRMmyIYFeUAzHFg="; + sha256_64bit = "sha256-DqwALfSNPjLsat4Q9Sg44BACNUyqK+kpUxL5CFzLlRc="; + openSha256 = "sha256-WWql/WBQyWNG+skZgvUFbNCClVjty3s3+QR6NnJhSF4="; settingsSha256 = "sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14="; persistencedSha256 = "sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 7c6469672a34..4ee461ed8cbf 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -106,11 +106,11 @@ let with pkgs; [ libdrm - xorg.libXext - xorg.libX11 - xorg.libXv - xorg.libXrandr - xorg.libxcb + libxext + libx11 + libxv + libxrandr + libxcb zlib stdenv.cc.cc wayland diff --git a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix index ad30afd0e1ab..7cf7075a1500 100644 --- a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix +++ b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix @@ -5,7 +5,6 @@ libusb1, glibc, libGL, - xorg, makeWrapper, qtx11extras, wrapQtAppsHook, diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index 0835972d1f1b..9300735a5e5f 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "SukramJ"; domain = "homematicip_local"; - version = "2.1.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "SukramJ"; repo = "custom_homematic"; tag = version; - hash = "sha256-GD5EcsVjlhP6jHsZgedd2HHASFHvt3iaJAPHtnm7U+0="; + hash = "sha256-aILnBc163oB0NgBAubbqQTP8wwrLN8AcvGP21sc1314="; }; postPatch = '' diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix index a531d347cd3a..fa19b6d35f01 100644 --- a/pkgs/servers/mir/common.nix +++ b/pkgs/servers/mir/common.nix @@ -38,7 +38,9 @@ udev, wayland, wayland-scanner, - xorg, + libxcursor, + libx11, + xorgproto, xwayland, dbus, gobject-introspection, @@ -141,9 +143,9 @@ stdenv.mkDerivation ( nettle udev wayland - xorg.libX11 - xorg.libXcursor - xorg.xorgproto + libx11 + libxcursor + xorgproto xwayland ] ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [ diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/pkgs/servers/misc/qremotecontrol-server/default.nix index 6114f32fdd35..0c4a5a1c60ef 100644 --- a/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -5,7 +5,7 @@ qmake, wrapQtAppsHook, qtbase, - xorg, + libxtst, }: stdenv.mkDerivation { @@ -29,7 +29,7 @@ stdenv.mkDerivation { buildInputs = [ qtbase - xorg.libXtst + libxtst ]; postPatch = '' diff --git a/pkgs/servers/nextcloud/packages/apps/memories.nix b/pkgs/servers/nextcloud/packages/apps/memories.nix index af9e7b620d3f..d85f5cc3841b 100644 --- a/pkgs/servers/nextcloud/packages/apps/memories.nix +++ b/pkgs/servers/nextcloud/packages/apps/memories.nix @@ -13,9 +13,9 @@ let latestVersionForNc = { "31" = { - version = "7.7.0"; - appHash = "sha256-ORv+6XkN+qTk5bXMFKv2Mv/jU+7F12IbWE9JjV2ot9o="; - srcHash = "sha256-hiYAQshi84oOw1qfNECWAssbln8UPwD+8Hfb2pKw8no="; + version = "7.8.1"; + appHash = "sha256-lD50xKxHYc04G6r4caAKzRcTl0Q2VSWUXHRETUCF1dg="; + srcHash = "sha256-E/hdjfBh6MorJ5A2W15F6iqax+wV8XHxiQQiahCM4Os="; }; "32" = latestVersionForNc."31"; }; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index be909083a0eb..f0cb92c52684 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -7,7 +7,11 @@ libtool, makeWrapper, perlPackages, - xorg, + libxtst, + libxi, + libx11, + libsm, + libice, libcap, alsa-lib, glib, @@ -140,11 +144,11 @@ stdenv.mkDerivation rec { ] ++ lib.optional jackaudioSupport libjack2 ++ lib.optionals x11Support [ - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXi - xorg.libXtst + libice + libsm + libx11 + libxi + libxtst ] ++ lib.optional useSystemd systemd ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index e45cb91e0939..2b52179dc8ae 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -8,7 +8,7 @@ zstd, pkg-config, python3, - xorg, + libx11, nghttp2, libgit2, withDefaultFeatures ? true, @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage { zstd ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zlib ] - ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ xorg.libX11 ] + ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ libx11 ] ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isDarwin) [ nghttp2 libgit2 diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index e5de61e4d2b0..bd4d5e9edf72 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -10,7 +10,7 @@ libXi, libjpeg_turbo, fltk, - xorg, + libxcb-keysyms, opencl-headers, opencl-clhpp, ocl-icd, @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libXv libXtst libXi - xorg.xcbutilkeysyms + libxcb-keysyms opencl-headers opencl-clhpp ocl-icd diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix index b12bec21ab26..6d6e7b297ccf 100644 --- a/pkgs/tools/admin/turbovnc/default.nix +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -25,7 +25,21 @@ which, xkbcomp, xkeyboard_config, - xorg, + tab-window-manager, + libxi, + libxfont_2, + libxext, + libxdmcp, + libxdamage, + libx11, + libsm, + xtrans, + xorgproto, + xauth, + pixman, + libxshmfence, + libxkbfile, + libfontenc, xterm, }: @@ -74,28 +88,26 @@ stdenv.mkDerivation (finalAttrs: { openssl pam perl - ] - ++ (with xorg; [ libfontenc # for -DTVNC_SYSTEMX11=1 - libSM - libX11 - libXdamage # for -DTVNC_SYSTEMX11=1 - libXdmcp # for -DTVNC_SYSTEMX11=1 - libXext - libXfont2 # for -DTVNC_SYSTEMX11=1 + libsm + libx11 + libxdamage # for -DTVNC_SYSTEMX11=1 + libxdmcp # for -DTVNC_SYSTEMX11=1 + libxext + libxfont_2 # for -DTVNC_SYSTEMX11=1 libxkbfile # for -DTVNC_SYSTEMX11=1 libxshmfence - libXi + libxi mesa-gl-headers # for -DTVNC_SYSTEMX11=1 pixman # for -DTVNC_SYSTEMX11=1 xorgproto xtrans # for -DTVNC_SYSTEMX11=1 - ]); + ]; postPatch = '' - substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "Xfont2" X11_Xfont2_LIB' 'set(X11_Xfont2_LIB ${xorg.libXfont2}/lib/libXfont2.so) #' - substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "fontenc" X11_Fontenc_LIB' 'set(X11_Fontenc_LIB ${xorg.libfontenc}/lib/libfontenc.so) #' - substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "pixman-1" X11_Pixman_LIB' 'set(X11_Pixman_LIB ${xorg.pixman}/lib/libpixman-1.so) #' + substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "Xfont2" X11_Xfont2_LIB' 'set(X11_Xfont2_LIB ${libxfont_2}/lib/libXfont2.so) #' + substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "fontenc" X11_Fontenc_LIB' 'set(X11_Fontenc_LIB ${libfontenc}/lib/libfontenc.so) #' + substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "pixman-1" X11_Pixman_LIB' 'set(X11_Pixman_LIB ${pixman}/lib/libpixman-1.so) #' ''; cmakeFlags = [ @@ -143,8 +155,8 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH : ${ lib.makeBinPath [ which - xorg.twm - xorg.xauth + tab-window-manager + xauth xterm ] } diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index bd6c826dcab0..553712f2222b 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -103,7 +103,7 @@ multiStdenv.mkDerivation (finalAttrs: { # Hard code bitbridge & runtime dependencies (replaceVars ./hardcode-dependencies.patch { libdbus = dbus.lib; - libxcb32 = pkgsi686Linux.xorg.libxcb; + libxcb32 = pkgsi686Linux.libxcb; inherit wine; }) diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 393fdd0cedcb..cfa35fd8cdce 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -6,6 +6,7 @@ pkg-config, protobuf, cacert, + nix-update-script, nixosTests, }: let @@ -47,7 +48,7 @@ let env.OPENSSL_NO_VENDOR = true; - # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v2.1.0/nix/compile.nix#L71-L78 + # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v2.2.0/nix/compile.nix#L71-L78 # on version changes for checking if changes are required here buildFeatures = [ "bundled-libs" @@ -63,7 +64,15 @@ let "telemetry-otlp" ]; - passthru.tests = nixosTests."garage_${lib.versions.major version}"; + passthru = { + tests = nixosTests."garage_${lib.versions.major version}"; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v(${lib.versions.major version}\\.[0-9.]+)" + ]; + }; + }; meta = { description = "S3-compatible object store for small self-hosted geo-distributed deployments"; @@ -84,15 +93,15 @@ let in rec { garage_1 = generic { - version = "1.3.0"; - hash = "sha256-6w+jun0UmQHmoXcokGpPM95BbQyOKefTeAelAFKxNCM="; - cargoHash = "sha256-mWLsOTWxzMdDfzEDu+WHJ12SVscEVfBVuOTVFbfnk0g="; + version = "1.3.1"; + hash = "sha256-wkCnJmbulnhzwHvzdpzh9MRceOzmPdhOogffwhqNGPg="; + cargoHash = "sha256-jfYe2A6zkVgTLrWBDbahICSKCRO3FwsBPNSVFapH0Rs="; }; garage_2 = generic { - version = "2.1.0"; - hash = "sha256-GGwF6kVIJ7MPvO6VRj2ebquJEjJQBwpW18P6L2sGVDs="; - cargoHash = "sha256-0pT2fqseN1numJZdC0FFg1JXbDq1YmlmBPQVbOpxtkw="; + version = "2.2.0"; + hash = "sha256-UaWHZPV0/Jgeiwvvr9V9Gqthn5KXErLx8gL4JdBRDVs="; + cargoHash = "sha256-U6Wipvlw3XdKUBNZMznENJ9m+9fzP9Nb6217+Kytu7s="; }; garage = garage_1; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 3f6c1aea1c95..dc10e084b071 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -17,7 +17,7 @@ pango, bash, bison, - xorg, + libxrender, python3, withXorg ? true, @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { pango bash ] - ++ optionals withXorg (with xorg; [ libXrender ]); + ++ optionals withXorg [ libxrender ]; hardeningDisable = [ "fortify" ]; @@ -68,7 +68,8 @@ stdenv.mkDerivation rec { "--with-ltdl-lib=${libtool.lib}/lib" "--with-ltdl-include=${libtool}/include" ] - ++ optional (xorg == null) "--without-x"; + # TODO: this should probably be !withXorg instead of false, however it causes 17k rebuilds + ++ optional false "--without-x"; enableParallelBuilding = true; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index adf43ad5a74b..926af6d0cd00 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libxtst, pkg-config, wrapGAppsHook3, go, @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libXtst + libxtst ]; preConfigure = '' diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix index 92dc9f5d0683..e25704c14b21 100644 --- a/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -5,7 +5,7 @@ fetchpatch, pkg-config, autoreconfHook, - xorg, + libxaw, freetype, }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libXaw + libxaw freetype ]; diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index fef3147a5641..bc4ced40e54f 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -6,7 +6,7 @@ pkg-config, SDL2, qttools, - xorg, + libxtst, fetchFromGitHub, itstool, udevCheckHook, @@ -33,7 +33,7 @@ mkDerivation rec { buildInputs = [ SDL2 qttools - xorg.libXtst + libxtst ]; postPatch = '' diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 6a2951c56aa9..79909f09742f 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -206,14 +206,13 @@ let in utils // { - coreboot-utils = - (buildEnv { - name = "coreboot-utils-${version}"; - paths = lib.filter (lib.meta.availableOn stdenv.hostPlatform) (lib.attrValues utils); - postBuild = "rm -rf $out/sbin"; - }) - // { + coreboot-utils = ( + buildEnv { + pname = "coreboot-utils"; inherit version; meta = commonMeta; - }; + paths = lib.filter (lib.meta.availableOn stdenv.hostPlatform) (lib.attrValues utils); + postBuild = "rm -rf $out/sbin"; + } + ); } diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index d70ee0ede206..8f6563cd2fb3 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, makeWrapper, - xorg, + xvfb, getopt, xauth, util-linux, @@ -53,7 +53,7 @@ stdenvNoCC.mkDerivation { --prefix PATH : ${ lib.makeBinPath [ getopt - xorg.xvfb + xvfb xauth which util-linux diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index a856cb60b7f8..dc3ae3bec622 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -22,7 +22,18 @@ nss, pango, systemd, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, autoPatchelfHook, wrapGAppsHook3, runtimeShell, @@ -66,18 +77,18 @@ stdenv.mkDerivation rec { nss pango systemd - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxcb libdrm libgbm ]; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index ae4917f9996b..71c598a69680 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -10,16 +10,16 @@ zlib, libiconv, libpng, - libX11, + libx11, freetype, ttfautohint, gd, - libXaw, + libxaw, icu, ghostscript, - libXpm, - libXmu, - libXext, + libxpm, + libxmu, + libxext, perl, perlPackages, python3Packages, @@ -37,7 +37,8 @@ brotli, cairo, pixman, - xorg, + libxi, + libxfixes, clisp, biber, woff2, @@ -414,7 +415,7 @@ rec { harfbuzz icu graphite2 - libX11 + libx11 potrace ]; @@ -751,17 +752,15 @@ rec { core # kpathsea freetype ghostscript - ] - ++ (with xorg; [ - libX11 - libXaw - libXi - libXpm - libXmu - libXaw - libXext - libXfixes - ]); + libx11 + libxaw + libxi + libxpm + libxmu + libxaw + libxext + libxfixes + ]; preConfigure = "cd texk/xdvik"; @@ -785,7 +784,7 @@ rec { inherit (common) src; - buildInputs = [ libX11 ]; + buildInputs = [ libx11 ]; preConfigure = "cd utils/xpdfopen"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 117509bec4f1..d2686039707a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -551,6 +551,7 @@ mapAliases { devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11 dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03 discord-screenaudio = throw "discord-screenaudio has been removed because it was archived upstream. Use vesktop instead."; # added 2025-11-29 + DisnixWebService = warnAlias "'DisnixWebService' has been renamed to 'disnix-web-service'" disnix-web-service; # Added 2026-01-14 dleyna-connector-dbus = throw "'dleyna-connector-dbus' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27 dleyna-core = throw "'dleyna-core' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27 dleyna-renderer = throw "'dleyna-renderer' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27 @@ -1801,6 +1802,7 @@ mapAliases { vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11 vboot_reference = vboot-utils; # Added 2025-11-01 vc_0_7 = throw "'vc_0_7' has been removed as it was broken, unused in nixpkgs and unmaintained"; # Added 2025-10-20 + vdhcoapp = throw "VDH >= 10 doesn't require a companion app and the repo has been archived."; # Added 2026-01-26 vdirsyncerStable = throw "'vdirsyncerStable' has been renamed to/replaced by 'vdirsyncer'"; # Converted to throw 2025-10-27 ventoy-bin = throw "'ventoy-bin' has been renamed to/replaced by 'ventoy'"; # Converted to throw 2025-10-27 ventoy-bin-full = throw "'ventoy-bin-full' has been renamed to/replaced by 'ventoy-full'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f052649a5878..78d079aea4fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3741,9 +3741,7 @@ with pkgs; ttfautohint-nox = ttfautohint.override { enableGUI = false; }; - twilight = callPackage ../tools/graphics/twilight { - libX11 = xorg.libX11; - }; + twilight = callPackage ../tools/graphics/twilight { }; twitch-chat-downloader = python3Packages.callPackage ../applications/misc/twitch-chat-downloader @@ -3816,7 +3814,7 @@ with pkgs; truecrack-cuda = truecrack.override { cudaSupport = true; }; turbovnc = callPackage ../tools/admin/turbovnc { - # fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; + # fontDirectories = [ font-adobe-75dpi font-misc-misc font-cursor-misc font-bh-lucidatypewriter-75dpi ]; libjpeg_turbo = libjpeg_turbo.override { enableJava = true; }; }; @@ -5202,14 +5200,9 @@ with pkgs; }; }; - dbqn = callPackage ../by-name/db/dbqn/package.nix { - jdk = jre; - stdenv = stdenvNoCC; - }; - dbqn-native = dbqn.override { buildNativeImage = true; - jdk = graalvmPackages.graalvm-ce; + jre = graalvmPackages.graalvm-ce; }; clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter { @@ -6996,9 +6989,7 @@ with pkgs; x11Support = false; }; - imlibsetroot = callPackage ../applications/graphics/imlibsetroot { - libXinerama = xorg.libXinerama; - }; + imlibsetroot = callPackage ../applications/graphics/imlibsetroot { }; indilib = callPackage ../development/libraries/science/astronomy/indilib { }; indi-3rdparty = recurseIntoAttrs ( @@ -8088,7 +8079,7 @@ with pkgs; libmagic = file; }; - xcb-util-cursor = xorg.xcbutilcursor; + xcb-util-cursor = libxcb-cursor; xgboostWithCuda = xgboost.override { cudaSupport = true; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 6055b609e506..f2d8cb4d20eb 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -66,7 +66,7 @@ let emacsWithPackages = { pkgs, lib }: pkgs.callPackage ../applications/editors/emacs/build-support/wrapper.nix { - inherit (pkgs.xorg) lndir; + inherit (pkgs) lndir; inherit lib; }; diff --git a/pkgs/top-level/nim-overrides.nix b/pkgs/top-level/nim-overrides.nix index 4e45ddf5cff3..3f0c587162a8 100644 --- a/pkgs/top-level/nim-overrides.nix +++ b/pkgs/top-level/nim-overrides.nix @@ -9,7 +9,9 @@ raylib, SDL2, tkrzw, - xorg, + libxinerama, + libxft, + libx11, }: # The following is list of overrides that take two arguments each: @@ -105,13 +107,11 @@ ... }: { - buildInputs = - buildInputs - ++ (with xorg; [ - libX11 - libXft - libXinerama - ]); + buildInputs = buildInputs ++ [ + libx11 + libxft + libxinerama + ]; }; zippy = diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 323e892019ba..29e619bb19de 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14544,7 +14544,7 @@ with self; pkgs.freetype pkgs.libpng pkgs.fontconfig - pkgs.xorg.libXpm + pkgs.libxpm ExtUtilsPkgConfig TestFork TestNoWarnings @@ -14559,7 +14559,7 @@ with self; "--lib_zlib_path=${pkgs.zlib.out}" "--lib_ft_path=${pkgs.freetype.out}" "--lib_fontconfig_path=${pkgs.fontconfig.lib}" - "--lib_xpm_path=${pkgs.xorg.libXpm.out}" + "--lib_xpm_path=${pkgs.libxpm.out}" ]; meta = { @@ -26611,10 +26611,10 @@ with self; pkgs.libGL pkgs.libGLU pkgs.libglut - pkgs.xorg.libX11 - pkgs.xorg.libXi - pkgs.xorg.libXmu - pkgs.xorg.libXext + pkgs.libx11 + pkgs.libxi + pkgs.libxmu + pkgs.libxext pkgs.xdummy ]; @@ -27584,8 +27584,8 @@ with self; ++ (with pkgs; [ gsl libglut - xorg.libXmu - xorg.libXi + libxmu + libxi ]); propagatedBuildInputs = [ @@ -37102,11 +37102,11 @@ with self; ''; makeMakerFlags = [ "AR=${pkgs.stdenv.cc.targetPrefix}ar" - "X11INC=${pkgs.xorg.libX11.dev}/include" - "X11LIB=${pkgs.xorg.libX11.out}/lib" + "X11INC=${pkgs.libx11.dev}/include" + "X11LIB=${pkgs.libx11.out}/lib" ]; buildInputs = [ - pkgs.xorg.libX11 + pkgs.libx11 pkgs.libpng ]; env = lib.optionalAttrs stdenv.cc.isGNU { @@ -37131,8 +37131,8 @@ with self; hash = "sha256-Rj4oTsRxN+fEJclpGwKo3sXOJytY6h9jWa6AQaI53Q8="; }; makeMakerFlags = [ - "X11INC=${pkgs.xorg.libX11.dev}/include" - "X11LIB=${pkgs.xorg.libX11.out}/lib" + "X11INC=${pkgs.libx11.dev}/include" + "X11LIB=${pkgs.libx11.out}/lib" ]; buildInputs = [ Tk ]; doCheck = false; # Expects working X11. @@ -38212,12 +38212,12 @@ with self; hash = "sha256-2P3cB455ge4xt2CMZTZFyyDwFr3dx8VQtNUn79NiR0g="; }; buildInputs = [ - pkgs.xorg.libXext - pkgs.xorg.libXScrnSaver - pkgs.xorg.libX11 + pkgs.libxext + pkgs.libxscrnsaver + pkgs.libx11 ]; propagatedBuildInputs = [ InlineC ]; - patchPhase = "sed -i -e 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm"; + patchPhase = "sed -i -e 's,-L/usr/X11R6/lib/,-L${pkgs.libx11.out}/lib/ -L${pkgs.libxext.out}/lib/ -L${pkgs.libxscrnsaver}/lib/,' IdleTime.pm"; meta = { description = "Get the idle time of X11"; license = with lib.licenses; [ @@ -38274,10 +38274,10 @@ with self; hash = "sha256-3O7eU3AGEP/xQtydXE5M0DcMiKTysTcfnL9NjYzm9ks="; }; buildInputs = [ - pkgs.xorg.libX11 - pkgs.xorg.libXi - pkgs.xorg.libXt - pkgs.xorg.libXtst + pkgs.libx11 + pkgs.libxi + pkgs.libxt + pkgs.libxtst ]; NIX_CFLAGS_LINK = "-lX11"; doCheck = false; # requires an X server @@ -38306,10 +38306,10 @@ with self; env.AUTOMATED_TESTING = false; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ - pkgs.xorg.libxcb - pkgs.xorg.xcbproto - pkgs.xorg.xcbutil - pkgs.xorg.xcbutilwm + pkgs.libxcb + pkgs.xcb-proto + pkgs.libxcb-util + pkgs.libxcb-wm ExtUtilsDepends ExtUtilsPkgConfig TestDeep diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 982a8c4e8471..d8aca0fd735e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3458,6 +3458,8 @@ self: super: with self; { cytoolz = callPackage ../development/python-modules/cytoolz { }; + cyvest = callPackage ../development/python-modules/cyvest { }; + dacite = callPackage ../development/python-modules/dacite { }; daemonize = callPackage ../development/python-modules/daemonize { }; @@ -4778,7 +4780,7 @@ self: super: with self; { ec2-metadata = callPackage ../development/python-modules/ec2-metadata { }; - ec2instanceconnectcli = callPackage ../tools/virtualization/ec2instanceconnectcli { }; + ec2instanceconnectcli = callPackage ../development/python-modules/ec2instanceconnectcli { }; eccodes = toPythonModule ( pkgs.eccodes.override { @@ -6420,7 +6422,7 @@ self: super: with self; { google-cloud-workstations = callPackage ../development/python-modules/google-cloud-workstations { }; - google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + google-compute-engine = callPackage ../development/python-modules/google-compute-engine { }; google-crc32c = callPackage ../development/python-modules/google-crc32c { inherit (pkgs) crc32c; }; @@ -9126,6 +9128,8 @@ self: super: with self; { logster = callPackage ../development/python-modules/logster { }; + logurich = callPackage ../development/python-modules/logurich { }; + loguru = callPackage ../development/python-modules/loguru { }; loguru-logging-intercept = callPackage ../development/python-modules/loguru-logging-intercept { }; @@ -9406,7 +9410,7 @@ self: super: with self; { mattermostdriver = callPackage ../development/python-modules/mattermostdriver { }; - maubot = callPackage ../tools/networking/maubot { }; + maubot = callPackage ../development/python-modules/maubot { }; mautrix = callPackage ../development/python-modules/mautrix { }; @@ -10154,6 +10158,8 @@ self: super: with self; { multiprocess = callPackage ../development/python-modules/multiprocess { }; + multiregex = callPackage ../development/python-modules/multiregex { }; + multiscale-spatial-image = callPackage ../development/python-modules/multiscale-spatial-image { }; multiset = callPackage ../development/python-modules/multiset { }; @@ -12211,8 +12217,8 @@ self: super: with self; { libwebp openjpeg zlib-ng + libxcb ; - inherit (pkgs.xorg) libxcb; }; pillow-heif = callPackage ../development/python-modules/pillow-heif { }; @@ -15723,12 +15729,13 @@ self: super: with self; { pythonocc-core = toPythonModule ( callPackage ../development/python-modules/pythonocc-core { - inherit (pkgs) fontconfig rapidjson; - inherit (pkgs.xorg) - libX11 - libXi - libXmu - libXext + inherit (pkgs) + fontconfig + rapidjson + libx11 + libxi + libxmu + libxext ; } ); @@ -20019,7 +20026,7 @@ self: super: with self; { ueagle = callPackage ../development/python-modules/ueagle { }; ueberzug = callPackage ../development/python-modules/ueberzug { - inherit (pkgs.xorg) libX11 libXext; + inherit (pkgs) libx11 libxext; }; ufal-chu-liu-edmonds = callPackage ../development/python-modules/ufal-chu-liu-edmonds { }; @@ -21056,9 +21063,9 @@ self: super: with self; { youtokentome = callPackage ../development/python-modules/youtokentome { }; - youtube-dl = callPackage ../tools/misc/youtube-dl { }; + youtube-dl = callPackage ../development/python-modules/youtube-dl { }; - youtube-dl-light = callPackage ../tools/misc/youtube-dl { ffmpegSupport = false; }; + youtube-dl-light = callPackage ../development/python-modules/youtube-dl { ffmpegSupport = false; }; youtube-search = callPackage ../development/python-modules/youtube-search { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 926a132a3805..34edecf6d968 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -134,8 +134,7 @@ let inherit lib; inherit (self) config; inherit (self) runtimeShell stdenv stdenvNoCC; - inherit (self.pkgsBuildHost) jq shellcheck-minimal; - inherit (self.pkgsBuildHost.xorg) lndir; + inherit (self.pkgsBuildHost) jq shellcheck-minimal lndir; }; stdenvBootstappingAndPlatforms =