diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 4aed9617cae4..3458e78b5577 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -10,18 +10,18 @@ Some architectural notes about key decisions and concepts in our workflows: Thus they should be lowered to the minimum with `permissions: {}` in every workflow by default. - By definition `pull_request_target` runs in the context of the **base** of the pull request. - This means, that the workflow files to run will be taken from the base branch, not the PR, and actions/checkout will not checkout the PR, but the base branch, by default. + This means that the workflow files to run will be taken from the base branch, not the PR, and actions/checkout will not checkout the PR, but the base branch, by default. To protect our secrets, we need to make sure to **never execute code** from the pull request and always evaluate or build nix code from the pull request with the **sandbox enabled**. - To test the pull request's contents, we checkout the "test merge commit". - This is a temporary commit that GitHub creates automatically as "what would happen, if this PR was merged into the base branch now?". + This is a temporary commit that GitHub creates automatically as "what would happen if this PR was merged into the base branch now?". The checkout could be done via the virtual branch `refs/pull//merge`, but doing so would cause failures when this virtual branch doesn't exist (anymore). This can happen when the PR has conflicts, in which case the virtual branch is not created, or when the PR is getting merged while workflows are still running, in which case the branch won't exist anymore at the time of checkout. Thus, we use the `prepare` job to check whether the PR is mergeable and the test merge commit exists and only then run the relevant jobs. - Various workflows need to make comparisons against the base branch. In this case, we checkout the parent of the "test merge commit" for best results. - Note, that this is not necessarily the same as the default commit that actions/checkout would use, which is also a commit from the base branch (see above), but might be older. + Note that this is not necessarily the same as the default commit that actions/checkout would use, which is also a commit from the base branch (see above), but might be older. ## Terminology diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a03d96437700..2e1dfa237ea9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -680,7 +680,7 @@ If you have any problems with formatting, please ping the [formatting team](http { buildInputs = if stdenv.hostPlatform.isDarwin then [ iconv ] else null; } ``` - As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild. + As an exception, an explicit conditional expression with null can be used when fixing an important bug without triggering a mass rebuild. If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`. - Any style choices not covered here but that can be expressed as general rules should be left at the discretion of the authors of changes and _not_ commented in reviews. @@ -865,7 +865,7 @@ If someone approved and didn't merge a few days later, they most likely just for Please see it as your responsibility to actively remind reviewers of your open PRs. The easiest way to do so is to notify them via GitHub. -Github notifies people involved, whenever you add a comment or push to your PR or re-request their review. +GitHub notifies people involved, whenever you add a comment or push to your PR or re-request their review. Doing any of that will get their attention again. Everyone deserves proper attention, and yes, that includes you! However, please be mindful that committers can sadly not always give everyone the attention they deserve. diff --git a/README.md b/README.md index 1a4b04896144..62e7df0febab 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ For more information about contributing to the project, please visit the [contri The infrastructure for NixOS and related projects is maintained by a nonprofit organization, the [NixOS Foundation](https://nixos.org/nixos/foundation.html). To ensure the continuity and expansion of the NixOS infrastructure, we are looking for donations to our organization. -You can donate to the NixOS foundation through [SEPA bank transfers](https://nixos.org/donate.html) or by using Open Collective: +You can donate to the NixOS Foundation through [SEPA bank transfers](https://nixos.org/donate.html) or by using Open Collective: diff --git a/ci/README.md b/ci/README.md index df5b196c49a4..be0e8e4c4fca 100644 --- a/ci/README.md +++ b/ci/README.md @@ -24,7 +24,7 @@ The Nixpkgs merge bot empowers package maintainers by enabling them to merge PRs It serves as a bridge for maintainers to quickly respond to user feedback, facilitating a more self-reliant approach. Especially when considering there are roughly 20 maintainers for every committer, this bot is a game-changer. -Following [RFC 172] the merge bot was originally implemented as a [python webapp](https://github.com/NixOS/nixpkgs-merge-bot), which has now been integrated into [`ci/github-script/bot.js`](./github-script/bot.js) and [`ci/github-script/merge.js`](./github-script/merge.js). +Following [RFC 172], the merge bot was originally implemented as a [python webapp](https://github.com/NixOS/nixpkgs-merge-bot), which has now been integrated into [`ci/github-script/bot.js`](./github-script/bot.js) and [`ci/github-script/merge.js`](./github-script/merge.js). ### Using the merge bot diff --git a/ci/eval/README.md b/ci/eval/README.md index 1cbb400552c7..9a7aace26851 100644 --- a/ci/eval/README.md +++ b/ci/eval/README.md @@ -19,7 +19,7 @@ The following arguments can be used to fine-tune performance: - `--max-jobs`: The maximum number of derivations to run at the same time. Only each [supported system](../supportedSystems.json) gets a separate derivation, so it doesn't make sense to set this higher than that number. - `--cores`: The number of cores to use for each job. - Recommended to set this to the amount of cores on your system divided by `--max-jobs`. + Recommended to set this to the number of cores on your system divided by `--max-jobs`. - `--arg chunkSize`: The number of attributes that are evaluated simultaneously on a single core. Lowering this decreases memory usage at the cost of increased evaluation time. If this is too high, there won't be enough chunks to process them in parallel, and will also increase evaluation time. diff --git a/doc/README.md b/doc/README.md index 6ac3edc8af62..c8e0189a2a19 100644 --- a/doc/README.md +++ b/doc/README.md @@ -111,7 +111,7 @@ This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/us #### HTML Inlining HTML is not allowed. -Parts of the documentation gets rendered to various non-HTML formats, such as man pages in the case of NixOS manual. +Parts of the documentation get rendered to various non-HTML formats, such as man pages in the case of NixOS manual. #### Roles @@ -407,7 +407,7 @@ To define a referenceable figure use the following fencing: ::: ``` -Defining figures through the `figure` fencing class adds them to a `List of Figures` after the `Table of Contents`. +Defining figures through the `figure` fencing class adds them to a `List of Figures` after the `Table of Contents`. Though this is not shown in the rendered documentation on nixos.org. #### Footnotes diff --git a/doc/build-helpers/dev-shell-tools.chapter.md b/doc/build-helpers/dev-shell-tools.chapter.md index 12018cd76cee..2571380a3e06 100644 --- a/doc/build-helpers/dev-shell-tools.chapter.md +++ b/doc/build-helpers/dev-shell-tools.chapter.md @@ -4,7 +4,7 @@ The `nix-shell` command has popularized the concept of transient shell environme However, `nix-shell` is not the only way to create such environments, and even `nix-shell` itself can indirectly benefit from this library. @@ -60,7 +60,7 @@ devShellTools.unstructuredDerivationInputEnv { #} ``` -Note that `args` is not included, because Nix does not added it to the builder process environment. +Note that `args` is not included, because Nix does not add it to the builder process environment. ::: diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index e2ac6640ef6c..3bd2d0751fb7 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -536,7 +536,7 @@ See [](#chap-pkgs-fetchers-caveats) for more details on how to work with the `ha Returns a [fixed-output derivation](https://nixos.org/manual/nix/stable/glossary.html#gloss-fixed-output-derivation) which downloads an archive from a given URL and decompresses it. Despite its name, `fetchzip` is not limited to `.zip` files but can also be used with [various compressed tarball formats](#tar-files) by default. -This can extended by specifying additional attributes, see [](#ex-fetchers-fetchzip-rar-archive) to understand how to do that. +This can be extended by specifying additional attributes, see [](#ex-fetchers-fetchzip-rar-archive) to understand how to do that. ### Inputs {#sec-pkgs-fetchers-fetchzip-inputs} @@ -765,7 +765,7 @@ Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `hash` ## `fetchgit` {#fetchgit} -Used with Git. Expects `url` to a Git repo, `rev` or `tag`, and `hash`. `rev` in this case can be full the git commit id (SHA1 hash), or use `tag` for a tag name like `refs/tags/v1.0`. +Used with Git. Expects `url` to a Git repo, `rev` or `tag`, and `hash`. `rev` in this case can be the full git commit id (SHA1 hash), or use `tag` for a tag name like `refs/tags/v1.0`. If you want to fetch a tag you should pass the `tag` parameter instead of `rev` which has the same effect as setting `rev = "refs/tags"/${version}"`. This is safer than just setting `rev = version` w.r.t. possible branch and tag name conflicts. @@ -799,7 +799,7 @@ Additionally, the following optional arguments can be given: *`deepClone`* (Boolean) -: Clone the entire repository as opposing to just creating a shallow clone. +: Clone the entire repository as opposed to just creating a shallow clone. This implies `leaveDotGit`. *`fetchTags`* (Boolean) diff --git a/doc/build-helpers/fixed-point-arguments.chapter.md b/doc/build-helpers/fixed-point-arguments.chapter.md index 78fc2ac65a89..af6d5912ce37 100644 --- a/doc/build-helpers/fixed-point-arguments.chapter.md +++ b/doc/build-helpers/fixed-point-arguments.chapter.md @@ -8,7 +8,7 @@ Build helpers don't always support fixed-point arguments yet, as support in [`st Developers can use the Nixpkgs library function [`lib.customisation.extendMkDerivation`](#function-library-lib.customisation.extendMkDerivation) to define a build helper supporting fixed-point arguments from an existing one with such support, with an attribute overlay similar to the one taken by [`.overrideAttrs`](#sec-pkg-overrideAttrs). -Besides overriding, `lib.extendMkDerivation` also supports `excludeDrvArgNames` to optionally exclude some arguments in the input fixed-point arguments from passing down the base build helper (specified as `constructDrv`). +Besides overriding, `lib.extendMkDerivation` also supports `excludeDrvArgNames` to optionally exclude some arguments in the input fixed-point arguments from passing down to the base build helper (specified as `constructDrv`). :::{.example #ex-build-helpers-extendMkDerivation} diff --git a/doc/build-helpers/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md index 091c9fc6d62d..5fcfb5964a80 100644 --- a/doc/build-helpers/images/dockertools.section.md +++ b/doc/build-helpers/images/dockertools.section.md @@ -73,7 +73,7 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has A value of `null` means that `buildImage` will use the first image available in the repository. :::{.note} - This must be used with `fromImageName`. Using only `fromImageTag` without `fromImageName` will make `buildImage` use the first image available in the repository + This must be used with `fromImageName`. Using only `fromImageTag` without `fromImageName` will make `buildImage` use the first image available in the repository. ::: _Default value:_ `null`. @@ -1013,7 +1013,7 @@ Because of this, using this function requires the `kvm` device to be available, A value of `null` means that `exportImage` will use the first image available in the repository. :::{.note} - This must be used with `fromImageName`. Using only `fromImageTag` without `fromImageName` will make `exportImage` use the first image available in the repository + This must be used with `fromImageName`. Using only `fromImageTag` without `fromImageName` will make `exportImage` use the first image available in the repository. ::: _Default value:_ `null`. @@ -1145,7 +1145,7 @@ $ file /nix/store/by3f40xvc4l6bkis74l0fj4zsy0djgkn-hello.tar.gz /nix/store/by3f40xvc4l6bkis74l0fj4zsy0djgkn-hello.tar.gz: POSIX tar archive (GNU) ``` -If the archive was actually compressed, the output of file would've mentioned that fact. +If the archive was actually compressed, the output of `file` would've mentioned that fact. Because of this, it may be important to set a proper `name` attribute when using `exportImage` with other functions from `dockerTools`. ::: diff --git a/doc/build-helpers/images/makediskimage.section.md b/doc/build-helpers/images/makediskimage.section.md index 18cffd270b71..4aa0760e65e3 100644 --- a/doc/build-helpers/images/makediskimage.section.md +++ b/doc/build-helpers/images/makediskimage.section.md @@ -8,7 +8,7 @@ This function can create images in two ways: - using a virtual machine to create a full NixOS installation. When testing early-boot or lifecycle parts of NixOS such as a bootloader or multiple generations, it is necessary to opt for a full NixOS system installation. -Whereas for many web servers, applications, it is possible to work with a Nix store only disk image and is faster to build. +Whereas for many web servers and applications, it is possible to work with a Nix store only disk image, which is faster to build. NixOS tests also use this function when preparing the VM. The `cptofs` method is used when `virtualisation.useBootLoader` is false (the default). Otherwise the second method is used. @@ -39,7 +39,7 @@ Features are separated in various sections depending on if you opt for a Nix-sto ### On bit-to-bit reproducibility {#sec-make-disk-image-features-reproducibility} -Images are **NOT** deterministic, please do not hesitate to try to fix this, source of determinisms are (not exhaustive) : +Images are **NOT** deterministic. Please do not hesitate to try to fix this. Sources of non-determinism are (not exhaustive): - bootloader installation has timestamps - SQLite Nix store database contains registration times diff --git a/doc/build-helpers/images/ocitools.section.md b/doc/build-helpers/images/ocitools.section.md index 88011bda79e1..0ed33cad3ac9 100644 --- a/doc/build-helpers/images/ocitools.section.md +++ b/doc/build-helpers/images/ocitools.section.md @@ -5,8 +5,8 @@ It makes no assumptions about the container runner you choose to use to run the The set of functions in `pkgs.ociTools` currently does not handle the [OCI image specification](https://github.com/opencontainers/image-spec). -At a high-level an OCI implementation would download an OCI Image then unpack that image into an OCI Runtime filesystem bundle. -At this point the OCI Runtime Bundle would be run by an OCI Runtime. +At a high level, an OCI implementation would download an OCI Image then unpack that image into an OCI Runtime filesystem bundle. +At this point, the OCI Runtime Bundle would be run by an OCI Runtime. `pkgs.ociTools` provides utilities to create OCI Runtime bundles. ## buildContainer {#ssec-pkgs-ociTools-buildContainer} @@ -54,7 +54,7 @@ Note that no user namespace is created, which means that you won't be able to ru `os` **DEPRECATED** -: Specifies the operating system on which the container filesystem is based on. +: Specifies the operating system on which the container filesystem is based. If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/main/config.md#properties). According to the linked specification, all possible values for `$GOOS` in [the Go docs](https://go.dev/doc/install/source#environment) should be valid, but will commonly be one of `darwin` or `linux`. diff --git a/doc/build-helpers/special/checkpoint-build.section.md b/doc/build-helpers/special/checkpoint-build.section.md index bc4616cd2486..3584a7a44261 100644 --- a/doc/build-helpers/special/checkpoint-build.section.md +++ b/doc/build-helpers/special/checkpoint-build.section.md @@ -6,7 +6,7 @@ For hermeticity, Nix derivations do not allow any state to be carried over betwe However, we can tell Nix explicitly what the previous build state was, by representing that previous state as a derivation output. This allows the passed build state to be used for an incremental build. -To change a normal derivation to a checkpoint based build, these steps must be taken: +To change a normal derivation to a checkpoint-based build, these steps must be taken: ```nix { checkpointArtifacts = (pkgs.checkpointBuildTools.prepareCheckpointBuild pkgs.virtualbox); diff --git a/doc/build-helpers/special/fhs-environments.section.md b/doc/build-helpers/special/fhs-environments.section.md index 69d830a32313..9a015f241453 100644 --- a/doc/build-helpers/special/fhs-environments.section.md +++ b/doc/build-helpers/special/fhs-environments.section.md @@ -14,11 +14,11 @@ Accepted arguments are: - `executableName` The name of the wrapper executable. Defaults to `pname` if set, or `name` otherwise. - `targetPkgs` - Packages to be installed for the main host's architecture (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also installed. + Packages to be installed for the main host's architecture (i.e. x86_64 on x86_64 installations). Along with libraries, binaries are also installed. - `multiPkgs` Packages to be installed for all architectures supported by a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are installed by default. - `multiArch` - Whether to install 32bit multiPkgs into the FHSEnv in 64bit environments + Whether to install 32-bit multiPkgs into the FHSEnv in 64-bit environments - `extraBuildCommands` Additional commands to be executed for finalizing the directory structure. - `extraBuildCommandsMulti` diff --git a/doc/build-helpers/special/makesetuphook.section.md b/doc/build-helpers/special/makesetuphook.section.md index 7b83653296eb..0823851aa37e 100644 --- a/doc/build-helpers/special/makesetuphook.section.md +++ b/doc/build-helpers/special/makesetuphook.section.md @@ -1,6 +1,6 @@ # pkgs.makeSetupHook {#sec-pkgs.makeSetupHook} -`pkgs.makeSetupHook` is a build helper that produces hooks that go in to `nativeBuildInputs` +`pkgs.makeSetupHook` is a build helper that produces hooks that go into `nativeBuildInputs` ## Usage {#sec-pkgs.makeSetupHook-usage} diff --git a/doc/build-helpers/special/vm-tools.section.md b/doc/build-helpers/special/vm-tools.section.md index 47988eb3f4a1..47f048e3c842 100644 --- a/doc/build-helpers/special/vm-tools.section.md +++ b/doc/build-helpers/special/vm-tools.section.md @@ -136,7 +136,7 @@ A set of functions that build a predefined set of minimal Linux distributions im ### Attributes {#vm-tools-diskImageFuns-attributes} * `size` (optional, defaults to `4096`). The size of the image, in MiB. -* `extraPackages` (optional). A list names of additional packages from the distribution that should be included in the image. +* `extraPackages` (optional). A list of names of additional packages from the distribution that should be included in the image. ### Examples {#vm-tools-diskImageFuns-examples} diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md index 49407c6e9b8e..a7741e96562b 100644 --- a/doc/build-helpers/testers.chapter.md +++ b/doc/build-helpers/testers.chapter.md @@ -63,7 +63,7 @@ Note the moduleNames used in cmake find_package are case sensitive. Check a packaged static site's links with the [`lychee` package](https://search.nixos.org/packages?show=lychee&type=packages&query=lychee). You may use Nix to reproducibly build static websites, such as for software documentation. -Some packages will install documentation in their `out` or `doc` outputs, or maybe you have dedicated package where you've made your static site reproducible by running a generator, such as [Hugo](https://gohugo.io/) or [mdBook](https://rust-lang.github.io/mdBook/), in a derivation. +Some packages will install documentation in their `out` or `doc` outputs, or maybe you have a dedicated package where you've made your static site reproducible by running a generator, such as [Hugo](https://gohugo.io/) or [mdBook](https://rust-lang.github.io/mdBook/), in a derivation. If you have a static site that can be built with Nix, you can use `lycheeLinkCheck` to check that the hyperlinks in your site are correct, and do so as part of your Nix workflow and CI. @@ -578,7 +578,7 @@ Use the derivation hash to invalidate the output via name, for testing. Type: `(a@{ name, ... } -> Derivation) -> a -> Derivation` -Normally, fixed output derivations can and should be cached by their output hash only, but for testing we want to re-fetch everytime the fetcher changes. +Normally, fixed output derivations can and should be cached by their output hash only, but for testing we want to re-fetch every time the fetcher changes. Changes to the fetcher become apparent in the drvPath, which is a hash of how to fetch, rather than a fixed store path. By inserting this hash into the name, we can make sure to re-run the fetcher every time the fetcher changes. diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md index 25c49a79ee6b..c7dbded893a8 100644 --- a/doc/build-helpers/trivial-build-helpers.chapter.md +++ b/doc/build-helpers/trivial-build-helpers.chapter.md @@ -8,7 +8,7 @@ Like [`stdenv.mkDerivation`](#sec-using-stdenv), each of these build helpers cre The function `runCommandWith` returns a derivation built using the specified command(s), in a specified environment. -It is the underlying base function of all [`runCommand*` variants]. +It is the underlying base function of all [`runCommand*` variants]. The general behavior is controlled via a single attribute set passed as the first argument, and allows specifying `stdenv` freely. @@ -45,7 +45,7 @@ runCommandWith :: { ::: `stdenv` (Derivation) -: The [standard environment](#chap-stdenv) to use, defaulting to `pkgs.stdenv` +: The [standard environment](#chap-stdenv) to use, defaulting to `pkgs.stdenv`. `derivationArgs` (Attribute set) : Additional arguments for [`mkDerivation`](#sec-using-stdenv). @@ -160,7 +160,7 @@ runCommandWith { inherit name derivationArgs; } buildCommand ## Writing text files {#trivial-builder-text-writing} Nixpkgs provides the following functions for producing derivations which write text files or executable scripts into the Nix store. -They are useful for creating files from Nix expression, and are all implemented as convenience wrappers around `writeTextFile`. +They are useful for creating files from Nix expressions, and are all implemented as convenience wrappers around `writeTextFile`. Each of these functions will cause a derivation to be produced. When you coerce the result of each of these functions to a string with [string interpolation](https://nixos.org/manual/nix/stable/language/string-interpolation) or [`toString`](https://nixos.org/manual/nix/stable/language/builtins#builtins-toString), it will evaluate to the [store path](https://nixos.org/manual/nix/stable/store/store-path) of this derivation. @@ -682,7 +682,7 @@ writeTextFile { ## `concatTextFile`, `concatText`, `concatScript` {#trivial-builder-concatText} These functions concatenate `files` to the Nix store in a single file. This is useful for configuration files structured in lines of text. `concatTextFile` takes an attribute set and expects two arguments, `name` and `files`. `name` corresponds to the name used in the Nix store path. `files` will be the files to be concatenated. You can also set `executable` to true to make this file have the executable bit set. -`concatText` and`concatScript` are simple wrappers over `concatTextFile`. +`concatText` and `concatScript` are simple wrappers over `concatTextFile`. Here are a few examples: ```nix diff --git a/doc/development/opening-issues.chapter.md b/doc/development/opening-issues.chapter.md index 2b82efae593a..230895e163a0 100644 --- a/doc/development/opening-issues.chapter.md +++ b/doc/development/opening-issues.chapter.md @@ -2,6 +2,6 @@ * Make sure you have a [GitHub account](https://github.com/signup/free) * Make sure there is no open issue on the topic -* [Submit a new issue](https://github.com/NixOS/nixpkgs/issues/new/choose) by choosing the kind of topic and fill out the template +* [Submit a new issue](https://github.com/NixOS/nixpkgs/issues/new/choose) by choosing the kind of topic and filling out the template diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index 5b4c54ef4cd6..a4ff07bf5a63 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -28,7 +28,7 @@ Packages, including the Nix packages collection, are distributed through [channels](https://nixos.org/nix/manual/#sec-channels). The collection is distributed for users of Nix on non-NixOS distributions through the channel `nixpkgs-unstable`. Users of NixOS generally use one of the `nixos-*` channels, -e.g. `nixos-22.11`, which includes all packages and modules for the stable NixOS +e.g., `nixos-22.11`, which includes all packages and modules for the stable NixOS 22.11. Stable NixOS releases are generally only given security updates. More up-to-date packages and modules are available via the `nixos-unstable` channel. @@ -36,7 +36,7 @@ security updates. More up-to-date packages and modules are available via the Both `nixos-unstable` and `nixpkgs-unstable` follow the `master` branch of the Nixpkgs repository, although both do lag the `master` branch by generally [a couple of days](https://status.nixos.org/). Updates to a channel are -distributed as soon as all tests for that channel pass, e.g. +distributed as soon as all tests for that channel pass, e.g., [this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents) shows the status of tests for the `nixpkgs-unstable` channel. @@ -47,4 +47,4 @@ The binaries are made available via a [binary cache](https://cache.nixos.org). The current Nix expressions of the channels are available in the [Nixpkgs repository](https://github.com/NixOS/nixpkgs) in branches -that correspond to the channel names (e.g. `nixos-22.11-small`). +that correspond to the channel names (e.g., `nixos-22.11-small`). diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 6c126a48f7d3..7eaa98acb54a 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -148,6 +148,10 @@ - Switch inhibitors were introduced, which add a pre-switch check that compares a list of strings between the previous and the new generation, and refuses to switch into the new generation when there is a difference between the two lists. This allows to avoid switching into a system when for instance the systemd version changed by adding `config.systemd.package.version` to the switch inhibitors for your system. You can still forcefully switch into any generation by setting `NIXOS_NO_CHECK=1`. +- GNU Taler has been updated to version 1.3. + This release focuses on getting everything ready for a deployment of GNU Taler by Magnet bank. + For more details, see the [upstream release notes](https://www.taler.net/en/news/2025-13.html). + - The `services.nextcloud-spreed-signaling` NixOS module has been added to facilitate declarative management of a standalone Spreed signaling server ("High Performance Backend" for Nextcloud Talk). - `fetchPnpmDeps` and `pnpmConfigHook` were added as top-level attributes, replacing the now deprecated `pnpm.fetchDeps` and `pnpm.configHook` attributes. diff --git a/lib/fileset/README.md b/lib/fileset/README.md index 80e7146992a8..c7ca6615dc97 100644 --- a/lib/fileset/README.md +++ b/lib/fileset/README.md @@ -16,7 +16,7 @@ It should have the following properties: Non-goals are: - Efficient: - If the abstraction proves itself worthwhile but too slow, it can be still be optimized further. + If the abstraction proves itself worthwhile but too slow, it can still be optimized further. ## Tests @@ -90,7 +90,7 @@ One of the following: - `"regular"`, `"symlink"`, `"unknown"` or any other non-`"directory"` string: A nested file with its file type. These specific strings are chosen to be compatible with `builtins.readDir` for a simpler implementation. - Distinguishing between different file types is not strictly necessary for the functionality this library, + Distinguishing between different file types is not strictly necessary for the functionality of this library, but it does allow nicer printing of file sets. - `null`: @@ -127,7 +127,7 @@ Arguments: ### Empty file set without a base There is a special representation for an empty file set without a base path. -This is used for return values that should be empty but when there's no base path that would makes sense. +This is used for return values that should be empty but when there's no base path that would make sense. Arguments: - Alternative: This could also be represented using `_internalBase = /.` and `_internalTree = null`. diff --git a/maintainers/README.md b/maintainers/README.md index 5a4009055aa6..4c3e5cff9c2a 100644 --- a/maintainers/README.md +++ b/maintainers/README.md @@ -169,7 +169,7 @@ See its [README](./scripts/README.md) for further information. # nixpkgs-merge-bot -To streamline autoupdates, leverage the nixpkgs-merge-bot by commenting `@NixOS/nixpkgs-merge-bot merge` if the package resides in pkgs-by-name, the commenter is among the package maintainers, and the pull request author is @r-ryantm or a Nixpkgs committer. +To streamline autoupdates, leverage the nixpkgs-merge-bot by commenting `@NixOS/nixpkgs-merge-bot merge` if the package resides in `pkgs/by-name`, the commenter is among the package maintainers, and the pull request author is @r-ryantm or a Nixpkgs committer. The bot ensures that all ofborg checks, except for darwin, are successfully completed before merging the pull request. Should the checks still be underway, the bot patiently waits for ofborg to finish before attempting the merge again. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1b2fcb922bec..c13400007c6d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15337,11 +15337,11 @@ name = "Andreas Wagner"; }; lpchaim = { - email = "lpchaim@gmail.comm"; + email = "lpchaim@proton.me"; matrix = "@lpchaim:matrix.org"; github = "lpchaim"; githubId = 4030336; - name = "Lucas Chaim"; + name = "Luna Perroni"; }; lpostula = { email = "lois@postu.la"; diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md index fd6e8bd21f64..4870ad01aeeb 100644 --- a/maintainers/scripts/README.md +++ b/maintainers/scripts/README.md @@ -47,7 +47,7 @@ robustly than text search through `maintainer-list.nix`. The maintainer is designated by a `selector` which must be one of: - `handle` (default): the maintainer's attribute name in `lib.maintainers`; -- `email`, `name`, `github`, `githubId`, `matrix`, `name`: +- `email`, `name`, `github`, `githubId`, `matrix`: attributes of the maintainer's object, matched exactly; see [`maintainer-list.nix`] for the fields' definition. [`maintainer-list.nix`]: ../maintainer-list.nix diff --git a/maintainers/scripts/bootstrap-files/README.md b/maintainers/scripts/bootstrap-files/README.md index a353be6e3f60..d04990bb976a 100644 --- a/maintainers/scripts/bootstrap-files/README.md +++ b/maintainers/scripts/bootstrap-files/README.md @@ -4,12 +4,12 @@ Currently `nixpkgs` builds most of its packages using bootstrap seed binaries (w - `bootstrap-tools`: an archive with the compiler toolchain and other helper tools enough to build the rest of the `nixpkgs`. - initial binaries needed to unpack `bootstrap-tools.*`. - On `linux` it's just `busybox`, on `darwin` and `freebsd` it is unpack.nar.xz which contains the binaries and script needed to unpack the tools. + On `linux` it's just `busybox`, on `darwin` and `freebsd` it is `unpack.nar.xz` which contains the binaries and script needed to unpack the tools. These binaries can be executed directly from the store. These are called "bootstrap files". -Bootstrap files should always be fetched from hydra and uploaded to `tarballs.nixos.org` to guarantee that all the binaries were built from the code committed into `nixpkgs` repository. +Bootstrap files should always be fetched from Hydra and uploaded to `tarballs.nixos.org` to guarantee that all the binaries were built from the code committed into `nixpkgs` repository. The uploads to `tarballs.nixos.org` are done by `@NixOS/infra` team members who have S3 write access. @@ -93,7 +93,7 @@ To do that you will need the following: 2. Add your new target to `pkgs/stdenv/linux/make-bootstrap-tools-cross.nix`. This will add a new hydra job to `nixpkgs:cross-trunk` jobset. -3. Wait for a hydra to build your bootstrap tarballs. +3. Wait for a Hydra to build your bootstrap tarballs. 4. Add your new target to `maintainers/scripts/bootstrap-files/refresh-tarballs.bash` around `CROSS_TARGETS=()`. @@ -103,15 +103,15 @@ To do that you will need the following: There are two types of bootstrap files: -- natively built `stdenvBootstrapTools.build` hydra jobs in [`nixpkgs:trunk`](https://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-jobs) jobset. +- natively built `stdenvBootstrapTools.build` Hydra jobs in [`nixpkgs:trunk`](https://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-jobs) jobset. Incomplete list of examples is: * `aarch64-unknown-linux-musl.nix` * `i686-unknown-linux-gnu.nix` - These are Tier 1 hydra platforms. + These are Tier 1 Hydra platforms. -- cross-built by `bootstrapTools.build` hydra jobs in [`nixpkgs:cross-trunk`](https://hydra.nixos.org/jobset/nixpkgs/cross-trunk#tabs-jobs) jobset. +- cross-built by `bootstrapTools.build` Hydra jobs in [`nixpkgs:cross-trunk`](https://hydra.nixos.org/jobset/nixpkgs/cross-trunk#tabs-jobs) jobset. Incomplete list of examples is: * `mips64el-unknown-linux-gnuabi64.nix` diff --git a/nixos/modules/hardware/facter/virtualisation.nix b/nixos/modules/hardware/facter/virtualisation.nix index e1a9a1647708..6acdd62516f9 100644 --- a/nixos/modules/hardware/facter/virtualisation.nix +++ b/nixos/modules/hardware/facter/virtualisation.nix @@ -105,7 +105,7 @@ in # parallels hardware.parallels.enable = lib.mkIf cfg.parallels.enable (lib.mkDefault true); nixpkgs.config = lib.mkIf (!options.nixpkgs.pkgs.isDefined && cfg.parallels.enable) { - allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "prl-tools" ]; + allowUnfreePackages = [ "prl-tools" ]; }; }; } diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index 047142dc468a..7f53c62fecbe 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -228,7 +228,7 @@ in contents = { "/EFI/BOOT/BOOTX64.EFI".source = "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; - } + }; repartConfig = { Type = "esp"; Format = "vfat"; diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index bbd0a093b998..1586a09aee5f 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -300,7 +300,7 @@ if ($virt eq "oracle") { # It is blocked by https://github.com/systemd/systemd/pull/23859 if ($virt eq "parallels") { push @attrs, "hardware.parallels.enable = true;"; - push @attrs, "nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ \"prl-tools\" ];"; + push @attrs, "nixpkgs.config.allowUnfreePackages = [ \"prl-tools\" ];"; } # Likewise for QEMU. diff --git a/nixos/modules/services/finance/odoo.nix b/nixos/modules/services/finance/odoo.nix index 4395010fe7a0..0c0c581fa987 100644 --- a/nixos/modules/services/finance/odoo.nix +++ b/nixos/modules/services/finance/odoo.nix @@ -103,6 +103,9 @@ in services.odoo.settings.options = { data_dir = "/var/lib/private/odoo/data"; proxy_mode = cfg.domain != null; + # Disable the database manager by default + # https://www.odoo.com/documentation/master/administration/on_premise/deploy.html#database-manager-security + list_db = lib.mkDefault false; } // (lib.optionalAttrs (cfg.addons != [ ]) { addons_path = lib.concatMapStringsSep "," lib.escapeShellArg cfg.addons; diff --git a/nixos/modules/services/finance/taler/exchange.nix b/nixos/modules/services/finance/taler/exchange.nix index 21e10d0f2002..66d8b3411365 100644 --- a/nixos/modules/services/finance/taler/exchange.nix +++ b/nixos/modules/services/finance/taler/exchange.nix @@ -91,7 +91,7 @@ in type = lib.types.lines; defaultText = "None, you must set this yourself."; example = '' - [COIN-KUDOS-n1-t1718140083] + [COIN_KUDOS-n1-t1718140083] VALUE = KUDOS:0.1 DURATION_WITHDRAW = 7 days DURATION_SPEND = 2 years diff --git a/nixos/modules/services/monitoring/osquery.nix b/nixos/modules/services/monitoring/osquery.nix index a54f4f4ecbbf..5f9638ce8992 100644 --- a/nixos/modules/services/monitoring/osquery.nix +++ b/nixos/modules/services/monitoring/osquery.nix @@ -25,17 +25,20 @@ let ({ config_path = conf; } // cfg.flags) ) ); - + osquery = cfg.package; osqueryi = pkgs.runCommand "osqueryi" { nativeBuildInputs = [ pkgs.makeWrapper ]; } '' mkdir -p $out/bin - makeWrapper ${pkgs.osquery}/bin/osqueryi $out/bin/osqueryi \ + makeWrapper ${osquery}/bin/osqueryi $out/bin/osqueryi \ --add-flags "--flagfile ${flagfile} --disable-database" ''; + in { options.services.osquery = { enable = lib.mkEnableOption "osqueryd daemon"; + package = lib.mkPackageOption pkgs "osquery" { }; + settings = lib.mkOption { default = { }; description = '' @@ -108,7 +111,7 @@ in ]; description = "The osquery daemon"; serviceConfig = { - ExecStart = "${pkgs.osquery}/bin/osqueryd --flagfile ${flagfile}"; + ExecStart = "${osquery}/bin/osqueryd --flagfile ${flagfile}"; PIDFile = cfg.flags.pidfile; LogsDirectory = lib.mkIf (cfg.flags.logger_path == "/var/log/osquery") [ "osquery" ]; StateDirectory = lib.mkIf (cfg.flags.database_path == "/var/lib/osquery/osquery.db") [ "osquery" ]; @@ -116,7 +119,7 @@ in }; wantedBy = [ "multi-user.target" ]; }; - systemd.tmpfiles.settings."10-osquery".${dirname (cfg.flags.pidfile)}.d = { + systemd.tmpfiles.settings."10-osquery".${dirname cfg.flags.pidfile}.d = { user = "root"; group = "root"; mode = "0755"; diff --git a/nixos/modules/system/activation/nixos-init.nix b/nixos/modules/system/activation/nixos-init.nix index a2928cf1e0a1..9d5094017c0b 100644 --- a/nixos/modules/system/activation/nixos-init.nix +++ b/nixos/modules/system/activation/nixos-init.nix @@ -20,28 +20,49 @@ in package = lib.mkPackageOption pkgs "nixos-init" { }; }; - config = lib.mkIf cfg.enable { - assertions = [ - { - assertion = config.boot.initrd.systemd.enable; - message = "nixos-init can only be used with boot.initrd.systemd.enable"; - } - { - assertion = config.system.etc.overlay.enable; - message = "nixos-init can only be used with system.etc.overlay.enable"; - } - { - assertion = config.services.userborn.enable || config.systemd.sysusers.enable; - message = "nixos-init can only be used with services.userborn.enable or systemd.sysusers.enable"; - } - { - assertion = config.boot.postBootCommands == ""; - message = "nixos-init cannot be used with boot.postBootCommands"; - } - { - assertion = config.powerManagement.powerUpCommands == ""; - message = "nixos-init cannot be used with powerManagement.powerUpCommands"; - } - ]; - }; + config = lib.mkMerge [ + { + boot.bootspec.extensions = { + "org.nixos.nixos-init.v1" = { + firmware = "${config.hardware.firmware}/lib/firmware"; + modprobe_binary = "${pkgs.kmod}/bin/modprobe"; + nix_store_mount_opts = config.boot.nixStoreMountOpts; + } + // lib.optionalAttrs (config.environment.binsh != null) { + sh_binary = config.environment.binsh; + } + // lib.optionalAttrs (config.environment.usrbinenv != null) { + env_binary = config.environment.usrbinenv; + } + // lib.optionalAttrs config.system.etc.overlay.enable { + etc_metadata_image = config.system.build.etcMetadataImage; + etc_basedir = config.system.build.etcBasedir; + }; + }; + } + (lib.mkIf cfg.enable { + assertions = [ + { + assertion = config.boot.initrd.systemd.enable; + message = "nixos-init can only be used with boot.initrd.systemd.enable"; + } + { + assertion = config.system.etc.overlay.enable; + message = "nixos-init can only be used with system.etc.overlay.enable"; + } + { + assertion = config.services.userborn.enable || config.systemd.sysusers.enable; + message = "nixos-init can only be used with services.userborn.enable or systemd.sysusers.enable"; + } + { + assertion = config.boot.postBootCommands == ""; + message = "nixos-init cannot be used with boot.postBootCommands"; + } + { + assertion = config.powerManagement.powerUpCommands == ""; + message = "nixos-init cannot be used with powerManagement.powerUpCommands"; + } + ]; + }) + ]; } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index f09bd38aa393..50a5204b0d70 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -33,11 +33,6 @@ let ln -s ${config.system.build.etc}/etc $out/etc - ${lib.optionalString config.system.etc.overlay.enable '' - ln -s ${config.system.build.etcMetadataImage} $out/etc-metadata-image - ln -s ${config.system.build.etcBasedir} $out/etc-basedir - ''} - ln -s ${config.system.path} $out/sw ln -s "$systemd" $out/systemd diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 0c20432e58f4..6afb23bd421c 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -733,17 +733,6 @@ in cfg.package.util-linux config.system.nixos-init.package ]; - environment = { - FIRMWARE = "${config.hardware.firmware}/lib/firmware"; - MODPROBE_BINARY = "${pkgs.kmod}/bin/modprobe"; - NIX_STORE_MOUNT_OPTS = lib.concatStringsSep "," config.boot.nixStoreMountOpts; - } - // lib.optionalAttrs (config.environment.usrbinenv != null) { - ENV_BINARY = config.environment.usrbinenv; - } - // lib.optionalAttrs (config.environment.binsh != null) { - SH_BINARY = config.environment.binsh; - }; serviceConfig = { ExecStart = [ "" diff --git a/nixos/tests/commafeed.nix b/nixos/tests/commafeed.nix index 18c5df00265f..d825cda4eb8d 100644 --- a/nixos/tests/commafeed.nix +++ b/nixos/tests/commafeed.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { name = "commafeed"; diff --git a/nixos/tests/odoo.nix b/nixos/tests/odoo.nix index a36a7a5b9801..8bc768d13e92 100644 --- a/nixos/tests/odoo.nix +++ b/nixos/tests/odoo.nix @@ -29,5 +29,6 @@ server.wait_for_unit("odoo.service") server.wait_until_succeeds("curl -s http://localhost:8069/web/database/selector | grep 'Odoo'") server.succeed("curl -s http://localhost/web/database/selector | grep 'Odoo'") + server.succeed("curl http://localhost/web/database/manager | grep 'database manager has been disabled'") ''; } diff --git a/nixos/tests/osquery.nix b/nixos/tests/osquery.nix index 5faf2f343740..e0ac28e68e90 100644 --- a/nixos/tests/osquery.nix +++ b/nixos/tests/osquery.nix @@ -1,5 +1,5 @@ import ./make-test-python.nix ( - { lib, pkgs, ... }: + { lib, ... }: let config_refresh = "10"; @@ -13,19 +13,17 @@ import ./make-test-python.nix ( lewo ]; - nodes.machine = - { config, pkgs, ... }: - { - services.osquery = { - enable = true; + nodes.machine = _: { + services.osquery = { + enable = true; - settings.options = { inherit nullvalue utc; }; - flags = { - inherit config_refresh; - nullvalue = "IGNORED"; - }; + settings.options = { inherit nullvalue utc; }; + flags = { + inherit config_refresh; + nullvalue = "IGNORED"; }; }; + }; testScript = { nodes, ... }: diff --git a/nixos/tests/sabnzbd-module.nix b/nixos/tests/sabnzbd-module.nix index 6b04049e9131..fd9f48ae35d0 100644 --- a/nixos/tests/sabnzbd-module.nix +++ b/nixos/tests/sabnzbd-module.nix @@ -60,7 +60,7 @@ ]; # unrar is unfree - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "unrar" ]; + nixpkgs.config.allowUnfreePackages = [ "unrar" ]; }; testScript = '' diff --git a/nixos/tests/taler/conf/taler-denominations.conf b/nixos/tests/taler/conf/taler-denominations.conf index e0c46ba9d6f6..ffb4a4c44793 100644 --- a/nixos/tests/taler/conf/taler-denominations.conf +++ b/nixos/tests/taler/conf/taler-denominations.conf @@ -1,4 +1,4 @@ -[COIN-KUDOS-n1-t1726827661] +[COIN_KUDOS-n1-t1726827661] VALUE = KUDOS:0.1 DURATION_WITHDRAW = 7 days DURATION_SPEND = 2 years @@ -10,7 +10,7 @@ FEE_REFUND = KUDOS:0 RSA_KEYSIZE = 2048 CIPHER = RSA -[COIN-KUDOS-n2-t1726827661] +[COIN_KUDOS-n2-t1726827661] VALUE = KUDOS:0.2 DURATION_WITHDRAW = 7 days DURATION_SPEND = 2 years @@ -22,7 +22,7 @@ FEE_REFUND = KUDOS:0 RSA_KEYSIZE = 2048 CIPHER = RSA -[COIN-KUDOS-n3-t1726827661] +[COIN_KUDOS-n3-t1726827661] VALUE = KUDOS:0.4 DURATION_WITHDRAW = 7 days DURATION_SPEND = 2 years @@ -34,7 +34,7 @@ FEE_REFUND = KUDOS:0 RSA_KEYSIZE = 2048 CIPHER = RSA -[COIN-KUDOS-n4-t1726827661] +[COIN_KUDOS-n4-t1726827661] VALUE = KUDOS:0.8 DURATION_WITHDRAW = 7 days DURATION_SPEND = 2 years @@ -46,7 +46,7 @@ FEE_REFUND = KUDOS:0 RSA_KEYSIZE = 2048 CIPHER = RSA -[COIN-KUDOS-n5-t1726827661] +[COIN_KUDOS-n5-t1726827661] VALUE = KUDOS:1.6 DURATION_WITHDRAW = 7 days DURATION_SPEND = 2 years @@ -58,7 +58,7 @@ FEE_REFUND = KUDOS:0 RSA_KEYSIZE = 2048 CIPHER = RSA -[COIN-KUDOS-n6-t1726827661] +[COIN_KUDOS-n6-t1726827661] VALUE = KUDOS:3.2 DURATION_WITHDRAW = 7 days DURATION_SPEND = 2 years @@ -70,7 +70,7 @@ FEE_REFUND = KUDOS:0 RSA_KEYSIZE = 2048 CIPHER = RSA -[COIN-KUDOS-n7-t1726827661] +[COIN_KUDOS-n7-t1726827661] VALUE = KUDOS:6.4 DURATION_WITHDRAW = 7 days DURATION_SPEND = 2 years @@ -82,7 +82,7 @@ FEE_REFUND = KUDOS:0 RSA_KEYSIZE = 2048 CIPHER = RSA -[COIN-KUDOS-n8-t1726827661] +[COIN_KUDOS-n8-t1726827661] VALUE = KUDOS:12.8 DURATION_WITHDRAW = 7 days DURATION_SPEND = 2 years diff --git a/nixos/tests/web-apps/immich-public-proxy.nix b/nixos/tests/web-apps/immich-public-proxy.nix index 1516156223ce..7f627e14404c 100644 --- a/nixos/tests/web-apps/immich-public-proxy.nix +++ b/nixos/tests/web-apps/immich-public-proxy.nix @@ -5,6 +5,7 @@ nodes.machine = { pkgs, ... }@args: { + virtualisation.memorySize = 2048; # test hits OOM with default 1024 environment.systemPackages = [ pkgs.imagemagick pkgs.immich-cli diff --git a/pkgs/README.md b/pkgs/README.md index 4118b92c2e14..ea8468f57fb2 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -20,7 +20,7 @@ See the [CONTRIBUTING.md](../CONTRIBUTING.md) document for more general informat - [`pkgs-lib`](./pkgs-lib): Definitions for utilities that need packages but are not needed for packages - [`test`](./test): Tests not directly associated with any specific packages - [`by-name`](./by-name): Top-level packages organised by name ([docs](./by-name/README.md)) -- All other directories loosely categorise top-level packages definitions, see [category hierarchy][categories] +- All other directories loosely categorise top-level package definitions, see [category hierarchy][categories] ## Quick Start to Adding a Package @@ -148,7 +148,7 @@ To add a package to Nixpkgs: - All other [`meta`](https://nixos.org/manual/nixpkgs/stable/#chap-meta) attributes are optional, but it’s still a good idea to provide at least the `description`, `homepage` and [`license`](https://nixos.org/manual/nixpkgs/stable/#sec-meta-license). - - The exact syntax and semantics of the Nix expression language, including the built-in functions, are [Nix language reference](https://nixos.org/manual/nix/stable/language/). + - The exact syntax and semantics of the Nix expression language, including the built-in functions, can be found in the [Nix language reference](https://nixos.org/manual/nix/stable/language/). 5. To test whether the package builds, run the following command from the root of the nixpkgs source tree: @@ -437,7 +437,7 @@ Follow these guidelines: - It _must_ be a valid identifier in Nix. - If the `pname` starts with a digit, the attribute name _should_ be prefixed with an underscore. - Otherwise the attribute name _should not_ be prefixed with an underline. + Otherwise the attribute name _should not_ be prefixed with an underscore. Example: The corresponding attribute name for `0ad` should be `_0ad`. @@ -460,7 +460,7 @@ Follow these guidelines: ## Versioning [versioning]: #versioning -These are the guidelines the `version` attribute of a package: +These are the guidelines for the `version` attribute of a package: - It _must_ start with a digit. This is required for backwards-compatibility with [how `nix-env` parses derivation names](https://nix.dev/manual/nix/latest/command-ref/nix-env#selectors). @@ -487,7 +487,7 @@ See also [`pkgs/by-name/README.md`'s section on this topic](https://github.com/N ## Meta attributes -The `meta` attribute set should always be placed last in the derivativion and any other "meta"-like attribute sets like `passthru` should be written before it. +The `meta` attribute set should always be placed last in the derivation and any other "meta"-like attribute sets like `passthru` should be written before it. * `meta.description` must: * Be short, just one sentence. @@ -655,7 +655,7 @@ The latter avoids link rot when the upstream abandons, squashes or rebases their { patches = [ ./0001-add-missing-include.patch ]; } ``` -If you do need to do create this sort of patch file, one way to do so is with git: +If you do need to create this sort of patch file, one way to do so is with git: 1. Move to the root directory of the source code you're patching. @@ -730,7 +730,7 @@ We use jbidwatcher as an example for a discontinued project here. 1. Create a pull request against Nixpkgs. Mention the package maintainer. -This is how the pull request looks like in this case: [https://github.com/NixOS/nixpkgs/pull/116470](https://github.com/NixOS/nixpkgs/pull/116470) +This is what the pull request looks like in this case: [https://github.com/NixOS/nixpkgs/pull/116470](https://github.com/NixOS/nixpkgs/pull/116470) ## Package tests @@ -743,7 +743,7 @@ To run the main types of tests locally: Tests are important to ensure quality and make reviews and automatic updates easy. -The following types of tests exists: +The following types of tests exist: * [NixOS **module tests**](https://nixos.org/manual/nixos/stable/#sec-nixos-tests), which spawn one or more NixOS VMs. They exercise both NixOS modules and the packaged programs used within them. @@ -1137,7 +1137,7 @@ Sample template for a package update review is provided below. ### New packages New packages are a common type of pull requests. -These pull requests consist in adding a new nix-expression for a package. +These pull requests consist of adding a new nix-expression for a package. Review process: @@ -1146,7 +1146,7 @@ Review process: - Ensure that the package versioning [fits the guidelines](#versioning). - Ensure that the commit text [fits the guidelines](../CONTRIBUTING.md#commit-conventions). - Ensure that the source is fetched from an official location, one of our [trusted mirrors](./build-support/fetchurl/mirrors.nix), or a mirror trusted by the authors. -- Ensure that the meta fields [fits the guidelines](#meta-attributes) and contain the correct information: +- Ensure that the meta fields [fit the guidelines](#meta-attributes) and contain the correct information: - License must match the upstream license. - Platforms should be set (or the package will not get binary substitutes). - Maintainers must be set. @@ -1250,7 +1250,7 @@ Note that there can be an extra comment containing links to previously reported #### Triaging and Fixing **Note**: An issue can be a "false positive" (i.e. automatically opened, but without the package it refers to being actually vulnerable). -If you find such a "false positive", comment on the issue an explanation of why it falls into this category, linking as much information as the necessary to help maintainers double check. +If you find such a "false positive", comment on the issue an explanation of why it falls into this category, linking as much information as necessary to help maintainers double check. If you are investigating a "true positive": diff --git a/pkgs/applications/editors/jetbrains/readme.md b/pkgs/applications/editors/jetbrains/readme.md index a4e3c054fc4d..b0919920d2e0 100644 --- a/pkgs/applications/editors/jetbrains/readme.md +++ b/pkgs/applications/editors/jetbrains/readme.md @@ -8,9 +8,9 @@ The jdk is in `pkgs/development/compilers/jetbrains-jdk`. ## How to use plugins: - Pass your IDE package and a list of plugin packages to `jetbrains.plugins.addPlugins`. E.g. `pkgs.jetbrains.plugins.addPlugins pkgs.jetbrains.idea [ ideavim ]` - - The list has to contain contain drvs giving the directory contents of the plugin or a single `.jar` (executable). + - The list has to contain drvs giving the directory contents of the plugin or a single `.jar` (executable). -Nixpkgs does not package Jetbrains plugins, however you can use third-party sources, such as +Nixpkgs does not package JetBrains plugins, however you can use third-party sources, such as [nix-jetbrains-plugins](https://github.com/nix-community/nix-jetbrains-plugins). Note that some plugins may not work without modification, if they are packaged in a way that is incompatible with NixOS. You can try installing such plugins from within the IDE instead. @@ -68,7 +68,7 @@ Any comments or other manual changes between these markers will be removed when - from source builds: - remove timestamps in output `.jar` of `jps-bootstrap` - automated update scripts - - fetch `.jar` s from stuff built in nixpkgs when available + - fetch `.jar`s from stuff built in nixpkgs when available - what stuff built in nixpkgs provides `.jar`s we care about? - kotlin - make `configurePhase` respect `$NIX_BUILD_CORES` diff --git a/pkgs/applications/editors/vscode/extensions/README.md b/pkgs/applications/editors/vscode/extensions/README.md index 3977dc5a3e13..9cbbd2b8f94d 100644 --- a/pkgs/applications/editors/vscode/extensions/README.md +++ b/pkgs/applications/editors/vscode/extensions/README.md @@ -9,7 +9,7 @@ * Currently `nixfmt-rfc-style` formatter is being used to format the VSCode extensions. -* Respect `alphabetical order` whenever adding extensions. On disorder, please, kindly open a PR re-establishing the order. +* Respect `alphabetical order` whenever adding extensions. If out of order, please kindly open a PR re-establishing the order. * Avoid [unnecessary](https://nix.dev/guides/best-practices.html#with-scopes) use of `with`, particularly `nested with`. @@ -27,7 +27,7 @@ - maintainers are listed in alphabetical order. - verify `license` in upstream. -* On commit messages: +* Commit messages: - Naming convention for: - Adding a new extension: diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 7c8aab115196..4259a6c6e942 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -675,8 +675,8 @@ let mktplcRef = { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.29.0"; - hash = "sha256-qjfZ2/otO2BAIbhjqicHI2H0KKdpji55K+2XfOrzUIw="; + version = "1.31.0"; + hash = "sha256-7KpyUXR3a7ZD9bcdJ4t5HRjSAlUww8q6XSOcxHCN4Cw="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-mermaid/changelog"; @@ -1965,8 +1965,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.64.1"; - hash = "sha256-kJqn7xNI6DF10h+CemsO0E80oJBifMdKKxpKJ3Y6PJ4="; + version = "6.67.5"; + hash = "sha256-xttk9mP5XIeeymE0l0TI+JsC862yOaEuwb6HscDyRMU="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -4218,8 +4218,8 @@ let mktplcRef = { publisher = "shopify"; name = "ruby-lsp"; - version = "0.9.33"; - hash = "sha256-Dkx4ecPFXTX1ilerkcnUc6Pu/mnXpswYVnHWqR4TYOA="; + version = "0.10.0"; + hash = "sha256-RSNcyoyrkVJsFp02aMDDZn51YBKohE+gy+bgHFP45v4="; }; meta = { description = "VS Code plugin for connecting with the Ruby LSP"; @@ -4892,8 +4892,8 @@ let mktplcRef = { name = "errorlens"; publisher = "usernamehw"; - version = "3.26.0"; - hash = "sha256-pAkk3QURnlLNMZ2cFBks2lAEl/Hk8Z2i/QgvjUv+u2Y="; + version = "3.28.0"; + hash = "sha256-7eu7y9IR1uxSFZ0IplDieFt3iWbcmdwf1lAcXq+S4C8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index cb81e627a1bc..2ccd20b5240a 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -14,19 +14,19 @@ let vsix = stdenvNoCC.mkDerivation (finalAttrs: { name = "roo-code-${finalAttrs.version}.vsix"; pname = "roo-code-vsix"; - version = "3.38.0"; + version = "3.45.0"; src = fetchFromGitHub { owner = "RooCodeInc"; repo = "Roo-Code"; tag = "v${finalAttrs.version}"; - hash = "sha256-ppgttz+kmhbQMcjO41mRRxEWcVt/xd5pb5XSolK5IpA="; + hash = "sha256-ZWt2R50yFxUHDJ2jrkMKaNoWUD6mSNm0ucq/FXPC2VE="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-92jZZg632IUh88SsnAbEZqczQZ7ytT5NKrv7tJySzyE="; + hash = "sha256-QAzk+aXdCtQQ/KEoqGfn5j7l7Gx3HDvlL3aO+81hABM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/README.md b/pkgs/applications/emulators/libretro/README.md index 2de2e61e4852..e444ab50a2b0 100644 --- a/pkgs/applications/emulators/libretro/README.md +++ b/pkgs/applications/emulators/libretro/README.md @@ -9,8 +9,8 @@ The basic steps to add a new core are: 1. Add a new core using `mkLibretroCore` function (use one of the existing cores as an example) -2. Add your new core to [`default.nix`](./default.nix) file -3. Try to build your core with `nix-build -A libretro.` +2. Add your new core to [`default.nix`](./default.nix) file. +3. Try to build your core with `nix-build -A libretro.`. ## Using RetroArch with cores diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix index 822ea79c759a..e6b78a5635e5 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "snes9x"; - version = "0-unstable-2026-01-10"; + version = "0-unstable-2026-01-26"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; - rev = "4b51d103b909e0c1ac566b6865b9f6229a7b59e4"; - hash = "sha256-ic8yR3mvql7QMGSp3QN+31MKkDvY0Tfsxx51dhUVs2c="; + rev = "830d8552551d7a71e9d084f727dc15cf15d9796c"; + hash = "sha256-Xu3s1z4Pab71D2orv7HyL8b3E59AnQEAil0XeWKfKdw="; }; makefile = "Makefile"; diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index c0154e2e1bf7..6ca7116a458f 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -81,14 +81,14 @@ let ]; in mkDerivation rec { - version = "3.40.14"; + version = "3.40.15"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-/AA3ATNjXj95XILyyfX8c5Sww2aUqlMXxGf8chwUbFY="; + hash = "sha256-N1ip6lMMpACDCr/Za26LGP455+iZiZe24s2MCkrYm8A="; }; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 33b9068361b4..37f6a659b13d 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -81,7 +81,7 @@ let ]; in mkDerivation rec { - version = "3.44.6"; + version = "3.44.7"; pname = "qgis-unwrapped"; outputs = [ "out" @@ -92,7 +92,7 @@ mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-gC7luJpGSrKHRmgOetrLDE8zegbE/4QjM+aHaew5pGM="; + hash = "sha256-ewYTl6tR1K7Q/AMA3BDlcSaj4mN3yt+1Kfa4a1JSXL0="; }; passthru = { diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix index c1bd6e8c12f7..00e4903f8a09 100644 --- a/pkgs/applications/graphics/unigine-superposition/default.nix +++ b/pkgs/applications/graphics/unigine-superposition/default.nix @@ -37,7 +37,7 @@ let src = fetchurl { url = "https://assets.unigine.com/d/Unigine_Superposition-${version}.run"; - sha256 = "12hzlz792pf8pvxf13fww3qhahqzwzkxq9q3mq20hbhvaphbg7nd"; + hash = "sha256-dJThxzv1nvIWFRPV1cudm/+9hHmSnUl2rFO2lV3lgPg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/README.md b/pkgs/applications/networking/browsers/chromium/README.md index dc928bb7b4e6..96615f56bcda 100644 --- a/pkgs/applications/networking/browsers/chromium/README.md +++ b/pkgs/applications/networking/browsers/chromium/README.md @@ -11,8 +11,8 @@ - `ungoogled-chromium`: A patch set for Chromium, that has its own entry in Chromium's `upstream-info.nix`. - `chromedriver`: Updated via Chromium's `upstream-info.nix` and not built from source. Must match Chromium's major version. - - `electron-source`: Various versions of electron that are built from source using Chromium's - `-unwrapped` derivation, due to electron being based on Chromium. + - `electron-source`: Various versions of Electron that are built from source using Chromium's + `-unwrapped` derivation, due to Electron being based on Chromium. # Upstream links diff --git a/pkgs/applications/networking/cluster/k3s/README.md b/pkgs/applications/networking/cluster/k3s/README.md index 7ad2a4be131f..5dc77cffe995 100644 --- a/pkgs/applications/networking/cluster/k3s/README.md +++ b/pkgs/applications/networking/cluster/k3s/README.md @@ -1,6 +1,6 @@ # K3s -K3s is a simplified [Kubernetes](https://wiki.nixos.org/wiki/Kubernetes) version that bundles Kubernetes cluster components into a few small binaries optimized for Edge and IoT devices. +K3s is a simplified [Kubernetes](https://wiki.nixos.org/wiki/Kubernetes) distribution that bundles Kubernetes cluster components into a few small binaries optimized for Edge and IoT devices. ## Usage @@ -8,8 +8,8 @@ K3s is a simplified [Kubernetes](https://wiki.nixos.org/wiki/Kubernetes) version ## Configuration Examples -* [Nvidia GPU Passthru](docs/examples/NVIDIA.md) -* [Intel GPU Passthru](docs/examples/INTEL.md) +* [Nvidia GPU Passthrough](docs/examples/NVIDIA.md) +* [Intel GPU Passthrough](docs/examples/INTEL.md) * [Storage Examples](docs/examples/STORAGE.md) ## Cluster Maintenance and Troubleshooting diff --git a/pkgs/applications/networking/cluster/k3s/docs/CLUSTER_UPKEEP.md b/pkgs/applications/networking/cluster/k3s/docs/CLUSTER_UPKEEP.md index 2542fd78655e..85ccf90bab5c 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/CLUSTER_UPKEEP.md +++ b/pkgs/applications/networking/cluster/k3s/docs/CLUSTER_UPKEEP.md @@ -7,27 +7,27 @@ General documentation for the K3s user for cluster tasks and troubleshooting ste ### Changing K3s Token -Changing the K3s token requires resetting cluster. To reset the cluster, you must do the following: +Changing the K3s token requires resetting the cluster. To reset the cluster, you must do the following: #### Stopping K3s -Disabling K3s NixOS module won't stop K3s related dependencies, such as containerd or networking. For stopping everything, either run "k3s-killall.sh" script (available on $PATH under `/run/current-system/sw/bin/k3s-killall.sh`) or reboot host. +Disabling the K3s NixOS module won't stop K3s related dependencies, such as containerd or networking. To stop everything, either run "k3s-killall.sh" script (available on $PATH under `/run/current-system/sw/bin/k3s-killall.sh`) or reboot the host. ### Syncing K3s in multiple hosts -Nix automatically syncs hosts to `configuration.nix`, for syncing configuration.nix's git repository and triggering `nixos-rebuild switch` in multiple hosts, it is commonly used `ansible`, which enables automation of cluster provisioning, upgrade and reset. +Nix automatically syncs hosts to `configuration.nix`. To sync `configuration.nix`'s git repository and trigger `nixos-rebuild switch` on multiple hosts, `ansible` is commonly used, which enables automation of cluster provisioning, upgrade and reset. ### Cluster Reset -As upstream "k3s-uninstall.sh" is yet to be packaged for NixOS, it's necessary to run manual steps for resetting cluster. +As upstream "k3s-uninstall.sh" is yet to be packaged for NixOS, it's necessary to run manual steps for resetting the cluster. -Disable K3s instances in **all** hosts: +Disable K3s instances on **all** hosts: In NixOS configuration, set: ``` services.k3s.enable = false; ``` -Rebuild NixOS. This is going to remove K3s service files. But it won't delete K3s data. +Rebuild the NixOS configuration. This is going to remove K3s service files. But it won't delete K3s data. To delete K3s files: @@ -43,7 +43,7 @@ Delete k3s data: ``` When using Etcd, Reset Etcd: -Certify **all** K3s instances are stopped, because a single instance can re-seed etcd database with previous cryptographic key. +Ensure **all** K3s instances are stopped, because a single instance can re-seed etcd database with previous cryptographic key. Disable etcd database in NixOS configuration: ``` @@ -55,22 +55,22 @@ Delete etcd files: ``` rm -rf /var/lib/etcd/ ``` -Reboot hosts. +Reboot the hosts. In NixOS configuration: -``` - Re-enable Etcd first. Rebuild NixOS. Certify service health. (systemctl status etcd) - Re-enable K3s second. Rebuild NixOS. Certify service health. (systemctl status k3s) -``` -Etcd & K3s cluster will be provisioned new. +``` + Re-enable Etcd first. Rebuild NixOS. Verify service health. (systemctl status etcd) + Re-enable K3s second. Rebuild NixOS. Verify service health. (systemctl status k3s) +``` +The Etcd & K3s cluster will be provisioned anew. Tip: Use Ansible to automate reset routine, like this. ## Troubleshooting ### Raspberry Pi not working -If the k3s.service/k3s server does not start and gives you the error FATA[0000] failed to find memory cgroup (v2) Here's the github issue: https://github.com/k3s-io/k3s/issues/2067 . +If the k3s.service/k3s server does not start and gives you the error FATA[0000] failed to find memory cgroup (v2) Here's the GitHub issue: https://github.com/k3s-io/k3s/issues/2067 . To fix the problem, you can add these things to your configuration.nix. ``` diff --git a/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md index 23eff54b0828..928d46d0524f 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md +++ b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md @@ -1,8 +1,8 @@ # Onboarding Maintainer -Anyone willing can become a maintainer, no pre-requisite knowledge is required. Willingness to learn is enough. +Anyone willing can become a maintainer, no prerequisite knowledge is required. Willingness to learn is enough. -A K3s maintainer, maintains K3s's: +A K3s maintainer maintains K3s's: - [documentation](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/cluster/k3s/README.md) - [issues](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+k3s) @@ -24,7 +24,7 @@ Only consensus is required to move forward any proposal. Consensus meaning the a If you cause a regression (we've all been there), you are responsible for fixing it, but in case you can't fix it (it happens), feel free to ask for help. That's fine, just let us know. -To merge code, you need to be a committer, or use the merge-bot, but currently the merge-bot only works for packages located at `pkgs/by-name/`, which means, K3s still need to be migrated there before you can use merge-bot for merging. As a non-committer, once you have approved a PR you need to forward the request to a committer. For deciding which committer, give preference initially to K3s committers, but any committer can commit. A committer usually has a green approval in PRs. +To merge code, you need to be a committer, or use the merge-bot, but currently the merge-bot only works for packages located at `pkgs/by-name/`, which means, K3s still needs to be migrated there before you can use merge-bot for merging. As a non-committer, once you have approved a PR you need to forward the request to a committer. For deciding which committer, give preference initially to K3s committers, but any committer can commit. A committer usually has a green approval in PRs. K3s's committers currently are: marcusramberg, Mic92. @@ -32,11 +32,11 @@ K3s's committers currently are: marcusramberg, Mic92. @mic92 stepped up when @superherointj stepped down a time ago, as Mic92 has a broad responsibility in nixpkgs (he is responsible for far too many things already, nixpkgs-reviews, sops-nix, release manager, bot-whatever), we avoid giving him chore work for `nixos-unstable`, only pick him as committer last. As Mic92 runs K3s in a `nixos-stable` setting, he might help in testing stable backports. -On how to handle requests, it's the usual basics, such as, when reviewing PRs, issues, be welcoming, helpful, provide hints whenever possible, try to move things forward, assume good will, ignore [as don't react to] any negativity [since it spirals badly], delay and sort any (severe) disagreement in private. Even on disagrements, be thankful to people for their dedicated time, no matter what happens. In essence, on any unfortunate event, **always put people over code**. +On how to handle requests, it's the usual basics, such as, when reviewing PRs, issues, be welcoming, helpful, provide hints whenever possible, try to move things forward, assume good will, ignore [as don't react to] any negativity [since it spirals badly], delay and sort any (severe) disagreement in private. Even on disagreements, be thankful to people for their dedicated time, no matter what happens. In essence, on any unfortunate event, **always put people over code**. -Dumbshit happens, we make mistakes, the CI, reviews, fellow maintainers are there to nudge us on a better direction, no need to over think interactions, if a problem happens, we'll handle it. +Dumbshit happens, we make mistakes, the CI, reviews, fellow maintainers are there to nudge us on a better direction, no need to overthink interactions, if a problem happens, we'll handle it. -We should optimize for maintainers satisfaction, because it is maintainers that make the service great. The best kind of win we have is when someone new steps up for being a maintainer. This multiplies our capabilities of doing meaningful work and increases our knowledge pool. +We should optimize for maintainer satisfaction, because it is maintainers that make the service great. The best kind of win we have is when someone new steps up for being a maintainer. This multiplies our capabilities of doing meaningful work and increases our knowledge pool. Know that your participation matters most for us. And we thank you for stepping up. It's good to have you here! diff --git a/pkgs/applications/networking/cluster/k3s/docs/PKG_UPKEEP.md b/pkgs/applications/networking/cluster/k3s/docs/PKG_UPKEEP.md index d41ef357da00..e09b34a8023c 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/PKG_UPKEEP.md +++ b/pkgs/applications/networking/cluster/k3s/docs/PKG_UPKEEP.md @@ -12,7 +12,7 @@ This process split into two sections and adheres to the versioning policy outlin * Prior to the breaking change window of the next release being closed: * `nixos-unstable`: Ensure k3s points to latest versioned release * `nixos-unstable`: Ensure release notes are up to date - * `nixos-unstable`: Remove k3s releases which will be end of life upstream prior to end-of-life for the next NixOS stable release are removed with proper deprecation notice (process listed below) + * `nixos-unstable`: Remove k3s releases which will be end of life upstream prior to end-of-life for the next NixOS stable release, with proper deprecation notice (process listed below) ### Post-Release @@ -53,7 +53,7 @@ Package removal policy and timelines follow our reasoning in the [versioning doc Quick checklist for reviewers of the k3s package: * Is the version of the Go compiler pinned according to the go.mod file for the release? - * Update script will not pin nor change the go version. + * The update script will not pin nor change the Go version. * Do the K3s passthru.tests work for all architectures supported? (linux-x86_64, aarch64-linux) * For GitHub CI, [OfBorg](https://github.com/NixOS/ofborg) can be used to test all platforms. * For Local testing, the following can be run in nixpkgs root on the upgrade branch: `nix build .#k3s_1_29.passthru.tests.{etcd,single-node,multi-node}` (Replace "29" to the version tested) diff --git a/pkgs/applications/networking/cluster/k3s/docs/USAGE.md b/pkgs/applications/networking/cluster/k3s/docs/USAGE.md index 1ddeba7a7132..bc3d19ab5ff4 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/USAGE.md +++ b/pkgs/applications/networking/cluster/k3s/docs/USAGE.md @@ -25,7 +25,7 @@ Multi-node setup ## Multi-Node -it is simple to create a cluster of multiple nodes in a highly available setup (all nodes are in the control-plane and are a part of the etcd cluster). +It is simple to create a cluster of multiple nodes in a highly available setup (all nodes are in the control-plane and are a part of the etcd cluster). The first node is configured like this: @@ -62,7 +62,7 @@ Tip: If you run into connectivity issues between nodes for specific applications ### `prefer-bundled-bin` K3s has a config setting `prefer-bundled-bin` (and CLI flag `--prefer-bundled-bin`) that makes k3s use binaries from the `/var/lib/rancher/k3s/data/current/bin/aux/` directory, as unpacked by the k3s binary, before the system `$PATH`. -This works with the official distribution of k3s but not with the package from nixpkgs, as it does not bundle the upstream binaries from [`k3s-root`](https://github.com/k3s-io/k3s-root) into the k3s binary. +This works with the official distribution of k3s but not with the package from Nixpkgs, as it does not bundle the upstream binaries from [`k3s-root`](https://github.com/k3s-io/k3s-root) into the k3s binary. Thus the `prefer-bundled-bin` setting **cannot** be used to work around issues (like [this `mount` regression](https://github.com/util-linux/util-linux/issues/3474)) with binaries used/called by the kubelet. ### Building from a different source diff --git a/pkgs/applications/networking/cluster/k3s/docs/VERSIONING.md b/pkgs/applications/networking/cluster/k3s/docs/VERSIONING.md index 191af0058453..cb84cdb314f9 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/VERSIONING.md +++ b/pkgs/applications/networking/cluster/k3s/docs/VERSIONING.md @@ -1,12 +1,12 @@ # Versioning -K3s, Kubernetes, and other clustered software has the property of not being able to update atomically. Most software in nixpkgs, like for example bash, can be updated as part of a "nixos-rebuild switch" without having to worry about the old and the new bash interacting in some way. +K3s, Kubernetes, and other clustered software have the property of not being able to update atomically. Most software in Nixpkgs, like for example bash, can be updated as part of a "nixos-rebuild switch" without having to worry about the old and the new bash interacting in some way. K3s/Kubernetes, on the other hand, is typically run across several NixOS machines, and each NixOS machine is updated independently. As such, different versions of the package and NixOS module must maintain compatibility with each other through temporary version skew during updates. The upstream Kubernetes project [documents this in their version-skew policy](https://kubernetes.io/releases/version-skew-policy/#supported-component-upgrade-order). -Within nixpkgs, we strive to maintain a valid "upgrade path" that does not run +Within Nixpkgs, we strive to maintain a valid "upgrade path" that does not run afoul of the upstream version skew policy. ## Patch Release Support Lifecycle @@ -15,11 +15,11 @@ K3s is built on top of K8s and typically provides a similar release cadence and In short, a new Kubernetes version is released roughly every 4 months and each release is supported for a little over 1 year. -## Versioning in nixpkgs +## Versioning in Nixpkgs -There are two package types that are maintained within nixpkgs when we are looking at the `nixos-unstable` branch. A standard `k3s` package and versioned releases such as `k3s_1_28`, `k3s_1_29`, and `k3s_1_30`. +There are two package types that are maintained within Nixpkgs when we are looking at the `nixos-unstable` branch. A standard `k3s` package and versioned releases such as `k3s_1_28`, `k3s_1_29`, and `k3s_1_30`. -The standard `k3s` package will be updated as new versions of k3s are released upstream. Versioned releases, on the other hand, will follow the path release support lifecycle as detailed in the previous section and be removed from `nixos-unstable` when they are either end-of-life upstream or older than the current `k3s` package in `nixos-stable`. +The standard `k3s` package will be updated as new versions of k3s are released upstream. Versioned releases, on the other hand, will follow the patch release support lifecycle as detailed in the previous section and be removed from `nixos-unstable` when they are either end-of-life upstream or older than the current `k3s` package in `nixos-stable`. ## Versioning in NixOS Releases diff --git a/pkgs/applications/networking/cluster/k3s/docs/examples/INTEL.md b/pkgs/applications/networking/cluster/k3s/docs/examples/INTEL.md index 467208b44457..c2429feccff7 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/examples/INTEL.md +++ b/pkgs/applications/networking/cluster/k3s/docs/examples/INTEL.md @@ -5,7 +5,7 @@ This article makes the following assumptions: 2. The Linux kernel running is modern enough to support your GPU out of the box 3. The desired driver is `i915` -- modify as needed for other drivers -> Note: at the time of writing, the author was using an Intel Arc A770 in k3s. The majority of this guide likely should work on other Kubernetes distributions, and will likely work identically for integrated graphics capabilities. +> Note: at the time of writing, the author was using an Intel Arc A770 in k3s. The majority of this guide should work on other Kubernetes distributions, and will likely work identically for integrated graphics capabilities. ### Enable the Intel driver in NixOS @@ -15,13 +15,13 @@ Add the following NixOS configuration to enable the Intel driver (necessary on h services.xserver.videoDrivers = [ "i915" ]; ``` -After rebuilding the configuration, reboot the host for the GPU driver to be assigned to the GPU. Use the following command to ensure the GPU is using the i915 kernel: +After rebuilding the configuration, reboot the host for the driver to be assigned to the GPU. Use the following command to ensure the GPU is using the i915 kernel: ``` sudo lspci -k ``` -i.e. the output looks like this on a host with the Intel Arc A770: +For example, the output looks like this on a host with the Intel Arc A770: ``` ❯ sudo lspci -k | grep -A 3 'Arc' @@ -117,7 +117,7 @@ Verify the number has been applied like so: kubectl get nodes -o yaml | grep gpu.intel.com/i915 | sort -u ``` -i.e. in this configuration, up to 10 pods can use the GPU: +For example, in this configuration, up to 10 pods can use the GPU: ``` ❯ kubectl get nodes -o yaml | grep gpu.intel.com/i915 | sort -u diff --git a/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md b/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md index fa8270e86ca8..3163024ec595 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md +++ b/pkgs/applications/networking/cluster/k3s/docs/examples/NVIDIA.md @@ -17,7 +17,7 @@ services.xserver = { videoDrivers = [ "nvidia" ]; }; -nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ +nixpkgs.config.allowUnfreePackages = [ "nvidia-x11" "nvidia-settings" ]; @@ -58,7 +58,7 @@ Additionally, `lspci -k` can be used to ensure the driver has been assigned to t ## Configure k3s -You now need to create a new file in `/var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl` with the following +You now need to create a new file in `/var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl` with the following: ``` {{ template "base" . }} diff --git a/pkgs/applications/networking/cluster/k3s/docs/examples/STORAGE.md b/pkgs/applications/networking/cluster/k3s/docs/examples/STORAGE.md index f61a13eee01d..02d4617c8aee 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/examples/STORAGE.md +++ b/pkgs/applications/networking/cluster/k3s/docs/examples/STORAGE.md @@ -14,7 +14,7 @@ services.openiscsi = { }; ``` -Longhorn container has trouble with NixOS path. Solution is to override PATH environment variable, such as: +The Longhorn container has trouble with the NixOS path. Solution is to override PATH environment variable, such as: ``` PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin @@ -42,7 +42,7 @@ metadata: policies.kyverno.io/category: Other policies.kyverno.io/description: >- Longhorn invokes executables on the host system, and needs - to be aware of the host systems PATH. This modifies all + to be aware of the host system's PATH. This modifies all deployments such that the PATH is explicitly set to support NixOS based systems. spec: diff --git a/pkgs/applications/networking/cluster/rke2/README.md b/pkgs/applications/networking/cluster/rke2/README.md index 9990e04de310..7835ef3fc77b 100644 --- a/pkgs/applications/networking/cluster/rke2/README.md +++ b/pkgs/applications/networking/cluster/rke2/README.md @@ -1,7 +1,7 @@ # RKE2 Version -RKE2, Kubernetes, and other clustered software has the property of not being able to update -atomically. Most software in nixpkgs, like for example bash, can be updated as part of a +RKE2, Kubernetes, and other clustered software have the property of not being able to update +atomically. Most software in Nixpkgs, like for example bash, can be updated as part of a `nixos-rebuild switch` without having to worry about the old and the new bash interacting in some way. RKE2/Kubernetes, on the other hand, is typically run across several machines, and each machine is updated independently. As such, different versions of the package and NixOS module must maintain @@ -9,7 +9,7 @@ compatibility with each other through temporary version skew during updates. The project documents this in their [version-skew policy](https://kubernetes.io/releases/version-skew-policy/#supported-component-upgrade-order). -Within nixpkgs, we strive to maintain a valid "upgrade path" that does not run afoul of the upstream +Within Nixpkgs, we strive to maintain a valid "upgrade path" that does not run afoul of the upstream version skew policy. > [!NOTE] @@ -18,13 +18,13 @@ version skew policy. ## Release Maintenance -This section describes how new RKE2 releases are published in nixpkgs. +This section describes how new RKE2 releases are published in Nixpkgs. Before contributing new RKE2 packages or updating existing packages, make sure that - New packages build (e.g. `nix-build -A rke2_1_34`) - All tests pass (e.g. `nix-build -A rke2_1_34.tests`) -- You respect the nixpkgs [contributing guidelines](/CONTRIBUTING.md) +- You respect the Nixpkgs [contributing guidelines](/CONTRIBUTING.md) ### Release Channels @@ -95,7 +95,7 @@ In order to remove a versioned RKE2 package, create a PR achieving the following [pkgs/top-level/all-packages.nix](/pkgs/top-level/all-packages.nix) 4. Add a deprecation notice in [pkgs/top-level/aliases.nix](/pkgs/top-level/aliases.nix) - Such as - `rke2_1_34 = throw "'rke2_1_34' has been removed from nixpkgs as it has reached end of life"; # Added 2026-10-27` + `rke2_1_34 = throw "'rke2_1_34' has been removed from Nixpkgs as it has reached end of life"; # Added 2026-10-27` #### Handling EOL on stable diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fac672529157..ffadba0e1a97 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -45,11 +45,11 @@ "vendorHash": "sha256-6sVapd0vqL4xGLqTQS4zQIlnMA8HRmjufDi1lOgldlU=" }, "aliyun_alicloud": { - "hash": "sha256-4Y6qItQx3gk4LsZb9OB2J2IQ4g6H5uDwy+FkWPCegrg=", + "hash": "sha256-JcNbhR9qeakHWTDu4tF3Sl2G5zfcohNEsK87znI5hiM=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.268.0", + "rev": "v1.269.0", "spdx": "MPL-2.0", "vendorHash": "sha256-ogQLStDbsM0aRf4QIbITB8Z+L9DUtZwoAPK6T4xylXI=" }, @@ -418,11 +418,11 @@ "vendorHash": "sha256-ZbU2z7qUHPR7vDSflesSjgK7x3LYXVe/gnVsy19q6Bs=" }, "fortinetdev_fortios": { - "hash": "sha256-xXCOhF+FPJDSPl7ISaRTn3FpDRSNmy0+3xdGmjbddKU=", + "hash": "sha256-w7LxnOEAoeJKyicI8Bfd2yH+3oTz3ZVBnskbSEgZBO4=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", "repo": "terraform-provider-fortios", - "rev": "1.24.0", + "rev": "1.24.1", "spdx": "MPL-2.0", "vendorHash": "sha256-V+D/D+i1xbPp9IAfrAds2rNv5t/aXQxPwH9vY09DsMo=" }, @@ -643,11 +643,11 @@ "vendorHash": "sha256-ssmAveYUVI8z/1UWNeaMX0qdUewowCHNufJIFMirdVg=" }, "hashicorp_random": { - "hash": "sha256-pt36xl5drR1YtXZ6IRqvvO14iINwb/m7MEAAw7RwQTA=", + "hash": "sha256-BKQifHycSujVAzARmNNRdI3Dsg35bmB8Kz9GL/KbSQA=", "homepage": "https://registry.terraform.io/providers/hashicorp/random", "owner": "hashicorp", "repo": "terraform-provider-random", - "rev": "v3.8.0", + "rev": "v3.8.1", "spdx": "MPL-2.0", "vendorHash": "sha256-GlkqFg9Bgs+Hi59PYAxqq3YW9ji1qeuX4vz59wQ4pRw=" }, @@ -1238,13 +1238,13 @@ "vendorHash": "sha256-XNPXjqrrTIC3WrpvDBP7veAYgmYws9FdF4W3j6ewRPk=" }, "splunk-terraform_signalfx": { - "hash": "sha256-Wixg+biff6OER/nXYa+WGXG7svs4T3E/qwPlV5xJEao=", + "hash": "sha256-dPhHzWOkNgIxlHSZm88zKkrgaXaXJ6RFdYeqX5zYSfU=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.23.1", + "rev": "v9.24.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HWAUI0mowVP8FPw44xYaFOTh6jjkfXa7fuPk2zoSZJ8=" + "vendorHash": "sha256-/zsslNR7GDLFrtL4T0GLYhKTBof51ODavb/+PHdziS4=" }, "spotinst_spotinst": { "hash": "sha256-aPOqAzK/FdDDTbl2WMKxA99a5w6ZM0xK/BLjzPnvuws=", @@ -1301,11 +1301,11 @@ "vendorHash": "sha256-Hzq97ElAjs7Y4tmJ2x7+g4j74MEdEvI2bD8pkvi5ZXg=" }, "temporalio_temporalcloud": { - "hash": "sha256-Lwb/T2yz8/hfV8/WrD/AXunoUNg/QbF9VzWtxSBlUX0=", + "hash": "sha256-bqUANWb+8XyY6iRGudSHKOHsErg40TY9SoaJArFqWNM=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v1.1.2", + "rev": "v1.2.0", "spdx": "MPL-2.0", "vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o=" }, diff --git a/pkgs/applications/networking/instant-messengers/linphone/README.md b/pkgs/applications/networking/instant-messengers/linphone/README.md index 5828ca223747..a724b1d7358a 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/README.md +++ b/pkgs/applications/networking/instant-messengers/linphone/README.md @@ -28,11 +28,11 @@ Updating is done in 3 steps: ## Adding new libraries -To add a new package to this scope, simply add a new subdirectory containing a `default.nix` file with the appropriate package name. The scope automatically picks up any directories and adds an according toplevel package. +To add a new package to this scope, simply add a new subdirectory containing a `default.nix` file with the appropriate package name. The scope automatically picks up any directories and adds a corresponding toplevel package. If the package you are adding is contained within the `linphone-sdk` monorepo, it makes sense to use the `mkLinphoneDerivation` function to streamline the build process. -If the package you are adding is a third-party libary with custom patches from BC, it should be prefixed with `bc-` for easy recognizability, so e.g. if BC were to patch `ffmpeg`, you would call the package `bc-ffmpeg`. +If the package you are adding is a third-party library with custom patches from BC, it should be prefixed with `bc-` for easy recognizability, so e.g. if BC were to patch `ffmpeg`, you would call the package `bc-ffmpeg`. ## Notes for the future diff --git a/pkgs/applications/radio/cqrlog/default.nix b/pkgs/applications/radio/cqrlog/default.nix deleted file mode 100644 index e17ee3fa221f..000000000000 --- a/pkgs/applications/radio/cqrlog/default.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fpc, - lazarus, - atk, - cairo, - gdk-pixbuf, - glib, - gtk2-x11, - libX11, - pango, - hamlib, - mariadb, - tqsl, - xdg-utils, - xplanet, - autoPatchelfHook, - wrapGAppsHook3, -}: - -stdenv.mkDerivation rec { - pname = "cqrlog"; - version = "2.5.2"; - - src = fetchFromGitHub { - owner = "ok2cqr"; - repo = "cqrlog"; - rev = "v${version}"; - sha256 = "0zzcg0bl6mq4wfifj998x9x09w8sigbh46synpqx034fpr0swyhb"; - }; - - # Adds the possibility to change the lazarus directory, - # otherwise, we would get error : "directory lcl not found" - patches = [ ./fix-makefile-lazarusdir.patch ]; - - postPatch = '' - substituteInPlace Makefile \ - --replace @Lazarusdir@ "${lazarus}/share/lazarus" \ - --replace /usr "" - substituteInPlace src/fTRXControl.pas \ - --replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld" - substituteInPlace src/fCallAttachment.pas \ - --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" - substituteInPlace src/fRotControl.pas \ - --replace "/usr/bin/rotctld" "${hamlib}/bin/rotctld" - substituteInPlace src/fPreferences.pas \ - --replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld" \ - --replace "/usr/bin/rotctld" "${hamlib}/bin/rotctld" \ - --replace "/usr/bin/xplanet" "${xplanet}/bin/xplanet" - substituteInPlace src/fLoTWExport.pas \ - --replace "/usr/bin/tqsl" "${tqsl}/bin/tqsl" - substituteInPlace src/dUtils.pas \ - --replace "/usr/bin/xplanet" "${xplanet}/bin/xplanet" \ - --replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld" - # Order is important - substituteInPlace src/dData.pas \ - --replace "/usr/bin/mysqld_safe" "${mariadb}/bin/mysqld_safe" \ - --replace "/usr/bin/mysqld" "${mariadb}/bin/mysqld" - - # To be fail when I need to patch a new hardcoded binary - ! grep -C src -RC0 "/usr" - ''; - - nativeBuildInputs = [ - lazarus - fpc - autoPatchelfHook - wrapGAppsHook3 - ]; - buildInputs = [ - atk - cairo - gdk-pixbuf - glib - gtk2-x11 - libX11 - pango - ]; - propagatedBuildInputs = [ - hamlib - mariadb - tqsl - xdg-utils - xplanet - ]; - - makeFlags = [ - "FPC=fpc" - "PP=fpc" - "DESTDIR=$(out)" - ]; - - postFixup = '' - libmysqlclient=$(find "${mariadb.client}/lib" -name "libmysqlclient.so" | tail -n1) - patchelf --add-needed "libmysqlclient.so" \ - --add-rpath "$(dirname "$libmysqlclient")" \ - "$out/bin/.cqrlog-wrapped" - ''; - - meta = { - description = "Linux logging program for amateur radio operators"; - mainProgram = "cqrlog"; - homepage = "https://www.cqrlog.com/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/radio/cqrlog/fix-makefile-lazarusdir.patch b/pkgs/applications/radio/cqrlog/fix-makefile-lazarusdir.patch deleted file mode 100644 index 9170387966ac..000000000000 --- a/pkgs/applications/radio/cqrlog/fix-makefile-lazarusdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -Seulement dans b: logs -diff --color -ur a/Makefile b/Makefile ---- a/Makefile 2021-02-15 17:07:14.333810200 +0100 -+++ b/Makefile 2021-02-15 17:19:18.599426984 +0100 -@@ -6,7 +6,7 @@ - tmpdir = /tmp - - cqrlog: src/cqrlog.lpi -- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi -+ $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus --lazarusdir=@Lazarusdir@ src/cqrlog.lpi - $(ST) src/cqrlog - gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz - diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c62b5cc27db1..df176c2b84d9 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -136,11 +136,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "10.1.2"; + version = "10.2.0"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-nXXzMcGly5tuuP2fZPVj7C6rNGyCLLl/izXNgtPxFHk="; + hash = "sha256-njCtG4ufe0RjABWC0aspfznPzOpdCFQMDKbWZyeFiDo="; }; depsBuildBuild = [ @@ -268,6 +268,50 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E="; revert = true; }) + + # Implement termios2 (TCGETS2 etc) for glibc 2.42 compatibility. Should be in the next release. + # https://gitlab.com/qemu-project/qemu/-/issues/3065 + # https://lore.kernel.org/qemu-devel/20260103153239.15787-1-dilfridge@gentoo.org/t/#u + (fetchpatch { + name = "0001-Add-termios2-support-to-linux-user.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/e9a8a10e84c1bf6e2e8be000e4dd5c83ba0d8470.patch"; + hash = "sha256-Zc+ZjiSug3uT/F7+mmoYc2VXqw2MV6UubYqB+pr2dNY="; + }) + (fetchpatch { + name = "0002-Add-termios2-support-to-alpha-target.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/8d8c6aeee8599a099e49ec4411f3d1e087ae40ad.patch"; + hash = "sha256-5e5vUp9nr96ZmVA98W/ETReLbkofayysJXlx1Ck9gDs="; + }) + (fetchpatch { + name = "0003-Add-termios2-support-to-hppa-target.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/edc741710acedd61011f937967b960d154794258.patch"; + hash = "sha256-nls6eTOB06eqACjQ/r1sQvb9YaYmrpJcegsDGqKAOaI="; + }) + (fetchpatch { + name = "0004-Add-termios2-support-to-mips-target.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/edf9184f4feb691b0f70dc544443db2380891598.patch"; + hash = "sha256-GrBhyMq2QiCc+WlUwaB9j4G8vB3ipxJRV5Hvyab/5Fk="; + }) + (fetchpatch { + name = "0005-Add-termios2-support-to-sh4-target.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/afbe0ff81c29d674b9c18a588bcaab34ddcb8a7b.patch"; + hash = "sha256-h+9eC6H8/GJ85Lt1Y0ggdJbbgTIvDfIJkPQfX/FgO4c="; + }) + (fetchpatch { + name = "0006-Add-termios2-support-to-sparc-target.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/947b971cad90375040f399899909a3f1f32b483f.patch"; + hash = "sha256-/JvF25aSR2mBSvkpqupDySMJYZI+lv7L0YwhqiaDk3A="; + }) + (fetchpatch { + name = "0007-linux-user-Add-missing-termios-baud-rates.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/4f22fcb5c67f40a36e6654f6cfaee23f9f9e93d1.patch"; + hash = "sha256-CM81yL0/i+fmQe8qzemre13N3A74J1HIC7ilCbb7ESQ="; + }) + (fetchpatch { + name = "0008-linux-user-fixup-termios2-related-things-on-PowerPC.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/d68f0e2e906939bef076d0cd52f902d433c8c3da.patch"; + hash = "sha256-vF47CKqg0wBBOUkHeJ3hv3nUHCftl2OwD3Nh0dL1PNk="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; diff --git a/pkgs/build-support/go/README.md b/pkgs/build-support/go/README.md index e65f81d17a67..f6a859b298cc 100644 --- a/pkgs/build-support/go/README.md +++ b/pkgs/build-support/go/README.md @@ -3,11 +3,11 @@ Go promises that "programs written to the Go 1 specification will continue to compile and run correctly, unchanged, over the lifetime of that specification" [1]. Newer toolchain versions should build projects developed against older toolchains without problems. -**Definition(a "toolchain-breaking" package):** +**Definition (a "toolchain-breaking" package):** There are however Go packages depending on internal APIs of the toolchain/runtime/stdlib that are not covered by the Go compatibility promise. These packages may break on toolchain minor version upgrades. -**Definition(a "toolchain-latest" package):** +**Definition (a "toolchain-latest" package):** Packages providing development support for the Go language (like `gopls`, `golangci-lint`,...) depend on the toolchain in another way: they must be compiled at least with the version they should be used for. If `gopls` is compiled for Go 1.23, it won't work for projects that require Go 1.24. @@ -21,13 +21,13 @@ Based on this, we align on the following policy for toolchain/builder upgrades f 2. The `go_latest` toolchain and the `buildGoLatestModule` are also bumped directly after release, but the update goes to the `master` branch. Packages in `toolchain-latest` SHOULD use `go_latest`/`buildGoLatestModule`. - Packages in nixpkgs MUST only use this toolchain/builder if they have a good reason to do so + Packages in nixpkgs MUST only use this toolchain/builder if they have a good reason to do so. A comment MUST be added explaining why this is the case for a certain package. It is important to keep the number of packages using this builder within nixpkgs low, so the bump won't cause a mass rebuild. `go_latest` MUST not point to release candidates of Go. - Consumer outside of nixpkgs on the other hand MAY rely on this toolchain/builder if they prefer being upgraded earlier to the newest toolchain minor version. + Consumers outside of nixpkgs on the other hand MAY rely on this toolchain/builder if they prefer being upgraded earlier to the newest toolchain minor version. 3. Packages in `toolchain-breaking` SHOULD pin a toolchain version by using a builder with a fixed Go version (`buildGo1xxModule`). The use of `buildGo1xxModule` MUST be accompanied with a comment explaining why this has a dependency on a specific Go version. @@ -40,7 +40,7 @@ Based on this, we align on the following policy for toolchain/builder upgrades f When an end-of-life toolchain is removed, builders that pin the EOL version (according to 3.) will automatically be bumped to the then oldest pinned builder (e.g. Go 1.22 is EOL, `buildGo122Module` is bumped to `buildGo123Module`). If the package won't build with that builder anymore, the package is marked broken. - It is the package maintainers responsibility to fix the package and get it working with a supported Go toolchain. + It is the package maintainer's responsibility to fix the package and get it working with a supported Go toolchain. For the stable release, we recognize that (1) removing a Go version, or updating the `go_latest` or `go` packages to a new Go minor release, would be a breaking change, and (2) some packages will need backports (e.g. for security reasons) that require the latest Go version. Therefore, on the stable release, new Go versions will be backported to the `release-2x.xx` branch, but the old versions will remain, and `go`, `buildGoModule`, `go_latest`, and `buildGoLatestModule` will remain unchanged. diff --git a/pkgs/build-support/kernel/make-initrd-ng/README.md b/pkgs/build-support/kernel/make-initrd-ng/README.md index d92b7eab7fe1..f36e3995b249 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/README.md +++ b/pkgs/build-support/kernel/make-initrd-ng/README.md @@ -74,7 +74,7 @@ initrd to a minimum. in less than a second, and the code is substantially easier to work with. -- This will not require end users to install a rust toolchain to use +- This will not require end users to install a Rust toolchain to use NixOS, as long as this tool is cached by Hydra. And if you're bootstrapping NixOS from source, rustc is already required anyway. diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 45423d21a570..f49c5ca49929 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -107,9 +107,11 @@ fi # copy module ordering hints for depmod cp $kernel/lib/modules/"$version"/modules.order $out/lib/modules/"$version"/. cp $kernel/lib/modules/"$version"/modules.builtin $out/lib/modules/"$version"/. +cp $kernel/lib/modules/"$version"/modules.builtin.modinfo $out/lib/modules/"$version"/. depmod -b $out -a $version # remove original hints from final derivation rm $out/lib/modules/"$version"/modules.order rm $out/lib/modules/"$version"/modules.builtin +rm $out/lib/modules/"$version"/modules.builtin.modinfo diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md index fd0bd031b12d..7f7e767e5021 100644 --- a/pkgs/by-name/README.md +++ b/pkgs/by-name/README.md @@ -64,7 +64,7 @@ The above expression is called using these arguments by default: But the package might need `pkgs.libbar_2` instead. While the `libbar` argument could explicitly be overridden in `all-packages.nix` with `libbar_2`, this would hide important information about this package from its interface. The fact that the package requires a certain version of `libbar` to work should not be hidden in a separate place. -It is preferable to use `libbar_2` as a argument name instead. +It is preferable to use `libbar_2` as an argument name instead. This approach also has the benefit that, if the expectation of the package changes to require a different version of `libbar`, a downstream user with an override of this argument will receive an error. This is comparable to a merge conflict in git: It's much better to be forced to explicitly address the conflict instead of silently keeping the override - which might lead to a different problem that is likely much harder to debug. diff --git a/pkgs/by-name/_3/_3proxy/package.nix b/pkgs/by-name/_3/_3proxy/package.nix index 2403efe6b346..1236f6ba4077 100644 --- a/pkgs/by-name/_3/_3proxy/package.nix +++ b/pkgs/by-name/_3/_3proxy/package.nix @@ -5,14 +5,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "3proxy"; version = "0.9.5"; src = fetchFromGitHub { owner = "3proxy"; repo = "3proxy"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-uy6flZ1a7o02pr5O0pgl9zCjh8mE9W5JxotJeBMB16A="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ misuzu ]; }; -} +}) diff --git a/pkgs/by-name/_4/_4ti2/package.nix b/pkgs/by-name/_4/_4ti2/package.nix index 50e952280963..65ad8e3b7611 100644 --- a/pkgs/by-name/_4/_4ti2/package.nix +++ b/pkgs/by-name/_4/_4ti2/package.nix @@ -7,14 +7,14 @@ gmp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "4ti2"; version = "1.6.13"; src = fetchFromGitHub { owner = "4ti2"; repo = "4ti2"; - rev = "Release_${builtins.replaceStrings [ "." ] [ "_" ] version}"; + rev = "Release_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-gbYG55LfVhjJJFJu0L8AWIAnFDViHIW2N1qtS8xOFAc="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/_6/_6tunnel/package.nix b/pkgs/by-name/_6/_6tunnel/package.nix index 29fcdc928f63..f1292c4837da 100644 --- a/pkgs/by-name/_6/_6tunnel/package.nix +++ b/pkgs/by-name/_6/_6tunnel/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "6tunnel"; version = "0.14"; src = fetchFromGitHub { owner = "wojtekka"; repo = "6tunnel"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-ftTAFjHlXRrXH6co8bX0RY092lAmv15svZn4BKGVuq0="; }; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { description = "Tunnelling for application that don't speak IPv6"; mainProgram = "6tunnel"; homepage = "https://github.com/wojtekka/6tunnel"; - changelog = "https://github.com/wojtekka/6tunnel/blob/${version}/ChangeLog"; + changelog = "https://github.com/wojtekka/6tunnel/blob/${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/_9/_915resolution/package.nix b/pkgs/by-name/_9/_915resolution/package.nix index 681855bb2862..b0597c491c09 100644 --- a/pkgs/by-name/_9/_915resolution/package.nix +++ b/pkgs/by-name/_9/_915resolution/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "915resolution"; version = "0.5.3"; src = fetchurl { - url = "http://915resolution.mango-lang.org/915resolution-${version}.tar.gz"; + url = "http://915resolution.mango-lang.org/915resolution-${finalAttrs.version}.tar.gz"; sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { ]; license = lib.licenses.publicDomain; }; -} +}) diff --git a/pkgs/by-name/_9/_9pfs/package.nix b/pkgs/by-name/_9/_9pfs/package.nix index 618710516d33..d57ea3abcb37 100644 --- a/pkgs/by-name/_9/_9pfs/package.nix +++ b/pkgs/by-name/_9/_9pfs/package.nix @@ -7,14 +7,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "9pfs"; version = "0.5"; src = fetchFromGitHub { owner = "ftrvxmtrx"; repo = "9pfs"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-NT8oIQK8Os3HRZLOH2OvauiCvh5bXZFbeEtTFbzNvrs="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { bsd2 ]; }; -} +}) diff --git a/pkgs/by-name/a2/a2jmidid/package.nix b/pkgs/by-name/a2/a2jmidid/package.nix index a615756043fb..61fd1a471b76 100644 --- a/pkgs/by-name/a2/a2jmidid/package.nix +++ b/pkgs/by-name/a2/a2jmidid/package.nix @@ -13,7 +13,7 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "a2jmidid"; version = "12"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { domain = "gitea.ladish.org"; owner = "LADI"; repo = "a2jmidid"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-PZKGhHmPMf0AucPruOLB9DniM5A3BKdghFCrd5pTzeM="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { "aarch64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/a2/a2ps/package.nix b/pkgs/by-name/a2/a2ps/package.nix index 8d97f7f96b11..1f4b30713050 100644 --- a/pkgs/by-name/a2/a2ps/package.nix +++ b/pkgs/by-name/a2/a2ps/package.nix @@ -12,12 +12,12 @@ libpaper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "a2ps"; version = "4.15.7"; src = fetchurl { - url = "mirror://gnu/a2ps/a2ps-${version}.tar.gz"; + url = "mirror://gnu/a2ps/a2ps-${finalAttrs.version}.tar.gz"; hash = "sha256-cV84Zwr9lQtMpxwB9Gj+760mXKUtPxEpNMY8Cov7uK8="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bennofs ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/a5/a52dec/package.nix b/pkgs/by-name/a5/a52dec/package.nix index b84b4763743e..d428b36d1785 100644 --- a/pkgs/by-name/a5/a52dec/package.nix +++ b/pkgs/by-name/a5/a52dec/package.nix @@ -5,7 +5,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "a52dec"; version = "0.8.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { domain = "git.adelielinux.org"; owner = "community"; repo = "a52dec"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Z4riiwetJkhQYa+AD8qOiwB1+cuLbOyN/g7D8HM8Pkw="; }; @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { meta = { description = "ATSC A/52 stream decoder"; homepage = "https://liba52.sourceforge.io/"; - changelog = "https://git.adelielinux.org/community/a52dec/-/blob/v${version}/ChangeLog?ref_type=tags"; + changelog = "https://git.adelielinux.org/community/a52dec/-/blob/v${finalAttrs.version}/ChangeLog?ref_type=tags"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ wegank ]; mainProgram = "a52dec"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/aa/aalib/package.nix b/pkgs/by-name/aa/aalib/package.nix index fb602b2ee596..ed722db84c0d 100644 --- a/pkgs/by-name/aa/aalib/package.nix +++ b/pkgs/by-name/aa/aalib/package.nix @@ -5,12 +5,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aalib"; version = "1.4rc5"; src = fetchurl { - url = "mirror://sourceforge/aa-project/aalib-${version}.tar.gz"; + url = "mirror://sourceforge/aa-project/aalib-${finalAttrs.version}.tar.gz"; sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.lgpl2; }; -} +}) diff --git a/pkgs/by-name/ab/abi-compliance-checker/package.nix b/pkgs/by-name/ab/abi-compliance-checker/package.nix index c08d64e5d26c..b0aa53d67428 100644 --- a/pkgs/by-name/ab/abi-compliance-checker/package.nix +++ b/pkgs/by-name/ab/abi-compliance-checker/package.nix @@ -8,14 +8,14 @@ abi-dumper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "abi-compliance-checker"; version = "2.3"; src = fetchFromGitHub { owner = "lvc"; repo = "abi-compliance-checker"; - tag = version; + tag = finalAttrs.version; sha256 = "1f1f9j2nf9j83sfl2ljadch99v6ha8rq8xm7ax5akc05hjpyckij"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ab/abi-dumper/package.nix b/pkgs/by-name/ab/abi-dumper/package.nix index aedefd7b022c..1008f350d17f 100644 --- a/pkgs/by-name/ab/abi-dumper/package.nix +++ b/pkgs/by-name/ab/abi-dumper/package.nix @@ -8,14 +8,14 @@ vtable-dumper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "abi-dumper"; version = "1.4"; src = fetchFromGitHub { owner = "lvc"; repo = "abi-dumper"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-BefDMeKHx4MNU6SyX5UpQnwdI+zqap7zunsgdWG/2xc="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ab/abiword/package.nix b/pkgs/by-name/ab/abiword/package.nix index 9bd0c0a5f7ce..1b2cf142e0e5 100644 --- a/pkgs/by-name/ab/abiword/package.nix +++ b/pkgs/by-name/ab/abiword/package.nix @@ -23,7 +23,7 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "abiword"; version = "3.0.7"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "AbiWord"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-dYbJ726Zuxs7+VTTCWHYQLsVZ/86hRUBQRac6toO4UI="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { sna ]; }; -} +}) diff --git a/pkgs/by-name/ab/abootimg/package.nix b/pkgs/by-name/ab/abootimg/package.nix index a1148560e271..1d8bd4d90a60 100644 --- a/pkgs/by-name/ab/abootimg/package.nix +++ b/pkgs/by-name/ab/abootimg/package.nix @@ -10,7 +10,7 @@ util-linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "abootimg"; version = "0.6"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { postPatch = '' cat < version.h - #define VERSION_STR "${version}" + #define VERSION_STR "${finalAttrs.version}" EOF ''; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ flokli ]; }; -} +}) diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix index da69e5021756..6abd42cb3f82 100644 --- a/pkgs/by-name/ab/abracadabra/package.nix +++ b/pkgs/by-name/ab/abracadabra/package.nix @@ -13,14 +13,14 @@ soapysdr-with-plugins, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "abracadabra"; version = "3.3.2"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QR3wc+eltIpmdNpyzQqJd4Zo40JVlTzRBNSr11tE0X8="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ markuskowa ]; mainProgram = "AbracaDABra"; }; -} +}) diff --git a/pkgs/by-name/ac/accountsservice/package.nix b/pkgs/by-name/ac/accountsservice/package.nix index 6401c52f0184..36f274498fea 100644 --- a/pkgs/by-name/ac/accountsservice/package.nix +++ b/pkgs/by-name/ac/accountsservice/package.nix @@ -20,7 +20,7 @@ libxcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "accountsservice"; version = "23.13.9"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${finalAttrs.version}.tar.xz"; sha256 = "rdpM3q4k+gmS598///nv+nCQvjrCM6Pt/fadWpybkk8="; }; @@ -107,4 +107,4 @@ stdenv.mkDerivation rec { teams = with lib.teams; [ freedesktop ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ac/acct/package.nix b/pkgs/by-name/ac/acct/package.nix index 6457cb539a98..760d11281d49 100644 --- a/pkgs/by-name/ac/acct/package.nix +++ b/pkgs/by-name/ac/acct/package.nix @@ -5,12 +5,12 @@ fetchpatch2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "acct"; version = "6.6.4"; src = fetchurl { - url = "mirror://gnu/acct/acct-${version}.tar.gz"; + url = "mirror://gnu/acct/acct-${finalAttrs.version}.tar.gz"; sha256 = "0gv6m8giazshvgpvwbng98chpas09myyfw1zr2y7hqxib0mvy5ac"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ac/accuraterip-checksum/package.nix b/pkgs/by-name/ac/accuraterip-checksum/package.nix index 6febd3179693..4d942a8ec538 100644 --- a/pkgs/by-name/ac/accuraterip-checksum/package.nix +++ b/pkgs/by-name/ac/accuraterip-checksum/package.nix @@ -5,14 +5,14 @@ libsndfile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "accuraterip-checksum"; version = "1.5"; src = fetchFromGitHub { owner = "leo-bogert"; repo = "accuraterip-checksum"; - tag = "version${version}"; + tag = "version${finalAttrs.version}"; sha256 = "1a6biy78jb094rifazn4a2g1dlhryg5q8p8gwj0a60ipl0vfb9bj"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "accuraterip-checksum"; }; -} +}) diff --git a/pkgs/by-name/ac/ace/package.nix b/pkgs/by-name/ac/ace/package.nix index 6b927e741c95..8cb204982dbd 100644 --- a/pkgs/by-name/ac/ace/package.nix +++ b/pkgs/by-name/ac/ace/package.nix @@ -7,12 +7,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ace"; version = "7.0.11"; src = fetchurl { - url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; + url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-r+LRiu/u1qMcbrjkSr8ErnemX6zvhgvc5cLWu8AQhww="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nico202 ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ac/acme-sh/package.nix b/pkgs/by-name/ac/acme-sh/package.nix index 90d9d9d4b744..d8a70ec76578 100644 --- a/pkgs/by-name/ac/acme-sh/package.nix +++ b/pkgs/by-name/ac/acme-sh/package.nix @@ -14,14 +14,14 @@ unixtools, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "acme.sh"; version = "3.1.1"; src = fetchFromGitHub { owner = "acmesh-official"; repo = "acme.sh"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Fgik1TCWDlkyEI9QkXpc/94mGKb7U7hMoamdYU7nTJc="; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://acme.sh/"; - changelog = "https://github.com/acmesh-official/acme.sh/releases/tag/${version}"; + changelog = "https://github.com/acmesh-official/acme.sh/releases/tag/${finalAttrs.version}"; description = "Pure Unix shell script implementing ACME client protocol"; longDescription = '' An ACME Shell script: acme.sh @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { inherit (coreutils.meta) platforms; mainProgram = "acme.sh"; }; -} +}) diff --git a/pkgs/by-name/ac/acme/package.nix b/pkgs/by-name/ac/acme/package.nix index 0712590464f8..3fb043ad15b7 100644 --- a/pkgs/by-name/ac/acme/package.nix +++ b/pkgs/by-name/ac/acme/package.nix @@ -4,7 +4,7 @@ fetchsvn, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "acme"; version = "unstable-2021-11-05"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1dzvip90yf1wg0fhfghn96dwrhg289d06b624px9a2wwy3vp5ryg"; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' substituteInPlace Makefile \ @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ OPNA2608 ]; }; -} +}) diff --git a/pkgs/by-name/ac/acpid/package.nix b/pkgs/by-name/ac/acpid/package.nix index 97a5416ab271..9d0ae904a326 100644 --- a/pkgs/by-name/ac/acpid/package.nix +++ b/pkgs/by-name/ac/acpid/package.nix @@ -5,12 +5,12 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "acpid"; version = "2.0.34"; src = fetchurl { - url = "mirror://sourceforge/acpid2/acpid-${version}.tar.xz"; + url = "mirror://sourceforge/acpid2/acpid-${finalAttrs.version}.tar.xz"; sha256 = "sha256-LQlcjPy8hHyux0bWLNyNC/8ewbxy73xnTHIeBNpqszM="; }; @@ -22,4 +22,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ac/acpitool/package.nix b/pkgs/by-name/ac/acpitool/package.nix index a8096c07a0c5..8852e795ac7c 100644 --- a/pkgs/by-name/ac/acpitool/package.nix +++ b/pkgs/by-name/ac/acpitool/package.nix @@ -14,12 +14,12 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "acpitool"; version = "0.5.1"; src = fetchurl { - url = "mirror://sourceforge/acpitool/acpitool-${version}.tar.bz2"; + url = "mirror://sourceforge/acpitool/acpitool-${finalAttrs.version}.tar.bz2"; sha256 = "004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f"; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.guibert ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ac/actkbd/package.nix b/pkgs/by-name/ac/actkbd/package.nix index bd838c13f50a..2916d4dc93f3 100644 --- a/pkgs/by-name/ac/actkbd/package.nix +++ b/pkgs/by-name/ac/actkbd/package.nix @@ -4,12 +4,12 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "actkbd"; version = "0.2.8"; src = fetchurl { - url = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/actkbd-${version}.tar.bz2"; + url = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/actkbd-${finalAttrs.version}.tar.bz2"; sha256 = "1ipb7k5q7k7p54is96ij2n74jfa6xc0llb9lpjwxhsqviqxn9slm"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "actkbd"; }; -} +}) diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index c6c8a6cd5192..a6d2ef1fe989 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ada"; version = "3.4.1"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2xrued35FRqmtZjrMTBtl5r/TB/pXNhhcKOfuwjxrhc="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nickcao ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ad/adapta-backgrounds/package.nix b/pkgs/by-name/ad/adapta-backgrounds/package.nix index 18aac63bf065..fa4669c443d2 100644 --- a/pkgs/by-name/ad/adapta-backgrounds/package.nix +++ b/pkgs/by-name/ad/adapta-backgrounds/package.nix @@ -8,14 +8,14 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "adapta-backgrounds"; version = "0.5.3.1"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-backgrounds"; - tag = version; + tag = finalAttrs.version; sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ romildo ]; }; -} +}) diff --git a/pkgs/by-name/ad/adapta-gtk-theme/package.nix b/pkgs/by-name/ad/adapta-gtk-theme/package.nix index 7bb6862f0463..670cff3ad815 100644 --- a/pkgs/by-name/ad/adapta-gtk-theme/package.nix +++ b/pkgs/by-name/ad/adapta-gtk-theme/package.nix @@ -15,14 +15,14 @@ gnome-shell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "adapta-gtk-theme"; version = "3.95.0.11"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; - tag = version; + tag = finalAttrs.version; sha256 = "19skrhp10xx07hbd0lr3d619vj2im35d8p9rmb4v4zacci804q04"; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ romildo ]; }; -} +}) diff --git a/pkgs/by-name/ad/adapta-kde-theme/package.nix b/pkgs/by-name/ad/adapta-kde-theme/package.nix index 54c5cb2de524..440681880fe8 100644 --- a/pkgs/by-name/ad/adapta-kde-theme/package.nix +++ b/pkgs/by-name/ad/adapta-kde-theme/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "adapta-kde-theme"; version = "20180828"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "adapta-kde"; - tag = version; + tag = finalAttrs.version; sha256 = "1q85678sff8is2kwvgd703ckcns42gdga2c1rqlp61gb6bqf09j8"; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.tadfisher ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ad/adementary-theme/package.nix b/pkgs/by-name/ad/adementary-theme/package.nix index 688e37965e47..5b28c627d262 100644 --- a/pkgs/by-name/ad/adementary-theme/package.nix +++ b/pkgs/by-name/ad/adementary-theme/package.nix @@ -6,14 +6,14 @@ sassc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "adementary-theme"; version = "201905r1"; src = fetchFromGitHub { owner = "hrdwrrsk"; repo = "adementary-theme"; - tag = version; + tag = finalAttrs.version; sha256 = "14y5s18g9r2c1ciw1skfksn09gvqgy8vjvwbr0z8gacf0jc2apqk"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ad/adlplug/package.nix b/pkgs/by-name/ad/adlplug/package.nix index 32b532513fba..1eadcfd29e26 100644 --- a/pkgs/by-name/ad/adlplug/package.nix +++ b/pkgs/by-name/ad/adlplug/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + unstableGitUpdater, cmake, pkg-config, fmt, @@ -36,7 +37,7 @@ let in stdenv.mkDerivation { pname = "${lib.strings.toLower type}plug"; - version = "unstable-2021-12-17"; + version = "1.0.2-unstable-2021-12-17"; src = fetchFromGitHub { owner = "jpcima"; @@ -112,6 +113,11 @@ stdenv.mkDerivation { mv au/${mainProgram}.component $out/Library/Audio/Plug-Ins/Components/ ''; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + tagFormat = "v*"; + }; + meta = { inherit mainProgram; description = "${chip} FM Chip Synthesizer"; diff --git a/pkgs/by-name/ad/adms/package.nix b/pkgs/by-name/ad/adms/package.nix index 405c1f510d82..b634700f28f8 100644 --- a/pkgs/by-name/ad/adms/package.nix +++ b/pkgs/by-name/ad/adms/package.nix @@ -13,14 +13,14 @@ gd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.3.7"; pname = "adms"; src = fetchFromGitHub { owner = "Qucs"; repo = "adms"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "0i37c9k6q1iglmzp9736rrgsnx7sw8xn3djqbbjw29zsyl3pf62c"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/ad/adoptopenjdk-icedtea-web/package.nix b/pkgs/by-name/ad/adoptopenjdk-icedtea-web/package.nix index 967a38d5c006..ddbd9a2d9f0c 100644 --- a/pkgs/by-name/ad/adoptopenjdk-icedtea-web/package.nix +++ b/pkgs/by-name/ad/adoptopenjdk-icedtea-web/package.nix @@ -17,7 +17,7 @@ let jdk = jdk8; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "adoptopenjdk-icedtea-web"; version = "1.8.8"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "AdoptOpenJDK"; repo = "IcedTea-Web"; - rev = "icedtea-web-${version}"; + rev = "icedtea-web-${finalAttrs.version}"; sha256 = "sha256-hpEVWG9ltNDL/0EFJjgQRRce+BLcCO4ZERULYZxyC1o="; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/adoptopenjdk/icedtea-web"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ad/adriconf/package.nix b/pkgs/by-name/ad/adriconf/package.nix index 9577c178a2b9..f9940a6fc4db 100644 --- a/pkgs/by-name/ad/adriconf/package.nix +++ b/pkgs/by-name/ad/adriconf/package.nix @@ -16,7 +16,7 @@ pciutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "adriconf"; version = "2.7.2"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "adriconf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-0XTsYeS4tNAnGhuJ81fmjHhFS6fVq1lirui5b+ojxTQ="; }; @@ -65,11 +65,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.freedesktop.org/mesa/adriconf/"; - changelog = "https://gitlab.freedesktop.org/mesa/adriconf/-/releases/v${version}"; + changelog = "https://gitlab.freedesktop.org/mesa/adriconf/-/releases/v${finalAttrs.version}"; description = "GUI tool used to configure open source graphics drivers"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ muscaln ]; platforms = lib.platforms.linux; mainProgram = "adriconf"; }; -} +}) diff --git a/pkgs/by-name/ad/adslib/package.nix b/pkgs/by-name/ad/adslib/package.nix index 8c7849ed6344..f29815505912 100644 --- a/pkgs/by-name/ad/adslib/package.nix +++ b/pkgs/by-name/ad/adslib/package.nix @@ -2,17 +2,18 @@ lib, stdenv, fetchFromGitHub, + unstableGitUpdater, }: stdenv.mkDerivation { pname = "adslib"; - version = "unstable-2020-08-28"; + version = "0-unstable-2021-11-07"; src = fetchFromGitHub { owner = "stlehmann"; repo = "ADS"; - rev = "c457b60d61d73325837ca50be2cc997c4792d481"; - sha256 = "11r86xa8fr4z957hd0abn8x7182nz30a198d02y7gzpbhpi3z43k"; + rev = "a894d4512a51f3ada026efbf9553e75ba9351e2e"; + sha256 = "SEh4yneTM1dfbWRdWlb5gP/uSeoOeE3g7g/rJWSTba8="; }; installPhase = '' @@ -20,6 +21,8 @@ stdenv.mkDerivation { cp adslib.so $out/lib/adslib.so ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Beckhoff protocol to communicate with TwinCAT devices"; homepage = "https://github.com/stlehmann/ADS"; diff --git a/pkgs/by-name/ad/advancecomp/package.nix b/pkgs/by-name/ad/advancecomp/package.nix index 3b79c32cf82c..7da02ef792e2 100644 --- a/pkgs/by-name/ad/advancecomp/package.nix +++ b/pkgs/by-name/ad/advancecomp/package.nix @@ -6,14 +6,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "advancecomp"; version = "2.6"; src = fetchFromGitHub { owner = "amadvance"; repo = "advancecomp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MwXdXT/ZEvTcYV4DjhCUFflrPKBFu0fk5PmaWt4MMOU="; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # the full git repo. so we have to put the version number in `.version`, otherwise # the binaries get built reporting "none" as their version number. postPatch = '' - echo "${version}" >.version + echo "${finalAttrs.version}" >.version ''; meta = { @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; homepage = "https://github.com/amadvance/advancecomp"; - changelog = "https://github.com/amadvance/advancecomp/blob/v${version}/HISTORY"; + changelog = "https://github.com/amadvance/advancecomp/blob/v${finalAttrs.version}/HISTORY"; }; -} +}) diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix index 77383abe1725..3d9035b013bd 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix @@ -12,12 +12,12 @@ hicolor-icon-theme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "adwaita-icon-theme"; version = "49.0"; src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz"; + url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major finalAttrs.version}/adwaita-icon-theme-${finalAttrs.version}.tar.xz"; hash = "sha256-ZRZkYdGyeKqUL1mqjQ/M8RCNccZfNyxiZuFyRJeRdVw="; }; @@ -55,9 +55,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme"; - changelog = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; platforms = with lib.platforms; linux ++ darwin; teams = [ lib.teams.gnome ]; license = lib.licenses.cc-by-sa-30; }; -} +}) diff --git a/pkgs/by-name/ae/aerospike/package.nix b/pkgs/by-name/ae/aerospike/package.nix index acfc089ce1e5..b90753491800 100644 --- a/pkgs/by-name/ae/aerospike/package.nix +++ b/pkgs/by-name/ae/aerospike/package.nix @@ -10,14 +10,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aerospike-server"; version = "8.0.0.10"; src = fetchFromGitHub { owner = "aerospike"; repo = "aerospike-server"; - rev = version; + rev = finalAttrs.version; hash = "sha256-RZqlU6vF8w/w8YZRmDV1x/X6tMQ+I1HEwx2WA3zS7mc="; fetchSubmodules = true; }; @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { preBuild = '' patchShebangs build/gen_version substituteInPlace build/gen_version \ - --replace-fail 'VERSION="$(git describe --abbrev=7)"' 'VERSION="${version}"' \ - --replace-fail 'CE_SHA="$(git rev-parse HEAD)"' 'CE_SHA="${version}"' \ + --replace-fail 'VERSION="$(git describe --abbrev=7)"' 'VERSION="${finalAttrs.version}"' \ + --replace-fail 'CE_SHA="$(git rev-parse HEAD)"' 'CE_SHA="${finalAttrs.version}"' \ --replace-fail '$(date)' '$(date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH")' patchShebangs build/os_version ''; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ kalbasit ]; }; -} +}) diff --git a/pkgs/by-name/ae/aescrypt/package.nix b/pkgs/by-name/ae/aescrypt/package.nix index a93e73ddf10b..5b01512cc890 100644 --- a/pkgs/by-name/ae/aescrypt/package.nix +++ b/pkgs/by-name/ae/aescrypt/package.nix @@ -5,12 +5,12 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.16"; pname = "aescrypt"; src = fetchurl { - url = "https://www.aescrypt.com/download/v3/linux/aescrypt-${version}.tgz"; + url = "https://www.aescrypt.com/download/v3/linux/aescrypt-${finalAttrs.version}.tgz"; sha256 = "sha256-4uGS0LReq5dI7+Wel7ZWzFXx+utZWi93q4TUSw7AhNI="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; hydraPlatforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/ae/aesfix/package.nix b/pkgs/by-name/ae/aesfix/package.nix index b4df2a8a1e26..aede73905fe2 100644 --- a/pkgs/by-name/ae/aesfix/package.nix +++ b/pkgs/by-name/ae/aesfix/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aesfix"; version = "1.0.1"; src = fetchurl { - url = "https://citpsite.s3.amazonaws.com/memory-content/src/aesfix-${version}.tar.gz"; + url = "https://citpsite.s3.amazonaws.com/memory-content/src/aesfix-${finalAttrs.version}.tar.gz"; sha256 = "sha256-exd+h2yu5qrkjwEjEC8R32WUpzhIP5pH8sdv6BzARdQ="; }; installPhase = '' @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { homepage = "https://citp.princeton.edu/our-work/memory/"; maintainers = with lib.maintainers; [ fedx-sudo ]; }; -} +}) diff --git a/pkgs/by-name/ae/aeskeyfind/package.nix b/pkgs/by-name/ae/aeskeyfind/package.nix index 0d663322a9cb..d95a17c5e031 100644 --- a/pkgs/by-name/ae/aeskeyfind/package.nix +++ b/pkgs/by-name/ae/aeskeyfind/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aeskeyfind"; version = "1.0"; src = fetchurl { - url = "https://citpsite.s3.amazonaws.com/memory-content/src/aeskeyfind-${version}.tar.gz"; + url = "https://citpsite.s3.amazonaws.com/memory-content/src/aeskeyfind-${finalAttrs.version}.tar.gz"; sha256 = "sha256-FBflwbYehruVJ9sfW+4ZlaDuqCR12zy8iA4Ev3Bgg+Q="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fedx-sudo ]; }; -} +}) diff --git a/pkgs/by-name/ae/aespipe/package.nix b/pkgs/by-name/ae/aespipe/package.nix index d0b52c57cdcb..6fbd589ebfb6 100644 --- a/pkgs/by-name/ae/aespipe/package.nix +++ b/pkgs/by-name/ae/aespipe/package.nix @@ -6,12 +6,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aespipe"; version = "2.4j"; src = fetchurl { - url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2"; + url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${finalAttrs.version}.tar.bz2"; sha256 = "sha256-RI/h5YYSwYSVFkXd2Sb8W9tk/E8vgox2bIKqESfpo+I="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ae/aether-lv2/package.nix b/pkgs/by-name/ae/aether-lv2/package.nix index 3bc7e3efba04..7a0abfdc3b82 100644 --- a/pkgs/by-name/ae/aether-lv2/package.nix +++ b/pkgs/by-name/ae/aether-lv2/package.nix @@ -10,14 +10,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aether-lv2"; version = "1.2.1"; src = fetchFromGitHub { owner = "Dougal-s"; repo = "aether"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0xhih4smjxn87s0f4gaab51d8594qlp0lyypzxl5lm37j1i9zigs"; fetchSubmodules = true; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/af/afetch/package.nix b/pkgs/by-name/af/afetch/package.nix index 8af8ed4438e0..aa145033dcdd 100644 --- a/pkgs/by-name/af/afetch/package.nix +++ b/pkgs/by-name/af/afetch/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "afetch"; version = "2.2.0"; src = fetchFromGitHub { owner = "13-CF"; repo = "afetch"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-bHP3DJpgh89AaCX4c1tQGaZ/PiWjArED1rMdszFUq+U="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "afetch"; }; -} +}) diff --git a/pkgs/by-name/af/afio/package.nix b/pkgs/by-name/af/afio/package.nix index f2421773190d..991de700f19d 100644 --- a/pkgs/by-name/af/afio/package.nix +++ b/pkgs/by-name/af/afio/package.nix @@ -5,14 +5,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.5.2"; pname = "afio"; src = fetchFromGitHub { owner = "kholtman"; repo = "afio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1vbxl66r5rp5a1qssjrkfsjqjjgld1cq57c871gd0m4qiq9rmcfy"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { license = lib.licenses.free; mainProgram = "afio"; }; -} +}) diff --git a/pkgs/by-name/af/afuse/package.nix b/pkgs/by-name/af/afuse/package.nix index 91d04ad73613..221a7aa379a3 100644 --- a/pkgs/by-name/af/afuse/package.nix +++ b/pkgs/by-name/af/afuse/package.nix @@ -7,14 +7,14 @@ fuse, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "afuse"; version = "0.5.0"; src = fetchFromGitHub { owner = "pcarrier"; repo = "afuse"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-KpysJRvDx+12BSl9pIGRqbJAM4W1NbzxMgDycGCr2RM="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ag/agenda/package.nix b/pkgs/by-name/ag/agenda/package.nix index 3fc37e1b6e72..c36ac63c7067 100644 --- a/pkgs/by-name/ag/agenda/package.nix +++ b/pkgs/by-name/ag/agenda/package.nix @@ -16,14 +16,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "agenda"; version = "1.2.1"; src = fetchFromGitHub { owner = "dahenson"; repo = "agenda"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CjlGkG43FFDdKGuwevBeCCazOzLcH114bqihMWTykC8="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; mainProgram = "com.github.dahenson.agenda"; }; -} +}) diff --git a/pkgs/by-name/ag/agg/package.nix b/pkgs/by-name/ag/agg/package.nix index b55eb554d94e..d027f6215301 100644 --- a/pkgs/by-name/ag/agg/package.nix +++ b/pkgs/by-name/ag/agg/package.nix @@ -13,11 +13,11 @@ let stdenv = gccStdenv; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "agg"; version = "2.5"; src = fetchurl { - url = "https://www.antigrain.com/agg-${version}.tar.gz"; + url = "https://www.antigrain.com/agg-${finalAttrs.version}.tar.gz"; sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"; }; nativeBuildInputs = [ @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.gpl2Plus; - homepage = "http://www.antigrain.com/"; + homepage = "https://agg.sourceforge.net/antigrain.com/index.html"; platforms = lib.platforms.unix; hydraPlatforms = lib.platforms.linux; # build hangs on both Darwin platforms, needs investigation }; -} +}) diff --git a/pkgs/by-name/ah/aha/package.nix b/pkgs/by-name/ah/aha/package.nix index 943246c3a193..d8b586c2ebdd 100644 --- a/pkgs/by-name/ah/aha/package.nix +++ b/pkgs/by-name/ah/aha/package.nix @@ -4,13 +4,13 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aha"; version = "0.5.1"; src = fetchFromGitHub { sha256 = "1gywad0rvvz3c5balz8cxsnx0562hj2ngzqyr8zsy2mb4pn0lpgv"; - tag = version; + tag = finalAttrs.version; repo = "aha"; owner = "theZiz"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code. ''; homepage = "https://github.com/theZiz/aha"; - changelog = "https://github.com/theZiz/aha/blob/${version}/CHANGELOG"; + changelog = "https://github.com/theZiz/aha/blob/${finalAttrs.version}/CHANGELOG"; license = with lib.licenses; [ lgpl2Plus mpl11 @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ah/ahcpd/package.nix b/pkgs/by-name/ah/ahcpd/package.nix index 054fbb4c3654..07075b9d61d9 100644 --- a/pkgs/by-name/ah/ahcpd/package.nix +++ b/pkgs/by-name/ah/ahcpd/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ahcpd"; version = "0.53"; src = fetchurl { - url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/ahcpd-${version}.tar.gz"; + url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/ahcpd-${finalAttrs.version}.tar.gz"; sha256 = "0lhdmky3zdyk51hclv2lrhw3hzymbdc8bw2khs3rnaibgn0jwqm4"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ahcpd"; }; -} +}) diff --git a/pkgs/by-name/ah/ahoviewer/package.nix b/pkgs/by-name/ah/ahoviewer/package.nix index 1af07950efdc..3824cda9795a 100644 --- a/pkgs/by-name/ah/ahoviewer/package.nix +++ b/pkgs/by-name/ah/ahoviewer/package.nix @@ -21,14 +21,14 @@ assert useUnrar -> unrar != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ahoviewer"; version = "1.6.5"; src = fetchFromGitHub { owner = "ahodesuka"; repo = "ahoviewer"; - tag = version; + tag = finalAttrs.version; sha256 = "1avdl4qcpznvf3s2id5qi1vnzy4wgh6vxpnrz777a1s4iydxpcd8"; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { # https://github.com/ahodesuka/ahoviewer/issues/62 platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ai/aircrack-ng/package.nix b/pkgs/by-name/ai/aircrack-ng/package.nix index 239c35c590cd..ee6ec7cd52cc 100644 --- a/pkgs/by-name/ai/aircrack-ng/package.nix +++ b/pkgs/by-name/ai/aircrack-ng/package.nix @@ -47,14 +47,14 @@ let extension = "zip"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aircrack-ng"; version = "1.7"; src = fetchFromGitHub { owner = "aircrack-ng"; repo = "aircrack-ng"; - tag = version; + tag = finalAttrs.version; hash = "sha256-niQDwiqi5GtBW5HIn0endnqPb/MqllcjsjXw4pTyFKY="; }; @@ -140,6 +140,6 @@ stdenv.mkDerivation rec { freebsd illumos ]; - changelog = "https://github.com/aircrack-ng/aircrack-ng/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/aircrack-ng/aircrack-ng/blob/${finalAttrs.src.rev}/ChangeLog"; }; -} +}) diff --git a/pkgs/by-name/ai/airgeddon/package.nix b/pkgs/by-name/ai/airgeddon/package.nix index 40e0c1791439..df0c0dc61510 100644 --- a/pkgs/by-name/ai/airgeddon/package.nix +++ b/pkgs/by-name/ai/airgeddon/package.nix @@ -113,14 +113,14 @@ let xdpyinfo ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "airgeddon"; version = "11.52"; src = fetchFromGitHub { owner = "v1s1t0r1sh3r3"; repo = "airgeddon"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FQB348wOXi89CnjS32cwZwTewjkguTbhK5Izvh/74Q0="; }; @@ -166,9 +166,9 @@ stdenv.mkDerivation rec { description = "Multi-use TUI to audit wireless networks"; mainProgram = "airgeddon"; homepage = "https://github.com/v1s1t0r1sh3r3/airgeddon"; - changelog = "https://github.com/v1s1t0r1sh3r3/airgeddon/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/v1s1t0r1sh3r3/airgeddon/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ai/airsonic/package.nix b/pkgs/by-name/ai/airsonic/package.nix index d34667a32f9c..33cc47b2f8b7 100644 --- a/pkgs/by-name/ai/airsonic/package.nix +++ b/pkgs/by-name/ai/airsonic/package.nix @@ -5,12 +5,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "airsonic"; version = "10.6.2"; src = fetchurl { - url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; + url = "https://github.com/airsonic/airsonic/releases/download/v${finalAttrs.version}/airsonic.war"; sha256 = "0q3qnqymj3gaa6n79pvbyidn1ga99lpngp5wvhlw1aarg1m7vccl"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ai/airspy/package.nix b/pkgs/by-name/ai/airspy/package.nix index 798d2f97c8cd..ac8f3f5acabd 100644 --- a/pkgs/by-name/ai/airspy/package.nix +++ b/pkgs/by-name/ai/airspy/package.nix @@ -8,14 +8,14 @@ libusb1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "airspy"; version = "1.0.10"; src = fetchFromGitHub { owner = "airspy"; repo = "airspyone_host"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1v7sfkkxc6f8ny1p9xrax1agkl6q583mjx8k0lrrwdz31rf9qgw9"; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/ai/airstrike/package.nix b/pkgs/by-name/ai/airstrike/package.nix index af846ee1ff87..c0eb06eeba78 100644 --- a/pkgs/by-name/ai/airstrike/package.nix +++ b/pkgs/by-name/ai/airstrike/package.nix @@ -7,12 +7,12 @@ SDL_image, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "airstrike"; version = "pre6a"; src = fetchurl { - url = "https://icculus.org/airstrike/airstrike-${version}-src.tar.gz"; + url = "https://icculus.org/airstrike/airstrike-${finalAttrs.version}-src.tar.gz"; sha256 = "1h6rv2zcp84ycmd0kv1pbpqjgwx57dw42x7878d2c2vnpi5jn8qi"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/aj/aj-snapshot/package.nix b/pkgs/by-name/aj/aj-snapshot/package.nix index 0f24c9f967d4..941509d01c8f 100644 --- a/pkgs/by-name/aj/aj-snapshot/package.nix +++ b/pkgs/by-name/aj/aj-snapshot/package.nix @@ -8,12 +8,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aj-snapshot"; version = "0.9.9"; src = fetchurl { - url = "mirror://sourceforge/aj-snapshot/aj-snapshot-${version}.tar.bz2"; + url = "mirror://sourceforge/aj-snapshot/aj-snapshot-${finalAttrs.version}.tar.bz2"; sha256 = "0z8wd5yvxdmw1h1rj6km9h01xd4xmp4d86gczlix7hsc7zrf0wil"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "aj-snapshot"; }; -} +}) diff --git a/pkgs/by-name/ak/akira-unstable/package.nix b/pkgs/by-name/ak/akira-unstable/package.nix index 4af6b8f8ab8b..8e133afb1098 100644 --- a/pkgs/by-name/ak/akira-unstable/package.nix +++ b/pkgs/by-name/ak/akira-unstable/package.nix @@ -22,14 +22,14 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "akira"; version = "0.0.16"; src = fetchFromGitHub { owner = "akiraux"; repo = "Akira"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-qrqmSCwA0kQVFD1gzutks9gMr7My7nw/KJs/VPisa0w="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "com.github.akiraux.akira"; }; -} +}) diff --git a/pkgs/by-name/ak/aks-mcp-server/package.nix b/pkgs/by-name/ak/aks-mcp-server/package.nix index 1a42c78c3805..07478bc3773b 100644 --- a/pkgs/by-name/ak/aks-mcp-server/package.nix +++ b/pkgs/by-name/ak/aks-mcp-server/package.nix @@ -74,6 +74,6 @@ buildGoModule (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ priyaananthasankar ]; platforms = lib.platforms.unix; # Now supports both Linux and macOS with withoutebpf - mainProgram = "aks-mcp-server"; + mainProgram = "aks-mcp"; }; }) diff --git a/pkgs/by-name/al/albatross/package.nix b/pkgs/by-name/al/albatross/package.nix index d016fc18f944..64b051b3dac7 100644 --- a/pkgs/by-name/al/albatross/package.nix +++ b/pkgs/by-name/al/albatross/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "Albatross"; version = "1.7.4"; src = fetchFromGitHub { repo = "Albatross"; owner = "shimmerproject"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0mq87n2hxy44nzr567av24n5nqjaljhi1afxrn3mpjqdbkq7lx88"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/al/alchemy/package.nix b/pkgs/by-name/al/alchemy/package.nix index d113d7a9c9ab..6fa02bc2ff38 100644 --- a/pkgs/by-name/al/alchemy/package.nix +++ b/pkgs/by-name/al/alchemy/package.nix @@ -6,14 +6,14 @@ runtimeShell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alchemy"; version = "008"; enableParallelBuilding = true; src = fetchurl { - url = "http://al.chemy.org/files/Alchemy-${version}.tar.gz"; + url = "http://al.chemy.org/files/Alchemy-${finalAttrs.version}.tar.gz"; sha256 = "0449bvdccgx1jqnws1bckzs4nv2d230523qs0jx015gi81s1q7li"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "alchemy"; }; -} +}) diff --git a/pkgs/by-name/al/alcove/package.nix b/pkgs/by-name/al/alcove/package.nix index 2d0ee0dd4561..8a1aa894c21b 100644 --- a/pkgs/by-name/al/alcove/package.nix +++ b/pkgs/by-name/al/alcove/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alcove"; - version = "1.4.1"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/henrikruscon/alcove-releases/releases/download/${finalAttrs.version}/Alcove.zip"; - hash = "sha256-9SYqvJqLC4h4AcK/F86S7H15PiW+tcmaF83ILdc/ejE="; + hash = "sha256-MhwtQDuDKP4vLPvOxSe9pY2W//dHplHlu6YvxfswNOg="; }; sourceRoot = "."; diff --git a/pkgs/by-name/al/alegreya-sans/package.nix b/pkgs/by-name/al/alegreya-sans/package.nix index a2db445ef4e4..c44919858224 100644 --- a/pkgs/by-name/al/alegreya-sans/package.nix +++ b/pkgs/by-name/al/alegreya-sans/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alegreya-sans"; version = "2.008"; src = fetchFromGitHub { owner = "huertatipografica"; repo = "Alegreya-Sans"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0xz5lq9fh0pj02ifazhddzh792qkxkz1z6ylj26d93wshc90jl5g"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ Thra11 ]; }; -} +}) diff --git a/pkgs/by-name/al/alegreya/package.nix b/pkgs/by-name/al/alegreya/package.nix index ab886d2233b0..a231abd11977 100644 --- a/pkgs/by-name/al/alegreya/package.nix +++ b/pkgs/by-name/al/alegreya/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alegreya"; version = "2.008"; src = fetchFromGitHub { owner = "huertatipografica"; repo = "Alegreya"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1m5xr95y6qxxv2ryvhfck39d6q5hxsr51f530fshg53x48l2mpwr"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ Thra11 ]; }; -} +}) diff --git a/pkgs/by-name/al/alembic/package.nix b/pkgs/by-name/al/alembic/package.nix index c1ae808b9888..12e36c6b2719 100644 --- a/pkgs/by-name/al/alembic/package.nix +++ b/pkgs/by-name/al/alembic/package.nix @@ -7,14 +7,14 @@ hdf5-threadsafe, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alembic"; version = "1.8.8"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; - tag = version; + tag = finalAttrs.version; hash = "sha256-R69UYyvLnMwv1JzEQ6S6elvR83Rmvc8acBJwSV/+hCk="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { tmarkus ]; }; -} +}) diff --git a/pkgs/by-name/al/alglib/package.nix b/pkgs/by-name/al/alglib/package.nix index e630c73a31ee..67ede7419971 100644 --- a/pkgs/by-name/al/alglib/package.nix +++ b/pkgs/by-name/al/alglib/package.nix @@ -6,12 +6,12 @@ clang, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alglib3"; version = "4.07.0"; src = fetchurl { - url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz"; + url = "https://www.alglib.net/translator/re/alglib-${finalAttrs.version}.cpp.gpl.tgz"; sha256 = "sha256-y4mlU+4gKwqUFgUHKoVxAjdq5EsMzSJeT6Dg4Llwi/A="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { * Fast Fourier Transform and many other algorithms ''; }; -} +}) diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index de0559e36a68..a26dedd94d4f 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2334"; + version = "2.0.2341"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-4/GKOjUSlj+upjGg0B642HRolCA46N+B2fM3fL1ip6Y="; + hash = "sha256-ZjUCNdP5UGq/sqUk7iqx2L2ymby5KcQyQdmdmxv57LY="; }; - npmDepsHash = "sha256-fBoHOmMvmNSmldwME8i7Xo2C2koYcAo4aTsU+JIptcs="; + npmDepsHash = "sha256-u/copIR9UIZ6A1k6SSv8CBgHL9rNs/T/m/Zani9+Edg="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/al/almanah/package.nix b/pkgs/by-name/al/almanah/package.nix index 2d1d0b096e82..509a2f6a1635 100644 --- a/pkgs/by-name/al/almanah/package.nix +++ b/pkgs/by-name/al/almanah/package.nix @@ -25,12 +25,12 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "almanah"; version = "0.12.4"; src = fetchurl { - url = "mirror://gnome/sources/almanah/${lib.versions.majorMinor version}/almanah-${version}.tar.xz"; + url = "mirror://gnome/sources/almanah/${lib.versions.majorMinor finalAttrs.version}/almanah-${finalAttrs.version}.tar.xz"; sha256 = "DywW6Gkohf0lrX3Mw/UawrS4h2JOaOfqH2SulHkxlFI="; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.gnome ]; }; -} +}) diff --git a/pkgs/by-name/al/alock/package.nix b/pkgs/by-name/al/alock/package.nix index 965619d8b0ee..9938810d1196 100644 --- a/pkgs/by-name/al/alock/package.nix +++ b/pkgs/by-name/al/alock/package.nix @@ -12,14 +12,14 @@ imlib2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alock"; version = "2.5.1"; src = fetchFromGitHub { owner = "Arkq"; repo = "alock"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xfPhsXZrTlEqea75SvacDfjM9o21MTudrqfNN9xtdcg="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { ]; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/al/alpine/package.nix b/pkgs/by-name/al/alpine/package.nix index 61d51e5ea0aa..a5f7050a5ea1 100644 --- a/pkgs/by-name/al/alpine/package.nix +++ b/pkgs/by-name/al/alpine/package.nix @@ -13,13 +13,13 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alpine"; version = "2.26"; src = fetchgit { url = "https://repo.or.cz/alpine.git"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cJyUBatQBjD6RG+jesJ0JRhWghPRBACc/HQl+2aCTd0="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; homepage = "https://alpineapp.email/"; }; -} +}) diff --git a/pkgs/by-name/al/alsa-oss/package.nix b/pkgs/by-name/al/alsa-oss/package.nix index 76e075d482e3..698b843c81de 100644 --- a/pkgs/by-name/al/alsa-oss/package.nix +++ b/pkgs/by-name/al/alsa-oss/package.nix @@ -8,12 +8,12 @@ libsamplerate, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alsa-oss"; version = "1.1.8"; src = fetchurl { - url = "mirror://alsa/oss-lib/alsa-oss-${version}.tar.bz2"; + url = "mirror://alsa/oss-lib/alsa-oss-${finalAttrs.version}.tar.bz2"; hash = "sha256-ZK3O9ZJ+hI0uAk5kxL+FtvOVlk2ZdOxhkFrky4011o4="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/al/alsa-scarlett-gui/package.nix b/pkgs/by-name/al/alsa-scarlett-gui/package.nix index c26925fec9f5..5e7773229026 100644 --- a/pkgs/by-name/al/alsa-scarlett-gui/package.nix +++ b/pkgs/by-name/al/alsa-scarlett-gui/package.nix @@ -11,14 +11,14 @@ wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alsa-scarlett-gui"; version = "0.5.1"; src = fetchFromGitHub { owner = "geoffreybennett"; repo = "alsa-scarlett-gui"; - tag = version; + tag = finalAttrs.version; hash = "sha256-DkfpMK0T67B4mnriignf4hx6Ifddls0rN0SxyfEsPZg="; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "DESTDIR=\${out}" "PREFIX=''" ]; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' substituteInPlace file.c \ @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ mdorman ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/al/alsa-tools/package.nix b/pkgs/by-name/al/alsa-tools/package.nix index 140f8bd4f2ad..8d5c11337336 100644 --- a/pkgs/by-name/al/alsa-tools/package.nix +++ b/pkgs/by-name/al/alsa-tools/package.nix @@ -4,7 +4,6 @@ fetchurl, alsa-lib, fltk_1_3, - gtk2, gtk3, makeWrapper, pkg-config, @@ -28,14 +27,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib fltk_1_3 - gtk2 gtk3 psmisc ]; env.TOOLSET = lib.concatStringsSep " " [ "as10k1" - "echomixer" + # "echomixer" # Requires gtk2 "envy24control" "hda-verb" "hdajackretask" @@ -48,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { # "qlo10k1" # needs Qt "mixartloader" "pcxhrloader" - "rmedigicontrol" + # "rmedigicontrol" # Requires gtk2 "sb16_csp" # "seq" # mysterious configure error "sscape_ctl" diff --git a/pkgs/by-name/al/alsaequal/package.nix b/pkgs/by-name/al/alsaequal/package.nix index de522ea490bb..973eab8fe54e 100644 --- a/pkgs/by-name/al/alsaequal/package.nix +++ b/pkgs/by-name/al/alsaequal/package.nix @@ -7,14 +7,14 @@ ladspaH, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alsaequal"; version = "0.7.1"; src = fetchFromGitHub { owner = "bassdr"; repo = "alsaequal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jI+w/jCFslQSNeIS7mwb+LZSawU4XjbSNNgpvuShH1g="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ymeister ]; }; -} +}) diff --git a/pkgs/by-name/al/alttab/package.nix b/pkgs/by-name/al/alttab/package.nix index 776fc2cc203a..abfcacffbf0f 100644 --- a/pkgs/by-name/al/alttab/package.nix +++ b/pkgs/by-name/al/alttab/package.nix @@ -23,7 +23,7 @@ python3Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.7.1"; pname = "alttab"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sagb"; repo = "alttab"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-1+hk0OeSriXPyefv3wOgeiW781PL4VP5Luvt+RS5jmg="; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "alttab"; }; -} +}) diff --git a/pkgs/by-name/am/amazon-ec2-utils/package.nix b/pkgs/by-name/am/amazon-ec2-utils/package.nix index e3e2cab53826..211acaf1ef27 100644 --- a/pkgs/by-name/am/amazon-ec2-utils/package.nix +++ b/pkgs/by-name/am/amazon-ec2-utils/package.nix @@ -16,14 +16,14 @@ util-linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "amazon-ec2-utils"; version = "2.2.0"; src = fetchFromGitHub { owner = "amazonlinux"; repo = "amazon-ec2-utils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-plTBh2LAXkYVSxN0IZJQuPr7QxD7+OAqHl/Zl8JPCmg="; }; @@ -116,4 +116,4 @@ stdenv.mkDerivation rec { thefloweringash ]; }; -} +}) diff --git a/pkgs/by-name/am/amber-theme/package.nix b/pkgs/by-name/am/amber-theme/package.nix index 16a227216941..4627309ecc70 100644 --- a/pkgs/by-name/am/amber-theme/package.nix +++ b/pkgs/by-name/am/amber-theme/package.nix @@ -11,14 +11,14 @@ gtk-engine-murrine, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "amber-theme"; version = "3.38-1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "amber-theme"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-OrdBeAD+gdIu6u8ESE9PtqYadSuJ8nx1Z8fB4D9y4W4="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/am/amd-libflame/package.nix b/pkgs/by-name/am/amd-libflame/package.nix index 6f3c59995539..b72755f874b2 100644 --- a/pkgs/by-name/am/amd-libflame/package.nix +++ b/pkgs/by-name/am/amd-libflame/package.nix @@ -13,14 +13,14 @@ withAMDOpt ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "amd-libflame"; version = "5.1"; src = fetchFromGitHub { owner = "amd"; repo = "libflame"; - tag = version; + tag = finalAttrs.version; hash = "sha256-9Z0e6RCJfqQlq3oT4fBu8rwPH1OWEKQ52rVDa0Y0rJU="; }; @@ -71,4 +71,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.markuskowa ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/am/amdctl/package.nix b/pkgs/by-name/am/amdctl/package.nix index ae46d5f4c097..46d49b03bcc4 100644 --- a/pkgs/by-name/am/amdctl/package.nix +++ b/pkgs/by-name/am/amdctl/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "amdctl"; version = "0.11"; src = fetchFromGitHub { owner = "kevinlekiller"; repo = "amdctl"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2wBk/9aAD7ARMGbcVxk+CzEvUf8U4RS4ZwTCj8cHNNo="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/am/amf-headers/package.nix b/pkgs/by-name/am/amf-headers/package.nix index 3c3ed6643916..b1f1dcc0e174 100644 --- a/pkgs/by-name/am/amf-headers/package.nix +++ b/pkgs/by-name/am/amf-headers/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "amf-headers"; version = "1.5.0"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "AMF"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-ZVC1e4S5CNpfl3ewHR9aVfYwxDBE7/BJ6OyH2kF00fQ="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ devusb ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix index 87225a32e87b..9f559ab9ca77 100644 --- a/pkgs/by-name/am/amule/package.nix +++ b/pkgs/by-name/am/amule/package.nix @@ -25,7 +25,7 @@ # daemon and client are not build monolithic assert monolithic || (!monolithic && (enableDaemon || client || httpServer)); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "amule" + lib.optionalString httpServer "-web" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "amule-project"; repo = "amule"; - tag = version; + tag = finalAttrs.version; sha256 = "1nm4vxgmisn1b6l3drmz0q04x067j2i8lw5rnf0acaapwlp8qwvi"; }; @@ -112,4 +112,4 @@ stdenv.mkDerivation rec { # Undefined symbols for architecture arm64: "_FSFindFolder" broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/an/anarchism/package.nix b/pkgs/by-name/an/anarchism/package.nix index 0e9cd164c62c..c4b12ca509f5 100644 --- a/pkgs/by-name/an/anarchism/package.nix +++ b/pkgs/by-name/an/anarchism/package.nix @@ -5,7 +5,7 @@ xdg-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "anarchism"; version = "15.3-1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "debian"; repo = "anarchism"; - rev = "debian/${version}"; + rev = "debian/${finalAttrs.version}"; sha256 = "04ylk0y5b3jml2awmyz7m1hnymni8y1n83m0k6ychdh0px8frhm5"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ davidak ]; platforms = with lib.platforms; all; }; -} +}) diff --git a/pkgs/by-name/an/android-file-transfer/package.nix b/pkgs/by-name/an/android-file-transfer/package.nix index 97b84ba965c8..f49f0790a878 100644 --- a/pkgs/by-name/an/android-file-transfer/package.nix +++ b/pkgs/by-name/an/android-file-transfer/package.nix @@ -9,14 +9,14 @@ qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "android-file-transfer"; version = "4.5"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-G+ErwZ/F8Cl8WLSzC+5LrEWWqNZL3xDMBvx/gjkgAXk="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.xaverdh ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/an/angelscript/package.nix b/pkgs/by-name/an/angelscript/package.nix index d0811fe73c0e..00f51c318b4b 100644 --- a/pkgs/by-name/an/angelscript/package.nix +++ b/pkgs/by-name/an/angelscript/package.nix @@ -6,12 +6,12 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "angelscript"; version = "2.38.0"; src = fetchurl { - url = "https://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; + url = "https://www.angelcode.com/angelscript/sdk/files/angelscript_${finalAttrs.version}.zip"; sha256 = "sha256-sztdvNoQMX72fWKDU9gyRphM5vysEC1Nwq7RIeulLm8="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { downloadPage = "https://www.angelcode.com/angelscript/downloads.html"; homepage = "https://www.angelcode.com/angelscript/"; }; -} +}) diff --git a/pkgs/by-name/an/angsd/package.nix b/pkgs/by-name/an/angsd/package.nix index 2ef0ac0c1e74..b93b6a25b90c 100644 --- a/pkgs/by-name/an/angsd/package.nix +++ b/pkgs/by-name/an/angsd/package.nix @@ -11,7 +11,7 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "angsd"; version = "0.940"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "ANGSD"; repo = "angsd"; sha256 = "sha256-Ppxgy54pAnqJUzNX5c12NHjKTQyEEcPSpCEEVOyZ/LA="; - tag = version; + tag = finalAttrs.version; }; patches = [ @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bzizou ]; license = lib.licenses.gpl2; }; -} +}) diff --git a/pkgs/by-name/an/animatch/package.nix b/pkgs/by-name/an/animatch/package.nix index 1a62ed74dce5..e727a92f87b0 100644 --- a/pkgs/by-name/an/animatch/package.nix +++ b/pkgs/by-name/an/animatch/package.nix @@ -7,14 +7,14 @@ stdenv, libx11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "animatch"; version = "1.0.3"; src = fetchFromGitLab { owner = "HolyPangolin"; repo = "animatch"; fetchSubmodules = true; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zBV45WMAXtCpPPbDpr04K/a9UtZ4KLP9nUauBlbhrFo="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ gpl3Plus ]; maintainers = with lib.maintainers; [ colinsane ]; }; -} +}) diff --git a/pkgs/by-name/an/ansilove/package.nix b/pkgs/by-name/an/ansilove/package.nix index ea2faa9b5fd5..604ebd1109a7 100644 --- a/pkgs/by-name/an/ansilove/package.nix +++ b/pkgs/by-name/an/ansilove/package.nix @@ -6,14 +6,14 @@ libansilove, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ansilove"; version = "4.2.1"; src = fetchFromGitHub { owner = "ansilove"; repo = "ansilove"; - tag = version; + tag = finalAttrs.version; hash = "sha256-13v2NLVJt11muwocBiQYz/rxQkte/W6LXwB/H/E9Nvk="; }; @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { meta = { description = "ANSI and ASCII art to PNG converter in C"; homepage = "https://github.com/ansilove/ansilove"; - changelog = "https://github.com/ansilove/ansilove/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/ansilove/ansilove/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ jethair ]; mainProgram = "ansilove"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/an/anthy/package.nix b/pkgs/by-name/an/anthy/package.nix index e38485fcbc02..c47b6f7d08b6 100644 --- a/pkgs/by-name/an/anthy/package.nix +++ b/pkgs/by-name/an/anthy/package.nix @@ -5,7 +5,7 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "anthy"; version = "9100h"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "mirror://osdn/anthy/37536/anthy-${version}.tar.gz"; + url = "mirror://osdn/anthy/37536/anthy-${finalAttrs.version}.tar.gz"; sha256 = "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"; }; -} +}) diff --git a/pkgs/by-name/an/antigen/package.nix b/pkgs/by-name/an/antigen/package.nix index f5efbc5fa790..4082d2a20e65 100644 --- a/pkgs/by-name/an/antigen/package.nix +++ b/pkgs/by-name/an/antigen/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.2.3"; pname = "antigen"; src = fetchurl { - url = "https://github.com/zsh-users/antigen/releases/download/v${version}/antigen.zsh"; + url = "https://github.com/zsh-users/antigen/releases/download/v${finalAttrs.version}/antigen.zsh"; sha256 = "1bmp3qf14509swpxin4j9f98n05pdilzapjm0jdzbv0dy3hn20ix"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { homepage = "https://antigen.sharats.me/"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/an/antiword/package.nix b/pkgs/by-name/an/antiword/package.nix index 62fdbb93dbce..2faeafacf987 100644 --- a/pkgs/by-name/an/antiword/package.nix +++ b/pkgs/by-name/an/antiword/package.nix @@ -4,12 +4,12 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "antiword"; version = "0.37"; src = fetchurl { - url = "http://www.winfield.demon.nl/linux/antiword-${version}.tar.gz"; + url = "http://www.winfield.demon.nl/linux/antiword-${finalAttrs.version}.tar.gz"; sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/an/any-nix-shell/package.nix b/pkgs/by-name/an/any-nix-shell/package.nix index 8bbe481e8292..1891d91d2bac 100644 --- a/pkgs/by-name/an/any-nix-shell/package.nix +++ b/pkgs/by-name/an/any-nix-shell/package.nix @@ -8,14 +8,14 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "any-nix-shell"; version = "2.0.1"; src = fetchFromGitHub { owner = "haslersn"; repo = "any-nix-shell"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-t6+LKSGWmkHQhfqw/4Ztz4QgDXQ2RZr9R/mMEEA3jlY="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ haslersn ]; mainProgram = "any-nix-shell"; }; -} +}) diff --git a/pkgs/by-name/ap/apache-directory-server/package.nix b/pkgs/by-name/ap/apache-directory-server/package.nix index c217bd94f90a..d341eeec3339 100644 --- a/pkgs/by-name/ap/apache-directory-server/package.nix +++ b/pkgs/by-name/ap/apache-directory-server/package.nix @@ -6,12 +6,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "apache-directory-server"; version = "2.0.0.AM26"; src = fetchzip { - url = "mirror://apache/directory/apacheds/dist/${version}/apacheds-${version}.zip"; + url = "mirror://apache/directory/apacheds/dist/${finalAttrs.version}/apacheds-${finalAttrs.version}.zip"; sha256 = "sha256-36kDvfSy5rt/3+nivEFTepnIKf6sX0NTgPRm28M+1v4="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.ners ]; }; -} +}) diff --git a/pkgs/by-name/ap/apfel/package.nix b/pkgs/by-name/ap/apfel/package.nix index 3432d1beec5e..71ff36540574 100644 --- a/pkgs/by-name/ap/apfel/package.nix +++ b/pkgs/by-name/ap/apfel/package.nix @@ -10,14 +10,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "apfel"; version = "3.1.1"; src = fetchFromGitHub { owner = "scarrazza"; repo = "apfel"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0Ix7KwEZUG/NmGJ380DVJbUA0PcoEJDlcGSc09l5Tbc="; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { lhapdf.pdf_sets.NNPDF31_nnlo_as_0118 ]; - env.NIX_CFLAGS_COMPILE = "-DAPFEL_VERSION=${version}"; + env.NIX_CFLAGS_COMPILE = "-DAPFEL_VERSION=${finalAttrs.version}"; meta = { description = "PDF Evolution Library"; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ap/apitrace/package.nix b/pkgs/by-name/ap/apitrace/package.nix index b2553e23d1dc..9319b421cf23 100644 --- a/pkgs/by-name/ap/apitrace/package.nix +++ b/pkgs/by-name/ap/apitrace/package.nix @@ -15,14 +15,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "apitrace"; version = "13.0"; src = fetchFromGitHub { owner = "apitrace"; repo = "apitrace"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ZZ2RL9nvwvHBEuKSDr1tgRhxBeg+XJKPUvSiHz6g/cg="; fetchSubmodules = true; }; @@ -102,4 +102,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ap/apktool/package.nix b/pkgs/by-name/ap/apktool/package.nix index 115369aa4b5f..d5a8db44706e 100644 --- a/pkgs/by-name/ap/apktool/package.nix +++ b/pkgs/by-name/ap/apktool/package.nix @@ -17,14 +17,14 @@ let ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "apktool"; version = "2.12.1"; src = fetchurl { urls = [ - "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" - "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" + "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${finalAttrs.version}.jar" + "https://github.com/iBotPeaches/Apktool/releases/download/v${finalAttrs.version}/apktool_${finalAttrs.version}.jar" ]; hash = "sha256-Zs9FJKSkWn9WVn0Issm27CN7zdeM7mn9SlnIoCQ66vo="; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; installPhase = '' - install -D ${src} "$out/libexec/apktool/apktool.jar" + install -D ${finalAttrs.src} "$out/libexec/apktool/apktool.jar" mkdir -p "$out/bin" makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ --add-flags "-jar $out/libexec/apktool/apktool.jar" \ @@ -47,10 +47,10 @@ stdenv.mkDerivation rec { description = "Tool for reverse engineering Android apk files"; mainProgram = "apktool"; homepage = "https://ibotpeaches.github.io/Apktool/"; - changelog = "https://github.com/iBotPeaches/Apktool/releases/tag/v${version}"; + changelog = "https://github.com/iBotPeaches/Apktool/releases/tag/v${finalAttrs.version}"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ offline ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/ap/apng2gif/package.nix b/pkgs/by-name/ap/apng2gif/package.nix index 5d302e1ca6bd..dd1d977558bb 100644 --- a/pkgs/by-name/ap/apng2gif/package.nix +++ b/pkgs/by-name/ap/apng2gif/package.nix @@ -5,12 +5,12 @@ libpng, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "apng2gif"; version = "1.8"; src = fetchzip { - url = "mirror://sourceforge/apng2gif/apng2gif-${version}-src.zip"; + url = "mirror://sourceforge/apng2gif/apng2gif-${finalAttrs.version}-src.zip"; stripRoot = false; hash = "sha256-qX8gmE0Lu2p15kL0y6cmX/bI0uk5Ehfi8ygt07BbgmU="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ap/apngopt/package.nix b/pkgs/by-name/ap/apngopt/package.nix index 649162226f34..e631b119be6e 100644 --- a/pkgs/by-name/ap/apngopt/package.nix +++ b/pkgs/by-name/ap/apngopt/package.nix @@ -7,12 +7,12 @@ zopfli, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "apngopt"; version = "1.4"; src = fetchzip { - url = "mirror://sourceforge/apng/apngopt-${version}-src.zip"; + url = "mirror://sourceforge/apng/apngopt-${finalAttrs.version}-src.zip"; stripRoot = false; hash = "sha256-MAqth5Yt7+SabY6iEgSFcaBmuHvA0ZkNdXSgvhKao1Y="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ap/apparix/package.nix b/pkgs/by-name/ap/apparix/package.nix index 3d3391761461..a4ffe8b8d6c8 100644 --- a/pkgs/by-name/ap/apparix/package.nix +++ b/pkgs/by-name/ap/apparix/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "apparix"; version = "11-062"; src = fetchurl { - url = "https://micans.org/apparix/src/apparix-${version}.tar.gz"; + url = "https://micans.org/apparix/src/apparix-${finalAttrs.version}.tar.gz"; sha256 = "211bb5f67b32ba7c3e044a13e4e79eb998ca017538e9f4b06bc92d5953615235"; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "apparix"; }; -} +}) diff --git a/pkgs/by-name/ap/appeditor/package.nix b/pkgs/by-name/ap/appeditor/package.nix index d422afdf677b..6ce089457f67 100644 --- a/pkgs/by-name/ap/appeditor/package.nix +++ b/pkgs/by-name/ap/appeditor/package.nix @@ -16,14 +16,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "appeditor"; version = "1.1.5"; src = fetchFromGitHub { owner = "donadigo"; repo = "appeditor"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-A0YasHw5osGrgUPiUPuRBnv1MR/Pth6jVHGEx/klOGY="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; mainProgram = "com.github.donadigo.appeditor"; }; -} +}) diff --git a/pkgs/by-name/ap/aptdec/package.nix b/pkgs/by-name/ap/aptdec/package.nix index 30aca08b3fee..ee51bf02ecf9 100644 --- a/pkgs/by-name/ap/aptdec/package.nix +++ b/pkgs/by-name/ap/aptdec/package.nix @@ -8,14 +8,14 @@ libsndfile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aptdec"; version = "1.8.0"; src = fetchFromGitHub { owner = "Xerbo"; repo = "aptdec"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5Pr2PlCPSEIWnThJXKcQEudmxhLJC2sVa9BfAOEKHB4="; fetchSubmodules = true; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ar/aravis/package.nix b/pkgs/by-name/ar/aravis/package.nix index 886fce3e95f4..82ea3b737c74 100644 --- a/pkgs/by-name/ar/aravis/package.nix +++ b/pkgs/by-name/ar/aravis/package.nix @@ -28,14 +28,14 @@ assert enableViewer -> enableGstPlugin; assert enableViewer -> gtk3 != null; assert enableViewer -> wrapGAppsHook3 != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aravis"; version = "0.8.35"; src = fetchFromGitHub { owner = "AravisProject"; repo = "aravis"; - tag = version; + tag = finalAttrs.version; hash = "sha256-RRIYZHtljZ44s1kmmUI1KMx92+PLLI/eCJRs4m0+egg="; }; @@ -95,4 +95,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ tpw_rules ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ar/arc-kde-theme/package.nix b/pkgs/by-name/ar/arc-kde-theme/package.nix index b1cb4b83928e..7ac03002a8eb 100644 --- a/pkgs/by-name/ar/arc-kde-theme/package.nix +++ b/pkgs/by-name/ar/arc-kde-theme/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "arc-kde-theme"; version = "20220908"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "arc-kde"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-dxk8YpJB4XaZHD/O+WvQUFKJD2TE38VZyC5orn4N7BA="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.nixy ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ar/archimedes/package.nix b/pkgs/by-name/ar/archimedes/package.nix index 19f290dfb377..b2190aac8a40 100644 --- a/pkgs/by-name/ar/archimedes/package.nix +++ b/pkgs/by-name/ar/archimedes/package.nix @@ -5,12 +5,12 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "archimedes"; version = "2.0.1"; src = fetchurl { - url = "mirror://gnu/archimedes/archimedes-${version}.tar.gz"; + url = "mirror://gnu/archimedes/archimedes-${finalAttrs.version}.tar.gz"; sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/ar/arduino-ci/package.nix b/pkgs/by-name/ar/arduino-ci/package.nix index 9553322bfec1..77011350a8f6 100644 --- a/pkgs/by-name/ar/arduino-ci/package.nix +++ b/pkgs/by-name/ar/arduino-ci/package.nix @@ -16,14 +16,14 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "arduino-ci"; version = "0.2.0"; src = fetchFromGitHub { owner = "pololu"; repo = "arduino-ci"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-9RbBxgwsSQ7oGGKr1Vsn9Ug9AsacoRgvQgd9jbRQ034="; }; @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { meta = { description = "CI for Arduino Libraries"; mainProgram = "arduino-ci"; - homepage = src.meta.homepage; + homepage = finalAttrs.src.meta.homepage; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ryantm ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ar/arduino-mk/package.nix b/pkgs/by-name/ar/arduino-mk/package.nix index e83caa531a60..255943ec7482 100644 --- a/pkgs/by-name/ar/arduino-mk/package.nix +++ b/pkgs/by-name/ar/arduino-mk/package.nix @@ -6,14 +6,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.6.0"; pname = "arduino-mk"; src = fetchFromGitHub { owner = "sudar"; repo = "Arduino-Makefile"; - tag = version; + tag = finalAttrs.version; sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.eyjhb ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ar/argp-standalone/package.nix b/pkgs/by-name/ar/argp-standalone/package.nix index 260f0a392f4c..3064c3c94f83 100644 --- a/pkgs/by-name/ar/argp-standalone/package.nix +++ b/pkgs/by-name/ar/argp-standalone/package.nix @@ -6,14 +6,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "argp-standalone"; version = "1.5.0"; src = fetchFromGitHub { owner = "argp-standalone"; repo = "argp-standalone"; - tag = version; + tag = finalAttrs.version; sha256 = "jWnoWVnUVDQlsC9ru7oB9PdtZuyCCNqGnMqF/f2m0ZY="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ amar1729 ]; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/pkgs/by-name/ar/argparse/package.nix b/pkgs/by-name/ar/argparse/package.nix index 19eebd6d7c4a..df7b2285c08a 100644 --- a/pkgs/by-name/ar/argparse/package.nix +++ b/pkgs/by-name/ar/argparse/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "argparse"; version = "3.2"; src = fetchFromGitHub { owner = "p-ranav"; repo = "argparse"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-w4IU8Yr+zPFOo7xR4YMHlqNJcEov4KU/ppDYrgsGlxM="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/ar/aria2/package.nix b/pkgs/by-name/ar/aria2/package.nix index 6eb58a32fb3e..272b4498f3d1 100644 --- a/pkgs/by-name/ar/aria2/package.nix +++ b/pkgs/by-name/ar/aria2/package.nix @@ -15,14 +15,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aria2"; version = "1.37.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "sha256-xbiNSg/Z+CA0x0DQfMNsWdA+TATyX6dCeW2Nf3L3Kfs="; }; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://aria2.github.io"; - changelog = "https://github.com/aria2/aria2/releases/tag/release-${version}"; + changelog = "https://github.com/aria2/aria2/releases/tag/release-${finalAttrs.version}"; description = "Lightweight, multi-protocol, multi-source, command-line download utility"; mainProgram = "aria2c"; license = lib.licenses.gpl2Plus; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { timhae ]; }; -} +}) diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix index b6f0db9f1eb4..f67aefdc28ac 100644 --- a/pkgs/by-name/ar/arkade/package.nix +++ b/pkgs/by-name/ar/arkade/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.65"; + version = "0.11.69"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; tag = version; - hash = "sha256-52yP/SV7xEIb6/w2C/JZcxiiI5Tem2pHsKNLyPFvmOY="; + hash = "sha256-aTgW7zYaY8R4fgfQEg2IKC0+199ZLyLPFEQhKmRqFys="; }; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix index 5745305c5a14..ddf1ded228c4 100644 --- a/pkgs/by-name/ar/armadillo/package.nix +++ b/pkgs/by-name/ar/armadillo/package.nix @@ -9,12 +9,12 @@ hdf5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "armadillo"; version = "15.2.3"; src = fetchurl { - url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; + url = "mirror://sourceforge/arma/armadillo-${finalAttrs.version}.tar.xz"; hash = "sha256-AYLWfWlJ5DR6C8YvyMJ5O+frIDxx8Z7f+T+MRf1KgZA="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { juliendehos ]; }; -} +}) diff --git a/pkgs/by-name/ar/arpa2cm/package.nix b/pkgs/by-name/ar/arpa2cm/package.nix index 56f42060ed7f..84eb1eeff552 100644 --- a/pkgs/by-name/ar/arpa2cm/package.nix +++ b/pkgs/by-name/ar/arpa2cm/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "arpa2cm"; version = "1.0.4"; src = fetchFromGitLab { owner = "arpa2"; repo = "arpa2cm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { fufexan ]; }; -} +}) diff --git a/pkgs/by-name/ar/arping/package.nix b/pkgs/by-name/ar/arping/package.nix index 41f7170c1f46..ccd012595cdd 100644 --- a/pkgs/by-name/ar/arping/package.nix +++ b/pkgs/by-name/ar/arping/package.nix @@ -7,14 +7,14 @@ libpcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "arping"; version = "2.28"; src = fetchFromGitHub { owner = "ThomasHabets"; repo = "arping"; - tag = "arping-${version}"; + tag = "arping-${finalAttrs.version}"; hash = "sha256-SS4z/aGu1qpTG1k4Cbj1TlC2kHRrP+7HRQyrIX2Xc/E="; }; @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { meta = { description = "Broadcasts a who-has ARP packet on the network and prints answers"; homepage = "https://github.com/ThomasHabets/arping"; - changelog = "https://github.com/ThomasHabets/arping/releases/tag/${src.tag}"; + changelog = "https://github.com/ThomasHabets/arping/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ michalrus ]; platforms = lib.platforms.unix; mainProgram = "arping"; }; -} +}) diff --git a/pkgs/by-name/ar/arpoison/package.nix b/pkgs/by-name/ar/arpoison/package.nix index c7aaa0d8fcf2..c75964942e7b 100644 --- a/pkgs/by-name/ar/arpoison/package.nix +++ b/pkgs/by-name/ar/arpoison/package.nix @@ -5,14 +5,14 @@ libnet, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "arpoison"; version = "0.7"; buildInputs = [ libnet ]; src = fetchzip { - url = "http://www.arpoison.net/arpoison-${version}.tar.gz"; + url = "http://www.arpoison.net/arpoison-${finalAttrs.version}.tar.gz"; sha256 = "0krhszx3s0qwfg4rma5a51ak71nnd9xfs2ibggc3hwiz506s2x37"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "arpoison"; }; -} +}) diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index 0ff6e83dd84c..845c910b6748 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -38,14 +38,14 @@ color-transformation-language, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "art"; version = "1.26.1"; src = fetchFromGitHub { owner = "artpixls"; repo = "ART"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Abh3Hj3wKdWNN7rdU61MgkZHmoa7ufYzZGKsrxplkj0="; }; @@ -120,4 +120,4 @@ stdenv.mkDerivation rec { mainProgram = "ART"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ar/artha/package.nix b/pkgs/by-name/ar/artha/package.nix index 766cdb772c27..85d7a879b094 100644 --- a/pkgs/by-name/ar/artha/package.nix +++ b/pkgs/by-name/ar/artha/package.nix @@ -9,12 +9,12 @@ wordnet, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "artha"; version = "1.0.5"; src = fetchurl { - url = "mirror://sourceforge/artha/${version}/artha-${version}.tar.bz2"; + url = "mirror://sourceforge/artha/${finalAttrs.version}/artha-${finalAttrs.version}.tar.bz2"; sha256 = "034r7vfk5y7705k068cdlq52ikp6ip10w6047a5zjdakbn55c3as"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "artha"; }; -} +}) diff --git a/pkgs/by-name/ar/artyFX/package.nix b/pkgs/by-name/ar/artyFX/package.nix index d3219d8b3cdc..6064c7d8cd11 100644 --- a/pkgs/by-name/ar/artyFX/package.nix +++ b/pkgs/by-name/ar/artyFX/package.nix @@ -14,14 +14,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "artyFX"; version = "1.3.1"; src = fetchFromGitHub { owner = "openAVproductions"; repo = "openAV-ArtyFX"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; hash = "sha256-GD9nwXdXSJX5OvAMxEAnngkvRW+E1jrNfWXK122bsTM="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { # Build uses `-msse` and `-mfpmath=sse` badPlatforms = [ "aarch64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/ar/arx-libertatis/package.nix b/pkgs/by-name/ar/arx-libertatis/package.nix index 4a31ab757b97..960fafc36e5a 100644 --- a/pkgs/by-name/ar/arx-libertatis/package.nix +++ b/pkgs/by-name/ar/arx-libertatis/package.nix @@ -31,14 +31,14 @@ let ; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "arx-libertatis"; version = "1.2.1"; src = fetchFromGitHub { owner = "arx"; repo = "ArxLibertatis"; - rev = version; + rev = finalAttrs.version; sha256 = "GBJcsibolZP3oVOTSaiVqG2nMmvXonKTp5i/0NNODKY="; }; @@ -96,4 +96,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/as/ashuffle/package.nix b/pkgs/by-name/as/ashuffle/package.nix index 7448598ae588..2d9995a419af 100644 --- a/pkgs/by-name/as/ashuffle/package.nix +++ b/pkgs/by-name/as/ashuffle/package.nix @@ -10,14 +10,14 @@ yaml-cpp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ashuffle"; version = "3.14.9"; src = fetchFromGitHub { owner = "joshkunz"; repo = "ashuffle"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-HQ4+vyTvX0mhfuRclbiC+MvllV3300ztAwL0IxrUiC8="; fetchSubmodules = true; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; mainProgram = "ashuffle"; }; -} +}) diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix index 1482e89ed3cc..f4b94b04c662 100644 --- a/pkgs/by-name/as/asn/package.nix +++ b/pkgs/by-name/as/asn/package.nix @@ -14,14 +14,14 @@ aha, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "asn"; version = "0.80.0"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GHzlYLBiWkayYvbkc/n1HLhL7RN1Q/AEjj+IDQBDTek="; }; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { lookup API server / Web traceroute server ''; homepage = "https://github.com/nitefood/asn"; - changelog = "https://github.com/nitefood/asn/releases/tag/v${version}"; + changelog = "https://github.com/nitefood/asn/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ devhell ]; mainProgram = "asn"; }; -} +}) diff --git a/pkgs/by-name/as/aspcud/package.nix b/pkgs/by-name/as/aspcud/package.nix index da5914a1b8ed..5d83cc86be8c 100644 --- a/pkgs/by-name/as/aspcud/package.nix +++ b/pkgs/by-name/as/aspcud/package.nix @@ -10,14 +10,14 @@ re2c, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.9.6"; pname = "aspcud"; src = fetchFromGitHub { owner = "potassco"; repo = "aspcud"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-PdRfpmH7zF5dn+feoijtzdSUjaYhjHwyAUfuYoWCL9E="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.hakuch ]; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/as/assetripper/deps.json b/pkgs/by-name/as/assetripper/deps.json index 961c7e4f691e..fa09f39dc7f7 100644 --- a/pkgs/by-name/as/assetripper/deps.json +++ b/pkgs/by-name/as/assetripper/deps.json @@ -56,8 +56,8 @@ }, { "pname": "AssetRipper.GUI.Web.Dependencies", - "version": "1.0.0", - "hash": "sha256-vRaU7qR5u2TKk1RdP4ZyTbe+/rJ02ffeC8YkqMp+W4E=" + "version": "1.1.0", + "hash": "sha256-ZsUjsQO2X6YuQfwkhmDQUlJLOGzkvdB73aE9oWpw/xY=" }, { "pname": "AssetRipper.HashAlgorithms", @@ -66,8 +66,8 @@ }, { "pname": "AssetRipper.ICSharpCode.Decompiler", - "version": "10.0.0.8273-preview2", - "hash": "sha256-FI+I2MZfFG6iHVW7ykNIO6WOSxTqmRSEtWx3CQNlRBY=" + "version": "10.0.0.8284-preview3", + "hash": "sha256-ae4zvCXkE9EgOdKy4LWI89laUtkAaPkdtf4YyQOZ4vA=" }, { "pname": "AssetRipper.IO.Endian", @@ -86,8 +86,8 @@ }, { "pname": "AssetRipper.NativeDialogs", - "version": "1.0.1", - "hash": "sha256-fLUIHFnyurjuM5YhV9G4KbwIY0oooSNY/OLglG038Cs=" + "version": "1.1.1", + "hash": "sha256-6ShudCx1WwuzmbElus3NxyxuNY5e8NthujoKkkgLFyE=" }, { "pname": "AssetRipper.Primitives", @@ -121,8 +121,8 @@ }, { "pname": "AssetRipper.SourceGenerated", - "version": "1.3.9", - "hash": "sha256-YjaQJNyRY+HM4qzlGYPFxjQstibVY5IB94DJoks1upo=" + "version": "1.3.10", + "hash": "sha256-CU8mSe7+vEmQ7QjRv0UDE9REOWniFz38BAtiKAtGsvo=" }, { "pname": "AssetRipper.Text.Html", @@ -136,8 +136,8 @@ }, { "pname": "AssetRipper.TextureDecoder", - "version": "2.5.0", - "hash": "sha256-Jxy6sjAnB0fVzlZ7TeKb8H45aNftiZe8gMTNQyefouU=" + "version": "2.6.0", + "hash": "sha256-qoecWzCXQq82wUTaw6A65pJYId/GxxkiKGZZ9AlbgWo=" }, { "pname": "AssetRipper.Tpk", @@ -172,13 +172,13 @@ }, { "pname": "Microsoft.AspNetCore.OpenApi", - "version": "10.0.1", - "hash": "sha256-O31K6+++fM7XWd0JGrzmzLrtydYGiI4efzv+WqAdnQA=" + "version": "10.0.2", + "hash": "sha256-FU57fPXL4NUDRqi+rLresi4yKttv1KcAnLuEdPCyTos=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "10.0.1", - "hash": "sha256-aHoslRGmAot/z1GCCqSzjAxT/hltxOOIZ1/oti4WbGY=" + "version": "10.0.2", + "hash": "sha256-3lrCf7HOpbkZkQx4/JSpKi8Rl+hp9NAaRi9dp6xqMaQ=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", @@ -217,8 +217,8 @@ }, { "pname": "Microsoft.OpenApi", - "version": "2.4.1", - "hash": "sha256-DXdbXq5Gpg3MJVBM0C8uF6mcLczVJAUFp6LAdFojgPs=" + "version": "2.6.1", + "hash": "sha256-cRA2net+NnfJUde1i3NRGvOxT8ycXq9+W+eerXKCapc=" }, { "pname": "NAudio.Core", @@ -282,8 +282,8 @@ }, { "pname": "SharpCompress", - "version": "0.42.1", - "hash": "sha256-cHQM/AKOZtH0dgWQaoNlLQobq4/1f/+MpXAAKHHuOxU=" + "version": "0.44.4", + "hash": "sha256-woh8cQz+Qc6MiYhCSXmMERxzhqYDWoqo7qDfRh3Od/o=" }, { "pname": "SourceGenerator.Foundations", @@ -337,8 +337,8 @@ }, { "pname": "System.IO.Pipelines", - "version": "10.0.1", - "hash": "sha256-3NHQjvO1mSPo8Hq9vMM5QeKJeS9/y3UpznideAf5pJA=" + "version": "10.0.2", + "hash": "sha256-Guh0w9aMQ5wNSI9ecuoH4tGOX4VFnlNgepvBTPGFgzc=" }, { "pname": "System.Memory", @@ -402,13 +402,13 @@ }, { "pname": "System.Text.Encodings.Web", - "version": "10.0.1", - "hash": "sha256-dBN9Rpe+J1F8/cdzwNxLHYiqvzgSX1r9128YXyb2DKM=" + "version": "10.0.2", + "hash": "sha256-DWbSR+d8DJtkMclrKKbS5Ghlvi6YYrrxgHGfyDJx50o=" }, { "pname": "System.Text.Json", - "version": "10.0.1", - "hash": "sha256-WfSgOpRL4DKfIry/H+eHxJHHrj6ENZ3+P6Q2ol3R2XM=" + "version": "10.0.2", + "hash": "sha256-Gf6L3mxsdvmN8gDyoUhfZDSFWKpmn9UjJ2v/p1CDFmk=" }, { "pname": "System.Threading.Tasks.Extensions", @@ -422,8 +422,8 @@ }, { "pname": "TerraFX.Interop.Windows", - "version": "10.0.26100.2", - "hash": "sha256-dIyetiPHgFg3cXN620ur3O/O3c+7Piw+KKzr88SlpHw=" + "version": "10.0.26100.6", + "hash": "sha256-oC1WDA7w1kVB9adGZh2KDCvJisRcOkw4Cy87wDjh2qc=" }, { "pname": "ZstdSharp.Port", @@ -432,7 +432,7 @@ }, { "pname": "ZstdSharp.Port", - "version": "0.8.6", - "hash": "sha256-rc3YWP80fykqujDsD72SXOA1tBDoy2KrvVETOC8eTx8=" + "version": "0.8.7", + "hash": "sha256-WsuDTZOv3TgiE8NV/TXbKRMHBsZKgWB8iDdKKr9OvAo=" } ] diff --git a/pkgs/by-name/as/assetripper/package.nix b/pkgs/by-name/as/assetripper/package.nix index 583231463211..116a1cc9a6d8 100644 --- a/pkgs/by-name/as/assetripper/package.nix +++ b/pkgs/by-name/as/assetripper/package.nix @@ -10,13 +10,13 @@ buildDotnetModule (finalAttrs: { pname = "assetripper"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "AssetRipper"; repo = "AssetRipper"; tag = finalAttrs.version; - hash = "sha256-cQt0udU2IjsKPwTpBZLFmw1kGv2DfRt7ecdh2ilQtN8="; + hash = "sha256-sqlZsUTeLyHHESNtC07F2FjgLXnuqgoPYRcgE57sq5k="; }; buildInputs = [ diff --git a/pkgs/by-name/as/astartectl/package.nix b/pkgs/by-name/as/astartectl/package.nix index a891c85f1448..4ca86cbae2ea 100644 --- a/pkgs/by-name/as/astartectl/package.nix +++ b/pkgs/by-name/as/astartectl/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "astartectl"; - version = "24.5.2"; + version = "24.5.3"; src = fetchFromGitHub { owner = "astarte-platform"; repo = "astartectl"; rev = "v${version}"; - hash = "sha256-T4/lkeipE7GWq1zTxkoV3MfADlduFKtGuB/dsI4YZZw="; + hash = "sha256-wziSP4mbUnAAPzmkl1qXbT95Ku/M9rMb63s/5ndCXrk="; }; - vendorHash = "sha256-kVI1DigDlTvrYLVRUYoW+AAkd31d9EehjRJxrqo8OB4="; + vendorHash = "sha256-TZ0ua64DPVlGBrr4ZCexBoyuwvJzRr1t37BTJ2bLuQI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix index 0bb0d1aa4cf8..c7e916bf6466 100644 --- a/pkgs/by-name/as/async-profiler/package.nix +++ b/pkgs/by-name/as/async-profiler/package.nix @@ -6,14 +6,14 @@ makeWrapper, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "async-profiler"; version = "4.2.1"; src = fetchFromGitHub { owner = "jvm-profiling-tools"; repo = "async-profiler"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ggqfBndcwHUerWjsvDqmRQ5uEyL6zhNgwVl18R18k0Q="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "async-profiler"; }; -} +}) diff --git a/pkgs/by-name/at/at/package.nix b/pkgs/by-name/at/at/package.nix index d354dc4b0d3d..cd1a7ea6dfcb 100644 --- a/pkgs/by-name/at/at/package.nix +++ b/pkgs/by-name/at/at/package.nix @@ -11,13 +11,13 @@ atWrapperPath ? "/run/wrappers/bin/at", }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "at"; version = "3.2.5"; src = fetchurl { # Debian is apparently the last location where it can be found. - url = "mirror://debian/pool/main/a/at/at_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/a/at/at_${finalAttrs.version}.orig.tar.gz"; hash = "sha256-uwZrOJ18m7nYSjVzgDK4XDDLp9lJ91gZKtxyyUd/07g="; }; @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "at"; }; -} +}) diff --git a/pkgs/by-name/at/atheme/package.nix b/pkgs/by-name/at/atheme/package.nix index 021786741ea4..9008c59ff772 100644 --- a/pkgs/by-name/at/atheme/package.nix +++ b/pkgs/by-name/at/atheme/package.nix @@ -13,13 +13,13 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "atheme"; version = "7.2.12"; src = fetchgit { url = "https://github.com/atheme/atheme.git"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-KAC1ZPNo4TqfVryKOYYef8cRWRgFmyEdvl1bgvpGNiM="; leaveDotGit = true; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ leo60228 ]; }; -} +}) diff --git a/pkgs/by-name/at/atkmm/package.nix b/pkgs/by-name/at/atkmm/package.nix index 336c885f2637..5b793a06baaf 100644 --- a/pkgs/by-name/at/atkmm/package.nix +++ b/pkgs/by-name/at/atkmm/package.nix @@ -11,12 +11,12 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "atkmm"; version = "2.28.4"; src = fetchurl { - url = "mirror://gnome/sources/atkmm/${lib.versions.majorMinor version}/atkmm-${version}.tar.xz"; + url = "mirror://gnome/sources/atkmm/${lib.versions.majorMinor finalAttrs.version}/atkmm-${finalAttrs.version}.tar.xz"; sha256 = "sha256-ChQqgSj4PAAe+4AU7kY+mnZgVO+EaGr5UxNeBNKP2rM="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { homepage = "https://gtkmm.org"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/at/atkmm_2_36/package.nix b/pkgs/by-name/at/atkmm_2_36/package.nix index e6bdd135d324..c86abd5b2abc 100644 --- a/pkgs/by-name/at/atkmm_2_36/package.nix +++ b/pkgs/by-name/at/atkmm_2_36/package.nix @@ -11,12 +11,12 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "atkmm"; version = "2.36.3"; src = fetchurl { - url = "mirror://gnome/sources/atkmm/${lib.versions.majorMinor version}/atkmm-${version}.tar.xz"; + url = "mirror://gnome/sources/atkmm/${lib.versions.majorMinor finalAttrs.version}/atkmm-${finalAttrs.version}.tar.xz"; sha256 = "sha256-bsJk6qDE3grbcgLGABcL3pp/vk1Ga/vpQOr3+qpsWXQ="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { homepage = "https://gtkmm.org"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/at/atlassian-plugin-sdk/package.nix b/pkgs/by-name/at/atlassian-plugin-sdk/package.nix index e8c20ce197e5..1b712b9f8bb3 100644 --- a/pkgs/by-name/at/atlassian-plugin-sdk/package.nix +++ b/pkgs/by-name/at/atlassian-plugin-sdk/package.nix @@ -17,12 +17,12 @@ let mavenGroupIdUrl = "https://packages.atlassian.com/maven/public/com/atlassian/amps"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "atlassian-plugin-sdk"; version = "9.9.1"; src = fetchurl { - url = "${mavenGroupIdUrl}/atlassian-plugin-sdk/${version}/atlassian-plugin-sdk-${version}.tar.gz"; + url = "${mavenGroupIdUrl}/atlassian-plugin-sdk/${finalAttrs.version}/atlassian-plugin-sdk-${finalAttrs.version}.tar.gz"; hash = "sha256-6svtGwk9d+/ipPHy/1kCQ5kyt1v9uaTwjYv6/ncCStc="; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out - cp -r atlassian-plugin-sdk-${version}/* $out + cp -r atlassian-plugin-sdk-${finalAttrs.version}/* $out rm $out/bin/*.bat for file in "$out"/bin/*; do @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { tests.version = testers.testVersion { package = atlassian-plugin-sdk; command = "atlas-version"; - version = "atlassian-plugin-sdk-${version}"; + version = "atlassian-plugin-sdk-${finalAttrs.version}"; }; updateScript = writeShellScript "update-atlassian-plugin-sdk" '' @@ -65,12 +65,12 @@ stdenv.mkDerivation rec { NEW_VERSION=$(curl -sL ${mavenGroupIdUrl}/atlassian-plugin-sdk/maven-metadata.xml | xq -r '.metadata.versioning.latest') - if [[ "${version}" = "$NEW_VERSION" ]]; then + if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then echo "The new version same as the old version." exit 0 fi - DOWNLOAD_URL="${mavenGroupIdUrl}/atlassian-plugin-sdk/${version}/atlassian-plugin-sdk-$NEW_VERSION.tar.gz" + DOWNLOAD_URL="${mavenGroupIdUrl}/atlassian-plugin-sdk/${finalAttrs.version}/atlassian-plugin-sdk-$NEW_VERSION.tar.gz" NIX_HASH=$(nix --extra-experimental-features nix-command hash to-sri sha256:$(nix-prefetch-url $DOWNLOAD_URL)) update-source-version "atlassian-plugin-sdk" "$NEW_VERSION" "$NIX_HASH" "$DOWNLOAD_URL" @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "atlas-mvn"; }; -} +}) diff --git a/pkgs/by-name/at/atomicparsley/package.nix b/pkgs/by-name/at/atomicparsley/package.nix index 7cd995415b4a..53d0c2734a43 100644 --- a/pkgs/by-name/at/atomicparsley/package.nix +++ b/pkgs/by-name/at/atomicparsley/package.nix @@ -6,14 +6,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "atomicparsley"; version = "20240608.083822.1ed9031"; src = fetchFromGitHub { owner = "wez"; repo = "atomicparsley"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-VhrOMpGNMkNNYjcfCqlHI8gdApWr1ThtcxDwQ6gyV/g="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pjones ]; mainProgram = "AtomicParsley"; }; -} +}) diff --git a/pkgs/by-name/at/atool/package.nix b/pkgs/by-name/at/atool/package.nix index 4b5110d98094..d3baea2bb87d 100644 --- a/pkgs/by-name/at/atool/package.nix +++ b/pkgs/by-name/at/atool/package.nix @@ -6,12 +6,12 @@ bash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "atool"; version = "0.39.0"; src = fetchurl { - url = "mirror://savannah/atool/atool-${version}.tar.gz"; + url = "mirror://savannah/atool/atool-${finalAttrs.version}.tar.gz"; sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; mainProgram = "atool"; }; -} +}) diff --git a/pkgs/by-name/at/atop/package.nix b/pkgs/by-name/at/atop/package.nix index 10c5f2816c65..0463c91245ea 100644 --- a/pkgs/by-name/at/atop/package.nix +++ b/pkgs/by-name/at/atop/package.nix @@ -14,12 +14,12 @@ withAtopgpu ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "atop"; version = "2.12.1"; src = fetchurl { - url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; + url = "https://www.atoptool.nl/download/atop-${finalAttrs.version}.tar.gz"; hash = "sha256-T9vmfF36+JQFY54YWZ9OrneXgHP/pU88eMNoq1S9EvY="; }; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { postInstall = '' # Remove extra files we don't need - rm -r $out/{var,etc} $out/bin/atop{sar,}-${version} + rm -r $out/{var,etc} $out/bin/atop{sar,}-${finalAttrs.version} '' + ( if withAtopgpu then @@ -107,4 +107,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; downloadPage = "http://atoptool.nl/downloadatop.php"; }; -} +}) diff --git a/pkgs/by-name/au/aubio/package.nix b/pkgs/by-name/au/aubio/package.nix index c6f1b09b9525..d450b9ec742f 100644 --- a/pkgs/by-name/au/aubio/package.nix +++ b/pkgs/by-name/au/aubio/package.nix @@ -12,12 +12,12 @@ wafHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aubio"; version = "0.4.9"; src = fetchurl { - url = "https://aubio.org/pub/aubio-${version}.tar.bz2"; + url = "https://aubio.org/pub/aubio-${finalAttrs.version}.tar.bz2"; sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/au/augeas/package.nix b/pkgs/by-name/au/augeas/package.nix index ddf84c05ccf5..ab8d027664df 100644 --- a/pkgs/by-name/au/augeas/package.nix +++ b/pkgs/by-name/au/augeas/package.nix @@ -11,14 +11,14 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "augeas"; version = "1.14.1"; src = fetchFromGitHub { owner = "hercules-team"; repo = "augeas"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-U5tm3LDUeI/idHtL2Zy33BigkyvHunXPjToDC59G9VE="; }; @@ -66,9 +66,9 @@ stdenv.mkDerivation rec { description = "Configuration editing tool"; license = lib.licenses.lgpl21Only; homepage = "https://augeas.net/"; - changelog = "https://github.com/hercules-team/augeas/releases/tag/release-${version}"; + changelog = "https://github.com/hercules-team/augeas/releases/tag/release-${finalAttrs.version}"; mainProgram = "augtool"; maintainers = with lib.maintainers; [ offline ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/au/augustus/package.nix b/pkgs/by-name/au/augustus/package.nix index d183ab7d0f2e..f6be90fd9773 100644 --- a/pkgs/by-name/au/augustus/package.nix +++ b/pkgs/by-name/au/augustus/package.nix @@ -11,14 +11,14 @@ imagemagick, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "augustus"; version = "4.0.0"; src = fetchFromGitHub { owner = "Keriew"; repo = "augustus"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-UWJmxirRJJqvL4ZSjBvFepeKVvL77+WMp4YdZuFNEkg="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { matteopacini ]; }; -} +}) diff --git a/pkgs/by-name/au/auto-epp/package.nix b/pkgs/by-name/au/auto-epp/package.nix index 4d902a889813..5a05736e0ae2 100644 --- a/pkgs/by-name/au/auto-epp/package.nix +++ b/pkgs/by-name/au/auto-epp/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "auto-epp"; version = "1.2.1"; src = fetchFromGitHub { owner = "jothi-prasath"; repo = "auto-epp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7sI8K+7ZAdzBN/XOzYQQZ1f9t+fFo6fcXYzX6abNyQ8="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.lamarios ]; }; -} +}) diff --git a/pkgs/by-name/au/autoconf-archive/package.nix b/pkgs/by-name/au/autoconf-archive/package.nix index 91e3e07e1740..8a3e537001e7 100644 --- a/pkgs/by-name/au/autoconf-archive/package.nix +++ b/pkgs/by-name/au/autoconf-archive/package.nix @@ -5,12 +5,12 @@ xz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "autoconf-archive"; version = "2024.10.16"; src = fetchurl { - url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; + url = "mirror://gnu/autoconf-archive/autoconf-archive-${finalAttrs.version}.tar.xz"; hash = "sha256-e81dABkW86UO10NvT3AOPSsbrePtgDIZxZLWJQKlc2M="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/au/autofs5/package.nix b/pkgs/by-name/au/autofs5/package.nix index 3b053f0d0165..c5d115d83185 100644 --- a/pkgs/by-name/au/autofs5/package.nix +++ b/pkgs/by-name/au/autofs5/package.nix @@ -23,12 +23,12 @@ libnsl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "5.1.9"; pname = "autofs"; src = fetchurl { - url = "mirror://kernel/linux/daemons/autofs/v5/autofs-${version}.tar.xz"; + url = "mirror://kernel/linux/daemons/autofs/v5/autofs-${finalAttrs.version}.tar.xz"; sha256 = "sha256-h+avagN5S5Ri6lGXgeUOfSO198ks1Z4RQshdJJOzwks="; }; patches = [ @@ -100,4 +100,4 @@ stdenv.mkDerivation rec { executables = [ "automount" ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/au/autogen/package.nix b/pkgs/by-name/au/autogen/package.nix index e0559379ce25..125c25bc27f6 100644 --- a/pkgs/by-name/au/autogen/package.nix +++ b/pkgs/by-name/au/autogen/package.nix @@ -12,12 +12,12 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "autogen"; version = "5.18.16"; src = fetchurl { - url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz"; + url = "mirror://gnu/autogen/rel${finalAttrs.version}/autogen-${finalAttrs.version}.tar.xz"; sha256 = "16mlbdys8q4ckxlvxyhwkdnh1ay9f6g0cyp1kylkpalgnik398gq"; }; @@ -160,4 +160,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/au/autojump/package.nix b/pkgs/by-name/au/autojump/package.nix index 7e36a036ed5c..349e2ddf45f4 100644 --- a/pkgs/by-name/au/autojump/package.nix +++ b/pkgs/by-name/au/autojump/package.nix @@ -5,14 +5,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "autojump"; version = "22.5.3"; src = fetchFromGitHub { owner = "wting"; repo = "autojump"; - rev = "release-v${version}"; + rev = "release-v${finalAttrs.version}"; sha256 = "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws"; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { yurrriq ]; }; -} +}) diff --git a/pkgs/by-name/au/autologin/package.nix b/pkgs/by-name/au/autologin/package.nix index 0711999710cb..fb7033aab148 100644 --- a/pkgs/by-name/au/autologin/package.nix +++ b/pkgs/by-name/au/autologin/package.nix @@ -8,14 +8,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "autologin"; version = "1.0.0"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = "autologin"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Cy4v/1NuaiSr5Bl6SQMWk5rga8h1QMBUkHpN6M3bWOc="; }; @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { meta = { description = "Run a command inside of a new PAM user session"; homepage = "https://sr.ht/~kennylevinsen/autologin"; - changelog = "https://git.sr.ht/~kennylevinsen/autologin/refs/${version}"; + changelog = "https://git.sr.ht/~kennylevinsen/autologin/refs/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ beviu ]; mainProgram = "autologin"; }; -} +}) diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 2870971e5dfd..d293b11a44f2 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "automatic-timezoned"; - version = "2.0.111"; + version = "2.0.113"; src = fetchFromGitHub { owner = "maxbrunet"; repo = "automatic-timezoned"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-lkeUORL+tL1WbDZ3CrM7tClVfgBjfPlBWV5L8OwogmU="; + sha256 = "sha256-R7JJNPwhWOJB+19RC38ICy/ViOQRYnoPU7Fghi5bC40="; }; - cargoHash = "sha256-GVXYfH42h+cBQ168ZTy0D9xpTqWZ9rjALU5sZOg7sek="; + cargoHash = "sha256-TMuQdYNCJf/krUXLf7vPdUidzLMsUiF1jWvTBqmNEBQ="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/au/automaticcomponenttoolkit/package.nix b/pkgs/by-name/au/automaticcomponenttoolkit/package.nix index aae670560be8..f007eddb4da2 100644 --- a/pkgs/by-name/au/automaticcomponenttoolkit/package.nix +++ b/pkgs/by-name/au/automaticcomponenttoolkit/package.nix @@ -6,14 +6,14 @@ writableTmpDirAsHomeHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "AutomaticComponentToolkit"; version = "1.6.0"; src = fetchFromGitHub { owner = "Autodesk"; repo = "AutomaticComponentToolkit"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1r0sbw82cf9dbcj3vgnbd4sc1lklzvijic2z5wgkvs21azcm0yzh"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/au/automirror/package.nix b/pkgs/by-name/au/automirror/package.nix index f0740c09097b..b571c055bf65 100644 --- a/pkgs/by-name/au/automirror/package.nix +++ b/pkgs/by-name/au/automirror/package.nix @@ -6,14 +6,14 @@ ronn, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "automirror"; version = "49"; src = fetchFromGitHub { owner = "schlomo"; repo = "automirror"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1syyf7dcm8fbyw31cpgmacg80h7pg036dayaaf0svvdsk0hqlsch"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "automirror"; }; -} +}) diff --git a/pkgs/by-name/au/automysqlbackup/package.nix b/pkgs/by-name/au/automysqlbackup/package.nix index 95d3298b81f1..1db5b17c67c1 100644 --- a/pkgs/by-name/au/automysqlbackup/package.nix +++ b/pkgs/by-name/au/automysqlbackup/package.nix @@ -11,14 +11,14 @@ gzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "automysqlbackup"; version = "3.0.7"; src = fetchFromGitHub { owner = "sixhop"; repo = "automysqlbackup"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-C0p1AY4yIxybQ6a/HsE3ZTHumtvQw5kKM51Ap+Se0ZI="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.aanderse ]; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/au/autopsy/package.nix b/pkgs/by-name/au/autopsy/package.nix index c95da9e437e2..2499d94a6487 100644 --- a/pkgs/by-name/au/autopsy/package.nix +++ b/pkgs/by-name/au/autopsy/package.nix @@ -16,12 +16,12 @@ let } ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "autopsy"; version = "4.22.1"; src = fetchzip { - url = "https://github.com/sleuthkit/autopsy/releases/download/autopsy-${version}/autopsy-${version}_v2.zip"; + url = "https://github.com/sleuthkit/autopsy/releases/download/autopsy-${finalAttrs.version}/autopsy-${finalAttrs.version}_v2.zip"; hash = "sha256-IHpUzwSXoghjixsPwpj3lMwHIby3+zx7BjzGRlAVcVs="; }; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical interface to The Sleuth Kit and other open source digital forensics tools"; homepage = "https://www.sleuthkit.org/autopsy"; - changelog = "https://github.com/sleuthkit/autopsy/releases/tag/autopsy-${version}"; + changelog = "https://github.com/sleuthkit/autopsy/releases/tag/autopsy-${finalAttrs.version}"; # Autopsy brings a lot of vendored dependencies license = with lib.licenses; [ asl20 @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { # Autopsy theoretically also supports darwin platforms = lib.platforms.x86_64; }; -} +}) diff --git a/pkgs/by-name/au/autorevision/package.nix b/pkgs/by-name/au/autorevision/package.nix index 0c2e3b37faf0..1eaa4ac2be2a 100644 --- a/pkgs/by-name/au/autorevision/package.nix +++ b/pkgs/by-name/au/autorevision/package.nix @@ -13,12 +13,12 @@ gnused, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "autorevision"; version = "1.22"; src = fetchurl { - url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${version}/autorevision-${version}.tgz"; + url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${finalAttrs.version}/autorevision-${finalAttrs.version}.tgz"; sha256 = "sha256-3ktLVC73m2xddq5BhxVKw/FJd6pZ5RVb7fv29dxUoRE="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "autorevision"; }; -} +}) diff --git a/pkgs/by-name/av/avidemux/package.nix b/pkgs/by-name/av/avidemux/package.nix index 435427403252..de00a6caac59 100644 --- a/pkgs/by-name/av/avidemux/package.nix +++ b/pkgs/by-name/av/avidemux/package.nix @@ -49,12 +49,12 @@ assert default != "qt5" -> default == "cli"; assert !withQT -> default != "qt5"; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "avidemux"; version = "2.8.1"; src = fetchurl { - url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; + url = "mirror://sourceforge/avidemux/avidemux/${finalAttrs.version}/avidemux_${finalAttrs.version}.tar.gz"; sha256 = "sha256-d9m9yoaDzlfBkradIHz6t8+Sp3Wc4PY/o3tcjkKtPaI="; }; @@ -188,4 +188,4 @@ stdenv.mkDerivation rec { ]; license = lib.licenses.gpl2; }; -} +}) diff --git a/pkgs/by-name/av/avra/package.nix b/pkgs/by-name/av/avra/package.nix index ea89544b0f7d..092fd326c9d2 100644 --- a/pkgs/by-name/av/avra/package.nix +++ b/pkgs/by-name/av/avra/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "avra"; version = "1.4.2"; src = fetchFromGitHub { owner = "Ro5bert"; repo = "avra"; - tag = version; + tag = finalAttrs.version; hash = "sha256-joOj89WZ9Si5fcu1w1VHj5fOcnB9N2313Yb29A+nCCY="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/av/avro-c/package.nix b/pkgs/by-name/av/avro-c/package.nix index d50bed88d0f2..648247a2146a 100644 --- a/pkgs/by-name/av/avro-c/package.nix +++ b/pkgs/by-name/av/avro-c/package.nix @@ -10,12 +10,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "avro-c"; version = "1.12.1"; src = fetchurl { - url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; + url = "mirror://apache/avro/avro-${finalAttrs.version}/c/avro-c-${finalAttrs.version}.tar.gz"; sha256 = "sha256-tk4xuUcZSZVJYiqpLx2W0XQpZ87SYaCTG2O+O76Qfyw="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lblasc ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix index 9762e2b75ba5..9a2a7990b0c1 100644 --- a/pkgs/by-name/av/avro-cpp/package.nix +++ b/pkgs/by-name/av/avro-cpp/package.nix @@ -9,12 +9,12 @@ versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "avro-c++"; version = "1.12.0"; src = fetchurl { - url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; + url = "mirror://apache/avro/avro-${finalAttrs.version}/cpp/avro-cpp-${finalAttrs.version}.tar.gz"; hash = "sha256-8u33cSanWw7BrRZncr4Fg1HOo9dESL5+LO8gBQwPmKs="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix index f5f042ec3737..52d943a19726 100644 --- a/pkgs/by-name/aw/await/package.nix +++ b/pkgs/by-name/aw/await/package.nix @@ -6,14 +6,14 @@ versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "await"; version = "2.4.0"; src = fetchFromGitHub { owner = "slavaGanzin"; repo = "await"; - tag = version; + tag = finalAttrs.version; hash = "sha256-MpdP4OJvxjF8zbKQ1YGVrtcC8RKxDNHDA90tWvLDQbU="; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; meta = { - changelog = "https://github.com/slavaGanzin/await/releases/tag/${version}"; + changelog = "https://github.com/slavaGanzin/await/releases/tag/${finalAttrs.version}"; description = "Small binary that runs a list of commands in parallel and awaits termination"; homepage = "https://github.com/slavaGanzin/await"; license = lib.licenses.mit; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "await"; }; -} +}) diff --git a/pkgs/by-name/aw/aws-c-auth/package.nix b/pkgs/by-name/aw/aws-c-auth/package.nix index afc41ea299a9..fd65cad5037f 100644 --- a/pkgs/by-name/aw/aws-c-auth/package.nix +++ b/pkgs/by-name/aw/aws-c-auth/package.nix @@ -13,7 +13,7 @@ s2n-tls, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-c-auth"; # nixpkgs-update: no auto update version = "0.9.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8oQTTqBuEzhBUWqXHVYrGtaX44SmB2sJQZchiweHekM="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ r-burns ]; }; -} +}) diff --git a/pkgs/by-name/aw/aws-c-common/package.nix b/pkgs/by-name/aw/aws-c-common/package.nix index e2e3833da048..46dd7b013a25 100644 --- a/pkgs/by-name/aw/aws-c-common/package.nix +++ b/pkgs/by-name/aw/aws-c-common/package.nix @@ -6,7 +6,7 @@ nix, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-c-common"; # nixpkgs-update: no auto update version = "0.12.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-common"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-hKCIPZlLPyH7D3Derk2onyqTzWGUtCx+f2+EKtAKlwA="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { r-burns ]; }; -} +}) diff --git a/pkgs/by-name/aw/aws-c-compression/package.nix b/pkgs/by-name/aw/aws-c-compression/package.nix index ac143760193f..2722bb676973 100644 --- a/pkgs/by-name/aw/aws-c-compression/package.nix +++ b/pkgs/by-name/aw/aws-c-compression/package.nix @@ -7,7 +7,7 @@ nix, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-c-compression"; # nixpkgs-update: no auto update version = "0.3.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-compression"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-gpru+hnppgLHhcPfVBOaMdcT6e8wUjZmY7Caaa/KAW4="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ r-burns ]; }; -} +}) diff --git a/pkgs/by-name/aw/aws-c-event-stream/package.nix b/pkgs/by-name/aw/aws-c-event-stream/package.nix index d8e93de74428..56e7f41d4529 100644 --- a/pkgs/by-name/aw/aws-c-event-stream/package.nix +++ b/pkgs/by-name/aw/aws-c-event-stream/package.nix @@ -12,7 +12,7 @@ libexecinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-c-event-stream"; # nixpkgs-update: no auto update version = "0.5.7"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-event-stream"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-JvjUrIj1bh5WZEzkauLSLIolxrT8CKIMjO7p1c35XZI="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/aw/aws-c-http/package.nix b/pkgs/by-name/aw/aws-c-http/package.nix index 7e5dfdc6d402..01b333b01b35 100644 --- a/pkgs/by-name/aw/aws-c-http/package.nix +++ b/pkgs/by-name/aw/aws-c-http/package.nix @@ -11,7 +11,7 @@ s2n-tls, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-c-http"; # nixpkgs-update: no auto update version = "0.10.4"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-t9PoxOjgV9qLris+C18SaEwXodBGcgK591LZl0dajxU="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ r-burns ]; }; -} +}) diff --git a/pkgs/by-name/aw/aws-c-io/package.nix b/pkgs/by-name/aw/aws-c-io/package.nix index 837f8fc45e0e..590195761664 100644 --- a/pkgs/by-name/aw/aws-c-io/package.nix +++ b/pkgs/by-name/aw/aws-c-io/package.nix @@ -9,7 +9,7 @@ s2n-tls, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-c-io"; # nixpkgs-update: no auto update version = "0.22.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-io"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-NOEjXk4s/FV4CdmyXOr4Oh2y+pFNrUMP/Sy+X+fVQc4="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/aw/aws-c-mqtt/package.nix b/pkgs/by-name/aw/aws-c-mqtt/package.nix index 250fe47283d8..4afa38301a65 100644 --- a/pkgs/by-name/aw/aws-c-mqtt/package.nix +++ b/pkgs/by-name/aw/aws-c-mqtt/package.nix @@ -12,7 +12,7 @@ s2n-tls, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-c-mqtt"; # nixpkgs-update: no auto update version = "0.13.3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Nf8c5iVl+NOPZFjsAPCMOGq2e7D8e7PafuMQh6t0DYw="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ r-burns ]; }; -} +}) diff --git a/pkgs/by-name/aw/aws-c-s3/package.nix b/pkgs/by-name/aw/aws-c-s3/package.nix index a82a3abb340b..9a732bf9237d 100644 --- a/pkgs/by-name/aw/aws-c-s3/package.nix +++ b/pkgs/by-name/aw/aws-c-s3/package.nix @@ -14,7 +14,7 @@ s2n-tls, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-c-s3"; # nixpkgs-update: no auto update version = "0.8.7"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-8yUwgiZ50BiItapeg0zIc5vr0+OFHvzIRrwWH4lQFBM="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { mainProgram = "s3"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/aw/aws-c-sdkutils/package.nix b/pkgs/by-name/aw/aws-c-sdkutils/package.nix index f676da89baa7..1b75863eba31 100644 --- a/pkgs/by-name/aw/aws-c-sdkutils/package.nix +++ b/pkgs/by-name/aw/aws-c-sdkutils/package.nix @@ -7,7 +7,7 @@ nix, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-c-sdkutils"; # nixpkgs-update: no auto update version = "0.2.4"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-zc8E5ESZxXBJ6WA/V5i2Us61UcNf9wXa2k63NWqGRtI="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ r-burns ]; }; -} +}) diff --git a/pkgs/by-name/aw/aws-checksums/package.nix b/pkgs/by-name/aw/aws-checksums/package.nix index 6c57c249129d..9ae804c87e13 100644 --- a/pkgs/by-name/aw/aws-checksums/package.nix +++ b/pkgs/by-name/aw/aws-checksums/package.nix @@ -7,7 +7,7 @@ nix, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-checksums"; # nixpkgs-update: no auto update version = "0.2.7"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-checksums"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-dYDTDWZJJ0JlvkMfLS376uUt5QzSmbV0UNRC4aq35TY="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/aw/aws-crt-cpp/package.nix b/pkgs/by-name/aw/aws-crt-cpp/package.nix index 2f540e015edf..d7b41258fc23 100644 --- a/pkgs/by-name/aw/aws-crt-cpp/package.nix +++ b/pkgs/by-name/aw/aws-crt-cpp/package.nix @@ -17,7 +17,7 @@ nix, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-crt-cpp"; # nixpkgs-update: no auto update version = "0.34.3"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-crt-cpp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-jKmIsWAzxnfsNgHavR6crhIQXVJq/PbQgaj4KVGrMP0="; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ r-burns ]; }; -} +}) diff --git a/pkgs/by-name/aw/aws-sdk-cpp/package.nix b/pkgs/by-name/aw/aws-sdk-cpp/package.nix index d1fdc2f125a4..23c4f10171c3 100644 --- a/pkgs/by-name/aw/aws-sdk-cpp/package.nix +++ b/pkgs/by-name/aw/aws-sdk-cpp/package.nix @@ -32,7 +32,7 @@ let throw "Unknown host OS"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-sdk-cpp"; # nixpkgs-update: no auto update version = "1.11.647"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-RJKR0xw3HTNItaLGyYCjibmfK3UBDA4hfAZzQ0xYg9U="; }; @@ -165,4 +165,4 @@ stdenv.mkDerivation rec { # building ec2 runs out of memory: cc1plus: out of memory allocating 33554372 bytes after a total of 74424320 bytes broken = stdenv.buildPlatform.is32bit && ((builtins.elem "ec2" apis) || (builtins.elem "*" apis)); }; -} +}) diff --git a/pkgs/by-name/ay/ayatana-ido/package.nix b/pkgs/by-name/ay/ayatana-ido/package.nix index a8ce5c744536..f55d9ab7a1b9 100644 --- a/pkgs/by-name/ay/ayatana-ido/package.nix +++ b/pkgs/by-name/ay/ayatana-ido/package.nix @@ -8,14 +8,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ayatana-ido"; version = "0.10.4"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-ido"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-KeErrT2umMaIVfLDr4CcQCmFrMb8/h6pNYbunuC/JtI="; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Ayatana Display Indicator Objects"; homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; - changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; + changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${finalAttrs.version}/ChangeLog"; license = [ lib.licenses.lgpl3Plus lib.licenses.lgpl21Plus @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.nickhu ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index 72e180febd7a..7dd39acc78fe 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "azahar"; - version = "2124.1"; + version = "2124.3"; src = fetchzip { url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-ezgDELKw3Nb4EwJhD3+bMykoGdEzQpU4FSyIiEt7Lac="; + hash = "sha256-JpqEJIKdmSJ5D9Q+a6YbHMJNTCK3+vDaSCSI23i60pk="; }; strictDeps = true; diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix index c0bf9a664cf2..4b54eee406df 100644 --- a/pkgs/by-name/az/azimuth/package.nix +++ b/pkgs/by-name/az/azimuth/package.nix @@ -8,14 +8,14 @@ installTool ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "azimuth"; version = "1.0.3"; src = fetchFromGitHub { owner = "mdsteele"; repo = "azimuth"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1znfvpmqiixd977jv748glk5zc4cmhw5813zp81waj07r9b0828r"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace data/azimuth.desktop \ --replace Exec=azimuth "Exec=$out/bin/azimuth" \ - --replace "Version=%AZ_VERSION_NUMBER" "Version=${version}" + --replace "Version=%AZ_VERSION_NUMBER" "Version=${finalAttrs.version}" ''; makeFlags = [ @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/az/azpainter/package.nix b/pkgs/by-name/az/azpainter/package.nix index f5e740555e6c..31ebda65c6ba 100644 --- a/pkgs/by-name/az/azpainter/package.nix +++ b/pkgs/by-name/az/azpainter/package.nix @@ -21,14 +21,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "azpainter"; version = "3.0.12"; src = fetchFromGitLab { owner = "azelpg"; repo = "azpainter"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-cUq1UmS0k5eib0aJI1zOJbJRzErezfAAXOOIFrgUS6E="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; mainProgram = "azpainter"; }; -} +}) diff --git a/pkgs/by-name/az/aztfexport/package.nix b/pkgs/by-name/az/aztfexport/package.nix index 6527293502d2..30b7ae7663a8 100644 --- a/pkgs/by-name/az/aztfexport/package.nix +++ b/pkgs/by-name/az/aztfexport/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "aztfexport"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Azure"; repo = "aztfexport"; tag = "v${finalAttrs.version}"; - hash = "sha256-j6WdQvbxmHOMEfCvnFDxr9ZNOZg0BIOC6u1nw+n3hA0="; + hash = "sha256-97lahgEsth2YUeqTe8J58brykpFV0lG6KwB7FJgODAE="; }; - vendorHash = "sha256-qb4/sUjtfw/USITTLSuB2fXWR2mAuAcvbawrNA/ilRo="; + vendorHash = "sha256-4u40PdRT3E+BZ8bIrnIgRnJkpws6EPK5DRyXu9oY7hc="; ldflags = [ "-s" diff --git a/pkgs/by-name/az/azure-cli/README.md b/pkgs/by-name/az/azure-cli/README.md index 958828067549..1abbfea8e5e2 100644 --- a/pkgs/by-name/az/azure-cli/README.md +++ b/pkgs/by-name/az/azure-cli/README.md @@ -4,7 +4,7 @@ - Update `version` and `src.hash` in package.nix - Check out the changes made to the azure-cli [setup.py](https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/setup.py) since the last release -- Try build the CLI, will likely fail with `ModuleNotFoundError`, for example +- Try to build the CLI, will likely fail with `ModuleNotFoundError`, for example ``` ModuleNotFoundError: No module named 'azure.mgmt.storage.v2023_05_01' ``` @@ -21,7 +21,7 @@ There are two sets of extensions: -- `extensions-generated.nix` are extensions with no external requirements, which can be regenerated running: +- `extensions-generated.nix` are extensions with no external requirements, which can be regenerated by running: > nix run .#azure-cli.passthru.generate-extensions - `extensions-manual.nix` are extensions with requirements, which need to be manually packaged and maintained. diff --git a/pkgs/by-name/b4/b43FirmwareCutter/package.nix b/pkgs/by-name/b4/b43FirmwareCutter/package.nix index ada2eabe0990..b590b3ab6408 100644 --- a/pkgs/by-name/b4/b43FirmwareCutter/package.nix +++ b/pkgs/by-name/b4/b43FirmwareCutter/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "b43-fwcutter"; version = "019"; src = fetchurl { - url = "https://bues.ch/b43/fwcutter/b43-fwcutter-${version}.tar.bz2"; + url = "https://bues.ch/b43/fwcutter/b43-fwcutter-${finalAttrs.version}.tar.bz2"; sha256 = "1ki1f5fy3yrw843r697f8mqqdz0pbsbqnvg4yzkhibpn1lqqbsnn"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ba/bacnet-stack/package.nix b/pkgs/by-name/ba/bacnet-stack/package.nix index 9d4d454319d3..e70700ee7c32 100644 --- a/pkgs/by-name/ba/bacnet-stack/package.nix +++ b/pkgs/by-name/ba/bacnet-stack/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bacnet-stack"; version = "1.3.5"; src = fetchFromGitHub { owner = "bacnet-stack"; repo = "bacnet-stack"; - rev = "bacnet-stack-${version}"; + rev = "bacnet-stack-${finalAttrs.version}"; sha256 = "sha256-Iwo0bNulKdFNwNU2xj6Uin+5hQt1I3N6+zso5BHrIOU="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ WhittlesJr ]; }; -} +}) diff --git a/pkgs/by-name/ba/badvpn/package.nix b/pkgs/by-name/ba/badvpn/package.nix index c7cc75de227b..5d6f80fabb2c 100644 --- a/pkgs/by-name/ba/badvpn/package.nix +++ b/pkgs/by-name/ba/badvpn/package.nix @@ -11,14 +11,14 @@ debug ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "badvpn"; version = "1.999.130"; src = fetchFromGitHub { owner = "ambrop72"; repo = "badvpn"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-bLTDpq3ohUP+KooPvhv1/AZfdo0HwB3g9QOuE2E/pmY="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ba/balatro/package.nix b/pkgs/by-name/ba/balatro/package.nix index ec56a60e8bda..eb039b8808a7 100644 --- a/pkgs/by-name/ba/balatro/package.nix +++ b/pkgs/by-name/ba/balatro/package.nix @@ -1,4 +1,5 @@ { + fetchurl, stdenv, lib, love, @@ -22,6 +23,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-DXX+FkrM8zEnNNSzesmHiN0V8Ljk+buLf5DE5Z3pP0c="; }; + srcIcon = fetchurl { + name = "balatro.png"; + url = "https://play-lh.googleusercontent.com/RSPv_SMlA3Lun8VHaJD7xCBQg29eCJR9sNJtZNJGlybVs8byYVLz4WnohrbLScC9srg"; + hash = "sha256-GoStvXBYI8x5b8T0wwH5D5C3Kahu0ssCyOM8MoLxy8Q="; + }; + nativeBuildInputs = [ p7zip copyDesktopItems @@ -54,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { # 'official' way of doing it. installPhase = '' runHook preInstall - install -Dm444 $tmpdir/resources/textures/2x/balatro.png -t $out/share/icons/ + install -Dm644 $srcIcon $out/share/icons/hicolor/scalable/apps/balatro.png cat ${lib.getExe love} $patchedExe > $out/share/Balatro chmod +x $out/share/Balatro @@ -71,7 +78,10 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.unfree; homepage = "https://store.steampowered.com/app/2379780/Balatro/"; - maintainers = [ lib.maintainers.antipatico ]; + maintainers = with lib.maintainers; [ + antipatico + appsforartists + ]; platforms = love.meta.platforms; mainProgram = "balatro"; }; diff --git a/pkgs/by-name/ba/bam/package.nix b/pkgs/by-name/ba/bam/package.nix index f6d4436b8443..74b34c555f6e 100644 --- a/pkgs/by-name/ba/bam/package.nix +++ b/pkgs/by-name/ba/bam/package.nix @@ -6,14 +6,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bam"; version = "0.5.1"; src = fetchFromGitHub { owner = "matricks"; repo = "bam"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { license = lib.licenses.zlib; downloadPage = "http://matricks.github.com/bam/"; }; -} +}) diff --git a/pkgs/by-name/ba/bamf/package.nix b/pkgs/by-name/ba/bamf/package.nix index 2a500d5f1a50..0f0dfc309246 100644 --- a/pkgs/by-name/ba/bamf/package.nix +++ b/pkgs/by-name/ba/bamf/package.nix @@ -22,7 +22,7 @@ withDocs ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bamf"; version = "0.5.6"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.launchpad.net/~unity-team/bamf"; - tag = version; + tag = finalAttrs.version; sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ="; }; @@ -109,4 +109,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ davidak ]; teams = [ lib.teams.pantheon ]; }; -} +}) diff --git a/pkgs/by-name/ba/banner/package.nix b/pkgs/by-name/ba/banner/package.nix index 6946017ed023..f585bfe624cb 100644 --- a/pkgs/by-name/ba/banner/package.nix +++ b/pkgs/by-name/ba/banner/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "banner"; version = "1.3.6"; src = fetchFromGitHub { owner = "pronovic"; repo = "banner"; - rev = "BANNER_V${version}"; + rev = "BANNER_V${finalAttrs.version}"; sha256 = "sha256-g9i460W0SanW2xIfZk9Am/vDsRlL7oxJOUhksa+I8zY="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/ba/baobab/package.nix b/pkgs/by-name/ba/baobab/package.nix index 650780e09824..683551b45e0c 100644 --- a/pkgs/by-name/ba/baobab/package.nix +++ b/pkgs/by-name/ba/baobab/package.nix @@ -17,12 +17,12 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "baobab"; version = "49.1"; src = fetchurl { - url = "mirror://gnome/sources/baobab/${lib.versions.major version}/baobab-${version}.tar.xz"; + url = "mirror://gnome/sources/baobab/${lib.versions.major finalAttrs.version}/baobab-${finalAttrs.version}.tar.xz"; hash = "sha256-YkPJIAK+fpH13s0klhL6zipKEtN0Kv2IsIapS4dd/+A="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ba/bar/package.nix b/pkgs/by-name/ba/bar/package.nix index 938dde819cfd..4fc6e9a2c720 100644 --- a/pkgs/by-name/ba/bar/package.nix +++ b/pkgs/by-name/ba/bar/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bar"; version = "1.11.1"; src = fetchurl { - url = "mirror://sourceforge/project/clpbar/clpbar/bar-${version}/bar_${version}.tar.gz"; + url = "mirror://sourceforge/project/clpbar/clpbar/bar-${finalAttrs.version}/bar_${finalAttrs.version}.tar.gz"; sha256 = "00v5cb6vzizyyhflgr62d3k8dqc0rg6wdgfyyk11c0s0r32mw3zs"; }; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "bar"; }; -} +}) diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix index 03c6654470ea..d68e5e377a74 100644 --- a/pkgs/by-name/ba/baresip/package.nix +++ b/pkgs/by-name/ba/baresip/package.nix @@ -30,14 +30,14 @@ dbusSupport ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "4.4.0"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-/4XFuOKE/VCIkue9QGwNK/MxkeBU8XoyfLPZd6WAuNg="; }; @@ -191,4 +191,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ba/base16384/package.nix b/pkgs/by-name/ba/base16384/package.nix index 8517ef6cdd5a..ff82ee325041 100644 --- a/pkgs/by-name/ba/base16384/package.nix +++ b/pkgs/by-name/ba/base16384/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "base16384"; version = "2.3.2"; src = fetchFromGitHub { owner = "fumiama"; repo = "base16384"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-qaDnv+KpXMYdx6eqH7pU0pEjSpU5xg9I7afxpoO3iGs="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 5fa1d6a58a09..28cf35927d28 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -18,13 +18,13 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.37.1"; + version = "1.37.2"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; tag = "v${version}"; - hash = "sha256-lBCCd9t6E0lUHOKc+5G1Ab3FmD/zj6g6SPoJ0Lh6oDE="; + hash = "sha256-xFbVeNfOse7FfivTFwBnEZ0XUU2uUXqe1im6MncZwyY="; }; npmDepsHash = "sha256-aZ9kfkW+S6Hjt59Z4Fc5joghs7OQ32354IYevFuKNeo="; diff --git a/pkgs/by-name/ba/basez/package.nix b/pkgs/by-name/ba/basez/package.nix index df86a85a5eed..b296f685a859 100644 --- a/pkgs/by-name/ba/basez/package.nix +++ b/pkgs/by-name/ba/basez/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "basez"; version = "1.6.2"; src = fetchurl { - url = "http://www.quarkline.net/basez/download/basez-${version}.tar.gz"; + url = "http://www.quarkline.net/basez/download/basez-${finalAttrs.version}.tar.gz"; sha256 = "sha256-Kp+CFIh5HCdj7wEgx1xD3IPdFlZ7fEFvMDMYif1ZiTc="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.oaksoaj ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ba/bash-completion/package.nix b/pkgs/by-name/ba/bash-completion/package.nix index b2da793ce093..f7c9b961c948 100644 --- a/pkgs/by-name/ba/bash-completion/package.nix +++ b/pkgs/by-name/ba/bash-completion/package.nix @@ -9,7 +9,7 @@ bashInteractive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bash-completion"; version = "2.17.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # test fixtures that are part of the repository. # See discussion in https://github.com/NixOS/nixpkgs/issues/107768 src = fetchurl { - url = "https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz"; + url = "https://github.com/scop/bash-completion/releases/download/${finalAttrs.version}/bash-completion-${finalAttrs.version}.tar.xz"; hash = "sha256-3Z2CXklkNfs766Oue+qfd+gh6JRmfQdDHR1MjFcLnlg="; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ philiptaron ]; }; -} +}) diff --git a/pkgs/by-name/ba/bash_unit/package.nix b/pkgs/by-name/ba/bash_unit/package.nix index 760333f9b31f..2eba0309bea8 100644 --- a/pkgs/by-name/ba/bash_unit/package.nix +++ b/pkgs/by-name/ba/bash_unit/package.nix @@ -4,14 +4,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bash_unit"; version = "2.3.3"; src = fetchFromGitHub { owner = "bash-unit"; repo = "bash_unit"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-uRUqa6sXaXXDes9JjyTsMlA+nYdTGdioM0/y2XDIiEw="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; mainProgram = "bash_unit"; }; -} +}) diff --git a/pkgs/by-name/ba/bashcards/package.nix b/pkgs/by-name/ba/bashcards/package.nix index f6cab3d940b3..643ba4ebd692 100644 --- a/pkgs/by-name/ba/bashcards/package.nix +++ b/pkgs/by-name/ba/bashcards/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bashcards"; version = "0.1.3"; src = fetchFromGitHub { owner = "rpearce"; repo = "bashcards"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1rpqrh0022sbrjvd55a0jvpdqhhka5msf8dsz6adbbmxy3xzgdid"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "bashcards"; }; -} +}) diff --git a/pkgs/by-name/ba/bashmount/package.nix b/pkgs/by-name/ba/bashmount/package.nix index 5d4397cd8529..2b8f6ca3c366 100644 --- a/pkgs/by-name/ba/bashmount/package.nix +++ b/pkgs/by-name/ba/bashmount/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bashmount"; version = "4.3.2"; src = fetchFromGitHub { owner = "jamielinux"; repo = "bashmount"; - tag = version; + tag = finalAttrs.version; sha256 = "1irw47s6i1qwxd20cymzlfw5sv579cw877l27j3p66qfhgadwxrl"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ba/bashrun2/package.nix b/pkgs/by-name/ba/bashrun2/package.nix index 6323618c0d26..49d7b463e869 100644 --- a/pkgs/by-name/ba/bashrun2/package.nix +++ b/pkgs/by-name/ba/bashrun2/package.nix @@ -14,14 +14,14 @@ util-linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bashrun2"; version = "0.2.6"; src = fetchFromGitHub { owner = "hbekel"; repo = "bashrun2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-U2ntplhyv8KAkaMd2D6wRsUIYkhJzxdgHo2xsbNRfqM="; }; @@ -87,4 +87,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; description = "Application launcher based on a modified bash session in a small terminal window"; }; -} +}) diff --git a/pkgs/by-name/ba/bastet/package.nix b/pkgs/by-name/ba/bastet/package.nix index 945fe048dbd0..7dba2a7eb54a 100644 --- a/pkgs/by-name/ba/bastet/package.nix +++ b/pkgs/by-name/ba/bastet/package.nix @@ -7,7 +7,7 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bastet"; version = "0.43.2"; buildInputs = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fph"; repo = "bastet"; - tag = version; + tag = finalAttrs.version; sha256 = "09kamxapm9jw9przpsgjfg33n9k94bccv65w95dakj0br33a75wn"; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.dezgeg ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ba/batsignal/package.nix b/pkgs/by-name/ba/batsignal/package.nix index 17b20e4acc99..65b15cc185e1 100644 --- a/pkgs/by-name/ba/batsignal/package.nix +++ b/pkgs/by-name/ba/batsignal/package.nix @@ -7,14 +7,14 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "batsignal"; version = "1.8.0"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-yngd2yP6XtRp8y8ZUd0NISdf8+8wJvpLogrQQMdB0lA="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "batsignal"; }; -} +}) diff --git a/pkgs/by-name/ba/batticonplus/package.nix b/pkgs/by-name/ba/batticonplus/package.nix index d83eacc1dacb..6794b2346788 100644 --- a/pkgs/by-name/ba/batticonplus/package.nix +++ b/pkgs/by-name/ba/batticonplus/package.nix @@ -12,14 +12,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "batticonplus"; version = "2.0.1"; src = fetchFromGitHub { owner = "artist4xlibre"; repo = "batticonplus"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-H9ZoiQ5zWMIoWWol2a6f9Z8g4o9DIHYdF+/nEsBfuzc="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ yechielw ]; }; -} +}) diff --git a/pkgs/by-name/ba/bayescan/package.nix b/pkgs/by-name/ba/bayescan/package.nix index 1919f0fea456..0a901f4355d8 100644 --- a/pkgs/by-name/ba/bayescan/package.nix +++ b/pkgs/by-name/ba/bayescan/package.nix @@ -6,12 +6,12 @@ llvmPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bayescan"; version = "2.1"; src = fetchurl { - url = "http://cmpg.unibe.ch/software/BayeScan/files/BayeScan${version}.zip"; + url = "http://cmpg.unibe.ch/software/BayeScan/files/BayeScan${finalAttrs.version}.zip"; sha256 = "0ismima8j8z0zj9yc267rpf7z90w57b2pbqzjnayhc3ab8mcbfy6"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Disable FORTIFY_SOURCE or the binary fails with "buffer overflow" hardeningDisable = [ "fortify" ]; - sourceRoot = "BayeScan${version}/source"; + sourceRoot = "BayeScan${finalAttrs.version}/source"; postPatch = '' substituteInPlace Makefile --replace-fail "-static" "" \ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mkdir -p $out/share/doc/bayescan - cp bayescan_${version} $out/bin + cp bayescan_${finalAttrs.version} $out/bin cp -r ../*pdf ../input_examples ../"R functions" $out/share/doc/bayescan ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "http://cmpg.unibe.ch/software/BayeScan"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.bzizou ]; - mainProgram = "bayescan_${version}"; + mainProgram = "bayescan_${finalAttrs.version}"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/bb/bbe/package.nix b/pkgs/by-name/bb/bbe/package.nix index 2087730fa62b..5597c382b51b 100644 --- a/pkgs/by-name/bb/bbe/package.nix +++ b/pkgs/by-name/bb/bbe/package.nix @@ -4,12 +4,12 @@ fetchurl, autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bbe"; version = "0.2.2"; src = fetchurl { - url = "mirror://sourceforge/bbe-/${version}/bbe-${version}.tar.gz"; + url = "mirror://sourceforge/bbe-/${finalAttrs.version}/bbe-${finalAttrs.version}.tar.gz"; sha256 = "1nyxdqi4425sffjrylh7gl57lrssyk4018afb7mvrnd6fmbszbms"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.hhm ]; mainProgram = "bbe"; }; -} +}) diff --git a/pkgs/by-name/bc/bc/package.nix b/pkgs/by-name/bc/bc/package.nix index c483783dc4a8..20e27fa528c6 100644 --- a/pkgs/by-name/bc/bc/package.nix +++ b/pkgs/by-name/bc/bc/package.nix @@ -11,11 +11,11 @@ texinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bc"; version = "1.08.2"; src = fetchurl { - url = "mirror://gnu/bc/bc-${version}.tar.lz"; + url = "mirror://gnu/bc/bc-${finalAttrs.version}.tar.lz"; hash = "sha256-eeMeAiqEsx3YCYFQY9S46lkLQJY3pSxQ7J9Cwr8zJxE="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "bc"; }; -} +}) diff --git a/pkgs/by-name/bc/bcache-tools/package.nix b/pkgs/by-name/bc/bcache-tools/package.nix index 9220ff281f25..65ae970d9804 100644 --- a/pkgs/by-name/bc/bcache-tools/package.nix +++ b/pkgs/by-name/bc/bcache-tools/package.nix @@ -9,13 +9,13 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bcache-tools"; version = "1.1"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git"; - rev = "bcache-tools-${version}"; + rev = "bcache-tools-${finalAttrs.version}"; hash = "sha256-8BiHC8qxk4otFPyKnvGNk57JSZytEOy51AGertWo2O0="; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { mainProgram = "bcache-tools"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bc/bcal/package.nix b/pkgs/by-name/bc/bcal/package.nix index 401c01d3b9b8..badd1c043dcd 100644 --- a/pkgs/by-name/bc/bcal/package.nix +++ b/pkgs/by-name/bc/bcal/package.nix @@ -7,14 +7,14 @@ python3Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bcal"; version = "2.4"; src = fetchFromGitHub { owner = "jarun"; repo = "bcal"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-PleWU2yyJzkUAZEvEYoCGdpEXqOgRvZK9zXTYrxRtQU="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/bc/bcg729/package.nix b/pkgs/by-name/bc/bcg729/package.nix index 942e9e4d6ebc..f53eded8c0c5 100644 --- a/pkgs/by-name/bc/bcg729/package.nix +++ b/pkgs/by-name/bc/bcg729/package.nix @@ -5,7 +5,7 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bcg729"; version = "1.1.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "public"; group = "BC"; repo = "bcg729"; - tag = version; + tag = finalAttrs.version; sha256 = "1hal6b3w6f8y5r1wa0xzj8sj2jjndypaxyw62q50p63garp2h739"; }; @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { meta = { description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec"; homepage = "https://linphone.org/technical-corner/bcg729"; - changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS"; + changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${finalAttrs.version}/NEWS"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ c0bw3b ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/bc/bchoppr/package.nix b/pkgs/by-name/bc/bchoppr/package.nix index 47c35fe14a0c..0a32a4b8578a 100644 --- a/pkgs/by-name/bc/bchoppr/package.nix +++ b/pkgs/by-name/bc/bchoppr/package.nix @@ -8,14 +8,14 @@ lv2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bchoppr"; version = "1.12.6"; src = fetchFromGitHub { owner = "sjaehn"; repo = "bchoppr"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ="; fetchSubmodules = true; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/bd/bdf2psf/package.nix b/pkgs/by-name/bd/bdf2psf/package.nix index 86d1257540a7..3fb6412b647e 100644 --- a/pkgs/by-name/bd/bdf2psf/package.nix +++ b/pkgs/by-name/bd/bdf2psf/package.nix @@ -6,12 +6,12 @@ dpkg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bdf2psf"; version = "1.245"; src = fetchurl { - url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; + url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${finalAttrs.version}_all.deb"; sha256 = "sha256-2NG/UYz4e6nqkf0JvKQXXvy+mU2pMjaB3xyfI+Is/eY="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "bdf2psf"; }; -} +}) diff --git a/pkgs/by-name/bd/bdf2sfd/package.nix b/pkgs/by-name/bd/bdf2sfd/package.nix index 20e6dd4a6ff1..ef29121a083d 100644 --- a/pkgs/by-name/bd/bdf2sfd/package.nix +++ b/pkgs/by-name/bd/bdf2sfd/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bdf2sfd"; version = "1.1.9"; src = fetchFromGitHub { owner = "fcambus"; repo = "bdf2sfd"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-L1fIPZdVP4px73VbnEA6sb28WrmsNUJ2tqLeGPpwDbA="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "bdf2sfd"; }; -} +}) diff --git a/pkgs/by-name/bd/bdfresize/package.nix b/pkgs/by-name/bd/bdfresize/package.nix index ab8ebee3f20d..dd92b30be47e 100644 --- a/pkgs/by-name/bd/bdfresize/package.nix +++ b/pkgs/by-name/bd/bdfresize/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bdfresize"; version = "1.5"; src = fetchzip { - url = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/bdfresize-${version}.tar.gz"; + url = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/bdfresize-${finalAttrs.version}.tar.gz"; hash = "sha256-C4ZLJIn6vVeVUCpNwMu0vdfQQ3qUz4EVIcPob9NejP0="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ malte-v ]; mainProgram = "bdfresize"; }; -} +}) diff --git a/pkgs/by-name/bd/bdsync/package.nix b/pkgs/by-name/bd/bdsync/package.nix index edf765d3967e..5efcd2dfa5da 100644 --- a/pkgs/by-name/bd/bdsync/package.nix +++ b/pkgs/by-name/bd/bdsync/package.nix @@ -7,14 +7,14 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bdsync"; version = "0.11.4"; src = fetchFromGitHub { owner = "rolffokkens"; repo = "bdsync"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-uvP26gdyIPC+IHxO5CYVuabfT4mnoWDOyaLTplYCW0I="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jluttine ]; mainProgram = "bdsync"; }; -} +}) diff --git a/pkgs/by-name/be/beanstalkd/package.nix b/pkgs/by-name/be/beanstalkd/package.nix index b022c9653d8b..8daaf3911ce8 100644 --- a/pkgs/by-name/be/beanstalkd/package.nix +++ b/pkgs/by-name/be/beanstalkd/package.nix @@ -6,14 +6,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.13"; pname = "beanstalkd"; src = fetchFromGitHub { owner = "kr"; repo = "beanstalkd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-xoudhPad4diGGE8iZaY1/4LiENlKT2dYcIR6wlQdlTU="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "beanstalkd"; }; -} +}) diff --git a/pkgs/by-name/be/bearer/package.nix b/pkgs/by-name/be/bearer/package.nix index e47b2559b8a8..c3702dcd7457 100644 --- a/pkgs/by-name/be/bearer/package.nix +++ b/pkgs/by-name/be/bearer/package.nix @@ -2,43 +2,40 @@ lib, buildGoModule, fetchFromGitHub, - testers, - bearer, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "bearer"; - version = "1.51.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; - tag = "v${version}"; - hash = "sha256-s1AUVpmSJYRoidEH4qM4mHPsbTsn2Uo9HfcNG2oMIXA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-kWs8NiuOroKgQC0Duvef9O7TqQnqgEd28EQZVf4y4oQ="; }; - vendorHash = "sha256-9OU0pqztGM5hmPCcMGCR6IdO/5XJE1MVcCCX+vH3us0="; + vendorHash = "sha256-uMu5CL/VAlSd2yZzbkr0ceQdUVJvhs9R+IoyZbtZPk8="; subPackages = [ "cmd/bearer" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + ldflags = [ "-s" "-w" - "-X=github.com/bearer/bearer/cmd/bearer/build.Version=${version}" + "-X=github.com/bearer/bearer/cmd/bearer/build.Version=${finalAttrs.version}" ]; - passthru.tests = { - version = testers.testVersion { - package = bearer; - command = "bearer version"; - }; - }; + doInstallCheck = true; meta = { description = "Code security scanning tool (SAST) to discover, filter and prioritize security and privacy risks"; homepage = "https://github.com/bearer/bearer"; - changelog = "https://github.com/Bearer/bearer/releases/tag/v${version}"; - license = with lib.licenses; [ elastic20 ]; + changelog = "https://github.com/Bearer/bearer/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.elastic20; maintainers = with lib.maintainers; [ fab ]; + mainProgram = "bearer"; }; -} +}) diff --git a/pkgs/by-name/be/beats/package.nix b/pkgs/by-name/be/beats/package.nix index d27d2556d8db..5865fc420b22 100644 --- a/pkgs/by-name/be/beats/package.nix +++ b/pkgs/by-name/be/beats/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "beats"; version = "1.1"; src = fetchFromGitHub { owner = "j0hax"; repo = "beats"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1rdvsqrjpily74y8vwch711401585xckb4p41cfwrmj6vf44jhif"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.j0hax ]; mainProgram = "beats"; }; -} +}) diff --git a/pkgs/by-name/be/bedops/package.nix b/pkgs/by-name/be/bedops/package.nix index a47a50ce2c08..007bc6e14482 100644 --- a/pkgs/by-name/be/bedops/package.nix +++ b/pkgs/by-name/be/bedops/package.nix @@ -8,14 +8,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bedops"; version = "2.4.42"; src = fetchFromGitHub { owner = "bedops"; repo = "bedops"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-IF2MWGpdnP8PKwLRboe5bxu8N+gV4qZ82BemJE/JCU0="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jbedo ]; platforms = lib.platforms.x86_64; }; -} +}) diff --git a/pkgs/by-name/be/beebeep/package.nix b/pkgs/by-name/be/beebeep/package.nix index 95c08c03ae5f..5619eb79a4ed 100644 --- a/pkgs/by-name/be/beebeep/package.nix +++ b/pkgs/by-name/be/beebeep/package.nix @@ -6,12 +6,12 @@ qt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "beebeep"; version = "5.8.6"; src = fetchzip { - url = "https://netix.dl.sourceforge.net/project/beebeep/Linux/beebeep-${version}-qt5-amd64.tar.gz"; + url = "https://netix.dl.sourceforge.net/project/beebeep/Linux/beebeep-${finalAttrs.version}-qt5-amd64.tar.gz"; hash = "sha256-YDgFRXFBM1tjLP99mHYJadgccHJYYPAZ1kqR+FngLKU="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/be/beefi/package.nix b/pkgs/by-name/be/beefi/package.nix index ac3a5e6b9d02..eaaee3aa1acc 100644 --- a/pkgs/by-name/be/beefi/package.nix +++ b/pkgs/by-name/be/beefi/package.nix @@ -7,14 +7,14 @@ systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "beefi"; version = "0.1.1"; src = fetchFromGitHub { owner = "jfeick"; repo = "beefi"; - tag = version; + tag = finalAttrs.version; sha256 = "1180avalbw414q1gnfqdgc9zg3k9y0401kw9qvcn51qph81d04v5"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ tu-maurice ]; homepage = "https://github.com/jfeick/beefi"; }; -} +}) diff --git a/pkgs/by-name/be/beep/package.nix b/pkgs/by-name/be/beep/package.nix index 5d534994419e..92e247961cf6 100644 --- a/pkgs/by-name/be/beep/package.nix +++ b/pkgs/by-name/be/beep/package.nix @@ -7,14 +7,14 @@ # this package is working only as root # in order to work as a non privileged user you would need to suid the bin -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "beep"; version = "1.4.12"; src = fetchFromGitHub { owner = "spkr-beep"; repo = "beep"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-gDgGI9F+wW2cN89IwP93PkMv6vixJA2JckF78nxZ+TU="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "beep"; }; -} +}) diff --git a/pkgs/by-name/be/bees/package.nix b/pkgs/by-name/be/bees/package.nix index 0366d72e5741..a3bf6614a5fb 100644 --- a/pkgs/by-name/be/bees/package.nix +++ b/pkgs/by-name/be/bees/package.nix @@ -14,14 +14,14 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bees"; version = "0.11"; src = fetchFromGitHub { owner = "Zygo"; repo = "bees"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-qaiRWRd9+ElJ40QGOS3AxT2NvF3phQCyPnVz6RfTt8c="; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; preBuild = '' - git() { if [[ $1 = describe ]]; then echo ${version}; else command git "$@"; fi; } + git() { if [[ $1 = describe ]]; then echo ${finalAttrs.version}; else command git "$@"; fi; } export -f git ''; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "SHELL=bash" "PREFIX=$(out)" "ETC_PREFIX=$(out)/etc" - "BEES_VERSION=${version}" + "BEES_VERSION=${finalAttrs.version}" "SYSTEMD_SYSTEM_UNIT_DIR=$(out)/etc/systemd/system" ]; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ chaduffy ]; }; -} +}) diff --git a/pkgs/by-name/be/bencode/package.nix b/pkgs/by-name/be/bencode/package.nix index 6ef2f15debc5..c4f66b92cd8c 100644 --- a/pkgs/by-name/be/bencode/package.nix +++ b/pkgs/by-name/be/bencode/package.nix @@ -10,14 +10,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bencode"; version = "1.0.1"; src = fetchFromGitHub { owner = "fbdtemme"; repo = "bencode"; - rev = version; + rev = finalAttrs.version; hash = "sha256-zpxvADZfYTUdlNLMZJSCanPL40EGl9BBCxR7oDhvOTw="; }; @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { meta = { description = "Header-only C++20 bencode serialization/deserialization library"; homepage = "https://github.com/fbdtemme/bencode"; - changelog = "https://github.com/fbdtemme/bencode/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/fbdtemme/bencode/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; # Broken because the default stdenv on these targets doesn't support C++20. broken = with stdenv; isDarwin || (isLinux && isAarch64); }; -} +}) diff --git a/pkgs/by-name/be/bento4/package.nix b/pkgs/by-name/be/bento4/package.nix index 64f4a6e27bdd..49bc54336100 100644 --- a/pkgs/by-name/be/bento4/package.nix +++ b/pkgs/by-name/be/bento4/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bento4"; version = "1.6.0-641"; src = fetchFromGitHub { owner = "axiomatic-systems"; repo = "Bento4"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Qy8D3cbCVHmLAaXtiF64rL2oRurXNCtd5Dsgt0W7WdY="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ makefu ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/be/betterlockscreen/package.nix b/pkgs/by-name/be/betterlockscreen/package.nix index c1e5b1bbcf0f..35f4e271ab19 100644 --- a/pkgs/by-name/be/betterlockscreen/package.nix +++ b/pkgs/by-name/be/betterlockscreen/package.nix @@ -39,14 +39,14 @@ let ++ lib.optionals withDunst [ dunst ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "betterlockscreen"; version = "4.4.0"; src = fetchFromGitHub { owner = "betterlockscreen"; repo = "betterlockscreen"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-59Ct7XIfZqU3yaW9FO7UV8SSMLdcZMPRc7WJangxFPo="; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { sebtm ]; }; -} +}) diff --git a/pkgs/by-name/bf/bfr/package.nix b/pkgs/by-name/bf/bfr/package.nix index 04a07efff125..acf9bfdca6fc 100644 --- a/pkgs/by-name/bf/bfr/package.nix +++ b/pkgs/by-name/bf/bfr/package.nix @@ -5,12 +5,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bfr"; version = "1.6"; src = fetchurl { - url = "http://www.sourcefiles.org/Utilities/Text_Utilities/bfr-${version}.tar.bz2"; + url = "http://www.sourcefiles.org/Utilities/Text_Utilities/bfr-${finalAttrs.version}.tar.bz2"; sha256 = "0fadfssvj9klj4dq9wdrzys1k2a1z2j0p6kgnfgbjv0n1bq6h4cy"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bf/bfs/package.nix b/pkgs/by-name/bf/bfs/package.nix index 4a4461b264ca..b64898bbfaeb 100644 --- a/pkgs/by-name/bf/bfs/package.nix +++ b/pkgs/by-name/bf/bfs/package.nix @@ -9,14 +9,14 @@ oniguruma, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bfs"; version = "4.1"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+hGxdsk9MU5MVvvx3C2cqomboNxD0UZ5y7t84fAwfqs="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "bfs"; }; -} +}) diff --git a/pkgs/by-name/bf/bftools/package.nix b/pkgs/by-name/bf/bftools/package.nix index 09ff0514e32b..2797e594d232 100644 --- a/pkgs/by-name/bf/bftools/package.nix +++ b/pkgs/by-name/bf/bftools/package.nix @@ -6,12 +6,12 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bftools"; version = "7.3.0"; src = fetchzip { - url = "http://downloads.openmicroscopy.org/bio-formats/${version}/artifacts/bftools.zip"; + url = "http://downloads.openmicroscopy.org/bio-formats/${finalAttrs.version}/artifacts/bftools.zip"; hash = "sha256-EQ7P07d53e6Q/9Wt2Pa1h0TfuYblOZeByGW30oE3i6M="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { homepage = "https://www.openmicroscopy.org/bio-formats/"; maintainers = [ lib.maintainers.tbenst ]; }; -} +}) diff --git a/pkgs/by-name/bg/bgpdump/package.nix b/pkgs/by-name/bg/bgpdump/package.nix index 93b5528f16ae..9a272ffe96fc 100644 --- a/pkgs/by-name/bg/bgpdump/package.nix +++ b/pkgs/by-name/bg/bgpdump/package.nix @@ -7,14 +7,14 @@ bzip2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bgpdump"; version = "1.6.2"; src = fetchFromGitHub { owner = "RIPE-NCC"; repo = "bgpdump"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-1HXMf9mHManR7jhonU2Agon0YFXOlM9APIN1Zm840AM="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "bgpdump"; }; -} +}) diff --git a/pkgs/by-name/bg/bgpq3/package.nix b/pkgs/by-name/bg/bgpq3/package.nix index c628b26be221..635afb626d06 100644 --- a/pkgs/by-name/bg/bgpq3/package.nix +++ b/pkgs/by-name/bg/bgpq3/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bgpq3"; version = "0.1.38"; src = fetchFromGitHub { owner = "snar"; repo = "bgpq3"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rqZI7yqlVHfdRTOsA5V6kzJ2TGCy8mp6yP+rzsQX9Yc="; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix; mainProgram = "bgpq3"; }; -} +}) diff --git a/pkgs/by-name/bg/bgpq4/package.nix b/pkgs/by-name/bg/bgpq4/package.nix index 4f30a93f98a2..276b95752c10 100644 --- a/pkgs/by-name/bg/bgpq4/package.nix +++ b/pkgs/by-name/bg/bgpq4/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bgpq4"; version = "1.15"; src = fetchFromGitHub { owner = "bgp"; repo = "bgpq4"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-3mfFj9KoQbDe0gH7Le03N1Yds/bTEmY+OiXNaOtHkpY="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix; mainProgram = "bgpq4"; }; -} +}) diff --git a/pkgs/by-name/bg/bgs/package.nix b/pkgs/by-name/bg/bgs/package.nix index c731c393059d..08cf1f52b143 100644 --- a/pkgs/by-name/bg/bgs/package.nix +++ b/pkgs/by-name/bg/bgs/package.nix @@ -8,7 +8,7 @@ imlib2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bgs"; version = "0.8"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Gottox"; repo = "bgs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "V8GP+xLSiCvaYZt8Bi3/3KlTBaGnMYQUeNCHwH6Ejzo="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; mainProgram = "bgs"; }; -} +}) diff --git a/pkgs/by-name/bi/bibclean/package.nix b/pkgs/by-name/bi/bibclean/package.nix index 7a32cdce0745..23a04a34fabe 100644 --- a/pkgs/by-name/bi/bibclean/package.nix +++ b/pkgs/by-name/bi/bibclean/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bibclean"; version = "3.07"; src = fetchurl { - url = "http://ftp.math.utah.edu/pub/bibclean/bibclean-${version}.tar.xz"; + url = "http://ftp.math.utah.edu/pub/bibclean/bibclean-${finalAttrs.version}.tar.xz"; sha256 = "sha256-kZM2eC6ePCBOYPVkhf0fjdZ562IvyP0fSDNZXuEBkaY="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/bi/biblatex-check/package.nix b/pkgs/by-name/bi/biblatex-check/package.nix index 0cac66cc10c1..5d24aa0f218f 100644 --- a/pkgs/by-name/bi/biblatex-check/package.nix +++ b/pkgs/by-name/bi/biblatex-check/package.nix @@ -5,14 +5,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "biblatex-check"; version = "1.0.2"; src = fetchFromGitHub { owner = "Pezmc"; repo = "BibLatex-Check"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-8oHX56+kRWWl8t22DqLAFinjPngRMo3vXxXuVXBwutM="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "biblatex-check"; }; -} +}) diff --git a/pkgs/by-name/bi/biblesync/package.nix b/pkgs/by-name/bi/biblesync/package.nix index 1ea944123e14..56b3d9a2cc01 100644 --- a/pkgs/by-name/bi/biblesync/package.nix +++ b/pkgs/by-name/bi/biblesync/package.nix @@ -8,7 +8,7 @@ libuuid, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "biblesync"; version = "2.1.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "karlkleinpaste"; repo = "biblesync"; - tag = version; + tag = finalAttrs.version; sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bi/bibtool/package.nix b/pkgs/by-name/bi/bibtool/package.nix index 5a3dd0a88dca..0c0bdf12b2fc 100644 --- a/pkgs/by-name/bi/bibtool/package.nix +++ b/pkgs/by-name/bi/bibtool/package.nix @@ -5,12 +5,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bibtool"; version = "2.68"; src = fetchurl { - url = "http://www.gerd-neugebauer.de/software/TeX/BibTool/BibTool-${version}.tar.gz"; + url = "http://www.gerd-neugebauer.de/software/TeX/BibTool/BibTool-${finalAttrs.version}.tar.gz"; sha256 = "1ymq901ckaysq2n1bplk1064rb2njq9n30pii15w157y0lxcwd3i"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.rycee ]; mainProgram = "bibtool"; }; -} +}) diff --git a/pkgs/by-name/bi/bigloo/package.nix b/pkgs/by-name/bi/bigloo/package.nix index 961716f0564a..a844d11e11ff 100644 --- a/pkgs/by-name/bi/bigloo/package.nix +++ b/pkgs/by-name/bi/bigloo/package.nix @@ -9,12 +9,12 @@ libunistring, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bigloo"; version = "4.6a"; src = fetchurl { - url = "https://www-sop.inria.fr/mimosa/fp/Bigloo/download/bigloo-${version}.tar.gz"; + url = "https://www-sop.inria.fr/mimosa/fp/Bigloo/download/bigloo-${finalAttrs.version}.tar.gz"; hash = "sha256-lwXsPeAMwcUe52mYlIQaN3DAaodCFbRWNbiESuba8KY="; }; @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { between Scheme and C# programs. ''; }; -} +}) diff --git a/pkgs/by-name/bi/biglybt/package.nix b/pkgs/by-name/bi/biglybt/package.nix index 63619e92bbfe..03d2bef1af38 100644 --- a/pkgs/by-name/bi/biglybt/package.nix +++ b/pkgs/by-name/bi/biglybt/package.nix @@ -8,12 +8,12 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "biglybt"; version = "3.9.0.0"; src = fetchurl { - url = "https://github.com/BiglySoftware/BiglyBT/releases/download/v${version}/GitHub_BiglyBT_unix.tar.gz"; + url = "https://github.com/BiglySoftware/BiglyBT/releases/download/v${finalAttrs.version}/GitHub_BiglyBT_unix.tar.gz"; hash = "sha256-NBXEY5f2kVPoZit7Gy4rM61bwQSdXovg0gURukhxJJ4="; }; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { }; meta = { - changelog = "https://github.com/BiglySoftware/BiglyBT/releases/tag/v${version}"; + changelog = "https://github.com/BiglySoftware/BiglyBT/releases/tag/v${finalAttrs.version}"; description = "BitTorrent client based on the Azureus that supports I2P darknet for privacy"; downloadPage = "https://github.com/BiglySoftware/BiglyBT"; homepage = "https://www.biglybt.com/"; @@ -80,4 +80,4 @@ stdenv.mkDerivation rec { mainProgram = "biglybt"; maintainers = with lib.maintainers; [ raspher ]; }; -} +}) diff --git a/pkgs/by-name/bi/bililiverecorder/package.nix b/pkgs/by-name/bi/bililiverecorder/package.nix index db693ab7d95e..6c1831380660 100644 --- a/pkgs/by-name/bi/bililiverecorder/package.nix +++ b/pkgs/by-name/bi/bililiverecorder/package.nix @@ -14,12 +14,12 @@ let aspnetcore_8_0-bin ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bililiverecorder"; version = "2.18.0"; src = fetchzip { - url = "https://github.com/BililiveRecorder/BililiveRecorder/releases/download/v${version}/BililiveRecorder-CLI-any.zip"; + url = "https://github.com/BililiveRecorder/BililiveRecorder/releases/download/v${finalAttrs.version}/BililiveRecorder-CLI-any.zip"; hash = "sha256-b1hHLf0w+XwBBbnvP07Ik6bwIWSs13MPVjIN5b1n+C4="; stripRoot = false; }; @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { meta = { description = "Convenient free open source bilibili live recording tool"; homepage = "https://rec.danmuji.org/"; - changelog = "https://github.com/BililiveRecorder/BililiveRecorder/releases/tag/${version}"; + changelog = "https://github.com/BililiveRecorder/BililiveRecorder/releases/tag/${finalAttrs.version}"; mainProgram = "BililiveRecorder"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ zaldnoay ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/bi/binbloom/package.nix b/pkgs/by-name/bi/binbloom/package.nix index 869a907bc2f1..12b545a5bb5a 100644 --- a/pkgs/by-name/bi/binbloom/package.nix +++ b/pkgs/by-name/bi/binbloom/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "binbloom"; version = "2.1"; src = fetchFromGitHub { owner = "quarkslab"; repo = "binbloom"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ox4o9RPtqMsme//8dVatNUo+mA/6dM9eI/T5lsuSAus="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ erdnaxe ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix index 6eb8f91e4c1d..c49ae029d7fa 100644 --- a/pkgs/by-name/bi/bind/package.nix +++ b/pkgs/by-name/bi/bind/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bind"; - version = "9.20.17"; + version = "9.20.18"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz"; - hash = "sha256-XMiaCdoJF+sd32QMwHwXL/RPqbvzo0raS2ovfucP8cg="; + hash = "sha256-38VGyZCsRRVSnNRcTdmVhisYrootDLKSCOiJal0yUzE="; }; outputs = [ diff --git a/pkgs/by-name/bi/biosdevname/package.nix b/pkgs/by-name/bi/biosdevname/package.nix index 26ec44e35d29..db07553b8a77 100644 --- a/pkgs/by-name/bi/biosdevname/package.nix +++ b/pkgs/by-name/bi/biosdevname/package.nix @@ -7,14 +7,14 @@ pciutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "biosdevname"; version = "0.7.3"; src = fetchFromGitHub { owner = "dell"; repo = "biosdevname"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "19wbb79x9h79k55sgd4dylvdbhhrvfaiaknbw9s1wvfmirkxa1dz"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "biosdevname"; }; -} +}) diff --git a/pkgs/by-name/bi/bird3/package.nix b/pkgs/by-name/bi/bird3/package.nix index 83b65e3ccc35..0177350e1fc3 100644 --- a/pkgs/by-name/bi/bird3/package.nix +++ b/pkgs/by-name/bi/bird3/package.nix @@ -10,7 +10,7 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bird"; version = "3.1.4"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { domain = "gitlab.nic.cz"; owner = "labs"; repo = "bird"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-xLhx+GWUrbyTXNdacy67F3f9liWHTwVPEDF7O37Q5Es="; }; @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.bird3; meta = { - changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS"; + changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${finalAttrs.version}/NEWS"; description = "BIRD Internet Routing Daemon"; homepage = "https://bird.nic.cz/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ herbetom ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bi/bitlbee-discord/package.nix b/pkgs/by-name/bi/bitlbee-discord/package.nix index c777f92c4a24..391c240f42e2 100644 --- a/pkgs/by-name/bi/bitlbee-discord/package.nix +++ b/pkgs/by-name/bi/bitlbee-discord/package.nix @@ -7,12 +7,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bitlbee-discord"; version = "0.4.3"; src = fetchFromGitHub { - tag = version; + tag = finalAttrs.version; owner = "sm00th"; repo = "bitlbee-discord"; sha256 = "00qgdvrp7hv02n0ns685igp810zxmv3adsama8601122al6x041n"; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lassulus ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bi/bitlbee-facebook/package.nix b/pkgs/by-name/bi/bitlbee-facebook/package.nix index 43ccd789e11d..c8f678dfaabc 100644 --- a/pkgs/by-name/bi/bitlbee-facebook/package.nix +++ b/pkgs/by-name/bi/bitlbee-facebook/package.nix @@ -10,12 +10,12 @@ json-glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bitlbee-facebook"; version = "1.2.2"; src = fetchFromGitHub { - rev = "v${version}"; + rev = "v${finalAttrs.version}"; owner = "bitlbee"; repo = "bitlbee-facebook"; sha256 = "1qiiiq17ybylbhwgbwsvmshb517589r8yy5rsh1rfaylmlcxyy7z"; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ toonn ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bi/bitlbee-mastodon/package.nix b/pkgs/by-name/bi/bitlbee-mastodon/package.nix index 10d6b239e2cb..579ed5c20ef6 100644 --- a/pkgs/by-name/bi/bitlbee-mastodon/package.nix +++ b/pkgs/by-name/bi/bitlbee-mastodon/package.nix @@ -7,13 +7,13 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bitlbee-mastodon"; version = "1.4.5"; src = fetchgit { url = "https://alexschroeder.ch/cgit/bitlbee-mastodon"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-8vmq/YstuBYUxe00P4NrxD/eMYI++R9uvn1sCcMTr7I="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jpotier ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bi/bitlbee-steam/package.nix b/pkgs/by-name/bi/bitlbee-steam/package.nix index 1aed226f155a..54506265176c 100644 --- a/pkgs/by-name/bi/bitlbee-steam/package.nix +++ b/pkgs/by-name/bi/bitlbee-steam/package.nix @@ -10,12 +10,12 @@ libgcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.4.2"; pname = "bitlbee-steam"; src = fetchFromGitHub { - rev = "v${version}"; + rev = "v${finalAttrs.version}"; owner = "bitlbee"; repo = "bitlbee-steam"; sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq"; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bi/bitwise/package.nix b/pkgs/by-name/bi/bitwise/package.nix index 1da56d712dc3..d21048103220 100644 --- a/pkgs/by-name/bi/bitwise/package.nix +++ b/pkgs/by-name/bi/bitwise/package.nix @@ -7,14 +7,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bitwise"; version = "0.50"; src = fetchFromGitHub { owner = "mellowcandle"; repo = "bitwise"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-x+ky1X0c0bQZnkNvNNuXN2BoMDtDSCt/8dBAG92jCCQ="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "bitwise"; }; -} +}) diff --git a/pkgs/by-name/bj/bjumblr/package.nix b/pkgs/by-name/bj/bjumblr/package.nix index da18b166204f..e72a29221607 100644 --- a/pkgs/by-name/bj/bjumblr/package.nix +++ b/pkgs/by-name/bj/bjumblr/package.nix @@ -9,14 +9,14 @@ libsndfile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bjumblr"; version = "1.6.8"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BJumblr"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-qSoGmWUGaMjx/bkiCJ/qb4LBbuFPXXlJ0e9hrFBXzwE="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/bl/blahtexml/package.nix b/pkgs/by-name/bl/blahtexml/package.nix index b5dd1ab54cbd..5d146930d141 100644 --- a/pkgs/by-name/bl/blahtexml/package.nix +++ b/pkgs/by-name/bl/blahtexml/package.nix @@ -7,14 +7,14 @@ xercesc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blahtexml"; version = "1.0"; src = fetchFromGitHub { owner = "gvanas"; repo = "blahtexml"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-DL5DyfARHHbwWBVHSa/VwHzNaAx/v7EDdnw1GLOk+y0="; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.xworld21 ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/bl/blast/package.nix b/pkgs/by-name/bl/blast/package.nix index 287b6a67637c..c91010e6635f 100644 --- a/pkgs/by-name/bl/blast/package.nix +++ b/pkgs/by-name/bl/blast/package.nix @@ -11,16 +11,16 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blast"; version = "2.14.1"; src = fetchurl { - url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; + url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${finalAttrs.version}/ncbi-blast-${finalAttrs.version}+-src.tar.gz"; sha256 = "sha256-cSwtvfD7E8wcLU9O9d0c5LBsO1fpbf6o8j5umfWxZQ4="; }; - sourceRoot = "ncbi-blast-${version}+-src/c++"; + sourceRoot = "ncbi-blast-${finalAttrs.version}+-src/c++"; configureFlags = [ # With flat Makefile we can use all_projects in order not to build extra. @@ -127,4 +127,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ luispedro ]; }; -} +}) diff --git a/pkgs/by-name/bl/blink1-tool/package.nix b/pkgs/by-name/bl/blink1-tool/package.nix index 01e6f09ffb40..e619acc3689e 100644 --- a/pkgs/by-name/bl/blink1-tool/package.nix +++ b/pkgs/by-name/bl/blink1-tool/package.nix @@ -6,14 +6,14 @@ libusb1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blink1"; version = "2.4.0"; src = fetchFromGitHub { owner = "todbot"; repo = "blink1-tool"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-9kbWZ0vq+A3y8IeqvK1HnWWgxXaieu1eU8l+om5F2/w="; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; makeFlags = [ - "GIT_TAG=v${version}" + "GIT_TAG=v${finalAttrs.version}" "USBLIB_TYPE=HIDAPI" "HIDAPI_TYPE=LIBUSB" ]; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "blink1-tool"; }; -} +}) diff --git a/pkgs/by-name/bl/blis/package.nix b/pkgs/by-name/bl/blis/package.nix index f0a553c16d90..0002f7c3c3ee 100644 --- a/pkgs/by-name/bl/blis/package.nix +++ b/pkgs/by-name/bl/blis/package.nix @@ -18,14 +18,14 @@ let blasIntSize = if blas64 then "64" else "32"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blis"; version = "2.0"; src = fetchFromGitHub { owner = "flame"; repo = "blis"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-+n8SbiiEJDN4j1IPmZfI5g1i2J+jWrUXh7S48JEDTAE="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ stephen-huan ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/bl/blktrace/package.nix b/pkgs/by-name/bl/blktrace/package.nix index ab1e6a20fe23..14950009e8b2 100644 --- a/pkgs/by-name/bl/blktrace/package.nix +++ b/pkgs/by-name/bl/blktrace/package.nix @@ -5,14 +5,14 @@ libaio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blktrace"; version = "1.3.0"; # Official source # "https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" src = fetchurl { - url = "https://brick.kernel.dk/snaps/blktrace-${version}.tar.bz2"; + url = "https://brick.kernel.dk/snaps/blktrace-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-1t7aA4Yt4r0bG5+6cpu7hi2bynleaqf3yoa2VoEacNY="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bl/blockhash/package.nix b/pkgs/by-name/bl/blockhash/package.nix index f1e1974a5533..ff236bf394bb 100644 --- a/pkgs/by-name/bl/blockhash/package.nix +++ b/pkgs/by-name/bl/blockhash/package.nix @@ -8,14 +8,14 @@ wafHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blockhash"; version = "0.3.3"; src = fetchFromGitHub { owner = "commonsmachinery"; repo = "blockhash"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-QoqFTCfWtXIrFF3Yx4NfOa9cSjHtCSKz3k3i0u9Qx9M="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "blockhash"; }; -} +}) diff --git a/pkgs/by-name/bl/blogc/package.nix b/pkgs/by-name/bl/blogc/package.nix index b67dd86a70c5..6d03c9925e5e 100644 --- a/pkgs/by-name/bl/blogc/package.nix +++ b/pkgs/by-name/bl/blogc/package.nix @@ -9,14 +9,14 @@ cmocka, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blogc"; version = "0.20.1"; src = fetchFromGitHub { owner = "blogc"; repo = "blogc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-YAwGgV5Vllz8JlIASbGIkdRzpciQbgPiXl5DjiSEJyE="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ sikmir ]; }; -} +}) diff --git a/pkgs/by-name/bl/blugon/package.nix b/pkgs/by-name/bl/blugon/package.nix index b334c1344473..5ee5ebf58c95 100644 --- a/pkgs/by-name/bl/blugon/package.nix +++ b/pkgs/by-name/bl/blugon/package.nix @@ -7,14 +7,14 @@ libXrandr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blugon"; version = "1.12.1"; src = fetchFromGitHub { owner = "jumper149"; repo = "blugon"; - tag = version; + tag = finalAttrs.version; sha256 = "1i67v8jxvavgax3dwvns200iwwdcvgki04liq0x64q52lg0vrh7m"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jumper149 ]; mainProgram = "blugon"; }; -} +}) diff --git a/pkgs/by-name/bl/blur-effect/package.nix b/pkgs/by-name/bl/blur-effect/package.nix index 0629583afb30..cb06b7f865f6 100644 --- a/pkgs/by-name/bl/blur-effect/package.nix +++ b/pkgs/by-name/bl/blur-effect/package.nix @@ -10,14 +10,14 @@ libgbm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blur-effect"; version = "1.1.3"; src = fetchFromGitHub { owner = "sonald"; repo = "blur-effect"; - tag = version; + tag = finalAttrs.version; sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ romildo ]; mainProgram = "blur_image"; }; -} +}) diff --git a/pkgs/by-name/bm/bmon/package.nix b/pkgs/by-name/bm/bmon/package.nix index bf7c33d77187..d31a2cb30cde 100644 --- a/pkgs/by-name/bm/bmon/package.nix +++ b/pkgs/by-name/bm/bmon/package.nix @@ -10,14 +10,14 @@ libnl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bmon"; version = "4.0"; src = fetchFromGitHub { owner = "tgraf"; repo = "bmon"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1ilba872c09mnlvylslv4hqv6c9cz36l76q74rr99jvis1dg69gf"; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "bmon"; }; -} +}) diff --git a/pkgs/by-name/bo/bobcat/package.nix b/pkgs/by-name/bo/bobcat/package.nix index 778a4e482cbe..115f211aa1b9 100644 --- a/pkgs/by-name/bo/bobcat/package.nix +++ b/pkgs/by-name/bo/bobcat/package.nix @@ -11,7 +11,7 @@ util-linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bobcat"; version = "5.11.01"; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { domain = "gitlab.com"; owner = "fbb-git"; repo = "bobcat"; - tag = version; + tag = finalAttrs.version; hash = "sha256-JLJKaJmztputIon9JkKzpm3Ch60iwm4Imh9p42crYzA="; }; - sourceRoot = "${src.name}/bobcat"; + sourceRoot = "${finalAttrs.src.name}/bobcat"; postPatch = '' substituteInPlace INSTALL.im \ @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bo/boca/package.nix b/pkgs/by-name/bo/boca/package.nix index 08312ed4fa50..b2063e145878 100644 --- a/pkgs/by-name/bo/boca/package.nix +++ b/pkgs/by-name/bo/boca/package.nix @@ -13,14 +13,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "BoCA"; version = "1.0.7"; src = fetchFromGitHub { owner = "enzo1982"; repo = "boca"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-HIYUMFj5yiEC+liZLMXD9otPyoEb1sxHlECTYtYXc2I="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/enzo1982/boca"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bo/bogofilter/package.nix b/pkgs/by-name/bo/bogofilter/package.nix index e5df34147405..74bffb835b78 100644 --- a/pkgs/by-name/bo/bogofilter/package.nix +++ b/pkgs/by-name/bo/bogofilter/package.nix @@ -8,12 +8,12 @@ pax, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bogofilter"; version = "1.2.5"; src = fetchurl { - url = "mirror://sourceforge/bogofilter/bogofilter-${version}.tar.xz"; + url = "mirror://sourceforge/bogofilter/bogofilter-${finalAttrs.version}.tar.xz"; hash = "sha256-MkihNzv/VSxQCDStvqS2yu4EIkUWrlgfslpMam3uieo="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bo/bolt/package.nix b/pkgs/by-name/bo/bolt/package.nix index c13efed9e5bb..c15ab862a6ff 100644 --- a/pkgs/by-name/bo/bolt/package.nix +++ b/pkgs/by-name/bo/bolt/package.nix @@ -21,7 +21,7 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bolt"; version = "0.9.8"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "bolt"; repo = "bolt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-sDPipSIT2MJMdsOjOQSB+uOe6KXzVnyAqcQxPPr2NsU="; }; @@ -103,4 +103,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ callahad ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bo/bombardier/package.nix b/pkgs/by-name/bo/bombardier/package.nix index 89928af20638..a797062c5aca 100644 --- a/pkgs/by-name/bo/bombardier/package.nix +++ b/pkgs/by-name/bo/bombardier/package.nix @@ -4,16 +4,18 @@ fetchFromGitHub, testers, bombardier, + versionCheckHook, + nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "bombardier"; version = "2.0.2"; src = fetchFromGitHub { owner = "codesenberg"; repo = "bombardier"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FoaiUky0WcipkGN8KIpSd+iizinlqtHC5lskvNCnx/Y="; }; @@ -26,12 +28,17 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=main.version=${version}" + "-X=main.version=${finalAttrs.version}" ]; __darwinAllowLocalNetworking = true; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + passthru.tests = { + updateScript = nix-update-script { }; version = testers.testVersion { package = bombardier; }; @@ -40,9 +47,9 @@ buildGoModule rec { meta = { description = "Fast cross-platform HTTP benchmarking tool written in Go"; homepage = "https://github.com/codesenberg/bombardier"; - changelog = "https://github.com/codesenberg/bombardier/releases/tag/${src.rev}"; + changelog = "https://github.com/codesenberg/bombardier/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "bombardier"; }; -} +}) diff --git a/pkgs/by-name/bo/bomutils/package.nix b/pkgs/by-name/bo/bomutils/package.nix index 89b36dc62e8e..f36e8879246b 100644 --- a/pkgs/by-name/bo/bomutils/package.nix +++ b/pkgs/by-name/bo/bomutils/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bomutils"; version = "0.2"; src = fetchFromGitHub { owner = "hogliux"; repo = "bomutils"; - tag = version; + tag = finalAttrs.version; sha256 = "1i7nhbq1fcbrjwfg64znz8p4l7662f7qz2l6xcvwd5z93dnmgmdr"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ prusnak ]; }; -} +}) diff --git a/pkgs/by-name/bo/bonmin/package.nix b/pkgs/by-name/bo/bonmin/package.nix index 8104e34ad4bd..a710c5fd7dc6 100644 --- a/pkgs/by-name/bo/bonmin/package.nix +++ b/pkgs/by-name/bo/bonmin/package.nix @@ -21,14 +21,14 @@ assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bonmin"; version = "1.8.9"; src = fetchFromGitHub { owner = "coin-or"; repo = "Bonmin"; - rev = "releases/${version}"; + rev = "releases/${finalAttrs.version}"; sha256 = "sha256-nqjAQ1NdNJ/T4p8YljEWRt/uy2aDwyBeAsag0TmRc5Q="; }; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { # Fix doc install. Should not be necessary after next release # ref https://github.com/coin-or/Bonmin/commit/4f665bc9e489a73cb867472be9aea518976ecd28 - sourceRoot = "${src.name}/Bonmin"; + sourceRoot = "${finalAttrs.src.name}/Bonmin"; # Fontconfig error: Cannot load default config file: No such file: (null) env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aanderse ]; }; -} +}) diff --git a/pkgs/by-name/bo/bonnie/package.nix b/pkgs/by-name/bo/bonnie/package.nix index 7d912d103504..1fa624517881 100644 --- a/pkgs/by-name/bo/bonnie/package.nix +++ b/pkgs/by-name/bo/bonnie/package.nix @@ -5,12 +5,12 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bonnie++"; version = "2.00a"; src = fetchurl { - url = "https://www.coker.com.au/bonnie++/bonnie++-${version}.tgz"; + url = "https://www.coker.com.au/bonnie++/bonnie++-${finalAttrs.version}.tgz"; hash = "sha256-qNM7vYG8frVZzlv25YS5tT+uo5zPtK6S5Y8nJX5Gjw4="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/bo/boolector/package.nix b/pkgs/by-name/bo/boolector/package.nix index 6d9d3d7526de..363d7b373a37 100644 --- a/pkgs/by-name/bo/boolector/package.nix +++ b/pkgs/by-name/bo/boolector/package.nix @@ -10,14 +10,14 @@ gmp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "boolector"; version = "3.2.4"; src = fetchFromGitHub { owner = "boolector"; repo = "boolector"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CKhaPaWUB6Fz0LfnCl81LVmTebCWzTvZLKeC0KH3by4="; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/bo/boops/package.nix b/pkgs/by-name/bo/boops/package.nix index a29cef3ff332..13cd55dc2a8c 100644 --- a/pkgs/by-name/bo/boops/package.nix +++ b/pkgs/by-name/bo/boops/package.nix @@ -9,14 +9,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "boops"; version = "1.8.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BOops"; - tag = version; + tag = finalAttrs.version; sha256 = "0nvpawk58g189z96xnjs4pyri5az3ckdi9mhi0i9s0a7k4gdkarr"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/bo/boost-sml/package.nix b/pkgs/by-name/bo/boost-sml/package.nix index 3d925b316772..2aa88070e2b8 100644 --- a/pkgs/by-name/bo/boost-sml/package.nix +++ b/pkgs/by-name/bo/boost-sml/package.nix @@ -6,14 +6,14 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "boost-sml"; version = "1.1.13"; src = fetchFromGitHub { owner = "boost-ext"; repo = "sml"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-VgJl09kCRCXBF/IraVbAVowrrMJH0NFcblQAKVQwl6w="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ prtzl ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/bo/boot/package.nix b/pkgs/by-name/bo/boot/package.nix index fcaabd8ccbb9..c9387be25702 100644 --- a/pkgs/by-name/bo/boot/package.nix +++ b/pkgs/by-name/bo/boot/package.nix @@ -5,12 +5,12 @@ jdk, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.7.2"; pname = "boot"; src = fetchurl { - url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh"; + url = "https://github.com/boot-clj/boot-bin/releases/download/${finalAttrs.version}/boot.sh"; sha256 = "1hqp3xxmsj5vkym0l3blhlaq9g3w0lhjgmp37g6y3rr741znkk8c"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ ragge ]; }; -} +}) diff --git a/pkgs/by-name/bo/boron/package.nix b/pkgs/by-name/bo/boron/package.nix index f524378f1790..1ba0472398f2 100644 --- a/pkgs/by-name/bo/boron/package.nix +++ b/pkgs/by-name/bo/boron/package.nix @@ -5,12 +5,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "boron"; version = "2.1.0"; src = fetchurl { - url = "https://sourceforge.net/projects/urlan/files/Boron/boron-${version}.tar.gz"; + url = "https://sourceforge.net/projects/urlan/files/Boron/boron-${finalAttrs.version}.tar.gz"; sha256 = "sha256-50HKcK2hQpe9k9RIoVa/N5krTRKlW9AsGYTmHITx7Nc="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ mausch ]; }; -} +}) diff --git a/pkgs/by-name/bo/bossa/package.nix b/pkgs/by-name/bo/bossa/package.nix index fbbe01285159..fcba7c83a213 100644 --- a/pkgs/by-name/bo/bossa/package.nix +++ b/pkgs/by-name/bo/bossa/package.nix @@ -21,14 +21,14 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bossa"; version = "1.9.1"; src = fetchFromGitHub { owner = "shumatech"; repo = "BOSSA"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw="; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/bo/bowtie/package.nix b/pkgs/by-name/bo/bowtie/package.nix index 3ccf414c60a1..a100e548003c 100644 --- a/pkgs/by-name/bo/bowtie/package.nix +++ b/pkgs/by-name/bo/bowtie/package.nix @@ -6,14 +6,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bowtie"; version = "1.3.1"; src = fetchFromGitHub { owner = "BenLangmead"; repo = "bowtie"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-mWItmrTMPst/NnzSpxxTHcBztDqHPCza9yOsZPwp7G4="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ prusnak ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/bo/boxes/package.nix b/pkgs/by-name/bo/boxes/package.nix index b8b348633910..2b8f92d52547 100644 --- a/pkgs/by-name/bo/boxes/package.nix +++ b/pkgs/by-name/bo/boxes/package.nix @@ -9,14 +9,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "boxes"; version = "2.3.1"; src = fetchFromGitHub { owner = "ascii-boxes"; repo = "boxes"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-dvhb5KWBQt7g4n0ZTQMcJQljIfavV3g8i+P3PWB6Gwk="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ waiting-for-dev ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/bp/bpfmon/package.nix b/pkgs/by-name/bp/bpfmon/package.nix index 1f539d04050a..37881e460c7f 100644 --- a/pkgs/by-name/bp/bpfmon/package.nix +++ b/pkgs/by-name/bp/bpfmon/package.nix @@ -6,14 +6,14 @@ yascreen, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bpfmon"; version = "2.53"; src = fetchFromGitHub { owner = "bbonev"; repo = "bpfmon"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+W+3RLvgXXtUImzLkJr9mSWExvAUgjMp+lR9sg14VaY="; }; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { description = "BPF based visual packet rate monitor"; mainProgram = "bpfmon"; homepage = "https://github.com/bbonev/bpfmon"; - changelog = "https://github.com/bbonev/bpfmon/releases/tag/v${version}"; + changelog = "https://github.com/bbonev/bpfmon/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ arezvov ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bp/bpftune/package.nix b/pkgs/by-name/bp/bpftune/package.nix index 3a7a0ce77b6f..14ac6330b4a2 100644 --- a/pkgs/by-name/bp/bpftune/package.nix +++ b/pkgs/by-name/bp/bpftune/package.nix @@ -12,7 +12,7 @@ unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bpftune"; version = "0-unstable-2025-03-20"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "prefix=${placeholder "out"}" "confprefix=${placeholder "out"}/etc" "libdir=lib" - "BPFTUNE_VERSION=${version}" + "BPFTUNE_VERSION=${finalAttrs.version}" "NL_INCLUDE=${lib.getDev libnl}/include/libnl3" "BPF_INCLUDE=${lib.getDev libbpf}/include" ]; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ nickcao ]; }; -} +}) diff --git a/pkgs/by-name/bp/bpp-core/package.nix b/pkgs/by-name/bp/bpp-core/package.nix index 1b7ccaacbb0f..f06bfdd398cb 100644 --- a/pkgs/by-name/bp/bpp-core/package.nix +++ b/pkgs/by-name/bp/bpp-core/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bpp-core"; version = "2.4.1"; src = fetchFromGitHub { owner = "BioPP"; repo = "bpp-core"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0ma2cl677l7s0n5sffh66cy9lxp5wycm50f121g8rx85p95vkgwv"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bcdarwin ]; license = lib.licenses.cecill20; }; -} +}) diff --git a/pkgs/by-name/bp/bpp-phyl/package.nix b/pkgs/by-name/bp/bpp-phyl/package.nix index d2078dfaf454..285570be147a 100644 --- a/pkgs/by-name/bp/bpp-phyl/package.nix +++ b/pkgs/by-name/bp/bpp-phyl/package.nix @@ -6,7 +6,7 @@ bpp-seq, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bpp-phyl"; inherit (bpp-core) version postPatch; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BioPP"; repo = "bpp-phyl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "192zks6wyk903n06c2lbsscdhkjnfwms8p7jblsmk3lvjhdipb20"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BioPP/bpp-phyl"; changelog = "https://github.com/BioPP/bpp-phyl/blob/master/ChangeLog"; }; -} +}) diff --git a/pkgs/by-name/bp/bpp-popgen/package.nix b/pkgs/by-name/bp/bpp-popgen/package.nix index b62a86cd5c8f..5985bdfc5a54 100644 --- a/pkgs/by-name/bp/bpp-popgen/package.nix +++ b/pkgs/by-name/bp/bpp-popgen/package.nix @@ -6,7 +6,7 @@ bpp-seq, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bpp-popgen"; inherit (bpp-core) version postPatch; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BioPP"; repo = "bpp-popgen"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0bz0fhrq3dri6a0hvfc3zlvrns8mrzzlnicw5pyfa812gc1qwfvh"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BioPP/bpp-popgen"; changelog = "https://github.com/BioPP/bpp-popgen/blob/master/ChangeLog"; }; -} +}) diff --git a/pkgs/by-name/bp/bpp-seq/package.nix b/pkgs/by-name/bp/bpp-seq/package.nix index 59e92324395b..d07780ddf592 100644 --- a/pkgs/by-name/bp/bpp-seq/package.nix +++ b/pkgs/by-name/bp/bpp-seq/package.nix @@ -5,7 +5,7 @@ bpp-core, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bpp-seq"; inherit (bpp-core) version postPatch; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BioPP"; repo = "bpp-seq"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1mc09g8jswzsa4wgrfv59jxn15ys3q8s0227p1j838wkphlwn2qk"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BioPP/bpp-seq"; changelog = "https://github.com/BioPP/bpp-seq/blob/master/ChangeLog"; }; -} +}) diff --git a/pkgs/by-name/bp/bppsuite/package.nix b/pkgs/by-name/bp/bppsuite/package.nix index 1444767bac16..7e0ca7ed618f 100644 --- a/pkgs/by-name/bp/bppsuite/package.nix +++ b/pkgs/by-name/bp/bppsuite/package.nix @@ -9,7 +9,7 @@ bpp-popgen, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bppsuite"; inherit (bpp-core) version postPatch; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BioPP"; repo = "bppsuite"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1wdwcgczqbc3m116vakvi0129wm3acln3cfc7ivqnalwvi6lrpds"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BioPP/bppsuite"; changelog = "https://github.com/BioPP/bppsuite/blob/master/ChangeLog"; }; -} +}) diff --git a/pkgs/by-name/br/braa/package.nix b/pkgs/by-name/br/braa/package.nix index 30273379b3db..d54ace91b763 100644 --- a/pkgs/by-name/br/braa/package.nix +++ b/pkgs/by-name/br/braa/package.nix @@ -4,12 +4,12 @@ fetchzip, zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "braa"; version = "0.82"; src = fetchzip { - url = "http://s-tech.elsat.net.pl/braa/braa-${version}.tar.gz"; + url = "http://s-tech.elsat.net.pl/braa/braa-${finalAttrs.version}.tar.gz"; hash = "sha256-GS3kk432BdGx/sLzzjXvotD9Qn4S3U4XtMmM0fWMhGA="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bycEEE ]; mainProgram = "braa"; }; -} +}) diff --git a/pkgs/by-name/br/braincurses/package.nix b/pkgs/by-name/br/braincurses/package.nix index 7dde10da68c2..b16e393c4a1f 100644 --- a/pkgs/by-name/br/braincurses/package.nix +++ b/pkgs/by-name/br/braincurses/package.nix @@ -5,14 +5,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "braincurses"; version = "1.1.0"; src = fetchFromGitHub { owner = "bderrly"; repo = "braincurses"; - tag = version; + tag = finalAttrs.version; sha256 = "0gpny9wrb0zj3lr7iarlgn9j4367awj09v3hhxz9r9a6yhk4anf5"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/br/brial/package.nix b/pkgs/by-name/br/brial/package.nix index f9894246b2e7..b58e1b87e497 100644 --- a/pkgs/by-name/br/brial/package.nix +++ b/pkgs/by-name/br/brial/package.nix @@ -9,14 +9,14 @@ gd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.2.15"; pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-I8p2jdc2/oq9piy1QvNl+N0+MHDE5Xv1kawkRTjrWSU="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/br/bridge-utils/package.nix b/pkgs/by-name/br/bridge-utils/package.nix index 07b59bcc327d..b2486b630def 100644 --- a/pkgs/by-name/br/bridge-utils/package.nix +++ b/pkgs/by-name/br/bridge-utils/package.nix @@ -6,12 +6,12 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bridge-utils"; version = "1.7.1"; src = fetchurl { - url = "https://kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-${version}.tar.xz"; + url = "https://kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-${finalAttrs.version}.tar.xz"; sha256 = "sha256-ph2L5PGhQFxgyO841UTwwYwFszubB+W0sxAzU2Fl5g4="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/br/brightnessctl/package.nix b/pkgs/by-name/br/brightnessctl/package.nix index 5b770fed6537..2d7d01cd9409 100644 --- a/pkgs/by-name/br/brightnessctl/package.nix +++ b/pkgs/by-name/br/brightnessctl/package.nix @@ -8,14 +8,14 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brightnessctl"; version = "0.5.1"; src = fetchFromGitHub { owner = "Hummer12007"; repo = "brightnessctl"; - tag = version; + tag = finalAttrs.version; sha256 = "0immxc7almmpg80n3bdn834p3nrrz7bspl2syhb04s3lawa5y2lq"; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { mainProgram = "brightnessctl"; }; -} +}) diff --git a/pkgs/by-name/br/brillo/package.nix b/pkgs/by-name/br/brillo/package.nix index f02b17e415fc..a7f5be00ea7e 100644 --- a/pkgs/by-name/br/brillo/package.nix +++ b/pkgs/by-name/br/brillo/package.nix @@ -8,14 +8,14 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brillo"; version = "1.4.13"; src = fetchFromGitLab { owner = "cameronnemo"; repo = "brillo"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-+BUyM3FFnsk87NFaD9FBwdLqf6wsNhX+FDB7nqhgAmM="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.alexarice ]; }; -} +}) diff --git a/pkgs/by-name/br/briss/package.nix b/pkgs/by-name/br/briss/package.nix index 73cde5730b8c..8a5aba9d4b76 100644 --- a/pkgs/by-name/br/briss/package.nix +++ b/pkgs/by-name/br/briss/package.nix @@ -8,11 +8,11 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "briss"; version = "0.9"; src = fetchurl { - url = "mirror://sourceforge/briss/briss-${version}.tar.gz"; + url = "mirror://sourceforge/briss/briss-${finalAttrs.version}.tar.gz"; sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin"; mkdir -p "$out/share"; install -D -m444 -t "$out/share" *.jar - makeWrapper "${jre}/bin/java" "$out/bin/briss" --add-flags "-Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" + makeWrapper "${jre}/bin/java" "$out/bin/briss" --add-flags "-Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${finalAttrs.version}.jar\"" ''; meta = { @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "briss"; }; -} +}) diff --git a/pkgs/by-name/br/brlaser/package.nix b/pkgs/by-name/br/brlaser/package.nix index e3e42d050cee..3358fe7ab5a3 100644 --- a/pkgs/by-name/br/brlaser/package.nix +++ b/pkgs/by-name/br/brlaser/package.nix @@ -7,14 +7,14 @@ cups, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brlaser"; version = "6.2.8"; src = fetchFromGitHub { owner = "Owl-Maintain"; repo = "brlaser"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fE3mKGrYPvLl66gVJJJPc3P3rBJk695SP7+3exE5exw="; }; @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { See the homepage for a full list. ''; homepage = "https://github.com/Owl-Maintain/brlaser"; - changelog = "https://github.com/Owl-Maintain/brlaser/releases/tag/v${version}"; + changelog = "https://github.com/Owl-Maintain/brlaser/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ onny ]; }; -} +}) diff --git a/pkgs/by-name/br/brltty/package.nix b/pkgs/by-name/br/brltty/package.nix index e6fb8a20baef..ca83614c6eac 100644 --- a/pkgs/by-name/br/brltty/package.nix +++ b/pkgs/by-name/br/brltty/package.nix @@ -20,12 +20,12 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brltty"; version = "6.8"; src = fetchurl { - url = "https://brltty.app/archive/brltty-${version}.tar.gz"; + url = "https://brltty.app/archive/brltty-${finalAttrs.version}.tar.gz"; sha256 = "sha256-MoDYjHU6aJY9e5cgjm9InOEDGCs+jvlEurMWg9wo4RY="; }; @@ -141,4 +141,4 @@ stdenv.mkDerivation rec { --replace 'logger' "${util-linux}/bin/logger" \ --replace 'udevadm' "${systemdMinimal}/bin/udevadm" ''; -} +}) diff --git a/pkgs/by-name/br/brunsli/package.nix b/pkgs/by-name/br/brunsli/package.nix index 1a0399733fb8..2a1f9d66410f 100644 --- a/pkgs/by-name/br/brunsli/package.nix +++ b/pkgs/by-name/br/brunsli/package.nix @@ -7,7 +7,7 @@ brotli, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brunsli"; version = "0.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "brunsli"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ZcrRz2xSoRepgG8KZYY/JzgONerItW0e6mH1PYsko98="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/by-name/br/brutefir/package.nix b/pkgs/by-name/br/brutefir/package.nix index 38524edc4202..35a127ccd293 100644 --- a/pkgs/by-name/br/brutefir/package.nix +++ b/pkgs/by-name/br/brutefir/package.nix @@ -9,12 +9,12 @@ libjack2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brutefir"; version = "1.0o"; src = fetchurl { - url = "https://torger.se/anders/files/brutefir-${version}.tar.gz"; + url = "https://torger.se/anders/files/brutefir-${finalAttrs.version}.tar.gz"; sha256 = "caae4a933b53b55b29d6cb7e2803e20819f31def6d0e4e12f9a48351e6dbbe9f"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "brutefir"; }; -} +}) diff --git a/pkgs/by-name/br/bruteforce-luks/package.nix b/pkgs/by-name/br/bruteforce-luks/package.nix index 1070911a7fc4..4e001b5ebe08 100644 --- a/pkgs/by-name/br/bruteforce-luks/package.nix +++ b/pkgs/by-name/br/bruteforce-luks/package.nix @@ -6,14 +6,14 @@ cryptsetup, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bruteforce-luks"; version = "1.4.1"; src = fetchFromGitHub { owner = "glv2"; repo = "bruteforce-luks"; - tag = version; + tag = finalAttrs.version; hash = "sha256-t07YyfCjaXQs/OMekcPNBT8DeSRtq2+8tUpsPP2pG7o="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/br/bruteforce-salted-openssl/package.nix b/pkgs/by-name/br/bruteforce-salted-openssl/package.nix index 6e50f2bc80a0..5fcbc623a7df 100644 --- a/pkgs/by-name/br/bruteforce-salted-openssl/package.nix +++ b/pkgs/by-name/br/bruteforce-salted-openssl/package.nix @@ -6,14 +6,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bruteforce-salted-openssl"; version = "1.5.0"; src = fetchFromGitHub { owner = "glv2"; repo = "bruteforce-salted-openssl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-hXB4CUQ5pihKmahyK359cgQACrs6YH1gHmZJAuTXgQM="; }; @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { meta = { description = "Try to find the password of file encrypted with OpenSSL"; homepage = "https://github.com/glv2/bruteforce-salted-openssl"; - changelog = "https://github.com/glv2/bruteforce-salted-openssl/blob/${src.rev}/NEWS"; + changelog = "https://github.com/glv2/bruteforce-salted-openssl/blob/${finalAttrs.src.rev}/NEWS"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ octodi ]; mainProgram = "bruteforce-salted-openssl"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/br/bruteforce-wallet/package.nix b/pkgs/by-name/br/bruteforce-wallet/package.nix index f9a3c705aed8..a5fdb8cc5faa 100644 --- a/pkgs/by-name/br/bruteforce-wallet/package.nix +++ b/pkgs/by-name/br/bruteforce-wallet/package.nix @@ -7,14 +7,14 @@ db, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bruteforce-wallet"; version = "1.5.4"; src = fetchFromGitHub { owner = "glv2"; repo = "bruteforce-wallet"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ngzG39c/bWv++PHVgce9r1PXElFhpgYoAepbqD/1Dq0="; }; @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { meta = { description = "Try to find password of encrypted cryptocurrency wallet"; homepage = "https://github.com/glv2/bruteforce-wallet"; - changelog = "https://github.com/glv2/bruteforce-wallet/blob/${src.rev}/NEWS"; + changelog = "https://github.com/glv2/bruteforce-wallet/blob/${finalAttrs.src.rev}/NEWS"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ octodi ]; mainProgram = "bruteforce-wallet"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bs/bs2b-lv2/package.nix b/pkgs/by-name/bs/bs2b-lv2/package.nix index f8f02e07a339..6028eebbfe40 100644 --- a/pkgs/by-name/bs/bs2b-lv2/package.nix +++ b/pkgs/by-name/bs/bs2b-lv2/package.nix @@ -9,14 +9,14 @@ lv2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bs2b-lv2"; version = "1.1.1"; src = fetchFromGitHub { owner = "nilninull"; repo = "bs2b-lv2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-dOcDPtiKN9Kfs2cdaeDO/GkWrh5tfJSHfiHPBtxJXvc="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bs/bschaffl/package.nix b/pkgs/by-name/bs/bschaffl/package.nix index 0ee9d001a0b1..aaae1dcc53ca 100644 --- a/pkgs/by-name/bs/bschaffl/package.nix +++ b/pkgs/by-name/bs/bschaffl/package.nix @@ -8,14 +8,14 @@ lv2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bschaffl"; version = "1.4.10"; src = fetchFromGitHub { owner = "sjaehn"; repo = "bschaffl"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-zfhPYH4eUNWHV27ZtX2IIvobyPdKs5yGr/ryJRQa6as="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/bs/bsequencer/package.nix b/pkgs/by-name/bs/bsequencer/package.nix index f5a8553c33dd..d0db3cbe83ac 100644 --- a/pkgs/by-name/bs/bsequencer/package.nix +++ b/pkgs/by-name/bs/bsequencer/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bsequencer"; version = "1.8.10"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BSEQuencer"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-1PSICm5mw37nO3gkHA9MNUH+CFULeOZURjimYEA/dXA="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/bs/bshapr/package.nix b/pkgs/by-name/bs/bshapr/package.nix index 52852ccbee24..83b4107e8046 100644 --- a/pkgs/by-name/bs/bshapr/package.nix +++ b/pkgs/by-name/bs/bshapr/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bshapr"; version = "0.13"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BShapr"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-9I4DPRl6i/VL8Etw3qLGZkP45BGsbxFxNOvRy3B3I+M="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/bs/bslizr/package.nix b/pkgs/by-name/bs/bslizr/package.nix index e5a18432a19b..8edcad9e0805 100644 --- a/pkgs/by-name/bs/bslizr/package.nix +++ b/pkgs/by-name/bs/bslizr/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bslizr"; version = "1.2.16"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BSlizr"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-5DvVkTz79CLvZMZ3XnI0COIfxnhERDSvzbVoJAcqNRI="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix index 4faf9f3da5bb..e7052cb87b54 100644 --- a/pkgs/by-name/bs/bspwm/package.nix +++ b/pkgs/by-name/bs/bspwm/package.nix @@ -10,14 +10,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bspwm"; version = "0.9.12"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-sEheWAZgKVDCEipQTtDLNfDSA2oho9zU9gK2d6W6WSU="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bt/btar/package.nix b/pkgs/by-name/bt/btar/package.nix index d3e13559c2c8..a325398ca61f 100644 --- a/pkgs/by-name/bt/btar/package.nix +++ b/pkgs/by-name/bt/btar/package.nix @@ -6,12 +6,12 @@ librsync, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "btar"; version = "1.1.1"; src = fetchurl { - url = "https://vicerveza.homeunix.net/~viric/soft/btar/btar-${version}.tar.gz"; + url = "https://vicerveza.homeunix.net/~viric/soft/btar/btar-${finalAttrs.version}.tar.gz"; sha256 = "0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/bt/btfs/package.nix b/pkgs/by-name/bt/btfs/package.nix index 18b15cae94a5..5f8f48d6aa2c 100644 --- a/pkgs/by-name/bt/btfs/package.nix +++ b/pkgs/by-name/bt/btfs/package.nix @@ -11,14 +11,14 @@ curl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "btfs"; version = "3.1"; src = fetchFromGitHub { owner = "johang"; repo = "btfs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-JuofC4TpbZ56qiUrHeoK607YHVbwqwLGMIdUpsTm9Ic="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ rnhmjoj ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/bt/btrfs-heatmap/package.nix b/pkgs/by-name/bt/btrfs-heatmap/package.nix index c331dc57fc69..4222c249c9ca 100644 --- a/pkgs/by-name/bt/btrfs-heatmap/package.nix +++ b/pkgs/by-name/bt/btrfs-heatmap/package.nix @@ -6,14 +6,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "btrfs-heatmap"; version = "9"; src = fetchFromGitHub { owner = "knorrie"; repo = "btrfs-heatmap"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-yCkuZqWwxrs2eS7EXY6pAOVVVSq7dAMxJtf581gX8vg="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix index dd7562919915..3d9d3cdf5968 100644 --- a/pkgs/by-name/bt/btrfs-progs/package.nix +++ b/pkgs/by-name/bt/btrfs-progs/package.nix @@ -19,12 +19,12 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "btrfs-progs"; version = "6.17.1"; src = fetchurl { - url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; + url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${finalAttrs.version}.tar.xz"; hash = "sha256-pL4Kbrs8R2Qn+12Xss8CewzNtrDFX/FjIzIMHoy3dlg="; }; @@ -109,10 +109,10 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for the btrfs filesystem"; homepage = "https://btrfs.readthedocs.io/en/latest/"; - changelog = "https://github.com/kdave/btrfs-progs/raw/v${version}/CHANGES"; + changelog = "https://github.com/kdave/btrfs-progs/raw/v${finalAttrs.version}/CHANGES"; license = lib.licenses.gpl2Only; mainProgram = "btrfs"; maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/bu/bubblewrap/package.nix b/pkgs/by-name/bu/bubblewrap/package.nix index f8e4f6b2f4a3..b8f75fa1a6c3 100644 --- a/pkgs/by-name/bu/bubblewrap/package.nix +++ b/pkgs/by-name/bu/bubblewrap/package.nix @@ -12,14 +12,14 @@ libselinux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bubblewrap"; version = "0.11.0"; src = fetchFromGitHub { owner = "containers"; repo = "bubblewrap"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-8IDMLQPeO576N1lizVudXUmTV6hNOiowjzRpEWBsZ+U="; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - changelog = "https://github.com/containers/bubblewrap/releases/tag/${src.rev}"; + changelog = "https://github.com/containers/bubblewrap/releases/tag/${finalAttrs.src.rev}"; description = "Unprivileged sandboxing tool"; homepage = "https://github.com/containers/bubblewrap"; license = lib.licenses.lgpl2Plus; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "bwrap"; }; -} +}) diff --git a/pkgs/by-name/bu/bugdom/package.nix b/pkgs/by-name/bu/bugdom/package.nix index 46b991693a9b..a3d3054f3a96 100644 --- a/pkgs/by-name/bu/bugdom/package.nix +++ b/pkgs/by-name/bu/bugdom/package.nix @@ -8,14 +8,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bugdom"; version = "1.3.4"; src = fetchFromGitHub { owner = "jorio"; repo = "bugdom"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0c7v5tSqYuqtLOFl4sqD7+naJNqX/wlKHVntkZQGJ8A="; fetchSubmodules = true; }; @@ -80,4 +80,4 @@ stdenv.mkDerivation rec { mainProgram = "Bugdom"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/bu/build2-bootstrap/package.nix b/pkgs/by-name/bu/build2-bootstrap/package.nix index 5c5c4098e65e..8520945927b9 100644 --- a/pkgs/by-name/bu/build2-bootstrap/package.nix +++ b/pkgs/by-name/bu/build2-bootstrap/package.nix @@ -5,11 +5,11 @@ buildPackages, fixDarwinDylibNames, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "build2-bootstrap"; version = "0.17.0"; src = fetchurl { - url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz"; + url = "https://download.build2.org/${finalAttrs.version}/build2-toolchain-${finalAttrs.version}.tar.xz"; hash = "sha256-NyKonqht90JTnQ+Ru0Qp/Ua79mhVOjUHgKY0EbZIv10="; }; patches = [ @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./nix-ldflags-sysdirs.patch ]; - sourceRoot = "build2-toolchain-${version}/build2"; + sourceRoot = "build2-toolchain-${finalAttrs.version}/build2"; makefile = "bootstrap.gmake"; enableParallelBuilding = true; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { r-burns ]; }; -} +}) diff --git a/pkgs/by-name/bu/bulky/package.nix b/pkgs/by-name/bu/bulky/package.nix index 370d05326e2b..9ff7145e46a3 100644 --- a/pkgs/by-name/bu/bulky/package.nix +++ b/pkgs/by-name/bu/bulky/package.nix @@ -13,14 +13,14 @@ xapp-symbolic-icons, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bulky"; version = "4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rUQ4GN8Pj7dXLbQBt99RmFk4rs+mFL/1taFJiTTVC2A="; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { --replace-fail "/usr/share/locale" "$out/share/locale" \ --replace-fail /usr/share/bulky "$out/share/bulky" \ --replace-fail /usr/share/common-licenses "${common-licenses}/share/common-licenses" \ - --replace-fail __DEB_VERSION__ "${version}" + --replace-fail __DEB_VERSION__ "${finalAttrs.version}" ''; installPhase = '' @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/bu/bullet/package.nix b/pkgs/by-name/bu/bullet/package.nix index b553a8ce52c1..ed46639f290b 100644 --- a/pkgs/by-name/bu/bullet/package.nix +++ b/pkgs/by-name/bu/bullet/package.nix @@ -9,14 +9,14 @@ libglut, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bullet"; version = "3.25"; src = fetchFromGitHub { owner = "bulletphysics"; repo = "bullet3"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-AGP05GoxLjHqlnW63/KkZe+TjO3IKcgBi+Qb/osQuCM="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ aforemny ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/bu/bupc/package.nix b/pkgs/by-name/bu/bupc/package.nix index e46d31fabf00..0077d8ad9730 100644 --- a/pkgs/by-name/bu/bupc/package.nix +++ b/pkgs/by-name/bu/bupc/package.nix @@ -6,12 +6,12 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "berkeley_upc"; version = "2020.12.0"; src = fetchurl { - url = "http://upc.lbl.gov/download/release/berkeley_upc-${version}.tar.gz"; + url = "http://upc.lbl.gov/download/release/berkeley_upc-${finalAttrs.version}.tar.gz"; hash = "sha256-JdpFORlXHpCQE+TivoQQnjQlxQN7C8BNfHvTOSwXbYQ="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ zimbatm ]; }; -} +}) diff --git a/pkgs/by-name/bu/burp/package.nix b/pkgs/by-name/bu/burp/package.nix index b8dd5e994a51..330974ba70b9 100644 --- a/pkgs/by-name/bu/burp/package.nix +++ b/pkgs/by-name/bu/burp/package.nix @@ -13,14 +13,14 @@ uthash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "burp"; version = "2.4.0"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-y6kRd1jD6t+Q6d5t7W9MDuk+m2Iq1THQkP50PJwI7Nc="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ arjan-s ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/bu/bustools/package.nix b/pkgs/by-name/bu/bustools/package.nix index 4951b32c5115..b032d65cb394 100644 --- a/pkgs/by-name/bu/bustools/package.nix +++ b/pkgs/by-name/bu/bustools/package.nix @@ -8,14 +8,14 @@ bustools, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bustools"; version = "0.45.1"; src = fetchFromGitHub { owner = "BUStools"; repo = "bustools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-G+ZMoUmhINp18XKmXpdb5GT7YMsiK/XX2zrjt56CbLg="; }; @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.kallistobus.tools/"; downloadPage = "https://bustools.github.io/download"; - changelog = "https://github.com/BUStools/bustools/releases/tag/v${version}"; + changelog = "https://github.com/BUStools/bustools/releases/tag/v${finalAttrs.version}"; maintainers = [ lib.maintainers.dflores ]; license = lib.licenses.bsd2; mainProgram = "bustools"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/c-/c-graph/package.nix b/pkgs/by-name/c-/c-graph/package.nix index 3e60cfe16473..ec8a857a9954 100644 --- a/pkgs/by-name/c-/c-graph/package.nix +++ b/pkgs/by-name/c-/c-graph/package.nix @@ -7,12 +7,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "c-graph"; version = "2.0.1"; src = fetchurl { - url = "mirror://gnu/c-graph/c-graph-${version}.tar.gz"; + url = "mirror://gnu/c-graph/c-graph-${finalAttrs.version}.tar.gz"; hash = "sha256-LSZ948nXXY3pXltR2hHnql6YEpHumjTvbtz4/qUIRCQ="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "c-graph"; }; -} +}) diff --git a/pkgs/by-name/c-/c-stdaux/package.nix b/pkgs/by-name/c-/c-stdaux/package.nix index 520c744007dd..07c18fdd34e1 100644 --- a/pkgs/by-name/c-/c-stdaux/package.nix +++ b/pkgs/by-name/c-/c-stdaux/package.nix @@ -6,14 +6,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "c-stdaux"; version = "1.6.0"; src = fetchFromGitHub { owner = "c-util"; repo = "c-stdaux"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/15lop+WUkTW9v9h7BBdwRSpJgcBXaJNtMM7LXgcQE4="; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/c-util/c-stdaux"; description = "Auxiliary macros and functions for the C standard library"; - changelog = "https://github.com/c-util/c-stdaux/releases/tag/${src.tag}"; + changelog = "https://github.com/c-util/c-stdaux/releases/tag/${finalAttrs.src.tag}"; license = with lib.licenses; [ asl20 lgpl2Plus @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qbisi ]; }; -} +}) diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix index e3516e13c591..ead052fd38bf 100644 --- a/pkgs/by-name/c3/c3c/package.nix +++ b/pkgs/by-name/c3/c3c/package.nix @@ -19,13 +19,13 @@ in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "c3c${optionalString debug "-debug"}"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "c3lang"; repo = "c3c"; tag = "v${finalAttrs.version}"; - hash = "sha256-c3eZ4vczZnTRN87uOxJq605hsqtDN9n+yN5E1gggca0="; + hash = "sha256-stbYTAetCkydPutI/Ck9Yx1bD6xc2idWz0Zr+zzl5F0="; }; cmakeBuildType = if debug then "Debug" else "Release"; diff --git a/pkgs/by-name/ca/cabextract/package.nix b/pkgs/by-name/ca/cabextract/package.nix index 2cc6c90876ae..0ac72b30e80a 100644 --- a/pkgs/by-name/ca/cabextract/package.nix +++ b/pkgs/by-name/ca/cabextract/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cabextract"; version = "1.11"; src = fetchurl { - url = "https://www.cabextract.org.uk/cabextract-${version}.tar.gz"; + url = "https://www.cabextract.org.uk/cabextract-${finalAttrs.version}.tar.gz"; sha256 = "sha256-tVRtsRVeTHGP89SyeFc2BPMN1kw8W/1GV80Im4I6OsY="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; mainProgram = "cabextract"; }; -} +}) diff --git a/pkgs/by-name/ca/cadaver/package.nix b/pkgs/by-name/ca/cadaver/package.nix index 261e0922c372..8b3d5462180e 100644 --- a/pkgs/by-name/ca/cadaver/package.nix +++ b/pkgs/by-name/ca/cadaver/package.nix @@ -9,12 +9,12 @@ readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cadaver"; version = "0.28"; src = fetchurl { - url = "https://notroj.github.io/cadaver/cadaver-${version}.tar.gz"; + url = "https://notroj.github.io/cadaver/cadaver-${finalAttrs.version}.tar.gz"; hash = "sha256-M+OlS9VLHrMltIMWp8rMJAR8Uz74jm75i4jfu2DhJzQ="; }; @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { meta = { description = "Command-line WebDAV client"; homepage = "https://notroj.github.io/cadaver/"; - changelog = "https://github.com/notroj/cadaver/blob/${version}/NEWS"; + changelog = "https://github.com/notroj/cadaver/blob/${finalAttrs.version}/NEWS"; maintainers = with lib.maintainers; [ ianwookim ]; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux ++ freebsd ++ openbsd; mainProgram = "cadaver"; }; -} +}) diff --git a/pkgs/by-name/ca/cadzinho/package.nix b/pkgs/by-name/ca/cadzinho/package.nix index 3ffc084f253a..7ffd7f6f1904 100644 --- a/pkgs/by-name/ca/cadzinho/package.nix +++ b/pkgs/by-name/ca/cadzinho/package.nix @@ -9,14 +9,14 @@ desktopToDarwinBundle, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cadzinho"; version = "0.6.0"; src = fetchFromGitHub { owner = "zecruel"; repo = "CadZinho"; - tag = version; + tag = finalAttrs.version; hash = "sha256-AHojy6lYLEyeBaYiIzo6MdQCM3jX5ENNTKgU+PGSD00="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "cadzinho"; }; -} +}) diff --git a/pkgs/by-name/ca/caf/package.nix b/pkgs/by-name/ca/caf/package.nix index d75d7166b8b5..a979212e10cf 100644 --- a/pkgs/by-name/ca/caf/package.nix +++ b/pkgs/by-name/ca/caf/package.nix @@ -6,14 +6,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "actor-framework"; version = "1.1.0"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; - tag = version; + tag = finalAttrs.version; hash = "sha256-opQaRMjEgPS78wPSFRIWb5kkxcQMuAb7aAa/93LKqpo="; }; @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { homepage = "http://actor-framework.org/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; - changelog = "https://github.com/actor-framework/actor-framework/raw/${version}/CHANGELOG.md"; + changelog = "https://github.com/actor-framework/actor-framework/raw/${finalAttrs.version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ bobakker tobim ]; }; -} +}) diff --git a/pkgs/by-name/ca/cairomm/package.nix b/pkgs/by-name/ca/cairomm/package.nix index 8c761ef204f9..06fc8e71d9d2 100644 --- a/pkgs/by-name/ca/cairomm/package.nix +++ b/pkgs/by-name/ca/cairomm/package.nix @@ -11,7 +11,7 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cairomm"; version = "1.14.5"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://www.cairographics.org/releases/cairomm-${version}.tar.xz"; + url = "https://www.cairographics.org/releases/cairomm-${finalAttrs.version}.tar.xz"; sha256 = "cBNiA1QMiE6Jzhye37Y2m5lTk39s1ZbZfHjJdYpdSNs="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ca/cairomm_1_16/package.nix b/pkgs/by-name/ca/cairomm_1_16/package.nix index 263f2bf3b5e5..c4ad5a60d154 100644 --- a/pkgs/by-name/ca/cairomm_1_16/package.nix +++ b/pkgs/by-name/ca/cairomm_1_16/package.nix @@ -11,7 +11,7 @@ libsigcxx30, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cairomm"; version = "1.18.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://www.cairographics.org/releases/cairomm-${version}.tar.xz"; + url = "https://www.cairographics.org/releases/cairomm-${finalAttrs.version}.tar.xz"; sha256 = "uBJVOU4+qOiqiHJ20ir6iYX8ja72BpLrJAfSMEnwPPs="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ca/calculix-ccx/package.nix b/pkgs/by-name/ca/calculix-ccx/package.nix index b9ddbcee6242..72100a5c4b70 100644 --- a/pkgs/by-name/ca/calculix-ccx/package.nix +++ b/pkgs/by-name/ca/calculix-ccx/package.nix @@ -11,12 +11,12 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !blas.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "calculix-ccx"; version = "2.22"; src = fetchurl { - url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2"; + url = "http://www.dhondt.de/ccx_${finalAttrs.version}.src.tar.bz2"; hash = "sha256-OpTcx3WjH1cCKXNLNB1rBjAevcdZhj35Aci5vxhUwLw="; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm0755 ccx_${version} $out/bin/ccx + install -Dm0755 ccx_${finalAttrs.version} $out/bin/ccx runHook postInstall ''; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ca/calf/package.nix b/pkgs/by-name/ca/calf/package.nix index 34edfdc3b7bb..9991ed0d05ae 100644 --- a/pkgs/by-name/ca/calf/package.nix +++ b/pkgs/by-name/ca/calf/package.nix @@ -15,14 +15,14 @@ fetchFromGitHub, cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "calf"; version = "0.90.6"; src = fetchFromGitHub { owner = "calf-studio-gear"; repo = "calf"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rcMuQFig6BrnyGFyvYaAHmOvabEHGl+1lMNfffLHn1w="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "calfjackhost"; }; -} +}) diff --git a/pkgs/by-name/ca/callaudiod/package.nix b/pkgs/by-name/ca/callaudiod/package.nix index 1468fb4998aa..a3de6449d519 100644 --- a/pkgs/by-name/ca/callaudiod/package.nix +++ b/pkgs/by-name/ca/callaudiod/package.nix @@ -10,7 +10,7 @@ libpulseaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "callaudiod"; version = "0.1.10"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { domain = "gitlab.com"; owner = "mobian1"; repo = "callaudiod"; - tag = version; + tag = finalAttrs.version; hash = "sha256-gc66XrrFyhF1TvrDECBfGQc+MiDtqZPxdCn0S/43XQU="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pacman99 ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ca/can-utils/package.nix b/pkgs/by-name/ca/can-utils/package.nix index 0baea4fe36e9..0ff4141bddd0 100644 --- a/pkgs/by-name/ca/can-utils/package.nix +++ b/pkgs/by-name/ca/can-utils/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "can-utils"; version = "2025.01"; src = fetchFromGitHub { owner = "linux-can"; repo = "can-utils"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-wum0hqPj3rCHHubNsOnj89tvrRQxoXrGQvZFcMKAGME="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { Luflosi ]; }; -} +}) diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix index 87fdb1706ed7..24b2a5b3a385 100644 --- a/pkgs/by-name/ca/candy-icons/package.nix +++ b/pkgs/by-name/ca/candy-icons/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "candy-icons"; - version = "0-unstable-2026-01-13"; + version = "0-unstable-2026-01-28"; src = fetchFromGitHub { owner = "EliverLara"; repo = "candy-icons"; - rev = "42f5c4817f47e2ef4b011080ebbb2f50a9a6955b"; - hash = "sha256-d7jxoqWPRlNX43CdIEihT6kxvke3k8GG9CJkmlkuRNw="; + rev = "ade95a235a50e5ea653a02fd3773c214ac43d425"; + hash = "sha256-XyFhC4I7Y1ppTfLs7em+hXmXx6jQ09rJxcf66EwoK7g="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/ca/canfigger/package.nix b/pkgs/by-name/ca/canfigger/package.nix index dd563cffb6e2..c9c7c71e35f6 100644 --- a/pkgs/by-name/ca/canfigger/package.nix +++ b/pkgs/by-name/ca/canfigger/package.nix @@ -6,14 +6,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "canfigger"; version = "0.3.0"; src = fetchFromGitHub { owner = "andy5995"; repo = "canfigger"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-S2rEQT8wKSjJ7LFF6vcigqb9r5QR/nNUCzNdhuBNjTo="; }; @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight library designed to parse configuration files"; homepage = "https://github.com/andy5995/canfigger"; - changelog = "https://github.com/andy5995/canfigger/blob/${src.rev}/ChangeLog.txt"; + changelog = "https://github.com/andy5995/canfigger/blob/${finalAttrs.src.rev}/ChangeLog.txt"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ iynaix ]; mainProgram = "canfigger"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ca/canta-theme/package.nix b/pkgs/by-name/ca/canta-theme/package.nix index 29f7355deeaa..a51dce1f9bdb 100644 --- a/pkgs/by-name/ca/canta-theme/package.nix +++ b/pkgs/by-name/ca/canta-theme/package.nix @@ -12,14 +12,14 @@ hicolor-icon-theme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "canta-theme"; version = "2021-09-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "canta-theme"; - tag = version; + tag = finalAttrs.version; sha256 = "05h42nrggb6znzjcbh4lqqfcm41h4r85n3vwimp3l4lq5p90igr2"; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; # numix-icon-theme-circle unavailable in darwin maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/ca/caper/package.nix b/pkgs/by-name/ca/caper/package.nix index f7dc73b829de..56900ec36b8b 100644 --- a/pkgs/by-name/ca/caper/package.nix +++ b/pkgs/by-name/ca/caper/package.nix @@ -6,14 +6,14 @@ gnum4, fetchFromGitLab, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "caper"; version = "0.9"; src = fetchFromGitLab { owner = "niksu"; repo = "caper"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-TSryjz0NrGdkc+6vmfBqsuVpV3N9FvteTFsVqpUcm0w="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ willow_ch ]; mainProgram = "caper"; }; -} +}) diff --git a/pkgs/by-name/ca/capnproto-java/package.nix b/pkgs/by-name/ca/capnproto-java/package.nix index e8833fffe065..c5feb66b5136 100644 --- a/pkgs/by-name/ca/capnproto-java/package.nix +++ b/pkgs/by-name/ca/capnproto-java/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "capnproto-java"; version = "0.1.16"; src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto-java"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7uYtRHKsJvbE1b0HbNXGbRXpkUHHLjMDIWLlOUcQWDk="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { solson ]; }; -} +}) diff --git a/pkgs/by-name/ca/caprice32/package.nix b/pkgs/by-name/ca/caprice32/package.nix index 502d2e27bd38..668082457ce1 100644 --- a/pkgs/by-name/ca/caprice32/package.nix +++ b/pkgs/by-name/ca/caprice32/package.nix @@ -11,7 +11,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "caprice32"; version = "4.6.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { repo = "caprice32"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; owner = "ColinPitrat"; sha256 = "0hng5krwgc1h9bz1xlkp2hwnvas965nd7sb3z9mb2m6x9ghxlacz"; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "cap32"; }; -} +}) diff --git a/pkgs/by-name/ca/caps/package.nix b/pkgs/by-name/ca/caps/package.nix index 5f12ee25b738..fbe3c02827d0 100644 --- a/pkgs/by-name/ca/caps/package.nix +++ b/pkgs/by-name/ca/caps/package.nix @@ -3,11 +3,11 @@ stdenv, fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "caps"; version = "0.9.26"; src = fetchurl { - url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2"; + url = "http://www.quitte.de/dsp/caps_${finalAttrs.version}.tar.bz2"; sha256 = "1jcq9y51vdnk93q27r566y9qmddvadhr4ddnvkiypaq5rrdnqjg7"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ca/capstone/package.nix b/pkgs/by-name/ca/capstone/package.nix index 5fd139afecce..e774c10f4372 100644 --- a/pkgs/by-name/ca/capstone/package.nix +++ b/pkgs/by-name/ca/capstone/package.nix @@ -6,14 +6,14 @@ fixDarwinDylibNames, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "capstone"; version = "5.0.6"; src = fetchFromGitHub { owner = "capstone-engine"; repo = "capstone"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ovIvsxVq+/q5UUMzP4WpxzaE0898uayNc1g2Coignnc="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { mainProgram = "cstool"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ca/capstone_4/package.nix b/pkgs/by-name/ca/capstone_4/package.nix index adb245c9b40e..2873697df194 100644 --- a/pkgs/by-name/ca/capstone_4/package.nix +++ b/pkgs/by-name/ca/capstone_4/package.nix @@ -6,14 +6,14 @@ fixDarwinDylibNames, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "capstone"; version = "4.0.2"; src = fetchFromGitHub { owner = "capstone-engine"; repo = "capstone"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-XMwQ7UaPC8YYu4yxsE4bbR3leYPfBHu5iixSLz05r3g="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { mainProgram = "cstool"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ca/cardinal/package.nix b/pkgs/by-name/ca/cardinal/package.nix index cfd49ad3ca1a..2f769dfd698d 100644 --- a/pkgs/by-name/ca/cardinal/package.nix +++ b/pkgs/by-name/ca/cardinal/package.nix @@ -26,12 +26,12 @@ headless ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cardinal"; version = "25.06"; src = fetchurl { - url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; + url = "https://github.com/DISTRHO/Cardinal/releases/download/${finalAttrs.version}/cardinal+deps-${finalAttrs.version}.tar.xz"; hash = "sha256-siZbbYrMGjhiof2M2ZBl2gekePuwsKvR8uZCdjyywiE="; }; @@ -101,4 +101,4 @@ stdenv.mkDerivation rec { # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ca/caribou/package.nix b/pkgs/by-name/ca/caribou/package.nix index 63138073731b..3bdd2335ae0a 100644 --- a/pkgs/by-name/ca/caribou/package.nix +++ b/pkgs/by-name/ca/caribou/package.nix @@ -24,15 +24,14 @@ }: let - pname = "caribou"; - version = "0.4.21"; pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]); in stdenv.mkDerivation rec { - name = "caribou-${version}"; + pname = "caribou"; + version = "0.4.21"; src = fetchurl { - url = "mirror://gnome/sources/caribou/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/caribou/${lib.versions.majorMinor version}/caribou-${version}.tar.xz"; hash = "sha256-nEPZ9L0w9P6n94DU6LFPdYkQfFLpy2vSAr0NHCBk3lU="; }; diff --git a/pkgs/by-name/ca/caroline/package.nix b/pkgs/by-name/ca/caroline/package.nix index a0d47bc16611..1a1c0faa49a3 100644 --- a/pkgs/by-name/ca/caroline/package.nix +++ b/pkgs/by-name/ca/caroline/package.nix @@ -11,14 +11,14 @@ gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "caroline"; version = "0.3.1"; src = fetchFromGitHub { owner = "dcharles525"; repo = "caroline"; - tag = version; + tag = finalAttrs.version; hash = "sha256-v423h9EC/h6B9VABhkvmYcyYXKPpvqhI8O7ZjbO637k"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix index 66e868fe9692..c74f13db2708 100644 --- a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix +++ b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix @@ -10,14 +10,14 @@ pkg-config, examples ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cassandra-cpp-driver"; version = "2.17.1"; src = fetchFromGitHub { owner = "datastax"; repo = "cpp-driver"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-GuvmKHJknudyn7ahrn/8+kKUA4NW5UjCfkYoX3aTE+Q="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { homepage = "https://docs.datastax.com/en/developer/cpp-driver/"; maintainers = [ lib.maintainers.npatsakula ]; }; -} +}) diff --git a/pkgs/by-name/ca/cassette/package.nix b/pkgs/by-name/ca/cassette/package.nix index 3f0fc3958cff..275f07febeb7 100644 --- a/pkgs/by-name/ca/cassette/package.nix +++ b/pkgs/by-name/ca/cassette/package.nix @@ -22,14 +22,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cassette"; version = "0.2.1.g49"; src = fetchFromGitHub { owner = "Rirusha"; repo = "Cassette"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-1wIYEDaVlqNDS50MiYGqCtf5xGWou/g/YfZChTdQIns="; }; @@ -71,4 +71,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "cassette"; }; -} +}) diff --git a/pkgs/by-name/ca/catatonit/package.nix b/pkgs/by-name/ca/catatonit/package.nix index 23c62c0afd85..6b1827e827c7 100644 --- a/pkgs/by-name/ca/catatonit/package.nix +++ b/pkgs/by-name/ca/catatonit/package.nix @@ -7,14 +7,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "catatonit"; version = "0.2.1"; src = fetchFromGitHub { owner = "openSUSE"; repo = "catatonit"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-sc/T4WjCPFfwUWxlBx07mQTmcOApblHygfVT824HcJM="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "catatonit"; }; -} +}) diff --git a/pkgs/by-name/ca/catch2/package.nix b/pkgs/by-name/ca/catch2/package.nix index 2163b3696315..5d8315120c08 100644 --- a/pkgs/by-name/ca/catch2/package.nix +++ b/pkgs/by-name/ca/catch2/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "catch2"; version = "2.13.10"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-XnT2ziES94Y4uzWmaxSw7nWegJFQjAqFUG8PkwK5nLU="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { ]; platforms = with lib.platforms; unix ++ windows; }; -} +}) diff --git a/pkgs/by-name/ca/catimg/package.nix b/pkgs/by-name/ca/catimg/package.nix index 4c5e97131dbd..70965486125b 100644 --- a/pkgs/by-name/ca/catimg/package.nix +++ b/pkgs/by-name/ca/catimg/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "catimg"; version = "2.7.0"; src = fetchFromGitHub { owner = "posva"; repo = "catimg"; - rev = version; + rev = finalAttrs.version; sha256 = "0a2dswbv4xddb2l2d55hc43lzvjwrjs5z9am7v6i0p0mi2fmc89s"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { mainProgram = "catimg"; }; -} +}) diff --git a/pkgs/by-name/ca/caudec/package.nix b/pkgs/by-name/ca/caudec/package.nix index 742d4c5863c1..b53a71d7d7ab 100644 --- a/pkgs/by-name/ca/caudec/package.nix +++ b/pkgs/by-name/ca/caudec/package.nix @@ -12,12 +12,12 @@ sox, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "caudec"; version = "1.7.5"; src = fetchurl { - url = "http://caudec.cocatre.net/downloads/caudec-${version}.tar.gz"; + url = "http://caudec.cocatre.net/downloads/caudec-${finalAttrs.version}.tar.gz"; sha256 = "5d1f5ab3286bb748bd29cbf45df2ad2faf5ed86070f90deccf71c60be832f3d5"; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/ca/cava/package.nix b/pkgs/by-name/ca/cava/package.nix index e3e12a739346..39419c786b6d 100644 --- a/pkgs/by-name/ca/cava/package.nix +++ b/pkgs/by-name/ca/cava/package.nix @@ -20,14 +20,14 @@ withPipewire ? stdenv.hostPlatform.isLinux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cava"; version = "0.10.6"; src = fetchFromGitHub { owner = "karlstav"; repo = "cava"; - rev = version; + rev = finalAttrs.version; hash = "sha256-dWPW9vd9LdGALt7Po4nZnW5HkivtZcIUBlXEFurq2os="; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { versionCheckProgramArg = "-v"; preAutoreconf = '' - echo ${version} > version + echo ${finalAttrs.version} > version ''; meta = { @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "cava"; }; -} +}) diff --git a/pkgs/by-name/cb/cbatticon/package.nix b/pkgs/by-name/cb/cbatticon/package.nix index 77e444b32207..e02491ff88f5 100644 --- a/pkgs/by-name/cb/cbatticon/package.nix +++ b/pkgs/by-name/cb/cbatticon/package.nix @@ -10,14 +10,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cbatticon"; version = "1.6.13"; src = fetchFromGitHub { owner = "valr"; repo = "cbatticon"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-VQjJujF9lnVvQxV+0YqodLgnI9F90JKDAGBu5nM/Q/c="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/cb/cbonsai/package.nix b/pkgs/by-name/cb/cbonsai/package.nix index 15a527cf33a2..ef13aaee2050 100644 --- a/pkgs/by-name/cb/cbonsai/package.nix +++ b/pkgs/by-name/cb/cbonsai/package.nix @@ -8,14 +8,14 @@ scdoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cbonsai"; version = "1.4.2"; src = fetchFromGitLab { owner = "jallbrit"; repo = "cbonsai"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-TZb/5DBdWcl54GoZXxz2xYy9dXq5lmJQsOA3C26tjEU="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ gpl3Only ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cc/ccal/package.nix b/pkgs/by-name/cc/ccal/package.nix index 31de2947e763..547270481821 100644 --- a/pkgs/by-name/cc/ccal/package.nix +++ b/pkgs/by-name/cc/ccal/package.nix @@ -6,11 +6,11 @@ ghostscript_headless, # for ps2pdf binary }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ccal"; version = "2.5.3"; src = fetchurl { - url = "https://ccal.chinesebay.com/ccal-${version}.tar.gz"; + url = "https://ccal.chinesebay.com/ccal-${finalAttrs.version}.tar.gz"; sha256 = "sha256-PUy9yfkFzgKrSEBB+79/C3oxmuajUMbBbWNuGlpQ35Y="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sharzy ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cc/ccd2iso/package.nix b/pkgs/by-name/cc/ccd2iso/package.nix index 486ca1858865..8f8e630f03a5 100644 --- a/pkgs/by-name/cc/ccd2iso/package.nix +++ b/pkgs/by-name/cc/ccd2iso/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ccd2iso"; version = "0.3"; src = fetchurl { - url = "mirror://sourceforge/ccd2iso/ccd2iso-${version}.tar.gz"; + url = "mirror://sourceforge/ccd2iso/ccd2iso-${finalAttrs.version}.tar.gz"; sha256 = "1z000zi7hpr2h9cabj6hzf3n6a6gd6glmm8nn36v4b8i4vzbhx7q"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "ccd2iso"; }; -} +}) diff --git a/pkgs/by-name/cc/ccemux/package.nix b/pkgs/by-name/cc/ccemux/package.nix index 663d44b6ea61..9337a0ecec56 100644 --- a/pkgs/by-name/cc/ccemux/package.nix +++ b/pkgs/by-name/cc/ccemux/package.nix @@ -40,7 +40,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ccemux"; inherit version; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share/ccemux} cp -r ${desktopItem}/share/applications $out/share/applications - install -D ${src} $out/share/ccemux/ccemux.jar + install -D ${finalAttrs.src} $out/share/ccemux/ccemux.jar install -D ${desktopIcon} $out/share/pixmaps/ccemux.png makeWrapper ${jre}/bin/java $out/bin/ccemux \ @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "ccemux"; }; -} +}) diff --git a/pkgs/by-name/cc/ccid/package.nix b/pkgs/by-name/cc/ccid/package.nix index 3c28c5faeaae..c5bc1aa625d3 100644 --- a/pkgs/by-name/cc/ccid/package.nix +++ b/pkgs/by-name/cc/ccid/package.nix @@ -13,14 +13,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ccid"; version = "1.6.2"; src = fetchFromGitHub { owner = "LudovicRousseau"; repo = "CCID"; - tag = version; + tag = finalAttrs.version; hash = "sha256-n7rOjnLZH4RLmddtBycr3FK2Bi/OLR+9IjWBRbWjnUw="; }; @@ -92,4 +92,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.anthonyroussel ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cc/ccls/package.nix b/pkgs/by-name/cc/ccls/package.nix index 9971193f5585..c6c7f597277a 100644 --- a/pkgs/by-name/cc/ccls/package.nix +++ b/pkgs/by-name/cc/ccls/package.nix @@ -8,14 +8,14 @@ runtimeShell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ccls"; version = "0.20241108"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-0hZ4VnscnKYBrXy58IjeoeDxja1oNq0mNaQGPmej5BA="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { rapidjson ]; - cmakeFlags = [ "-DCCLS_VERSION=${version}" ]; + cmakeFlags = [ "-DCCLS_VERSION=${finalAttrs.version}" ]; preConfigure = '' cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="-fvisibility=hidden -fno-rtti") @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { tobim ]; }; -} +}) diff --git a/pkgs/by-name/cc/cconv/package.nix b/pkgs/by-name/cc/cconv/package.nix index 092aad782b18..ecaf9c4a7c99 100644 --- a/pkgs/by-name/cc/cconv/package.nix +++ b/pkgs/by-name/cc/cconv/package.nix @@ -6,14 +6,14 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cconv"; version = "0.6.3"; src = fetchFromGitHub { owner = "xiaoyjy"; repo = "cconv"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "RAFl/+I+usUfeG/l17F3ltThK7G4+TekyQGwzQIgeH8="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.redfish64 ]; }; -} +}) diff --git a/pkgs/by-name/cc/ccrtp/package.nix b/pkgs/by-name/cc/ccrtp/package.nix index e1177402c003..60bd79c01f49 100644 --- a/pkgs/by-name/cc/ccrtp/package.nix +++ b/pkgs/by-name/cc/ccrtp/package.nix @@ -8,12 +8,12 @@ libgcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ccrtp"; version = "2.1.2"; src = fetchurl { - url = "mirror://gnu/ccrtp/ccrtp-${version}.tar.gz"; + url = "mirror://gnu/ccrtp/ccrtp-${finalAttrs.version}.tar.gz"; sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ marcweber ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/cc/ccrypt/package.nix b/pkgs/by-name/cc/ccrypt/package.nix index bdfef537e8a8..d64e62913e3f 100644 --- a/pkgs/by-name/cc/ccrypt/package.nix +++ b/pkgs/by-name/cc/ccrypt/package.nix @@ -5,12 +5,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ccrypt"; version = "1.11"; src = fetchurl { - url = "mirror://sourceforge/ccrypt/ccrypt-${version}.tar.gz"; + url = "mirror://sourceforge/ccrypt/ccrypt-${finalAttrs.version}.tar.gz"; sha256 = "0kx4a5mhmp73ljknl2lcccmw9z3f5y8lqw0ghaymzvln1984g75i"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; all; }; -} +}) diff --git a/pkgs/by-name/cd/cddlib/package.nix b/pkgs/by-name/cd/cddlib/package.nix index e9bda06e0d70..98d81a7db6c2 100644 --- a/pkgs/by-name/cd/cddlib/package.nix +++ b/pkgs/by-name/cd/cddlib/package.nix @@ -7,13 +7,13 @@ texliveSmall, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cddlib"; version = "0.94n"; src = fetchFromGitHub { owner = "cddlib"; repo = "cddlib"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-j4gXrxsWWiJH5gZc2ZzfYGsBCMJ7G7SQ1xEgurRWZrQ="; }; buildInputs = [ gmp ]; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html"; }; -} +}) diff --git a/pkgs/by-name/cd/cdecrypt/package.nix b/pkgs/by-name/cd/cdecrypt/package.nix index 91ce7bc654eb..13a81d0fa27d 100644 --- a/pkgs/by-name/cd/cdecrypt/package.nix +++ b/pkgs/by-name/cd/cdecrypt/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cdecrypt"; version = "4.8"; src = fetchFromGitHub { owner = "VitaSmith"; repo = "cdecrypt"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PyT60RDyp1/Co/7WHC0+KrsnrDeTJ605x1pt4OmlGYg="; }; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { description = "Utility that decrypts Wii U NUS content files"; mainProgram = "cdecrypt"; homepage = "https://github.com/VitaSmith/cdecrypt"; - changelog = "https://github.com/VitaSmith/cdecrypt/releases/tag/v${version}"; + changelog = "https://github.com/VitaSmith/cdecrypt/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ hughobrien ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/cd/cdogs-sdl/package.nix b/pkgs/by-name/cd/cdogs-sdl/package.nix index f88126c1b81d..458746e7f744 100644 --- a/pkgs/by-name/cd/cdogs-sdl/package.nix +++ b/pkgs/by-name/cd/cdogs-sdl/package.nix @@ -12,14 +12,14 @@ protobuf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cdogs-sdl"; version = "2.3.2"; src = fetchFromGitHub { repo = "cdogs-sdl"; owner = "cxong"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-g1eLFdHsmqnz6zTlmaiLOXgX5dnS94k/PvaFJE3gfLo="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/cdogs-sdl.x86_64-darwin }; -} +}) diff --git a/pkgs/by-name/cd/cdparanoiaIII/package.nix b/pkgs/by-name/cd/cdparanoiaIII/package.nix index 1f968bb1499c..4b3243c1415b 100644 --- a/pkgs/by-name/cd/cdparanoiaIII/package.nix +++ b/pkgs/by-name/cd/cdparanoiaIII/package.nix @@ -8,12 +8,12 @@ freebsd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cdparanoia-III"; version = "10.2"; src = fetchurl { - url = "https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${version}.src.tgz"; + url = "https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${finalAttrs.version}.src.tgz"; sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; @@ -174,4 +174,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "cdparanoia"; }; -} +}) diff --git a/pkgs/by-name/ce/ceph-csi/package.nix b/pkgs/by-name/ce/ceph-csi/package.nix index 19d3e61306db..02ddfdee1e26 100644 --- a/pkgs/by-name/ce/ceph-csi/package.nix +++ b/pkgs/by-name/ce/ceph-csi/package.nix @@ -6,14 +6,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ceph-csi"; version = "3.15.1"; src = fetchFromGitHub { owner = "ceph"; repo = "ceph-csi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-eLF/V6NaBU8r3ttJku4lSGrIuP2vao24rsAsEAWB0wk="; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Container Storage Interface (CSI) driver for Ceph RBD and CephFS"; downloadPage = "https://github.com/ceph/ceph-csi"; - changelog = "https://github.com/ceph/ceph-csi/releases/tag/v${version}"; + changelog = "https://github.com/ceph/ceph-csi/releases/tag/v${finalAttrs.version}"; homepage = "https://ceph.com/"; license = lib.licenses.asl20; mainProgram = "cephcsi"; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { "aarch64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/ce/certinfo-go/package.nix b/pkgs/by-name/ce/certinfo-go/package.nix index 26e1e6ec53f4..3f634ed58876 100644 --- a/pkgs/by-name/ce/certinfo-go/package.nix +++ b/pkgs/by-name/ce/certinfo-go/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "certinfo-go"; - version = "0.1.50"; + version = "0.1.51"; src = fetchFromGitHub { owner = "paepckehh"; repo = "certinfo"; tag = "v${version}"; - hash = "sha256-MR7JYhYGE0WUwsBoie8wWEWqCGdpl+k4eUWIVVS5CEg="; + hash = "sha256-8CN3mu7xLSXDQ4nTVlJSCZwDCRQyUGE3oIdJTbpWKzQ="; }; - vendorHash = "sha256-3GjVPV8Lwi4yNbIl/IT0fe9yFlWaqqCU1hzfR8H5r7Y="; + vendorHash = "sha256-VU40TmdABNbbROl9kL0m+k2ITBiPfs5CaXB3Ntd89ig="; ldflags = [ "-s" diff --git a/pkgs/by-name/ce/cewl/package.nix b/pkgs/by-name/ce/cewl/package.nix index 098f36398310..a3cdebb0d54f 100644 --- a/pkgs/by-name/ce/cewl/package.nix +++ b/pkgs/by-name/ce/cewl/package.nix @@ -12,13 +12,13 @@ let gemdir = ./.; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cewl"; version = "5.5.2"; src = fetchFromGitHub { owner = "digininja"; repo = "CeWL"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { homepage = "https://digi.ninja/projects/cewl.php/"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/cf/cflow/package.nix b/pkgs/by-name/cf/cflow/package.nix index 2fa5fbf34219..37bed2201a6b 100644 --- a/pkgs/by-name/cf/cflow/package.nix +++ b/pkgs/by-name/cf/cflow/package.nix @@ -6,12 +6,12 @@ emacs, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cflow"; version = "1.8"; src = fetchurl { - url = "mirror://gnu/cflow/cflow-${version}.tar.bz2"; + url = "mirror://gnu/cflow/cflow-${finalAttrs.version}.tar.bz2"; hash = "sha256-gyFie1W2x4d/akP8xvn4RqlLFHaggaA1Rl96eNNJmrg="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/cf/cfm/package.nix b/pkgs/by-name/cf/cfm/package.nix index 9209a64b4e02..5a7cd9d625d9 100644 --- a/pkgs/by-name/cf/cfm/package.nix +++ b/pkgs/by-name/cf/cfm/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cfm"; version = "0.6.6"; src = fetchFromGitHub { owner = "willeccles"; repo = "cfm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-uXL0RO9P+NYSZ0xCv91KzjHOJJI500YUT8IJkFS86pE="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "cfm"; }; -} +}) diff --git a/pkgs/by-name/cf/cfr/package.nix b/pkgs/by-name/cf/cfr/package.nix index f9d159a6fcb1..77f681fc594a 100644 --- a/pkgs/by-name/cf/cfr/package.nix +++ b/pkgs/by-name/cf/cfr/package.nix @@ -6,19 +6,19 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cfr"; version = "0.152"; src = fetchurl { - url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; + url = "http://www.benf.org/other/cfr/cfr_${finalAttrs.version}.jar"; sha256 = "sha256-9obo897Td9e8h9IWqQ6elRLfQVbnWwbGVaFmSK6HZbI="; }; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' - jar=$out/share/java/cfr_${version}.jar + jar=$out/share/java/cfr_${finalAttrs.version}.jar install -Dm444 $src $jar makeWrapper ${jre}/bin/java $out/bin/cfr --add-flags "-jar $jar" ''; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cg/cgal/5.nix b/pkgs/by-name/cg/cgal/5.nix index 7048408ac0ec..345d123f5d01 100644 --- a/pkgs/by-name/cg/cgal/5.nix +++ b/pkgs/by-name/cg/cgal/5.nix @@ -8,12 +8,12 @@ mpfr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cgal"; version = "5.6.2"; src = fetchurl { - url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz"; + url = "https://github.com/CGAL/cgal/releases/download/v${finalAttrs.version}/CGAL-${finalAttrs.version}.tar.xz"; hash = "sha256-RY9g346PHy/a2TyPJOGqj0sJXMYaFPrIG5BoDXMGpC4="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.raskin ]; }; -} +}) diff --git a/pkgs/by-name/cg/cglm/package.nix b/pkgs/by-name/cg/cglm/package.nix index 7ab692763c03..5af03055982f 100644 --- a/pkgs/by-name/cg/cglm/package.nix +++ b/pkgs/by-name/cg/cglm/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cglm"; version = "0.9.6"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-caDw9Sqf4hS2JNbNxG/xaFIvO6oIlvT+hZQhdX37BKw="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cg/cgminer/package.nix b/pkgs/by-name/cg/cgminer/package.nix index 8a4d6bb1a164..a82f222a7e8b 100644 --- a/pkgs/by-name/cg/cgminer/package.nix +++ b/pkgs/by-name/cg/cgminer/package.nix @@ -17,14 +17,14 @@ jansson, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cgminer"; version = "4.11.1"; src = fetchFromGitHub { owner = "ckolivas"; repo = "cgminer"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5"; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ch/charls/package.nix b/pkgs/by-name/ch/charls/package.nix index 430f289ec253..d62da5e9670f 100644 --- a/pkgs/by-name/ch/charls/package.nix +++ b/pkgs/by-name/ch/charls/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "charls"; version = "2.4.2"; src = fetchFromGitHub { owner = "team-charls"; repo = "charls"; - tag = version; + tag = finalAttrs.version; hash = "sha256-c1wrk6JLcAH7TFPwjARlggaKXrAsLWyUQF/3WHlqoqg="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ch/chase/package.nix b/pkgs/by-name/ch/chase/package.nix index a22ff96a6180..25bbb21cdd1c 100644 --- a/pkgs/by-name/ch/chase/package.nix +++ b/pkgs/by-name/ch/chase/package.nix @@ -7,7 +7,7 @@ boehmgc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chase"; version = "0.5.2"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { boehmgc ]; src = fetchurl { - url = "mirror://debian/pool/main/c/chase/chase_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/c/chase/chase_${finalAttrs.version}.orig.tar.gz"; sha256 = "68d95c2d4dc45553b75790fcea4413b7204a2618dff148116ca9bdb0310d737f"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "chase"; }; -} +}) diff --git a/pkgs/by-name/ch/check-sieve/package.nix b/pkgs/by-name/ch/check-sieve/package.nix index 0a29ac7162d7..e07ce964f47d 100644 --- a/pkgs/by-name/ch/check-sieve/package.nix +++ b/pkgs/by-name/ch/check-sieve/package.nix @@ -8,14 +8,14 @@ python3, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "check-sieve"; version = "0.11"; src = fetchFromGitHub { owner = "dburkart"; repo = "check-sieve"; - tag = "check-sieve-${version}"; + tag = "check-sieve-${finalAttrs.version}"; hash = "sha256-vmfHXjcZ5J/+kO3/a0p8krLOuC67+q8SxcPJgW+UaTw="; }; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { description = "Syntax checker for mail sieves"; mainProgram = "check-sieve"; homepage = "https://github.com/dburkart/check-sieve"; - changelog = "https://github.com/dburkart/check-sieve/blob/${src.tag}/ChangeLog"; + changelog = "https://github.com/dburkart/check-sieve/blob/${finalAttrs.src.tag}/ChangeLog"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ eilvelia ]; }; -} +}) diff --git a/pkgs/by-name/ch/check/package.nix b/pkgs/by-name/ch/check/package.nix index dd8566805aff..caa7223352ec 100644 --- a/pkgs/by-name/ch/check/package.nix +++ b/pkgs/by-name/ch/check/package.nix @@ -4,12 +4,12 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "check"; version = "0.15.2"; src = fetchurl { - url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; + url = "https://github.com/libcheck/check/releases/download/${finalAttrs.version}/check-${finalAttrs.version}.tar.gz"; sha256 = "02m25y9m46pb6n46s51av62kpd936lkfv3b13kfpckgvmh5lxpm8"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { mainProgram = "checkmk"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ch/cheese/package.nix b/pkgs/by-name/ch/cheese/package.nix index 6742b32ed5a0..fa7535f31756 100644 --- a/pkgs/by-name/ch/cheese/package.nix +++ b/pkgs/by-name/ch/cheese/package.nix @@ -32,7 +32,7 @@ pipewire, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cheese"; version = "44.1"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/cheese/${lib.versions.major version}/cheese-${version}.tar.xz"; + url = "mirror://gnome/sources/cheese/${lib.versions.major finalAttrs.version}/cheese-${finalAttrs.version}.tar.xz"; hash = "sha256-XyGFxMmeVN3yuLr2DIKBmVDlSVLhMuhjmHXz7cv49o4="; }; @@ -111,11 +111,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/cheese"; - changelog = "https://gitlab.gnome.org/GNOME/cheese/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/cheese/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Take photos and videos with your webcam, with fun graphical effects"; mainProgram = "cheese"; maintainers = with lib.maintainers; [ aleksana ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ch/chelf/package.nix b/pkgs/by-name/ch/chelf/package.nix index c331b418ad00..6a3ecd6db28e 100644 --- a/pkgs/by-name/ch/chelf/package.nix +++ b/pkgs/by-name/ch/chelf/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chelf"; version = "0.2.2"; src = fetchFromGitHub { owner = "Gottox"; repo = "chelf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0xwd84aynyqsi2kcndbff176vmhrak3jmn3lfcwya59653pppjr6"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "chelf"; }; -} +}) diff --git a/pkgs/by-name/ch/cherry/package.nix b/pkgs/by-name/ch/cherry/package.nix index ee5f2613e8f3..79531d3b7ef2 100644 --- a/pkgs/by-name/ch/cherry/package.nix +++ b/pkgs/by-name/ch/cherry/package.nix @@ -6,14 +6,14 @@ fonttosfnt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cherry"; version = "1.4"; src = fetchFromGitHub { owner = "turquoise-hexagon"; repo = "cherry"; - tag = version; + tag = finalAttrs.version; sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ch/chess-clock/package.nix b/pkgs/by-name/ch/chess-clock/package.nix index 353a94422c17..875b0af184e3 100644 --- a/pkgs/by-name/ch/chess-clock/package.nix +++ b/pkgs/by-name/ch/chess-clock/package.nix @@ -15,7 +15,7 @@ wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chess-clock"; version = "0.6.1"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "chess-clock"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-XDOCHFZC3s3b/4kD1ZkhWar3kozW3vXc0pk7O6oQfiE="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { mainProgram = "chess-clock"; teams = [ lib.teams.gnome-circle ]; }; -} +}) diff --git a/pkgs/by-name/ch/chessdb/package.nix b/pkgs/by-name/ch/chessdb/package.nix index 987906795e40..4c117dc62236 100644 --- a/pkgs/by-name/ch/chessdb/package.nix +++ b/pkgs/by-name/ch/chessdb/package.nix @@ -8,12 +8,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chessdb"; version = "3.6.19-beta-1"; src = fetchurl { - url = "mirror://sourceforge/chessdb/ChessDB-${version}.tar.gz"; + url = "mirror://sourceforge/chessdb/ChessDB-${finalAttrs.version}.tar.gz"; sha256 = "0brc3wln3bxp979iqj2w1zxpfd0pch8zzazhdmwf7acww4hrsz62"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { description = "Free chess database"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ch/chez-matchable/package.nix b/pkgs/by-name/ch/chez-matchable/package.nix index 88288690db47..5242c7bdef90 100644 --- a/pkgs/by-name/ch/chez-matchable/package.nix +++ b/pkgs/by-name/ch/chez-matchable/package.nix @@ -5,7 +5,7 @@ chez, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chez-matchable"; # nixpkgs-update: no auto update version = "0.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fedeinthemix"; repo = "chez-matchable"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-UYoT8Kp1FTfiL22ntrFXFcAB1HGVrJ6p9JgvhUKi+Yo="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { license = lib.licenses.publicDomain; }; -} +}) diff --git a/pkgs/by-name/ch/chez-srfi/package.nix b/pkgs/by-name/ch/chez-srfi/package.nix index 1079950de668..72b043217690 100644 --- a/pkgs/by-name/ch/chez-srfi/package.nix +++ b/pkgs/by-name/ch/chez-srfi/package.nix @@ -5,14 +5,14 @@ chez, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chez-srfi"; version = "1.1"; src = fetchFromGitHub { owner = "fedeinthemix"; repo = "chez-srfi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-yBhRNfoEt1LOn3/zd/yOWwfErN/qG/tQZnDRqEf8j/0="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.x11; }; -} +}) diff --git a/pkgs/by-name/ch/chibi/package.nix b/pkgs/by-name/ch/chibi/package.nix index 309d16af8e50..49018564bc39 100644 --- a/pkgs/by-name/ch/chibi/package.nix +++ b/pkgs/by-name/ch/chibi/package.nix @@ -5,14 +5,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.11"; pname = "chibi-scheme"; src = fetchFromGitHub { owner = "ashinn"; repo = "chibi-scheme"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-i+xiaYwM7a+0T824VSuh7UUNI6HV9KpqzQPE1WAZ+As="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { DerGuteMoritz ]; }; -} +}) diff --git a/pkgs/by-name/ch/cholmod-extra/package.nix b/pkgs/by-name/ch/cholmod-extra/package.nix index 25594400d56a..5426acb9b724 100644 --- a/pkgs/by-name/ch/cholmod-extra/package.nix +++ b/pkgs/by-name/ch/cholmod-extra/package.nix @@ -7,14 +7,14 @@ blas, lapack, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cholmod-extra"; version = "1.2.0"; src = fetchFromGitHub { repo = "cholmod-extra"; owner = "jluttine"; - tag = version; + tag = finalAttrs.version; sha256 = "0hz1lfp0zaarvl0dv0zgp337hyd8np41kmdpz5rr3fc6yzw7vmkg"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/ch/chrome-export/package.nix b/pkgs/by-name/ch/chrome-export/package.nix index 92dc04c14bba..0228861b2edf 100644 --- a/pkgs/by-name/ch/chrome-export/package.nix +++ b/pkgs/by-name/ch/chrome-export/package.nix @@ -5,14 +5,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chrome-export"; version = "2.0.2"; src = fetchFromGitHub { owner = "bdesham"; repo = "chrome-export"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0p1914wfjggjavw7a0dh2nb7z97z3wrkwrpwxkdc2pj5w5lv405m"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bdesham ]; platforms = python3.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/ch/chrpath/package.nix b/pkgs/by-name/ch/chrpath/package.nix index 51007a25d2e9..c595c1fce4e5 100644 --- a/pkgs/by-name/ch/chrpath/package.nix +++ b/pkgs/by-name/ch/chrpath/package.nix @@ -5,12 +5,12 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chrpath"; version = "0.18"; src = fetchurl { - url = "https://codeberg.org/pere/chrpath/archive/release-${version}.tar.gz"; + url = "https://codeberg.org/pere/chrpath/archive/release-${finalAttrs.version}.tar.gz"; hash = "sha256-8JxJ8GGGYMoR/G2VgN3ekExyJNTG0Pby0fm83JECyao="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/ch/chunksync/package.nix b/pkgs/by-name/ch/chunksync/package.nix index be6909a7e9d5..179619c35068 100644 --- a/pkgs/by-name/ch/chunksync/package.nix +++ b/pkgs/by-name/ch/chunksync/package.nix @@ -6,12 +6,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.4"; pname = "chunksync"; src = fetchurl { - url = "https://chunksync.florz.de/chunksync_${version}.tar.gz"; + url = "https://chunksync.florz.de/chunksync_${finalAttrs.version}.tar.gz"; sha256 = "1gwqp1kjwhcmwhynilakhzpzgc0c6kk8c9vkpi30gwwrwpz3cf00"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [ yayayayaka ]; }; -} +}) diff --git a/pkgs/by-name/ci/ciao/package.nix b/pkgs/by-name/ci/ciao/package.nix index 80f6ed061d60..f65f9c758114 100644 --- a/pkgs/by-name/ci/ciao/package.nix +++ b/pkgs/by-name/ci/ciao/package.nix @@ -4,13 +4,13 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ciao"; version = "1.25.0-m1"; src = fetchFromGitHub { owner = "ciao-lang"; repo = "ciao"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-jsHz50+R/bs19ees3kKYalYk72ET9eSAAUY7QogI0go="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/ciao.x86_64-darwin }; -} +}) diff --git a/pkgs/by-name/ci/ciftilib/package.nix b/pkgs/by-name/ci/ciftilib/package.nix index a45f77f23cc5..0e1497f396a4 100644 --- a/pkgs/by-name/ci/ciftilib/package.nix +++ b/pkgs/by-name/ci/ciftilib/package.nix @@ -9,14 +9,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ciftilib"; version = "1.6.0"; src = fetchFromGitHub { owner = "Washington-University"; repo = "CiftiLib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xc2dpMse4SozYEV/w3rXCrh1LKpTThq5nHB2y5uAD0A="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { broken = stdenv.hostPlatform.isDarwin; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix index 9cb9a33c8ad6..fc64851c586c 100644 --- a/pkgs/by-name/ci/cinnamon-control-center/package.nix +++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix @@ -28,14 +28,14 @@ upower, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cinnamon-control-center"; version = "6.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-control-center"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TjTwtTFbiC4A4qe9TIyZJtGrSymujhEgM8SpZQ92RZA="; }; @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix index 749f38a0d900..03394b5953ee 100644 --- a/pkgs/by-name/ci/cinnamon-desktop/package.nix +++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix @@ -21,14 +21,14 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cinnamon-desktop"; version = "6.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-desktop"; - tag = version; + tag = finalAttrs.version; hash = "sha256-AcUJ9anKuvUAJKaQVHbkYShmrlSHG35gV/NIkPgJojk="; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/ci/cinnamon-menus/package.nix b/pkgs/by-name/ci/cinnamon-menus/package.nix index f6cbfb50d737..9900ff162e47 100644 --- a/pkgs/by-name/ci/cinnamon-menus/package.nix +++ b/pkgs/by-name/ci/cinnamon-menus/package.nix @@ -10,14 +10,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cinnamon-menus"; version = "6.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-menus"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vjgWPFNmRkJWynimvBuxCxLK5C7tQxqJ5Y4dkZXSDSA="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix index f4d8d0e7d83b..d2a6b5d5aad5 100644 --- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix +++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix @@ -29,14 +29,14 @@ iso-flags-png-320x240, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cinnamon-screensaver"; version = "6.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-screensaver"; - tag = version; + tag = finalAttrs.version; hash = "sha256-NK33cIrcTicLs59eJ550FghjuWS93yD642ObAS55Dtk="; }; @@ -116,4 +116,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix index 6167b605a5a7..39981d043e10 100644 --- a/pkgs/by-name/ci/cinnamon-session/package.nix +++ b/pkgs/by-name/ci/cinnamon-session/package.nix @@ -37,14 +37,14 @@ let ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cinnamon-session"; version = "6.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-session"; - tag = version; + tag = finalAttrs.version; hash = "sha256-zPfyPBKN9Qqs2UndW0vYzBqmeFla3ytvdcv/X2dv1zs="; }; @@ -108,4 +108,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/ci/cinnamon-translations/package.nix b/pkgs/by-name/ci/cinnamon-translations/package.nix index cdf4d74b03df..5d77a779ec66 100644 --- a/pkgs/by-name/ci/cinnamon-translations/package.nix +++ b/pkgs/by-name/ci/cinnamon-translations/package.nix @@ -5,14 +5,14 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cinnamon-translations"; version = "6.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-translations"; - tag = version; + tag = finalAttrs.version; hash = "sha256-DHwW9YrQFNtTvY4/QMBVLQ2idyuknacZvoMIMiHFsU4="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/ci/ciopfs/package.nix b/pkgs/by-name/ci/ciopfs/package.nix index b2f0c62fc109..7f504e09813b 100644 --- a/pkgs/by-name/ci/ciopfs/package.nix +++ b/pkgs/by-name/ci/ciopfs/package.nix @@ -8,12 +8,12 @@ attr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ciopfs"; version = "0.4"; src = fetchurl { - url = "http://www.brain-dump.org/projects/ciopfs/ciopfs-${version}.tar.gz"; + url = "http://www.brain-dump.org/projects/ciopfs/ciopfs-${finalAttrs.version}.tar.gz"; sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ci/cipher/package.nix b/pkgs/by-name/ci/cipher/package.nix index 13c80ea8dda8..cda00d8dd58c 100644 --- a/pkgs/by-name/ci/cipher/package.nix +++ b/pkgs/by-name/ci/cipher/package.nix @@ -16,14 +16,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cipher"; version = "2.5.0"; src = fetchFromGitHub { owner = "arshubham"; repo = "cipher"; - tag = version; + tag = finalAttrs.version; sha256 = "00azc5ck17zkdypfza6x1viknwhimd9fqgk2ybff3mx6aphmla7a"; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; mainProgram = "com.github.arshubham.cipher"; }; -} +}) diff --git a/pkgs/by-name/cj/cjose/package.nix b/pkgs/by-name/cj/cjose/package.nix index 38f042660a37..59ceae11a2de 100644 --- a/pkgs/by-name/cj/cjose/package.nix +++ b/pkgs/by-name/cj/cjose/package.nix @@ -11,14 +11,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cjose"; version = "0.6.2.2"; src = fetchFromGitHub { owner = "zmartzone"; repo = "cjose"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-vDvCxMpgCdteGvNxy2HCNRaxbhxOuTadL0nM2wkFHtk="; }; @@ -48,10 +48,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/zmartzone/cjose"; - changelog = "https://github.com/zmartzone/cjose/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/zmartzone/cjose/blob/${finalAttrs.version}/CHANGELOG.md"; description = "C library for Javascript Object Signing and Encryption. This is a maintained fork of the original project"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ midchildan ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cj/cjson/package.nix b/pkgs/by-name/cj/cjson/package.nix index 3c650787f2c6..e9bb7894f2b8 100644 --- a/pkgs/by-name/cj/cjson/package.nix +++ b/pkgs/by-name/cj/cjson/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cjson"; version = "1.7.19"; src = fetchFromGitHub { owner = "DaveGamble"; repo = "cJSON"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-WjgzokT9aHJ7dB40BtmhS7ur1slTuXmemgDimZHLVQM="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.matthiasbeyer ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ck/ckbcomp/package.nix b/pkgs/by-name/ck/ckbcomp/package.nix index 4b3b57270f4c..c62a20fa3f5d 100644 --- a/pkgs/by-name/ck/ckbcomp/package.nix +++ b/pkgs/by-name/ck/ckbcomp/package.nix @@ -6,7 +6,7 @@ xkeyboard_config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ckbcomp"; version = "1.242"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-5PV1Mbg7ZGQsotwnBVz8DI77Y8ULCnoTANqBLlP3YrE="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "ckbcomp"; }; -} +}) diff --git a/pkgs/by-name/ck/cksfv/package.nix b/pkgs/by-name/ck/cksfv/package.nix index 5cfb5738934e..5b8010c894da 100644 --- a/pkgs/by-name/ck/cksfv/package.nix +++ b/pkgs/by-name/ck/cksfv/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cksfv"; version = "1.3.15"; src = fetchurl { - url = "https://zakalwe.fi/~shd/foss/cksfv/files/cksfv-${version}.tar.bz2"; + url = "https://zakalwe.fi/~shd/foss/cksfv/files/cksfv-${finalAttrs.version}.tar.bz2"; sha256 = "0k06aq94cn5xp4knjw0p7gz06hzh622ql2xvnrlr3q8rcmdvwwx1"; }; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "cksfv"; }; -} +}) diff --git a/pkgs/by-name/cl/cl-launch/package.nix b/pkgs/by-name/cl/cl-launch/package.nix index 3f08e828e7b5..a43b56dac306 100644 --- a/pkgs/by-name/cl/cl-launch/package.nix +++ b/pkgs/by-name/cl/cl-launch/package.nix @@ -3,12 +3,12 @@ stdenv, fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cl-launch"; version = "4.1.4.1"; src = fetchurl { - url = "http://common-lisp.net/project/xcvb/cl-launch/cl-launch-${version}.tar.gz"; + url = "http://common-lisp.net/project/xcvb/cl-launch/cl-launch-${finalAttrs.version}.tar.gz"; sha256 = "sha256-v5aURs2Verhn2HmGiijvY9br20OTPFrOGBWsb6cHhSQ="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cl/classads/package.nix b/pkgs/by-name/cl/classads/package.nix index 7902c5672cf4..9e15be4e8591 100644 --- a/pkgs/by-name/cl/classads/package.nix +++ b/pkgs/by-name/cl/classads/package.nix @@ -6,12 +6,12 @@ pcre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "classads"; version = "1.0.10"; src = fetchurl { - url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz"; + url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${finalAttrs.version}.tar.gz"; sha256 = "1czgj53gnfkq3ncwlsrwnr4y91wgz35sbicgkp4npfrajqizxqnd"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cl/claws-mail/package.nix b/pkgs/by-name/cl/claws-mail/package.nix index dcd0e50bf22f..9f67995955e5 100644 --- a/pkgs/by-name/cl/claws-mail/package.nix +++ b/pkgs/by-name/cl/claws-mail/package.nix @@ -273,12 +273,12 @@ let } ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "claws-mail"; version = "4.3.1"; src = fetchurl { - url = "https://claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; + url = "https://claws-mail.org/download.php?file=releases/claws-mail-${finalAttrs.version}.tar.xz"; hash = "sha256-2K3yEMdnq1glLfxas8aeYD1//bcoGh4zQNLYYGL0aKY="; }; @@ -295,12 +295,12 @@ stdenv.mkDerivation rec { # autotools check tries to dlopen libpython as a requirement for the python plugin export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python3}/lib # generate version without .git - [ -e version ] || echo "echo ${version}" > version + [ -e version ] || echo "echo ${finalAttrs.version}" > version ''; postPatch = '' substituteInPlace configure.ac \ - --replace 'm4_esyscmd([./get-git-version])' '${version}' + --replace 'm4_esyscmd([./get-git-version])' '${finalAttrs.version}' substituteInPlace src/procmime.c \ --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; @@ -355,4 +355,4 @@ stdenv.mkDerivation rec { ajs124 ]; }; -} +}) diff --git a/pkgs/by-name/cl/clblast/package.nix b/pkgs/by-name/cl/clblast/package.nix index 42825af00cda..49169200e764 100644 --- a/pkgs/by-name/cl/clblast/package.nix +++ b/pkgs/by-name/cl/clblast/package.nix @@ -9,14 +9,14 @@ ocl-icd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clblast"; version = "1.6.3"; src = fetchFromGitHub { owner = "CNugteren"; repo = "CLBlast"; - rev = version; + rev = finalAttrs.version; hash = "sha256-fzenYFCAQ0B2NQgh5OaErv/yNEzjznB6ogRapqfL6P4="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ Tungsten842 ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/cl/clboss/package.nix b/pkgs/by-name/cl/clboss/package.nix index 1f12b714b060..f998d8f2c6d5 100644 --- a/pkgs/by-name/cl/clboss/package.nix +++ b/pkgs/by-name/cl/clboss/package.nix @@ -11,13 +11,13 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clboss"; version = "0.15.1"; # The release tarball includes the pre-generated file `commit_hash.h` that is required for building src = fetchzip { - url = "https://github.com/ZmnSCPxj/clboss/releases/download/v${version}/clboss-v${version}.tar.gz"; + url = "https://github.com/ZmnSCPxj/clboss/releases/download/v${finalAttrs.version}/clboss-v${finalAttrs.version}.tar.gz"; hash = "sha256-9wrgJzXVBKGSNB2UbP+CnUmaRwdXgRAnHBZbvm/Am7Q="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "clboss"; }; -} +}) diff --git a/pkgs/by-name/cl/clearlooks-phenix/package.nix b/pkgs/by-name/cl/clearlooks-phenix/package.nix index f46008f892d6..2b5a1b576773 100644 --- a/pkgs/by-name/cl/clearlooks-phenix/package.nix +++ b/pkgs/by-name/cl/clearlooks-phenix/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "7.1"; pname = "clearlooks-phenix"; src = fetchzip { - url = "https://github.com/jpfleury/clearlooks-phenix/archive/${version}.tar.gz"; + url = "https://github.com/jpfleury/clearlooks-phenix/archive/${finalAttrs.version}.tar.gz"; sha256 = "sha256-UJgKPoNcpBkIxITAIn3INsANJn/hD8l9NCr/entbZx8="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.prikhi ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/cl/clearlyU/package.nix b/pkgs/by-name/cl/clearlyU/package.nix index 7198b1393830..5d7424dd294e 100644 --- a/pkgs/by-name/cl/clearlyU/package.nix +++ b/pkgs/by-name/cl/clearlyU/package.nix @@ -7,12 +7,12 @@ libfaketime, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clearlyU"; version = "12-1.9"; src = fetchurl { - url = "https://www.math.nmsu.edu/~mleisher/Software/cu/cu${version}.tgz"; + url = "https://www.math.nmsu.edu/~mleisher/Software/cu/cu${finalAttrs.version}.tgz"; sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.raskin ]; }; -} +}) diff --git a/pkgs/by-name/cl/clex/package.nix b/pkgs/by-name/cl/clex/package.nix index 45baf3c9ad4b..376d1baeecbb 100644 --- a/pkgs/by-name/cl/clex/package.nix +++ b/pkgs/by-name/cl/clex/package.nix @@ -5,12 +5,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clex"; version = "4.7"; src = fetchurl { - url = "https://github.com/xitop/clex/releases/download/v${version}/clex-${version}.tar.gz"; + url = "https://github.com/xitop/clex/releases/download/v${finalAttrs.version}/clex-${finalAttrs.version}.tar.gz"; hash = "sha256-3Y3ayJEy9pHLTUSeXYeekTVdopwKLZ8vVcVarLIFnpM="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/cl/clfft/package.nix b/pkgs/by-name/cl/clfft/package.nix index 9df79dc4638a..b3d55f41e5c0 100644 --- a/pkgs/by-name/cl/clfft/package.nix +++ b/pkgs/by-name/cl/clfft/package.nix @@ -13,18 +13,18 @@ let stdenv = gccStdenv; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clfft"; version = "2.12.2"; src = fetchFromGitHub { owner = "clMathLibraries"; repo = "clFFT"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-yp7u6qhpPYQpBw3d+VLg0GgMyZONVII8BsBCEoRZm4w="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' sed -i '/-m64/d;/-m32/d' CMakeLists.txt @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ chessai ]; }; -} +}) diff --git a/pkgs/by-name/cl/clhep/package.nix b/pkgs/by-name/cl/clhep/package.nix index c93d000e2df1..cc36efb40a82 100644 --- a/pkgs/by-name/cl/clhep/package.nix +++ b/pkgs/by-name/cl/clhep/package.nix @@ -5,12 +5,12 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clhep"; version = "2.4.7.1"; src = fetchurl { - url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; + url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${finalAttrs.version}.tgz"; hash = "sha256-HIMEp3cqxrmRlfEwA3jG4930rQfIXWSgRQVlKruKVfk="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cl/clib/package.nix b/pkgs/by-name/cl/clib/package.nix index 666a5d7275e4..cba265393440 100644 --- a/pkgs/by-name/cl/clib/package.nix +++ b/pkgs/by-name/cl/clib/package.nix @@ -5,12 +5,12 @@ curl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.8.7"; pname = "clib"; src = fetchFromGitHub { - rev = version; + rev = finalAttrs.version; owner = "clibs"; repo = "clib"; sha256 = "sha256-uL8prMk2DrYLjCmZW8DdbCg5FJ5uksT3vIATyOW2ZzY="; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jb55 ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cl/clickclack/package.nix b/pkgs/by-name/cl/clickclack/package.nix index 368af05775a1..3eeda9b090e9 100644 --- a/pkgs/by-name/cl/clickclack/package.nix +++ b/pkgs/by-name/cl/clickclack/package.nix @@ -5,14 +5,14 @@ SDL2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clickclack"; version = "0.2.3"; src = fetchFromSourcehut { owner = "~proycon"; repo = "clickclack"; - rev = version; + rev = finalAttrs.version; hash = "sha256-YmlbGEmZgT/30c+mWQzdz4rKc69d75zhoNUA5FdxdMc="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dotlambda ]; mainProgram = "clickclack"; }; -} +}) diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix index d7d3e9256f2c..2ad63012eca3 100644 --- a/pkgs/by-name/cl/clightning/package.nix +++ b/pkgs/by-name/cl/clightning/package.nix @@ -27,12 +27,12 @@ let p.mako ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clightning"; version = "25.12.1"; src = fetchurl { - url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; + url = "https://github.com/ElementsProject/lightning/releases/download/v${finalAttrs.version}/clightning-v${finalAttrs.version}.zip"; hash = "sha256-50rcNH9dXeRezJ3nEW/cRK5uE+IpGoHAzkU3C7p44KY="; }; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-valgrind" ]; - makeFlags = [ "VERSION=v${version}" ]; + makeFlags = [ "VERSION=v${finalAttrs.version}" ]; enableParallelBuilding = true; @@ -112,4 +112,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/cl/clinfo/package.nix b/pkgs/by-name/cl/clinfo/package.nix index 92dbaa9912ba..93e26b017066 100644 --- a/pkgs/by-name/cl/clinfo/package.nix +++ b/pkgs/by-name/cl/clinfo/package.nix @@ -6,14 +6,14 @@ opencl-headers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clinfo"; version = "3.0.25.02.14"; src = fetchFromGitHub { owner = "Oblomov"; repo = "clinfo"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-UkkrRpmY5vZtTeEqPNYfxAGaJDoTSrNUG9N1Bknozow="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "clinfo"; }; -} +}) diff --git a/pkgs/by-name/cl/clipboard-jh/package.nix b/pkgs/by-name/cl/clipboard-jh/package.nix index e3bd85271cc6..1237eb9139ac 100644 --- a/pkgs/by-name/cl/clipboard-jh/package.nix +++ b/pkgs/by-name/cl/clipboard-jh/package.nix @@ -14,14 +14,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clipboard-jh"; version = "0.10.0"; src = fetchFromGitHub { owner = "Slackadays"; repo = "clipboard"; - rev = version; + rev = finalAttrs.version; hash = "sha256-3SloqijgbX3XIwdO2VBOd61or7tnByi7w45dCBKTkm8="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "cb"; }; -} +}) diff --git a/pkgs/by-name/cl/clipp/package.nix b/pkgs/by-name/cl/clipp/package.nix index 9ace3f390b67..1e948343155c 100644 --- a/pkgs/by-name/cl/clipp/package.nix +++ b/pkgs/by-name/cl/clipp/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clipp"; version = "1.2.3"; src = fetchFromGitHub { owner = "muellan"; repo = "clipp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0rq80ba2krwzvcg4r2g1al88453c7lz6ziri2s1ygv8inp9r775s"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ xbreak ]; platforms = with lib.platforms; all; }; -} +}) diff --git a/pkgs/by-name/cl/clipper/package.nix b/pkgs/by-name/cl/clipper/package.nix index cf660f30fc86..0e08cbfc4ac0 100644 --- a/pkgs/by-name/cl/clipper/package.nix +++ b/pkgs/by-name/cl/clipper/package.nix @@ -7,11 +7,11 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "6.4.2"; pname = "Clipper"; src = fetchurl { - url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip"; + url = "mirror://sourceforge/polyclipping/clipper_ver${finalAttrs.version}.zip"; sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ mpickering ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/cl/clipper2/package.nix b/pkgs/by-name/cl/clipper2/package.nix index febf7b4a8a28..c250a2e55fa5 100644 --- a/pkgs/by-name/cl/clipper2/package.nix +++ b/pkgs/by-name/cl/clipper2/package.nix @@ -6,18 +6,18 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clipper2"; version = "1.5.4"; src = fetchFromGitHub { owner = "AngusJohnson"; repo = "Clipper2"; - rev = "Clipper2_${version}"; + rev = "Clipper2_${finalAttrs.version}"; hash = "sha256-2vZXxT5hISz2xbWbvYNGTrq9QovTjNwUK103iVtz8ok="; }; - sourceRoot = "${src.name}/CPP"; + sourceRoot = "${finalAttrs.src.name}/CPP"; nativeBuildInputs = [ cmake @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.cadkin ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cl/cliqr/package.nix b/pkgs/by-name/cl/cliqr/package.nix index 1d9fddf98708..318aec371df3 100644 --- a/pkgs/by-name/cl/cliqr/package.nix +++ b/pkgs/by-name/cl/cliqr/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "cliqr"; - version = "0.1.30"; + version = "0.1.31"; src = fetchFromGitHub { owner = "paepckehh"; repo = "cliqr"; tag = "v${finalAttrs.version}"; - hash = "sha256-+HP7RDh/8gIsHAO1adtClKZbBg70LSxvf88aS0hFBJs="; + hash = "sha256-AEUtPmLzNDsO39zRah1ln077w1S6ldsV8SsKStfQOlI="; }; vendorHash = null; diff --git a/pkgs/by-name/cl/cliquer/package.nix b/pkgs/by-name/cl/cliquer/package.nix index 6cb0e3bbc78a..90be31a3b072 100644 --- a/pkgs/by-name/cl/cliquer/package.nix +++ b/pkgs/by-name/cl/cliquer/package.nix @@ -6,7 +6,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.23"; pname = "cliquer"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "dimpase"; repo = "autocliquer"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-SGpur3sF1dYQU97wprERUqlr6LIX+NyXZVl0eSEd3uM="; }; @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { easy to use. ''; homepage = "https://users.aalto.fi/~pat/cliquer.html"; - downloadPage = src.meta.homepage; # autocliquer + downloadPage = finalAttrs.src.meta.homepage; # autocliquer license = lib.licenses.gpl2Plus; teams = [ lib.teams.sage ]; mainProgram = "cl"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cl/clolcat/package.nix b/pkgs/by-name/cl/clolcat/package.nix index da60ef80ff9e..66b58534fb3e 100644 --- a/pkgs/by-name/cl/clolcat/package.nix +++ b/pkgs/by-name/cl/clolcat/package.nix @@ -4,14 +4,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clolcat"; version = "1.1"; src = fetchFromGitHub { owner = "IchMageBaume"; repo = "clolcat"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-fLa239dwEXe4Jyy5ntgfU9V0h5wrBsvq6/s2HCis7Sc="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { license = lib.licenses.wtfpl; mainProgram = "clolcat"; }; -} +}) diff --git a/pkgs/by-name/cl/clooj/package.nix b/pkgs/by-name/cl/clooj/package.nix index d723a12be424..3435c7b4aae6 100644 --- a/pkgs/by-name/cl/clooj/package.nix +++ b/pkgs/by-name/cl/clooj/package.nix @@ -6,13 +6,13 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clooj"; version = "0.4.4"; jar = fetchurl { # mirrored as original mediafire.com source does not work without user interaction - url = "https://archive.org/download/clooj-${version}-standalone/clooj-${version}-standalone.jar"; + url = "https://archive.org/download/clooj-${finalAttrs.version}-standalone/clooj-${finalAttrs.version}-standalone.jar"; sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cl/closurecompiler/package.nix b/pkgs/by-name/cl/closurecompiler/package.nix index 1b3945f6b2ba..4123d2a06020 100644 --- a/pkgs/by-name/cl/closurecompiler/package.nix +++ b/pkgs/by-name/cl/closurecompiler/package.nix @@ -6,12 +6,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "closure-compiler"; version = "20250820"; src = fetchurl { - url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; + url = "mirror://maven/com/google/javascript/closure-compiler/v${finalAttrs.version}/closure-compiler-v${finalAttrs.version}.jar"; sha256 = "sha256-Fx0kNU/+fc03j+Tfsw5Gc4WTkfTaEacLoE/awN1NgtI="; }; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/java $out/bin - cp ${src} $out/share/java/closure-compiler-v${version}.jar + cp ${finalAttrs.src} $out/share/java/closure-compiler-v${finalAttrs.version}.jar makeWrapper ${jre}/bin/java $out/bin/closure-compiler \ - --add-flags "-jar $out/share/java/closure-compiler-v${version}.jar" + --add-flags "-jar $out/share/java/closure-compiler-v${finalAttrs.version}.jar" ''; meta = { @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cl/cloud-utils/package.nix b/pkgs/by-name/cl/cloud-utils/package.nix index bf63afe7147b..73c98d600722 100644 --- a/pkgs/by-name/cl/cloud-utils/package.nix +++ b/pkgs/by-name/cl/cloud-utils/package.nix @@ -31,7 +31,7 @@ let cdrkit ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { # NOTICE: if you bump this, make sure to run # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops # growpart is needed in initrd in nixos/system/boot/grow-partition.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "canonical"; repo = "cloud-utils"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YqfkmYclPZu6Mc2bFYxtiuH7uvfa3V4YlD0aHuKn1hw="; }; nativeBuildInputs = [ makeWrapper ]; @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/cl/cloudcompare/package.nix b/pkgs/by-name/cl/cloudcompare/package.nix index 0b1db7e3a7d1..799c9cb7e8c7 100644 --- a/pkgs/by-name/cl/cloudcompare/package.nix +++ b/pkgs/by-name/cl/cloudcompare/package.nix @@ -20,14 +20,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cloudcompare"; version = "2.13.2"; src = fetchFromGitHub { owner = "CloudCompare"; repo = "CloudCompare"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-a/0lf3Mt5ZpLFRM8jAoqZer8pY1ROgPRY4dPt34Bk3E="; fetchSubmodules = true; }; @@ -160,4 +160,4 @@ stdenv.mkDerivation rec { mainProgram = "CloudCompare"; platforms = with lib.platforms; linux; # only tested here; might work on others }; -} +}) diff --git a/pkgs/by-name/cl/clp/package.nix b/pkgs/by-name/cl/clp/package.nix index a3ca971e5c27..5f3c55fccdf8 100644 --- a/pkgs/by-name/cl/clp/package.nix +++ b/pkgs/by-name/cl/clp/package.nix @@ -8,13 +8,13 @@ osi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.17.10"; pname = "clp"; src = fetchFromGitHub { owner = "coin-or"; repo = "Clp"; - rev = "releases/${version}"; + rev = "releases/${finalAttrs.version}"; hash = "sha256-9IlBT6o1aHAaYw2/39XrUis72P9fesmG3B6i/e+v3mM="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.darwin ++ lib.platforms.linux; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/by-name/cl/clucene-core_2/package.nix b/pkgs/by-name/cl/clucene-core_2/package.nix index e3da56146fae..78ca99d327c7 100644 --- a/pkgs/by-name/cl/clucene-core_2/package.nix +++ b/pkgs/by-name/cl/clucene-core_2/package.nix @@ -8,12 +8,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clucene-core"; version = "2.3.3.4"; src = fetchurl { - url = "mirror://sourceforge/clucene/clucene-core-${version}.tar.gz"; + url = "mirror://sourceforge/clucene/clucene-core-${finalAttrs.version}.tar.gz"; sha256 = "1arffdwivig88kkx685pldr784njm0249k0rb1f1plwavlrw9zfx"; }; @@ -100,4 +100,4 @@ stdenv.mkDerivation rec { lgpl2 ]; }; -} +}) diff --git a/pkgs/by-name/cm/cm256cc/package.nix b/pkgs/by-name/cm/cm256cc/package.nix index 86c2f7b3eebd..3e427fd6d47d 100644 --- a/pkgs/by-name/cm/cm256cc/package.nix +++ b/pkgs/by-name/cm/cm256cc/package.nix @@ -6,14 +6,14 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cm256cc"; version = "1.1.2"; src = fetchFromGitHub { owner = "f4exb"; repo = "cm256cc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-sAbc8yieGolV8lowiwFBVsd1HNYl1oxJwIw1kc3iI3U="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { ]; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/cm/cmark-gfm/package.nix b/pkgs/by-name/cm/cmark-gfm/package.nix index 1ea91aaa9751..cd4bcdf6d800 100644 --- a/pkgs/by-name/cm/cmark-gfm/package.nix +++ b/pkgs/by-name/cm/cmark-gfm/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cmark-gfm"; version = "0.29.0.gfm.13"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-HiSGtRsSbW03R6aKoMVVFOLrwP5aXtpeXUC/bE5M/qo="; }; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { description = "GitHub's fork of cmark, a CommonMark parsing and rendering library and program in C"; mainProgram = "cmark-gfm"; homepage = "https://github.com/github/cmark-gfm"; - changelog = "https://github.com/github/cmark-gfm/raw/${version}/changelog.txt"; + changelog = "https://github.com/github/cmark-gfm/raw/${finalAttrs.version}/changelog.txt"; maintainers = with lib.maintainers; [ cyplo ]; platforms = lib.platforms.unix; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/by-name/cm/cmdstan/package.nix b/pkgs/by-name/cm/cmdstan/package.nix index 6d5f39f3f654..87d0feed6a6a 100644 --- a/pkgs/by-name/cm/cmdstan/package.nix +++ b/pkgs/by-name/cm/cmdstan/package.nix @@ -10,14 +10,14 @@ cmdstan, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cmdstan"; version = "2.37.0"; src = fetchFromGitHub { owner = "stan-dev"; repo = "cmdstan"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-bKkzzFkMF8+Ufz/EdKLJdB290Fvc2t8b47xB8oPz/sk="; }; @@ -94,4 +94,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cm/cmrt/package.nix b/pkgs/by-name/cm/cmrt/package.nix index 6720317abb1c..052afa01740e 100644 --- a/pkgs/by-name/cm/cmrt/package.nix +++ b/pkgs/by-name/cm/cmrt/package.nix @@ -8,14 +8,14 @@ libva, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cmrt"; version = "1.0.6"; src = fetchFromGitHub { owner = "intel"; repo = "cmrt"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-W6MQI41J9CKeM1eILCkvmW34cbCC8YeEF2mE+Ci8o7s="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ tadfisher ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/cm/cmt/package.nix b/pkgs/by-name/cm/cmt/package.nix index 3066e0e4921e..adaf0b2950ca 100644 --- a/pkgs/by-name/cm/cmt/package.nix +++ b/pkgs/by-name/cm/cmt/package.nix @@ -5,12 +5,12 @@ ladspaH, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cmt"; version = "1.18"; src = fetchurl { - url = "http://www.ladspa.org/download/cmt_${version}.tgz"; + url = "http://www.ladspa.org/download/cmt_${finalAttrs.version}.tgz"; sha256 = "sha256-qC+GNt4fSto4ahmaAXqc13Wkm0nnFrEejdP3I8k99so="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ sjfloat ]; }; -} +}) diff --git a/pkgs/by-name/cm/cmus/package.nix b/pkgs/by-name/cm/cmus/package.nix index 7e73d01a2cd5..410f3aa35469 100644 --- a/pkgs/by-name/cm/cmus/package.nix +++ b/pkgs/by-name/cm/cmus/package.nix @@ -135,14 +135,14 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cmus"; version = "2.12.0"; src = fetchFromGitHub { owner = "cmus"; repo = "cmus"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-8hgibGtkiwzenMI9YImIApRmw2EzTwE6RhglALpUkp4="; }; @@ -172,4 +172,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ oxij ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/cm/cmusfm/package.nix b/pkgs/by-name/cm/cmusfm/package.nix index 9e22a7d2d06e..56a0e284bfcc 100644 --- a/pkgs/by-name/cm/cmusfm/package.nix +++ b/pkgs/by-name/cm/cmusfm/package.nix @@ -11,14 +11,14 @@ debug ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cmusfm"; version = "0.5.0"; src = fetchFromGitHub { owner = "Arkq"; repo = "cmusfm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-CA585ZpkxMMLgzv81QB2kKMFg5R5CwKS9xAYrU+pAxs="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "cmusfm"; }; -} +}) diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index 8989e0347d04..4e8a271f62c4 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -4,37 +4,37 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "cnspec"; - version = "12.19.2"; + version = "12.20.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; - tag = "v${version}"; - hash = "sha256-tP3JtuiQJeLmN5YbRgUiuzCvtE690n3O2jHCWbxcBLE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tckUExRppqjpO2yS4J/+8w8SE4b6zKWjFY6xlpVFcKE="; }; proxyVendor = true; - vendorHash = "sha256-AyhnFjUzbT54JhmUEX045EiTCLuMTqXiA/ofl7HpJQM="; + vendorHash = "sha256-z6Y4d76TaormYbtstm1uytfXGfoHQ+9/6bw6uyRYsP8="; subPackages = [ "apps/cnspec" ]; ldflags = [ "-s" "-w" - "-X=go.mondoo.com/cnspec.Version=${version}" + "-X=go.mondoo.com/cnspec.Version=${finalAttrs.version}" ]; meta = { description = "Open source, cloud-native security and policy project"; homepage = "https://github.com/mondoohq/cnspec"; - changelog = "https://github.com/mondoohq/cnspec/releases/tag/v${version}"; + changelog = "https://github.com/mondoohq/cnspec/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsl11; maintainers = with lib.maintainers; [ fab mariuskimmina ]; }; -} +}) diff --git a/pkgs/by-name/co/coin-utils/package.nix b/pkgs/by-name/co/coin-utils/package.nix index 97ce0ba699ed..9dc46b2da028 100644 --- a/pkgs/by-name/co/coin-utils/package.nix +++ b/pkgs/by-name/co/coin-utils/package.nix @@ -5,14 +5,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.11.10"; pname = "coinutils"; src = fetchFromGitHub { owner = "coin-or"; repo = "CoinUtils"; - rev = "releases/${version}"; + rev = "releases/${finalAttrs.version}"; hash = "sha256-Rbm45HRbRKQ6Cdup+gvKJ1xkK1HKG3irR5AIjhLer7g="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { description = "Collection of classes and helper functions that are generally useful to multiple COIN-OR projects"; maintainers = with lib.maintainers; [ tmarkus ]; }; -} +}) diff --git a/pkgs/by-name/co/collapseos-cvm/package.nix b/pkgs/by-name/co/collapseos-cvm/package.nix index ce97d00ab9d2..48b519ff1e15 100644 --- a/pkgs/by-name/co/collapseos-cvm/package.nix +++ b/pkgs/by-name/co/collapseos-cvm/package.nix @@ -5,11 +5,11 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "collapseos-cvm"; version = "20220316"; src = fetchurl { - url = "http://collapseos.org/files/collapseos-${version}.tar.gz"; + url = "http://collapseos.org/files/collapseos-${finalAttrs.version}.tar.gz"; hash = "sha256-8bt6wj93T82K9fqtuC/mctkMCzfvW0taxv6QAKeJb5g="; }; buildInputs = [ ncurses ]; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; mainProgram = "cos-serial"; }; -} +}) diff --git a/pkgs/by-name/co/colord-gtk/package.nix b/pkgs/by-name/co/colord-gtk/package.nix index ce1ae366d4eb..34ada9509bf6 100644 --- a/pkgs/by-name/co/colord-gtk/package.nix +++ b/pkgs/by-name/co/colord-gtk/package.nix @@ -20,7 +20,7 @@ lcms2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "colord-gtk"; version = "0.3.1"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://www.freedesktop.org/software/colord/releases/colord-gtk-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/colord/releases/colord-gtk-${finalAttrs.version}.tar.xz"; sha256 = "wXa4ibdWMKF/Tj1+8kwJo+EjaOYzSWCHRZyLU6w6Ei0="; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "cd-convert"; }; -} +}) diff --git a/pkgs/by-name/co/colord/package.nix b/pkgs/by-name/co/colord/package.nix index 04a22087a26f..f3e60c1b6ec2 100644 --- a/pkgs/by-name/co/colord/package.nix +++ b/pkgs/by-name/co/colord/package.nix @@ -34,7 +34,7 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "colord"; version = "1.4.6"; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://www.freedesktop.org/software/colord/releases/colord-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/colord/releases/colord-${finalAttrs.version}.tar.xz"; sha256 = "dAdjGie/5dG2cueuQndwAcEF2GC3tzkig8jGMA3ojm8="; }; @@ -144,4 +144,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.freedesktop ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/colordiff/package.nix b/pkgs/by-name/co/colordiff/package.nix index 66d7183d1a1c..17def3b74ae0 100644 --- a/pkgs/by-name/co/colordiff/package.nix +++ b/pkgs/by-name/co/colordiff/package.nix @@ -10,14 +10,14 @@ diffutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "colordiff"; version = "1.0.22"; src = fetchFromGitHub { owner = "daveewart"; repo = "colordiff"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ZFxBY/QrKlRC7glEGWpB/79Jup0e4RCnS82Ct6lhK4Y="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "colordiff"; }; -} +}) diff --git a/pkgs/by-name/co/combinatorial_designs/package.nix b/pkgs/by-name/co/combinatorial_designs/package.nix index da6479f4dd65..8e26ae3b4f7d 100644 --- a/pkgs/by-name/co/combinatorial_designs/package.nix +++ b/pkgs/by-name/co/combinatorial_designs/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "combinatorial_designs"; version = "20140630"; src = fetchurl { - url = "mirror://sageupstream/combinatorial_designs/combinatorial_designs-${version}.tar.bz2"; + url = "mirror://sageupstream/combinatorial_designs/combinatorial_designs-${finalAttrs.version}.tar.bz2"; sha256 = "0bj8ngiq59hipa6izi6g5ph5akmy4cbk0vlsb0wa67f7grnnqj69"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; teams = [ lib.teams.sage ]; }; -} +}) diff --git a/pkgs/by-name/co/comical/package.nix b/pkgs/by-name/co/comical/package.nix index 5443b5231cfc..12b60ba5c3f9 100644 --- a/pkgs/by-name/co/comical/package.nix +++ b/pkgs/by-name/co/comical/package.nix @@ -7,12 +7,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "comical"; version = "0.8"; src = fetchurl { - url = "mirror://sourceforge/comical/comical-${version}.tar.gz"; + url = "mirror://sourceforge/comical/comical-${finalAttrs.version}.tar.gz"; hash = "sha256-C2UnzAayWpNwQfHrJI0P2IHPBVNiCXA2uTmBf3hauF4="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix; mainProgram = "comical"; }; -} +}) diff --git a/pkgs/by-name/co/common-licenses/package.nix b/pkgs/by-name/co/common-licenses/package.nix index f738d88cb129..53b819bcf086 100644 --- a/pkgs/by-name/co/common-licenses/package.nix +++ b/pkgs/by-name/co/common-licenses/package.nix @@ -4,12 +4,12 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "common-licenses"; version = "13"; src = fetchurl { - url = "http://deb.debian.org/debian/pool/main/b/base-files/base-files_${version}.tar.xz"; + url = "http://deb.debian.org/debian/pool/main/b/base-files/base-files_${finalAttrs.version}.tar.xz"; hash = "sha256-Q5FTvfKWSBE1ywuAH+RnZdyD+LmRSgJ11qFiM53hL1Y="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.mkg20001 ]; }; -} +}) diff --git a/pkgs/by-name/co/commonsBcel/package.nix b/pkgs/by-name/co/commonsBcel/package.nix index 68f15b6bdd7b..9e6fae6adf90 100644 --- a/pkgs/by-name/co/commonsBcel/package.nix +++ b/pkgs/by-name/co/commonsBcel/package.nix @@ -4,19 +4,19 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "6.10.0"; pname = "commons-bcel"; src = fetchurl { - url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz"; + url = "mirror://apache/commons/bcel/binaries/bcel-${finalAttrs.version}-bin.tar.gz"; hash = "sha256-RRVXxPtwbT9AX92T60uDJpFWF6DiotcG1KvKrlFfEWU="; }; installPhase = '' - tar xf ${src} + tar xf ${finalAttrs.src} mkdir -p $out/share/java - cp bcel-${version}.jar $out/share/java/ + cp bcel-${finalAttrs.version}.jar $out/share/java/ ''; meta = { @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/co/commonsBsf/package.nix b/pkgs/by-name/co/commonsBsf/package.nix index 1050cca9c6ee..96cdd942da05 100644 --- a/pkgs/by-name/co/commonsBsf/package.nix +++ b/pkgs/by-name/co/commonsBsf/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "commons-bsf"; version = "2.4.0"; src = fetchurl { - url = "mirror://apache/commons/bsf/binaries/bsf-bin-${version}.tar.gz"; + url = "mirror://apache/commons/bsf/binaries/bsf-bin-${finalAttrs.version}.tar.gz"; sha256 = "1my3hv4y8cvrd1kr315wvbjqsamzlzswnbqcmsa2m4hqcafddfr8"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/co/commonsDaemon/package.nix b/pkgs/by-name/co/commonsDaemon/package.nix index 37208c10c6b2..f59e5da48daa 100644 --- a/pkgs/by-name/co/commonsDaemon/package.nix +++ b/pkgs/by-name/co/commonsDaemon/package.nix @@ -4,17 +4,17 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.4.1"; pname = "commons-daemon"; src = fetchurl { - url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; + url = "mirror://apache/commons/daemon/binaries/commons-daemon-${finalAttrs.version}-bin.tar.gz"; sha256 = "sha256-pfKrZ3duDz5wKTn3+SM+ye3UNN129VWCPOeI7JSuYts="; }; installPhase = '' - tar xf ${src} + tar xf ${finalAttrs.src} mkdir -p $out/share/java cp *.jar $out/share/java/ ''; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/co/commonsLogging/package.nix b/pkgs/by-name/co/commonsLogging/package.nix index e296d5ea0625..a1f5961e687f 100644 --- a/pkgs/by-name/co/commonsLogging/package.nix +++ b/pkgs/by-name/co/commonsLogging/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "commons-logging"; version = "1.3.5"; src = fetchurl { - url = "mirror://apache/commons/logging/binaries/commons-logging-${version}-bin.tar.gz"; + url = "mirror://apache/commons/logging/binaries/commons-logging-${finalAttrs.version}-bin.tar.gz"; sha256 = "sha256-4s/DfNYp/CXSIAtUAUHC2GReQrmlhpN8tRwvpHmB2G0="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/co/commonsMath/package.nix b/pkgs/by-name/co/commonsMath/package.nix index 6254ce20ce4d..a0a598d09fa2 100644 --- a/pkgs/by-name/co/commonsMath/package.nix +++ b/pkgs/by-name/co/commonsMath/package.nix @@ -4,17 +4,17 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.6.1"; pname = "commons-math"; src = fetchurl { - url = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz"; + url = "mirror://apache/commons/math/binaries/commons-math3-${finalAttrs.version}-bin.tar.gz"; sha256 = "0x4nx5pngv2n4ga11c1s4w2mf6cwydwkgs7da6wwvcjraw57bhkz"; }; installPhase = '' - tar xf ${src} + tar xf ${finalAttrs.src} mkdir -p $out/share/java cp *.jar $out/share/java/ ''; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/co/connect/package.nix b/pkgs/by-name/co/connect/package.nix index 3e1834c11e8c..c0c97c76f938 100644 --- a/pkgs/by-name/co/connect/package.nix +++ b/pkgs/by-name/co/connect/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "connect"; version = "1.105"; src = fetchurl { - url = "https://bitbucket.org/gotoh/connect/get/${version}.tar.bz2"; + url = "https://bitbucket.org/gotoh/connect/get/${finalAttrs.version}.tar.bz2"; sha256 = "00yld6yinc8s4xv3b8kbvzn2f4rja5dmp6ysv3n4847qn4k60dh7"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jcumming ]; mainProgram = "connect"; }; -} +}) diff --git a/pkgs/by-name/co/conserver/package.nix b/pkgs/by-name/co/conserver/package.nix index f9eb15eb04a4..51dc6f11f5de 100644 --- a/pkgs/by-name/co/conserver/package.nix +++ b/pkgs/by-name/co/conserver/package.nix @@ -16,14 +16,14 @@ udsSupport ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "conserver"; version = "8.2.7"; src = fetchFromGitHub { owner = "bstansell"; repo = "conserver"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-LiCknqitBoa8E8rNMVgp1004CwkW8G4O5XGKe4NfZI8="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ sarcasticadmin ]; }; -} +}) diff --git a/pkgs/by-name/co/console-bridge/package.nix b/pkgs/by-name/co/console-bridge/package.nix index 707ba47ca24d..8560fd9cc223 100644 --- a/pkgs/by-name/co/console-bridge/package.nix +++ b/pkgs/by-name/co/console-bridge/package.nix @@ -7,14 +7,14 @@ validatePkgConfig, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "console-bridge"; version = "1.0.2"; src = fetchFromGitHub { owner = "ros"; repo = "console_bridge"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-M3GocT0hodw3Sc2NHcFDiPVZ1XN7BqIUuYLW8OaXMqM="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lopsided98 ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/co/convbin/package.nix b/pkgs/by-name/co/convbin/package.nix index 57ee6f63c737..9846b9d9d775 100644 --- a/pkgs/by-name/co/convbin/package.nix +++ b/pkgs/by-name/co/convbin/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "convbin"; version = "5.1"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = "convbin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-k0hwBdjOweFoAE6jzhlRFZsMOVDDpi4R4LHA7SwO3os="; fetchSubmodules = true; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "convbin"; }; -} +}) diff --git a/pkgs/by-name/co/convimg/package.nix b/pkgs/by-name/co/convimg/package.nix index 087345f5f5e0..56af50db6f8f 100644 --- a/pkgs/by-name/co/convimg/package.nix +++ b/pkgs/by-name/co/convimg/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "convimg"; version = "9.4"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = "convimg"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5insJ391Usef8GF3Yh74PEqE534zitQg9udFRPcz69g="; fetchSubmodules = true; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "convimg"; }; -} +}) diff --git a/pkgs/by-name/co/cool-retro-term/package.nix b/pkgs/by-name/co/cool-retro-term/package.nix index 233b7674108a..11023013463c 100644 --- a/pkgs/by-name/co/cool-retro-term/package.nix +++ b/pkgs/by-name/co/cool-retro-term/package.nix @@ -6,14 +6,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.2.0"; pname = "cool-retro-term"; src = fetchFromGitHub { owner = "Swordfish90"; repo = "cool-retro-term"; - tag = version; + tag = finalAttrs.version; hash = "sha256-PewHLVmo+RTBHIQ/y2FBkgXsIvujYd7u56JdFC10B4c="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "cool-retro-term"; }; -} +}) diff --git a/pkgs/by-name/co/coq2html/package.nix b/pkgs/by-name/co/coq2html/package.nix index 2fe644068c64..28fce147c50a 100644 --- a/pkgs/by-name/co/coq2html/package.nix +++ b/pkgs/by-name/co/coq2html/package.nix @@ -5,14 +5,14 @@ ocaml, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coq2html"; version = "1.4"; src = fetchFromGitHub { owner = "xavierleroy"; repo = "coq2html"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-dBXYeRwBhBWXJfdULLzfgZU+WD6WC6R8wV2eS1zAkq8="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "coq2html"; }; -} +}) diff --git a/pkgs/by-name/co/corrosion/package.nix b/pkgs/by-name/co/corrosion/package.nix index ab018ed8f613..ce647cbdf350 100644 --- a/pkgs/by-name/co/corrosion/package.nix +++ b/pkgs/by-name/co/corrosion/package.nix @@ -8,14 +8,14 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "corrosion"; version = "0.6.1"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ppuDNObfKhneD9AlnPAvyCRHKW3BidXKglD1j/LE9CM="; }; @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { meta = { description = "Tool for integrating Rust into an existing CMake project"; homepage = "https://github.com/corrosion-rs/corrosion"; - changelog = "https://github.com/corrosion-rs/corrosion/blob/${src.rev}/RELEASES.md"; + changelog = "https://github.com/corrosion-rs/corrosion/blob/${finalAttrs.src.rev}/RELEASES.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/by-name/co/costa/package.nix b/pkgs/by-name/co/costa/package.nix index 3413c4f77b85..b5b19e1c6706 100644 --- a/pkgs/by-name/co/costa/package.nix +++ b/pkgs/by-name/co/costa/package.nix @@ -8,14 +8,14 @@ llvmPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "COSTA"; version = "2.2.4"; src = fetchFromGitHub { owner = "eth-cscs"; repo = "COSTA"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-smrDK7iucGWlL1pDv+O4QXefxr1QirC00q5Wva0S+ks="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix index 71143d692017..dd9b4bed60b4 100644 --- a/pkgs/by-name/co/coturn/package.nix +++ b/pkgs/by-name/co/coturn/package.nix @@ -12,14 +12,14 @@ systemdMinimal, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coturn"; version = "4.8.0"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YeEyEGtlzzltEssPez7BIS3Wcfd+HgDgmrKyxOVu9PA="; }; @@ -63,10 +63,10 @@ stdenv.mkDerivation rec { meta = { description = "TURN server"; homepage = "https://coturn.net/"; - changelog = "https://github.com/coturn/coturn/blob/${version}/ChangeLog"; + changelog = "https://github.com/coturn/coturn/blob/${finalAttrs.version}/ChangeLog"; license = with lib.licenses; [ bsd3 ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ _0x4A6F ]; broken = stdenv.hostPlatform.isDarwin; # 2018-10-21 }; -} +}) diff --git a/pkgs/by-name/co/courier-unicode/package.nix b/pkgs/by-name/co/courier-unicode/package.nix index 208cc63491c6..899fae0fe2c9 100644 --- a/pkgs/by-name/co/courier-unicode/package.nix +++ b/pkgs/by-name/co/courier-unicode/package.nix @@ -5,12 +5,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "courier-unicode"; version = "2.5.0"; src = fetchurl { - url = "mirror://sourceforge/courier/courier-unicode/${version}/courier-unicode-${version}.tar.bz2"; + url = "mirror://sourceforge/courier/courier-unicode/${finalAttrs.version}/courier-unicode-${finalAttrs.version}.tar.bz2"; hash = "sha256-Xsp6U2UWEg745d5gFOaQcRvGs/saG9V9LxkDxU3ts+A="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/co/cowpatty/package.nix b/pkgs/by-name/co/cowpatty/package.nix index 0e5924de2396..1493c7185c6f 100644 --- a/pkgs/by-name/co/cowpatty/package.nix +++ b/pkgs/by-name/co/cowpatty/package.nix @@ -9,14 +9,14 @@ libpcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cowpatty"; version = "4.8"; src = fetchFromGitHub { owner = "joswr1ght"; repo = "cowpatty"; - tag = version; + tag = finalAttrs.version; sha256 = "0fvwwghhd7wsx0lw2dj9rdsjnirawnq3c6silzvhi0yfnzn5fs0s"; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/cp/cp437/package.nix b/pkgs/by-name/cp/cp437/package.nix index 4bc341e2db3f..1f45365ca434 100644 --- a/pkgs/by-name/cp/cp437/package.nix +++ b/pkgs/by-name/cp/cp437/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cp437"; version = "0.6"; src = fetchFromGitHub { owner = "keaston"; repo = "cp437"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "18f4mnfnyviqclbhmbhix80k823481ypkwbp26qfvhnxdgzbggcc"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jb55 ]; mainProgram = "cp437"; }; -} +}) diff --git a/pkgs/by-name/cp/cpcfs/package.nix b/pkgs/by-name/cp/cpcfs/package.nix index 4e347430250a..a13a24eb906e 100644 --- a/pkgs/by-name/cp/cpcfs/package.nix +++ b/pkgs/by-name/cp/cpcfs/package.nix @@ -8,7 +8,7 @@ ronn, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpcfs"; version = "0.85.4"; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "derikz"; repo = "cpcfs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0rfbry0qy8mv746mzk9zdfffkdgq4w7invgb5cszjma2cp83q3i2"; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; nativeBuildInputs = [ makeWrapper @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cp/cpio/package.nix b/pkgs/by-name/cp/cpio/package.nix index 69efb5f2f2a2..d53c81fe6919 100644 --- a/pkgs/by-name/cp/cpio/package.nix +++ b/pkgs/by-name/cp/cpio/package.nix @@ -11,12 +11,12 @@ rpm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpio"; version = "2.15"; src = fetchurl { - url = "mirror://gnu/cpio/cpio-${version}.tar.bz2"; + url = "mirror://gnu/cpio/cpio-${finalAttrs.version}.tar.bz2"; hash = "sha256-k3YQuXwymh7JJoVT+3gAN7z/8Nz/6XJevE/ZwaqQdds="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { priority = 6; # resolves collision with gnutar's "libexec/rmt" mainProgram = "cpio"; }; -} +}) diff --git a/pkgs/by-name/cp/cpp-jwt/package.nix b/pkgs/by-name/cp/cpp-jwt/package.nix index 09f78320572f..ec50abda75a0 100644 --- a/pkgs/by-name/cp/cpp-jwt/package.nix +++ b/pkgs/by-name/cp/cpp-jwt/package.nix @@ -8,14 +8,14 @@ nlohmann_json, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpp-jwt"; version = "1.5.1"; src = fetchFromGitHub { owner = "arun11299"; repo = "cpp-jwt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-TyLYTk7vlpNmYJxaH9zhGwFvv1BEcShTDr7JYfgu6f0="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fpletz ]; }; -} +}) diff --git a/pkgs/by-name/cp/cpp-redis/package.nix b/pkgs/by-name/cp/cpp-redis/package.nix index 255e379c09fb..5f129f3352da 100644 --- a/pkgs/by-name/cp/cpp-redis/package.nix +++ b/pkgs/by-name/cp/cpp-redis/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpp-redis"; version = "4.3.1"; src = fetchFromGitHub { owner = "cpp-redis"; repo = "cpp_redis"; - tag = version; + tag = finalAttrs.version; hash = "sha256-dLAnxgldylWWKO3WIyx+F7ylOpRH+0nD7NZjWSOxuwQ="; fetchSubmodules = true; }; @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { meta = { description = "C++11 Lightweight Redis client: async, thread-safe, no dependency, pipelining, multi-platform"; homepage = "https://github.com/cpp-redis/cpp_redis"; - changelog = "https://github.com/cpp-redis/cpp_redis/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/cpp-redis/cpp_redis/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ poelzi ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cp/cppe/package.nix b/pkgs/by-name/cp/cppe/package.nix index dfe9ace7a411..69779fff4fd9 100644 --- a/pkgs/by-name/cp/cppe/package.nix +++ b/pkgs/by-name/cp/cppe/package.nix @@ -6,14 +6,14 @@ llvmPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cppe"; version = "0.3.1"; src = fetchFromGitHub { owner = "maxscheurer"; repo = "cppe"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-guM7+ZWDJLcAUJtPkKLvC4LYSA2eBvER7cgwPZ7FxHw="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/cp/cpptest/package.nix b/pkgs/by-name/cp/cpptest/package.nix index 8ee7b241aa3f..8ca514ceded9 100644 --- a/pkgs/by-name/cp/cpptest/package.nix +++ b/pkgs/by-name/cp/cpptest/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpptest"; version = "2.0.0"; src = fetchurl { - url = "mirror://sourceforge/project/cpptest/cpptest/cpptest-${version}/cpptest-${version}.tar.gz"; + url = "mirror://sourceforge/project/cpptest/cpptest/cpptest-${finalAttrs.version}/cpptest-${finalAttrs.version}.tar.gz"; sha256 = "0lpy3f2fjx1srh02myanlp6zfi497whlldcrnij39ghfhm0arcnm"; }; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cp/cppzmq/package.nix b/pkgs/by-name/cp/cppzmq/package.nix index f465fa3279b3..d8284a40bc62 100644 --- a/pkgs/by-name/cp/cppzmq/package.nix +++ b/pkgs/by-name/cp/cppzmq/package.nix @@ -6,14 +6,14 @@ zeromq, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cppzmq"; version = "4.11.0"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-c6IZ5PnuB96NLYHDHdNclYSF4LpqAfFWxVzeP8BzhCE="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cp/cproto/package.nix b/pkgs/by-name/cp/cproto/package.nix index 4dc9a1c1d364..2c9e3be32dd4 100644 --- a/pkgs/by-name/cp/cproto/package.nix +++ b/pkgs/by-name/cp/cproto/package.nix @@ -6,15 +6,15 @@ bison, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cproto"; version = "4.7y"; src = fetchurl { urls = [ - "mirror://debian/pool/main/c/cproto/cproto_${version}.orig.tar.gz" + "mirror://debian/pool/main/c/cproto/cproto_${finalAttrs.version}.orig.tar.gz" # No version listings and apparently no versioned tarball over http(s). - "https://invisible-island.net/archives/cproto/cproto-${version}.tgz" + "https://invisible-island.net/archives/cproto/cproto-${finalAttrs.version}.tgz" ]; sha256 = "sha256-C9HYvo/wpMpD+Uf5V1DTT2TtqTyeLKeRAP1gFAt8YzE="; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' - [ "$("$out/bin/cproto" -V 2>&1)" = '${version}' ] + [ "$("$out/bin/cproto" -V 2>&1)" = '${finalAttrs.version}' ] ''; meta = { @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { license = lib.licenses.publicDomain; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cp/cpu-energy-meter/package.nix b/pkgs/by-name/cp/cpu-energy-meter/package.nix index 965155643821..280a15274045 100644 --- a/pkgs/by-name/cp/cpu-energy-meter/package.nix +++ b/pkgs/by-name/cp/cpu-energy-meter/package.nix @@ -5,14 +5,14 @@ libcap, udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpu-energy-meter"; version = "1.2"; src = fetchFromGitHub { owner = "sosy-lab"; repo = "cpu-energy-meter"; - rev = version; + rev = finalAttrs.version; hash = "sha256-QW65Z8mRYLHcyLeOtNAHjwPNWAUP214wqIYclK+whFw="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; mainProgram = "cpu-energy-meter"; }; -} +}) diff --git a/pkgs/by-name/cp/cpufetch/package.nix b/pkgs/by-name/cp/cpufetch/package.nix index d6afdd378943..9ccd5a422957 100644 --- a/pkgs/by-name/cp/cpufetch/package.nix +++ b/pkgs/by-name/cp/cpufetch/package.nix @@ -5,14 +5,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpufetch"; version = "1.07"; src = fetchFromGitHub { owner = "Dr-Noob"; repo = "cpufetch"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-qmT7WBWKtSWGIK/dEd3/bF1bBjqSjfkP99htfnlFLCw="; }; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { description = "Simplistic yet fancy CPU architecture fetching tool"; license = lib.licenses.gpl2Only; homepage = "https://github.com/Dr-Noob/cpufetch"; - changelog = "https://github.com/Dr-Noob/cpufetch/releases/tag/v${version}"; + changelog = "https://github.com/Dr-Noob/cpufetch/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ devhell ]; mainProgram = "cpufetch"; }; -} +}) diff --git a/pkgs/by-name/cp/cpufrequtils/package.nix b/pkgs/by-name/cp/cpufrequtils/package.nix index ae5ce804270c..c6dd0665b217 100644 --- a/pkgs/by-name/cp/cpufrequtils/package.nix +++ b/pkgs/by-name/cp/cpufrequtils/package.nix @@ -6,12 +6,12 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpufrequtils"; version = "008"; src = fetchurl { - url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-${version}.tar.gz"; + url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-${finalAttrs.version}.tar.gz"; hash = "sha256-AFOgcYPQaUg70GJhS8YcuAgMV32mHN9+ExsGThoa8Yg="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; mainProgram = "cpufreq-set"; }; -} +}) diff --git a/pkgs/by-name/cp/cpulimit/package.nix b/pkgs/by-name/cp/cpulimit/package.nix index 49ecd04353f5..0c99b63edaa5 100644 --- a/pkgs/by-name/cp/cpulimit/package.nix +++ b/pkgs/by-name/cp/cpulimit/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpulimit"; version = "0.2"; src = fetchFromGitHub { owner = "opsengine"; repo = "cpulimit"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1dz045yhcsw1rdamzpz4bk8mw888in7fyqk1q1b3m1yk4pd1ahkh"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { mainProgram = "cpulimit"; maintainers = [ lib.maintainers.jsoo1 ]; }; -} +}) diff --git a/pkgs/by-name/cp/cpuminer/package.nix b/pkgs/by-name/cp/cpuminer/package.nix index c330418259d0..f8fc77cddc58 100644 --- a/pkgs/by-name/cp/cpuminer/package.nix +++ b/pkgs/by-name/cp/cpuminer/package.nix @@ -9,14 +9,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpuminer"; version = "2.5.1"; src = fetchFromGitHub { owner = "pooler"; repo = "cpuminer"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0f44i0z8rid20c2hiyp92xq0q0mjj537r05sa6vdbc0nl0a5q40i"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; mainProgram = "minerd"; }; -} +}) diff --git a/pkgs/by-name/cp/cpustat/package.nix b/pkgs/by-name/cp/cpustat/package.nix index 7f67942f15ed..d99a632e9f3a 100644 --- a/pkgs/by-name/cp/cpustat/package.nix +++ b/pkgs/by-name/cp/cpustat/package.nix @@ -5,14 +5,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpustat"; version = "0.03.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "cpustat"; - tag = "V${version}"; + tag = "V${finalAttrs.version}"; hash = "sha256-wvCaMmWKEzanwgDBL2+8qAIIIKfGNi0O2J+SUXOx508="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "cpustat"; }; -} +}) diff --git a/pkgs/by-name/cr/crackxls/package.nix b/pkgs/by-name/cr/crackxls/package.nix index 7e7d4d9cf798..c54620e40bd7 100644 --- a/pkgs/by-name/cr/crackxls/package.nix +++ b/pkgs/by-name/cr/crackxls/package.nix @@ -10,14 +10,14 @@ gmp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crackxls"; version = "1.0"; src = fetchFromGitHub { owner = "GavinSmith0123"; repo = "crackxls2003"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-CJFC4iKHHpSRQBdotmum7NjpPNUjbB6cSCs5HMXnjO8="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/cr/crcpp/package.nix b/pkgs/by-name/cr/crcpp/package.nix index fdc0b20661ab..422c6a7fc45f 100644 --- a/pkgs/by-name/cr/crcpp/package.nix +++ b/pkgs/by-name/cr/crcpp/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crcpp"; version = "1.2.1.0"; src = fetchFromGitHub { owner = "d-bahr"; repo = "CRCpp"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "sha256-9oAG2MCeSsgA9x1mSU+xiKHUlUuPndIqQJnkrItgsAA="; }; @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/d-bahr/CRCpp"; - changelog = "https://github.com/d-bahr/CRCpp/releases/tag/release-${version}"; + changelog = "https://github.com/d-bahr/CRCpp/releases/tag/release-${finalAttrs.version}"; description = "Easy to use and fast C++ CRC library"; platforms = lib.platforms.all; maintainers = [ ]; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/cr/cre2/package.nix b/pkgs/by-name/cr/cre2/package.nix index f479a75117ab..9a058fd4d3bf 100644 --- a/pkgs/by-name/cr/cre2/package.nix +++ b/pkgs/by-name/cr/cre2/package.nix @@ -9,14 +9,14 @@ texinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cre2"; version = "0.3.6"; src = fetchFromGitHub { owner = "marcomaggi"; repo = "cre2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cr/createrepo_c/package.nix b/pkgs/by-name/cr/createrepo_c/package.nix index 0d7b0b14e283..83f8e7d4486b 100644 --- a/pkgs/by-name/cr/createrepo_c/package.nix +++ b/pkgs/by-name/cr/createrepo_c/package.nix @@ -21,14 +21,14 @@ libmodulemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "createrepo_c"; version = "1.2.1"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "createrepo_c"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2mvU2F9rvG4FtDgq+M9VXWg+c+AsW/+tDPaEj7zVmQ0="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/cr/creep/package.nix b/pkgs/by-name/cr/creep/package.nix index 06cab50ef7ad..d02a20f4f427 100644 --- a/pkgs/by-name/cr/creep/package.nix +++ b/pkgs/by-name/cr/creep/package.nix @@ -7,14 +7,14 @@ fonttosfnt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "creep"; version = "0.31"; src = fetchFromGitHub { owner = "romeovs"; repo = "creep"; - rev = version; + rev = finalAttrs.version; sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/cr/crex/package.nix b/pkgs/by-name/cr/crex/package.nix index c08d5e9254c5..cd927702e9e0 100644 --- a/pkgs/by-name/cr/crex/package.nix +++ b/pkgs/by-name/cr/crex/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crex"; version = "0.2.5"; src = fetchFromGitHub { owner = "octobanana"; repo = "crex"; - rev = version; + rev = finalAttrs.version; sha256 = "086rvwl494z48acgsq3yq11qh1nxm8kbf11adn16aszai4d4ipr3"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "crex"; }; -} +}) diff --git a/pkgs/by-name/cr/criu/package.nix b/pkgs/by-name/cr/criu/package.nix index da0fb8dcb68e..aeb6aed9b409 100644 --- a/pkgs/by-name/cr/criu/package.nix +++ b/pkgs/by-name/cr/criu/package.nix @@ -27,14 +27,14 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "criu"; version = "4.1.1"; src = fetchFromGitHub { owner = "checkpoint-restore"; repo = "criu"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-SfpJskXX7r3jbAwgZl2qpa7j1M4i8/sV6rlAWiUEoQs="; }; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { substituteInPlace ./Documentation/Makefile \ --replace "2>/dev/null" "" \ --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" - substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0" + substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${finalAttrs.version}.0" ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; @@ -150,4 +150,4 @@ stdenv.mkDerivation rec { ]; maintainers = [ lib.maintainers.thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/cr/cromfs/package.nix b/pkgs/by-name/cr/cromfs/package.nix index 0465bf6e506d..894893e3c45d 100644 --- a/pkgs/by-name/cr/cromfs/package.nix +++ b/pkgs/by-name/cr/cromfs/package.nix @@ -7,12 +7,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cromfs"; version = "1.5.10.2"; src = fetchurl { - url = "https://bisqwit.iki.fi/src/arch/cromfs-${version}.tar.bz2"; + url = "https://bisqwit.iki.fi/src/arch/cromfs-${finalAttrs.version}.tar.bz2"; sha256 = "0xy2x1ws1qqfp7hfj6yzm80zhrxzmhn0w2yns77im1lmd2h18817"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/cr/crosswords/package.nix b/pkgs/by-name/cr/crosswords/package.nix index f2aa015e19f6..2944e468c472 100644 --- a/pkgs/by-name/cr/crosswords/package.nix +++ b/pkgs/by-name/cr/crosswords/package.nix @@ -15,7 +15,7 @@ wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crosswords"; version = "0.3.15"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "jrb"; repo = "crosswords"; - rev = version; + rev = finalAttrs.version; hash = "sha256-KcHcTjPoQNA5TBXnKgudjBTV/0JbeVMJ09XVAL7SizI="; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = { description = "Crossword player and editor for GNOME"; homepage = "https://gitlab.gnome.org/jrb/crosswords"; - changelog = "https://gitlab.gnome.org/jrb/crosswords/-/blob/${version}/NEWS.md?ref_type=tags"; + changelog = "https://gitlab.gnome.org/jrb/crosswords/-/blob/${finalAttrs.version}/NEWS.md?ref_type=tags"; license = lib.licenses.gpl3Plus; mainProgram = "crosswords"; maintainers = with lib.maintainers; [ @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cr/crumbs/package.nix b/pkgs/by-name/cr/crumbs/package.nix index 4e9cf9153999..467d2e00bf13 100644 --- a/pkgs/by-name/cr/crumbs/package.nix +++ b/pkgs/by-name/cr/crumbs/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crumbs"; version = "0.0.3"; src = fetchFromGitHub { owner = "fasseg"; repo = "crumbs"; - rev = version; + rev = finalAttrs.version; sha256 = "0jjvydn4i4n9xv8vsal2jxpa95mk2lw6myv0gx9wih242k9vy0l7"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ thesola10 ]; mainProgram = "crumbs"; }; -} +}) diff --git a/pkgs/by-name/cr/cryptominisat/package.nix b/pkgs/by-name/cr/cryptominisat/package.nix index 16683bd8ac4f..305f0c0a7270 100644 --- a/pkgs/by-name/cr/cryptominisat/package.nix +++ b/pkgs/by-name/cr/cryptominisat/package.nix @@ -7,14 +7,14 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cryptominisat"; version = "5.11.21"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; - rev = version; + rev = finalAttrs.version; hash = "sha256-8oH9moMjQEWnQXKmKcqmXuXcYkEyvr4hwC1bC4l26mo="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ mic92 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cs/csdp/package.nix b/pkgs/by-name/cs/csdp/package.nix index f858bb526114..3bb5c2585de5 100644 --- a/pkgs/by-name/cs/csdp/package.nix +++ b/pkgs/by-name/cs/csdp/package.nix @@ -7,12 +7,12 @@ lapack, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "csdp"; version = "6.1.1"; src = fetchurl { - url = "https://www.coin-or.org/download/source/Csdp/Csdp-${version}.tgz"; + url = "https://www.coin-or.org/download/source/Csdp/Csdp-${finalAttrs.version}.tgz"; sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { description = "C Library for Semidefinite Programming"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cs/csdr/package.nix b/pkgs/by-name/cs/csdr/package.nix index 744119cf1663..aa1a6e039727 100644 --- a/pkgs/by-name/cs/csdr/package.nix +++ b/pkgs/by-name/cs/csdr/package.nix @@ -9,14 +9,14 @@ versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "csdr"; version = "0.18.2"; src = fetchFromGitHub { owner = "jketterl"; repo = "csdr"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-LdVzeTTIvDQIXRdcz/vpQu/fUgtE8nx1kIEfoiwxrUg="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/cs/csound-manual/package.nix b/pkgs/by-name/cs/csound-manual/package.nix index 52437fb368f9..a6e58ebb6a4a 100644 --- a/pkgs/by-name/cs/csound-manual/package.nix +++ b/pkgs/by-name/cs/csound-manual/package.nix @@ -8,14 +8,14 @@ libxslt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "csound-manual"; version = "6.18.0"; src = fetchFromGitHub { owner = "csound"; repo = "manual"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-W8MghqUBr3V7LPgNwU6Ugw16wdK3G37zAPuasMlZ2+I="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ hlolli ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cs/csv2latex/package.nix b/pkgs/by-name/cs/csv2latex/package.nix index 60b572f1e908..3e785ede7722 100644 --- a/pkgs/by-name/cs/csv2latex/package.nix +++ b/pkgs/by-name/cs/csv2latex/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "csv2latex"; version = "0.23.1"; src = fetchurl { - url = "http://brouits.free.fr/csv2latex/csv2latex-${version}.tar.gz"; + url = "http://brouits.free.fr/csv2latex/csv2latex-${finalAttrs.version}.tar.gz"; sha256 = "sha256-k1vQyrVJmfaJ7jVaoW2dkPD7GO8EoDqJY5m8O2U/kYw="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; mainProgram = "csv2latex"; }; -} +}) diff --git a/pkgs/by-name/cs/csvquote/package.nix b/pkgs/by-name/cs/csvquote/package.nix index e5c7b28dec52..ec2c999f0700 100644 --- a/pkgs/by-name/cs/csvquote/package.nix +++ b/pkgs/by-name/cs/csvquote/package.nix @@ -6,14 +6,14 @@ patsh, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "csvquote"; version = "0.1.5"; src = fetchFromGitHub { owner = "dbro"; repo = "csvquote"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-847JAoDEfA9K4LB8z9cqSw+GTImqmITBylB/4odLDb0="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ct/ctmg/package.nix b/pkgs/by-name/ct/ctmg/package.nix index 90cdfe0df74f..fbea468407ba 100644 --- a/pkgs/by-name/ct/ctmg/package.nix +++ b/pkgs/by-name/ct/ctmg/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ctmg"; version = "1.2"; src = fetchzip { - url = "https://git.zx2c4.com/ctmg/snapshot/ctmg-${version}.tar.xz"; + url = "https://git.zx2c4.com/ctmg/snapshot/ctmg-${finalAttrs.version}.tar.xz"; sha256 = "1i4v8sriwjrmj3yizbl1ysckb711yl9qsn9x45jq0ij1apsydhyc"; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ctmg"; }; -} +}) diff --git a/pkgs/by-name/ct/ctodo/package.nix b/pkgs/by-name/ct/ctodo/package.nix index f779042e6a09..c2c93ba6e22b 100644 --- a/pkgs/by-name/ct/ctodo/package.nix +++ b/pkgs/by-name/ct/ctodo/package.nix @@ -7,14 +7,14 @@ readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ctodo"; version = "1.3"; src = fetchFromGitHub { owner = "Acolarh"; repo = "ctodo"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0mqy5b35cbdwfpbs91ilsgz3wc4cky38xfz9pnr4q88q1vybigna"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "ctodo"; }; -} +}) diff --git a/pkgs/by-name/ct/ctpl/package.nix b/pkgs/by-name/ct/ctpl/package.nix index a7287ea2cc9a..298121b6da71 100644 --- a/pkgs/by-name/ct/ctpl/package.nix +++ b/pkgs/by-name/ct/ctpl/package.nix @@ -6,12 +6,12 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ctpl"; version = "0.3.5"; src = fetchurl { - url = "https://download.tuxfamily.org/ctpl/releases/ctpl-${version}.tar.gz"; + url = "https://download.tuxfamily.org/ctpl/releases/ctpl-${finalAttrs.version}.tar.gz"; sha256 = "sha256-IRCPx1Z+0hbe6kWRrb/s6OiLH0uxynfDdACSBkTXVr4="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/ct/ctpv/package.nix b/pkgs/by-name/ct/ctpv/package.nix index cad23ee246d6..f0087e476b8f 100644 --- a/pkgs/by-name/ct/ctpv/package.nix +++ b/pkgs/by-name/ct/ctpv/package.nix @@ -19,14 +19,14 @@ ueberzug, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ctpv"; version = "1.1"; src = fetchFromGitHub { owner = "NikitaIvanovV"; repo = "ctpv"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-3BQi4m44hBmPkJBFNCg6d9YKRbDZwLxdzBb/NDWTQP4="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.wesleyjrz ]; }; -} +}) diff --git a/pkgs/by-name/ct/ctre/package.nix b/pkgs/by-name/ct/ctre/package.nix index 50fe7527e55b..7c62280763bb 100644 --- a/pkgs/by-name/ct/ctre/package.nix +++ b/pkgs/by-name/ct/ctre/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ctre"; version = "3.10.0"; src = fetchFromGitHub { owner = "hanickadot"; repo = "compile-time-regular-expressions"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-/44oZi6j8+a1D6ZGZpoy82GHjPtqzOvuS7d3SPbH7fs="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ azahi ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ct/ctrtool/package.nix b/pkgs/by-name/ct/ctrtool/package.nix index 4ae0290dcbb4..eabfba7e4c8e 100644 --- a/pkgs/by-name/ct/ctrtool/package.nix +++ b/pkgs/by-name/ct/ctrtool/package.nix @@ -5,18 +5,18 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ctrtool"; version = "1.3.0"; src = fetchFromGitHub { owner = "jakcron"; repo = "Project_CTR"; - rev = "ctrtool-v${version}"; + rev = "ctrtool-v${finalAttrs.version}"; sha256 = "GvEzv97DqCsaDWVqDpajQRWYe+WM8xCYmGE0D3UcSrM="; }; - sourceRoot = "${src.name}/ctrtool"; + sourceRoot = "${finalAttrs.src.name}/ctrtool"; enableParallelBuilding = true; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { mainProgram = "ctrtool"; }; -} +}) diff --git a/pkgs/by-name/ct/ctypes_sh/package.nix b/pkgs/by-name/ct/ctypes_sh/package.nix index 6d2151a355cb..c2885e928179 100644 --- a/pkgs/by-name/ct/ctypes_sh/package.nix +++ b/pkgs/by-name/ct/ctypes_sh/package.nix @@ -10,14 +10,14 @@ libdwarf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ctypes.sh"; version = "1.2"; src = fetchFromGitHub { owner = "taviso"; repo = "ctypes.sh"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cu/cubicsdr/package.nix b/pkgs/by-name/cu/cubicsdr/package.nix index 65c31cfacaa6..796e4587faf3 100644 --- a/pkgs/by-name/cu/cubicsdr/package.nix +++ b/pkgs/by-name/cu/cubicsdr/package.nix @@ -16,14 +16,14 @@ enableDigitalLab ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cubicsdr"; version = "0.2.7"; src = fetchFromGitHub { owner = "cjcliffe"; repo = "CubicSDR"; - rev = version; + rev = finalAttrs.version; sha256 = "0cyv1vk97x4i3h3hhh7dx8mv6d1ad0fypdbx5fl26bz661sr8j2n"; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "CubicSDR"; }; -} +}) diff --git a/pkgs/by-name/cu/cuetools/package.nix b/pkgs/by-name/cu/cuetools/package.nix index de0ba4563b21..7a569beffb1d 100644 --- a/pkgs/by-name/cu/cuetools/package.nix +++ b/pkgs/by-name/cu/cuetools/package.nix @@ -10,14 +10,14 @@ vorbis-tools, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cuetools"; version = "1.4.1"; src = fetchFromGitHub { owner = "svend"; repo = "cuetools"; - rev = version; + rev = finalAttrs.version; sha256 = "02ksv1ahf1v4cr2xbclsfv5x17m9ivzbssb5r8xjm97yh8a7spa3"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cu/cunit/package.nix b/pkgs/by-name/cu/cunit/package.nix index 756b9aa49f8e..7d9ee6b0f51d 100644 --- a/pkgs/by-name/cu/cunit/package.nix +++ b/pkgs/by-name/cu/cunit/package.nix @@ -8,7 +8,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "CUnit"; version = "2.1-3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool ]; src = fetchurl { - url = "mirror://sourceforge/cunit/CUnit/${version}/CUnit-${version}.tar.bz2"; + url = "mirror://sourceforge/cunit/CUnit/${finalAttrs.version}/CUnit-${finalAttrs.version}.tar.bz2"; sha256 = "057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cu/cups-browsed/package.nix b/pkgs/by-name/cu/cups-browsed/package.nix index 24b7a0332803..4f85130c12db 100644 --- a/pkgs/by-name/cu/cups-browsed/package.nix +++ b/pkgs/by-name/cu/cups-browsed/package.nix @@ -11,14 +11,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cups-browsed"; version = "2.1.1"; src = fetchFromGitHub { owner = "OpenPrinting"; repo = "cups-browsed"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Cfk28rxxgzzQs7B+tNmeUzDYL1eCx9zYwRsS/J6QX9s="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { mainProgram = "cups-browsed"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/cu/cups-pk-helper/package.nix b/pkgs/by-name/cu/cups-pk-helper/package.nix index f3d4001ee708..8de1a6327d24 100644 --- a/pkgs/by-name/cu/cups-pk-helper/package.nix +++ b/pkgs/by-name/cu/cups-pk-helper/package.nix @@ -10,12 +10,12 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.2.6"; pname = "cups-pk-helper"; src = fetchurl { - url = "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${finalAttrs.version}.tar.xz"; sha256 = "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/cu/curlftpfs/package.nix b/pkgs/by-name/cu/curlftpfs/package.nix index fcf9fc9e6f77..2d4b90b9c764 100644 --- a/pkgs/by-name/cu/curlftpfs/package.nix +++ b/pkgs/by-name/cu/curlftpfs/package.nix @@ -10,12 +10,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "curlftpfs"; version = "0.9.2"; src = fetchurl { - url = "mirror://sourceforge/curlftpfs/curlftpfs-${version}.tar.gz"; + url = "mirror://sourceforge/curlftpfs/curlftpfs-${finalAttrs.version}.tar.gz"; sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cu/curlpp/package.nix b/pkgs/by-name/cu/curlpp/package.nix index 64b6db7da128..88b4369d642d 100644 --- a/pkgs/by-name/cu/curlpp/package.nix +++ b/pkgs/by-name/cu/curlpp/package.nix @@ -6,13 +6,13 @@ curl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "curlpp"; version = "0.8.1"; src = fetchFromGitHub { owner = "jpbarrette"; repo = "curlpp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1b0ylnnrhdax4kwjq64r1fk0i24n5ss6zfzf4hxwgslny01xiwrk"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/cv/cvc4/package.nix b/pkgs/by-name/cv/cvc4/package.nix index a0de9d03fdc3..7f692eff8de8 100644 --- a/pkgs/by-name/cv/cvc4/package.nix +++ b/pkgs/by-name/cv/cvc4/package.nix @@ -16,14 +16,14 @@ antlr3_4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cvc4"; version = "1.8"; src = fetchFromGitHub { owner = "cvc4"; repo = "cvc4-archived"; - rev = version; + rev = finalAttrs.version; sha256 = "1rhs4pvzaa1wk00czrczp58b2cxfghpsnq534m0l3snnya2958jp"; }; @@ -95,4 +95,4 @@ stdenv.mkDerivation rec { thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/cv/cvc5/package.nix b/pkgs/by-name/cv/cvc5/package.nix index b9156237f890..93a36acc5bbc 100644 --- a/pkgs/by-name/cv/cvc5/package.nix +++ b/pkgs/by-name/cv/cvc5/package.nix @@ -15,14 +15,14 @@ libpoly, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cvc5"; version = "1.3.2"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; - tag = "cvc5-${version}"; + tag = "cvc5-${finalAttrs.version}"; hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ shadaj ]; }; -} +}) diff --git a/pkgs/by-name/cv/cvs-fast-export/package.nix b/pkgs/by-name/cv/cvs-fast-export/package.nix index d4ce023e4329..07338a107e3d 100644 --- a/pkgs/by-name/cv/cvs-fast-export/package.nix +++ b/pkgs/by-name/cv/cvs-fast-export/package.nix @@ -15,12 +15,12 @@ rsync, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cvs-fast-export"; version = "1.63"; src = fetchurl { - url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${finalAttrs.version}.tar.gz"; sha256 = "sha256-YZF2QebWbvn/N9pLpccudZsFHzocJp/3M0Gx9p7fQ5Y="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { homepage = "http://www.catb.org/esr/cvs-fast-export/"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/cv/cvsps/package.nix b/pkgs/by-name/cv/cvsps/package.nix index 055ade25d49e..6c2f53094d77 100644 --- a/pkgs/by-name/cv/cvsps/package.nix +++ b/pkgs/by-name/cv/cvsps/package.nix @@ -7,12 +7,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cvsps"; version = "2.1"; src = fetchurl { - url = "mirror://debian/pool/main/c/cvsps/cvsps_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/c/cvsps/cvsps_${finalAttrs.version}.orig.tar.gz"; sha256 = "0nh7q7zcmagx0i63h6fqqkkq9i55k77myvb8h6jn2f266f5iklwi"; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "cvsps"; }; -} +}) diff --git a/pkgs/by-name/cv/cvsq/package.nix b/pkgs/by-name/cv/cvsq/package.nix index f0e0334d6a35..11ad7e53053c 100644 --- a/pkgs/by-name/cv/cvsq/package.nix +++ b/pkgs/by-name/cv/cvsq/package.nix @@ -12,12 +12,12 @@ diffutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cvsq"; version = "1.11"; src = fetchurl { - url = "http://www.linta.de/~aehlig/cvsq/cvsq-${version}.tgz"; + url = "http://www.linta.de/~aehlig/cvsq/cvsq-${finalAttrs.version}.tgz"; sha256 = "0491k4skk3jyyd6plp2kcihmxxav9rsch7vd1yi697m2fqckp5ws"; }; @@ -113,4 +113,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ clkamp ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/cw/cwm/package.nix b/pkgs/by-name/cw/cwm/package.nix index 1128e945ca74..e2dc85ce035a 100644 --- a/pkgs/by-name/cw/cwm/package.nix +++ b/pkgs/by-name/cw/cwm/package.nix @@ -10,7 +10,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cwm"; version = "7.4"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "leahneukirchen"; repo = "cwm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-L3u4mH2UH2pTHhSPVr5dUi94b9DheslkIWL6EgQ05yA="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "cwm"; }; -} +}) diff --git a/pkgs/by-name/cx/cxxtools/package.nix b/pkgs/by-name/cx/cxxtools/package.nix index 356440e046b6..bad3b441dcaf 100644 --- a/pkgs/by-name/cx/cxxtools/package.nix +++ b/pkgs/by-name/cx/cxxtools/package.nix @@ -8,14 +8,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cxxtools"; version = "3.0"; src = fetchFromGitHub { owner = "maekitalo"; repo = "cxxtools"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-AiMVmtvI20nyv/nuHHxGH4xFnlc9AagVkKlnRlaYCPM="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.juliendehos ]; }; -} +}) diff --git a/pkgs/by-name/cy/cyan/package.nix b/pkgs/by-name/cy/cyan/package.nix index 414ca5077d4e..5399803a20ec 100644 --- a/pkgs/by-name/cy/cyan/package.nix +++ b/pkgs/by-name/cy/cyan/package.nix @@ -10,14 +10,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cyan"; version = "1.2.4"; src = fetchFromGitHub { owner = "rodlie"; repo = "cyan"; - rev = version; + rev = finalAttrs.version; hash = "sha256-R5sj8AN7UT9OIeUPNrdTIUQvtEitXp1A32l/Z2qRS94="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ zendo ]; }; -} +}) diff --git a/pkgs/by-name/cy/cyclonedds-cxx/package.nix b/pkgs/by-name/cy/cyclonedds-cxx/package.nix index 3dd19cdb4b32..702e2554f3e5 100644 --- a/pkgs/by-name/cy/cyclonedds-cxx/package.nix +++ b/pkgs/by-name/cy/cyclonedds-cxx/package.nix @@ -6,7 +6,7 @@ cyclonedds, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cyclonedds-cxx"; version = "0.10.5"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "eclipse-cyclonedds"; repo = "cyclonedds-cxx"; - rev = version; + rev = finalAttrs.version; hash = "sha256-whFVEQec/Ca+dr6R7z9mMrNg315z3oIWchVT+vQ36So="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ linbreux ]; }; -} +}) diff --git a/pkgs/by-name/cy/cyclonedds/package.nix b/pkgs/by-name/cy/cyclonedds/package.nix index 7af6b7e22425..ec54083be952 100644 --- a/pkgs/by-name/cy/cyclonedds/package.nix +++ b/pkgs/by-name/cy/cyclonedds/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cyclonedds"; version = "0.10.5"; src = fetchFromGitHub { owner = "eclipse-cyclonedds"; repo = "cyclonedds"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-MQVUZ7PkxauoPpfxlhhAtsKztMe9tcZOpOzshuz/eb8="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ epl20 ]; maintainers = with lib.maintainers; [ bachp ]; }; -} +}) diff --git a/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix b/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix index 291f6f84a639..807f386d4a4a 100644 --- a/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix +++ b/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix @@ -8,14 +8,14 @@ cyrus_sasl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cyrus-sasl-xoauth2"; version = "0.2"; src = fetchFromGitHub { owner = "moriyoshi"; repo = "cyrus-sasl-xoauth2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-lI8uKtVxrziQ8q/Ss+QTgg1xTObZUTAzjL3MYmtwyd8="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ wentasah ]; }; -} +}) diff --git a/pkgs/by-name/da/dablin/package.nix b/pkgs/by-name/da/dablin/package.nix index a989199bd2fa..644c13ee5b0c 100644 --- a/pkgs/by-name/da/dablin/package.nix +++ b/pkgs/by-name/da/dablin/package.nix @@ -11,14 +11,14 @@ pcre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dablin"; version = "1.16.1"; src = fetchFromGitHub { owner = "Opendigitalradio"; repo = "dablin"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-dx+KPPFCx78HtNvEb00URX/eu49Wtj7fksPjDtpkk5Q="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/da/daemon/package.nix b/pkgs/by-name/da/daemon/package.nix index 03af4a3cf836..6471eac596b7 100644 --- a/pkgs/by-name/da/daemon/package.nix +++ b/pkgs/by-name/da/daemon/package.nix @@ -5,12 +5,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "daemon"; version = "0.8.4"; src = fetchurl { - url = "http://libslack.org/daemon/download/daemon-${version}.tar.gz"; + url = "http://libslack.org/daemon/download/daemon-${finalAttrs.version}.tar.gz"; sha256 = "sha256-+iiFmtNBywoLASwRwnGBT4cEggE7SfcQYAMh03mIfNE="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "daemon"; }; -} +}) diff --git a/pkgs/by-name/da/daemonize/package.nix b/pkgs/by-name/da/daemonize/package.nix index be5daa3c708b..a08e31d6d3c7 100644 --- a/pkgs/by-name/da/daemonize/package.nix +++ b/pkgs/by-name/da/daemonize/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "daemonize"; version = "1.7.8"; src = fetchFromGitHub { owner = "bmc"; repo = "daemonize"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "1e6LZXf/lK7sB2CbXwOg7LOi0Q8IBQNAa4d7rX0Ej3A="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ freebsd ++ darwin; mainProgram = "daemonize"; }; -} +}) diff --git a/pkgs/by-name/da/daemontools/package.nix b/pkgs/by-name/da/daemontools/package.nix index c3f9d28f38c7..dfc5b8bf1354 100644 --- a/pkgs/by-name/da/daemontools/package.nix +++ b/pkgs/by-name/da/daemontools/package.nix @@ -13,12 +13,12 @@ let sha256 = "sha256-om5r1ddUx1uObp9LR+SwCLLtm+rRuLoq28OLbhWhdzU="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "daemontools"; version = "0.76"; src = fetchurl { - url = "https://cr.yp.to/daemontools/daemontools-${version}.tar.gz"; + url = "https://cr.yp.to/daemontools/daemontools-${finalAttrs.version}.tar.gz"; sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5"; }; @@ -40,14 +40,14 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - cd daemontools-${version} + cd daemontools-${finalAttrs.version} sed -i -e '1 s_$_ -include ${glibc.dev}/include/errno.h -std=gnu17_' src/conf-cc substituteInPlace src/Makefile \ --replace-fail '/bin/sh' '${bash}/bin/bash -oxtrace' - sed -i -e "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests + sed -i -e "s_^PATH=.*_PATH=$src/daemontools-${finalAttrs.version}/compile:''${PATH}_" src/rts.tests cat ${glibc.dev}/include/errno.h @@ -83,4 +83,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ kevincox ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/da/dalphaball/package.nix b/pkgs/by-name/da/dalphaball/package.nix index 5a1142f993e2..1561aaf9bbd8 100644 --- a/pkgs/by-name/da/dalphaball/package.nix +++ b/pkgs/by-name/da/dalphaball/package.nix @@ -6,7 +6,7 @@ gmp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dalphaball"; version = "0-unstable-2023-06-15"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { hash = "sha256-mUxEL9b67z/mG+0pcM5uQ/jPAfEUpJlXOXPmqDea+U4="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; strictDeps = true; nativeBuildInputs = [ @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ aschleck ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/da/darkhttpd/package.nix b/pkgs/by-name/da/darkhttpd/package.nix index c58139703e2e..462fe16592fd 100644 --- a/pkgs/by-name/da/darkhttpd/package.nix +++ b/pkgs/by-name/da/darkhttpd/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "darkhttpd"; version = "1.17"; src = fetchFromGitHub { owner = "emikulic"; repo = "darkhttpd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-d5pDUY1EbVjykb4in4hhbgbjIXJtj133nRAQ84ASicQ="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bobvanderlinden ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/da/darkstat/package.nix b/pkgs/by-name/da/darkstat/package.nix index d5efe788aa35..b907988a7a81 100644 --- a/pkgs/by-name/da/darkstat/package.nix +++ b/pkgs/by-name/da/darkstat/package.nix @@ -8,14 +8,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "darkstat"; version = "3.0.721"; src = fetchFromGitHub { owner = "emikulic"; repo = "darkstat"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kKj4fCgphoe3lojJfARwpITxQh7E6ehUew9FVEW63uQ="; }; @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { - Supports IPv6. ''; homepage = "http://unix4lyfe.org/darkstat"; - changelog = "https://github.com/emikulic/darkstat/releases/tag/${version}"; + changelog = "https://github.com/emikulic/darkstat/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl2Only; platforms = with lib.platforms; unix; mainProgram = "darkstat"; }; -} +}) diff --git a/pkgs/by-name/da/dasm/package.nix b/pkgs/by-name/da/dasm/package.nix index 688465cad182..0c438f3d1373 100644 --- a/pkgs/by-name/da/dasm/package.nix +++ b/pkgs/by-name/da/dasm/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dasm"; version = "2.20.14.1"; src = fetchFromGitHub { owner = "dasm-assembler"; repo = "dasm"; - rev = version; + rev = finalAttrs.version; sha256 = "1bna0bj503xyn5inwzzsrsgi9qg8p20by4dfk7azj91ynw56pl41"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.jwatt ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/da/datamash/package.nix b/pkgs/by-name/da/datamash/package.nix index d716852e53b3..1a30f828c130 100644 --- a/pkgs/by-name/da/datamash/package.nix +++ b/pkgs/by-name/da/datamash/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "datamash"; version = "1.9"; src = fetchurl { - url = "mirror://gnu/datamash/datamash-${version}.tar.gz"; + url = "mirror://gnu/datamash/datamash-${finalAttrs.version}.tar.gz"; sha256 = "sha256-84Lr2gNlDdZ5Fh91j5wKbMkpMhNDjUp3qO2jJarLh9I="; }; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/da/dateutils/package.nix b/pkgs/by-name/da/dateutils/package.nix index e7f5bc416916..41fac34b3d23 100644 --- a/pkgs/by-name/da/dateutils/package.nix +++ b/pkgs/by-name/da/dateutils/package.nix @@ -6,12 +6,12 @@ tzdata, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.4.11"; pname = "dateutils"; src = fetchurl { - url = "https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-${version}.tar.xz"; + url = "https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-${finalAttrs.version}.tar.xz"; sha256 = "sha256-uP6gsJcUu63yArmzQ0zOa1nCgueGkmjQwIuFiA/btEY="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.paperdigits ]; }; -} +}) diff --git a/pkgs/by-name/da/davtest/package.nix b/pkgs/by-name/da/davtest/package.nix index 3f914bbe7e66..1c0c8262f3c4 100644 --- a/pkgs/by-name/da/davtest/package.nix +++ b/pkgs/by-name/da/davtest/package.nix @@ -5,12 +5,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "davtest"; version = "1.0"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/davtest/davtest-${version}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/davtest/davtest-${finalAttrs.version}.tar.bz2"; sha256 = "0kigcgv1bbnan9yr5481s4b9islmvzl2arpg1ig1i39sxrna06y7"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ emilytrau ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/db/dbacl/package.nix b/pkgs/by-name/db/dbacl/package.nix index 6cc65fb8cae4..07f974ddda6a 100644 --- a/pkgs/by-name/db/dbacl/package.nix +++ b/pkgs/by-name/db/dbacl/package.nix @@ -4,12 +4,12 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dbacl"; version = "1.14"; src = fetchurl { - url = "https://www.lbreyer.com/gpl/dbacl-${version}.tar.gz"; + url = "https://www.lbreyer.com/gpl/dbacl-${finalAttrs.version}.tar.gz"; sha256 = "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7"; }; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/db/dbcsr/package.nix b/pkgs/by-name/db/dbcsr/package.nix index 5631ff15e8ef..3021ba446435 100644 --- a/pkgs/by-name/db/dbcsr/package.nix +++ b/pkgs/by-name/db/dbcsr/package.nix @@ -14,14 +14,14 @@ mpi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dbcsr"; version = "2.9.1"; src = fetchFromGitHub { owner = "cp2k"; repo = "dbcsr"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-F6EvpsPAJJvmEZQKJDW2Mk4Yo8VsQCD4CE2IqxpjyN8="; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cp2k/dbcsr"; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/db/dbus/package.nix b/pkgs/by-name/db/dbus/package.nix index 8344e570cfaa..5c0e9255d315 100644 --- a/pkgs/by-name/db/dbus/package.nix +++ b/pkgs/by-name/db/dbus/package.nix @@ -20,12 +20,12 @@ libice, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dbus"; version = "1.14.10"; src = fetchurl { - url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"; + url = "https://dbus.freedesktop.org/releases/dbus/dbus-${finalAttrs.version}.tar.xz"; sha256 = "sha256-uh8h0r2dM52i1KqHgMCd8y/qh5mLc9ok9Jq53x42pQ8="; }; @@ -135,9 +135,9 @@ stdenv.mkDerivation rec { meta = { description = "Simple interprocess messaging system"; homepage = "https://www.freedesktop.org/wiki/Software/dbus/"; - changelog = "https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-${version}/NEWS"; + changelog = "https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-${finalAttrs.version}/NEWS"; license = lib.licenses.gpl2Plus; # most is also under AFL-2.1 teams = [ lib.teams.freedesktop ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/db/dbus_java/package.nix b/pkgs/by-name/db/dbus_java/package.nix index ef324f70c244..ef558cba2a29 100644 --- a/pkgs/by-name/db/dbus_java/package.nix +++ b/pkgs/by-name/db/dbus_java/package.nix @@ -7,12 +7,12 @@ libmatthew_java, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dbus-java"; version = "2.7"; src = fetchurl { - url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-${version}.tar.gz"; + url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-${finalAttrs.version}.tar.gz"; sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y"; }; JAVA_HOME = jdk8; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.afl21; }; -} +}) diff --git a/pkgs/by-name/dc/dcap/package.nix b/pkgs/by-name/dc/dcap/package.nix index b0c9a0e8c00a..1b6bf5b24a41 100644 --- a/pkgs/by-name/dc/dcap/package.nix +++ b/pkgs/by-name/dc/dcap/package.nix @@ -9,14 +9,14 @@ cunit, libxcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dcap"; version = "2.47.14"; src = fetchFromGitHub { owner = "dCache"; repo = "dcap"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-hn4nkFTIbSUUhvf9UfsEqVhphAdNWmATaCrv8jOuC0Y="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { mainProgram = "dccp"; maintainers = with lib.maintainers; [ ShamrockLee ]; }; -} +}) diff --git a/pkgs/by-name/dc/dcmtk/package.nix b/pkgs/by-name/dc/dcmtk/package.nix index f96e19b502ae..ce9865b7e472 100644 --- a/pkgs/by-name/dc/dcmtk/package.nix +++ b/pkgs/by-name/dc/dcmtk/package.nix @@ -12,14 +12,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dcmtk"; version = "3.6.9"; src = fetchFromGitHub { owner = "DCMTK"; repo = "dcmtk"; - tag = "DCMTK-${version}"; + tag = "DCMTK-${finalAttrs.version}"; hash = "sha256-mdI/YqM38WhnCbsylIlmqLLWC5/QR+a8Wn9CNcN7KXU="; }; @@ -102,4 +102,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ iimog ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix index f44dd682222f..69831571d54c 100644 --- a/pkgs/by-name/dc/dconf-editor/package.nix +++ b/pkgs/by-name/dc/dconf-editor/package.nix @@ -20,12 +20,12 @@ gobject-introspection, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dconf-editor"; version = "49.0"; src = fetchurl { - url = "mirror://gnome/sources/dconf-editor/${lib.versions.major version}/dconf-editor-${version}.tar.xz"; + url = "mirror://gnome/sources/dconf-editor/${lib.versions.major finalAttrs.version}/dconf-editor-${finalAttrs.version}.tar.xz"; hash = "sha256-kKjM+t9R3/MeACgyT7mjWLLSbFroYaccfb+fTdm905k="; }; @@ -66,9 +66,9 @@ stdenv.mkDerivation rec { description = "GSettings editor for GNOME"; mainProgram = "dconf-editor"; homepage = "https://apps.gnome.org/DconfEditor/"; - changelog = "https://gitlab.gnome.org/GNOME/dconf-editor/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/dconf-editor/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.gpl3Plus; teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/dd/ddate/package.nix b/pkgs/by-name/dd/ddate/package.nix index 9130752cbba8..16389c8ab8ee 100644 --- a/pkgs/by-name/dd/ddate/package.nix +++ b/pkgs/by-name/dd/ddate/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ddate"; version = "0.2.2"; src = fetchFromGitHub { owner = "bo0ts"; repo = "ddate"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "ddate"; }; -} +}) diff --git a/pkgs/by-name/dd/ddcutil/package.nix b/pkgs/by-name/dd/ddcutil/package.nix index 449904b5abdb..80795c41efa9 100644 --- a/pkgs/by-name/dd/ddcutil/package.nix +++ b/pkgs/by-name/dd/ddcutil/package.nix @@ -14,12 +14,12 @@ libxext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ddcutil"; version = "2.2.3"; src = fetchurl { - url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz"; + url = "https://www.ddcutil.com/tarballs/ddcutil-${finalAttrs.version}.tar.gz"; hash = "sha256-4XvAUqYvnqhS2eOLpPHtfnNmVnoOGdvhpDnuca2+BqA="; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ rnhmjoj ]; - changelog = "https://github.com/rockowitz/ddcutil/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/rockowitz/ddcutil/blob/v${finalAttrs.version}/CHANGELOG.md"; mainProgram = "ddcutil"; }; -} +}) diff --git a/pkgs/by-name/dd/ddgr/package.nix b/pkgs/by-name/dd/ddgr/package.nix index 032764f1049a..b59940213ad2 100644 --- a/pkgs/by-name/dd/ddgr/package.nix +++ b/pkgs/by-name/dd/ddgr/package.nix @@ -6,14 +6,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.2"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-88cCQm3eViy0OwSyCTlnW7uuiFwz2/6Wz45QzxCgXxg="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = python3.meta.platforms; mainProgram = "ddgr"; }; -} +}) diff --git a/pkgs/by-name/dd/ddrescue/package.nix b/pkgs/by-name/dd/ddrescue/package.nix index 0988990cb4e6..406466805d20 100644 --- a/pkgs/by-name/dd/ddrescue/package.nix +++ b/pkgs/by-name/dd/ddrescue/package.nix @@ -5,12 +5,12 @@ lzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ddrescue"; version = "1.29.1"; src = fetchurl { - url = "mirror://gnu/ddrescue/ddrescue-${version}.tar.lz"; + url = "mirror://gnu/ddrescue/ddrescue-${finalAttrs.version}.tar.lz"; sha256 = "sha256-3dfUXfAmgHg1ouxqucNl3y7xno3hpQ/+aIbNOR4E3XU="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { fpletz ]; }; -} +}) diff --git a/pkgs/by-name/dd/dduper/package.nix b/pkgs/by-name/dd/dduper/package.nix index 7311aa772735..68ce1a13857f 100644 --- a/pkgs/by-name/dd/dduper/package.nix +++ b/pkgs/by-name/dd/dduper/package.nix @@ -24,14 +24,14 @@ let ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dduper"; version = "0.04"; src = fetchFromGitHub { owner = "lakshmipathi"; repo = "dduper"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "09ncdawxkffldadqhfblqlkdl05q2qmywxyg6p61fv3dr2f2v5wm"; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ thesola10 ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/de/debian-goodies/package.nix b/pkgs/by-name/de/debian-goodies/package.nix index 2d63b7df09df..2e4ed623ac4a 100644 --- a/pkgs/by-name/de/debian-goodies/package.nix +++ b/pkgs/by-name/de/debian-goodies/package.nix @@ -9,7 +9,7 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "debian-goodies"; version = "0.88.2"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "debian"; repo = "debian-goodies"; - tag = "debian/${version}"; + tag = "debian/${finalAttrs.version}"; sha256 = "sha256-KPPRxYmCEYwlUAR29tc8w4rerXpswO/rbpEjXPoDV4Q="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; -} +}) diff --git a/pkgs/by-name/de/debootstrap/package.nix b/pkgs/by-name/de/debootstrap/package.nix index c825db3b1f70..3a394ec99974 100644 --- a/pkgs/by-name/de/debootstrap/package.nix +++ b/pkgs/by-name/de/debootstrap/package.nix @@ -44,7 +44,7 @@ let zstd ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "debootstrap"; version = "1.0.140_bpo12+1"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "installer-team"; repo = "debootstrap"; - tag = version; + tag = finalAttrs.version; hash = "sha256-4vINaMRo6IrZ6e2/DAJ06ODy2BWm4COR1JDSY52upUc="; }; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { --replace 'CHROOT_CMD="unshare ' 'CHROOT_CMD="${util-linux}/bin/unshare ' \ --replace /usr/bin/dpkg ${dpkg}/bin/dpkg \ --replace '#!/bin/sh' '#!/bin/bash' \ - --subst-var-by VERSION ${version} + --subst-var-by VERSION ${finalAttrs.version} d=$out/share/debootstrap mkdir -p $out/{share/debootstrap,bin} @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { }; meta = { - changelog = "https://salsa.debian.org/installer-team/debootstrap/-/blob/${version}/debian/changelog"; + changelog = "https://salsa.debian.org/installer-team/debootstrap/-/blob/${finalAttrs.version}/debian/changelog"; description = "Tool to create a Debian system in a chroot"; homepage = "https://wiki.debian.org/Debootstrap"; license = lib.licenses.mit; @@ -105,4 +105,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "debootstrap"; }; -} +}) diff --git a/pkgs/by-name/de/debugedit/package.nix b/pkgs/by-name/de/debugedit/package.nix index 002c5a75dd1a..e2a7ee58f038 100644 --- a/pkgs/by-name/de/debugedit/package.nix +++ b/pkgs/by-name/de/debugedit/package.nix @@ -14,13 +14,13 @@ gdb, dwz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "debugedit"; version = "5.2"; src = fetchgit { url = "git://sourceware.org/git/debugedit.git"; - tag = "debugedit-${version}"; + tag = "debugedit-${finalAttrs.version}"; hash = "sha256-6SOw5t9Hnb9Picx18LwqLwaPieueO6mXl8/vGnU+81E="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = [ lib.systems.inspect.patterns.isElf ]; maintainers = with lib.maintainers; [ deliciouslytyped ]; }; -} +}) diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix index 3c97c6768ed4..d01fefa06869 100644 --- a/pkgs/by-name/de/decker/package.nix +++ b/pkgs/by-name/de/decker/package.nix @@ -8,14 +8,14 @@ multimarkdown, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "decker"; version = "1.60"; src = fetchFromGitHub { owner = "JohnEarnest"; repo = "Decker"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-A8lsQs3fZm8XREHx2IPRNWZp4tTZ4Jya30+gBT6xME8="; }; @@ -83,4 +83,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/de/deer/package.nix b/pkgs/by-name/de/deer/package.nix index db0adc93a325..2a153d302db2 100644 --- a/pkgs/by-name/de/deer/package.nix +++ b/pkgs/by-name/de/deer/package.nix @@ -5,14 +5,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "deer"; version = "1.4"; src = fetchFromGitHub { owner = "Vifon"; repo = "deer"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1xnbnbi0zk2xsyn8dqsmyxqlfnl36pb1wwibnlp0dxixw6sfymyl"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/de/deheader/package.nix b/pkgs/by-name/de/deheader/package.nix index 3b71e375ca60..28f0b2a1effd 100644 --- a/pkgs/by-name/de/deheader/package.nix +++ b/pkgs/by-name/de/deheader/package.nix @@ -8,7 +8,7 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "deheader"; version = "1.11"; outputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "esr"; repo = "deheader"; - rev = version; + rev = finalAttrs.version; hash = "sha256-RaWU6075PvgxbsH1+Lt/CEDAcl9Vx6kxcZAA/A/Af4o="; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/de/dejsonlz4/package.nix b/pkgs/by-name/de/dejsonlz4/package.nix index 04118e6a2733..cffbf5676ab7 100644 --- a/pkgs/by-name/de/dejsonlz4/package.nix +++ b/pkgs/by-name/de/dejsonlz4/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dejsonlz4"; version = "1.1"; src = fetchFromGitHub { owner = "avih"; repo = "dejsonlz4"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "dejsonlz4"; }; -} +}) diff --git a/pkgs/by-name/de/design/package.nix b/pkgs/by-name/de/design/package.nix index cff89d7b38a3..0c18480cc07d 100644 --- a/pkgs/by-name/de/design/package.nix +++ b/pkgs/by-name/de/design/package.nix @@ -14,14 +14,14 @@ libadwaita, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "design"; version = "48-alpha1"; src = fetchFromGitHub { owner = "dubstar-04"; repo = "Design"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-xLARmvqJUxVjHHeak/BrpfIe18KCy9++8HRjOFjwE7I="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "io.github.dubstar_04.design"; }; -} +}) diff --git a/pkgs/by-name/de/deskew/package.nix b/pkgs/by-name/de/deskew/package.nix index 51ffc7ad3d01..f56001da55c4 100644 --- a/pkgs/by-name/de/deskew/package.nix +++ b/pkgs/by-name/de/deskew/package.nix @@ -6,7 +6,7 @@ fpc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "deskew"; version = "1.30"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "galfar"; repo = "deskew"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-xghVOEMkQ/mXpOzJqMaT3SII7xneMNoFqRlqjtzmDnA="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { mainProgram = "deskew"; }; -} +}) diff --git a/pkgs/by-name/de/desktop-file-utils/package.nix b/pkgs/by-name/de/desktop-file-utils/package.nix index 3119ac5e2251..b1dc3f5bd6c0 100644 --- a/pkgs/by-name/de/desktop-file-utils/package.nix +++ b/pkgs/by-name/de/desktop-file-utils/package.nix @@ -9,12 +9,12 @@ libintl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "desktop-file-utils"; version = "0.28"; src = fetchurl { - url = "https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${finalAttrs.version}.tar.xz"; hash = "sha256-RAHU4jHYQsLegkI5WnSjlcpGjNlvX2ENgi3zNZSJinA="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.freebsd; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/de/detach/package.nix b/pkgs/by-name/de/detach/package.nix index a9025beaee11..a83f3721817c 100644 --- a/pkgs/by-name/de/detach/package.nix +++ b/pkgs/by-name/de/detach/package.nix @@ -5,12 +5,12 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "detach"; version = "0.2.3"; src = fetchzip { - url = "http://inglorion.net/download/detach-${version}.tar.bz2"; + url = "http://inglorion.net/download/detach-${finalAttrs.version}.tar.bz2"; hash = "sha256-nnhJGtmPlTeqM20FAKRyhhSMViTXFpQT0A1ol4lhsoc="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pbsds ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/de/dethrace/package.nix b/pkgs/by-name/de/dethrace/package.nix index 5ff9c61cfd34..35620afd9a81 100644 --- a/pkgs/by-name/de/dethrace/package.nix +++ b/pkgs/by-name/de/dethrace/package.nix @@ -7,14 +7,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dethrace"; version = "0.9.0"; src = fetchFromGitHub { owner = "dethrace-labs"; repo = "dethrace"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+C3NyRLmvXrkZuhLGwIIHFWjXLMpt3srLZCVrxRUlkA="; fetchSubmodules = true; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ astro ]; mainProgram = "dethrace"; }; -} +}) diff --git a/pkgs/by-name/de/devhelp/package.nix b/pkgs/by-name/de/devhelp/package.nix index 074af5591d80..61cb0dfca537 100644 --- a/pkgs/by-name/de/devhelp/package.nix +++ b/pkgs/by-name/de/devhelp/package.nix @@ -19,7 +19,7 @@ shared-mime-info, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "devhelp"; version = "43.0"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/devhelp-${version}.tar.xz"; + url = "mirror://gnome/sources/devhelp/${lib.versions.major finalAttrs.version}/devhelp-${finalAttrs.version}.tar.xz"; hash = "sha256-Y87u/QU5LgIESIHvHs1yQpNVPaVzW378CCstE/6F3QQ="; }; @@ -84,9 +84,9 @@ stdenv.mkDerivation rec { description = "API documentation browser for GNOME"; mainProgram = "devhelp"; homepage = "https://apps.gnome.org/Devhelp/"; - changelog = "https://gitlab.gnome.org/GNOME/devhelp/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/devhelp/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.gpl3Plus; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/de/devmode/README.md b/pkgs/by-name/de/devmode/README.md index 506474769004..cd3806e6677d 100644 --- a/pkgs/by-name/de/devmode/README.md +++ b/pkgs/by-name/de/devmode/README.md @@ -1,6 +1,6 @@ # `devmode` -`devmode` is a daemon, that: +`devmode` is a daemon that: 1. watches the manual's source for changes and when they occur — rebuilds 2. HTTP serves the manual, injecting a script that triggers reload on changes 3. opens the manual in the default browser diff --git a/pkgs/by-name/de/devour/package.nix b/pkgs/by-name/de/devour/package.nix index 5d1f87cd385a..f49b88e4cea4 100644 --- a/pkgs/by-name/de/devour/package.nix +++ b/pkgs/by-name/de/devour/package.nix @@ -5,14 +5,14 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "devour"; version = "12"; src = fetchFromGitHub { owner = "salman-abedin"; repo = "devour"; - rev = version; + rev = finalAttrs.version; sha256 = "1qq5l6d0fn8azg7sj7a4m2jsmhlpswl5793clcxs1p34vy4wb2lp"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "devour"; }; -} +}) diff --git a/pkgs/by-name/de/dex/package.nix b/pkgs/by-name/de/dex/package.nix index 81ad7dd5389d..9aebc493f164 100644 --- a/pkgs/by-name/de/dex/package.nix +++ b/pkgs/by-name/de/dex/package.nix @@ -6,14 +6,14 @@ sphinx, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dex"; version = "0.10.1"; src = fetchFromGitHub { owner = "jceb"; repo = "dex"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-1fgSz4f6W+Dr3mo4vQY8buD2dNC8RBMGrwCTOIzH7rQ="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nickcao ]; mainProgram = "dex"; }; -} +}) diff --git a/pkgs/by-name/dh/dhcpdump/package.nix b/pkgs/by-name/dh/dhcpdump/package.nix index 21ce06a7373d..f3df31573529 100644 --- a/pkgs/by-name/dh/dhcpdump/package.nix +++ b/pkgs/by-name/dh/dhcpdump/package.nix @@ -7,14 +7,14 @@ libpcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dhcpdump"; version = "1.9"; src = fetchFromGitHub { owner = "bbonev"; repo = "dhcpdump"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ck6DLsLQ00unNqPLBKkxaJLDCaPFjTFJcQjTbKSq0U8="; }; @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { meta = { description = "Tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; homepage = "https://github.com/bbonev/dhcpdump"; - changelog = "https://github.com/bbonev/dhcpdump/releases/tag/v${version}"; + changelog = "https://github.com/bbonev/dhcpdump/releases/tag/v${finalAttrs.version}"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ nickcao ]; license = lib.licenses.bsd2; mainProgram = "dhcpdump"; }; -} +}) diff --git a/pkgs/by-name/dh/dhcping/package.nix b/pkgs/by-name/dh/dhcping/package.nix index 4a625dda5ace..bb281d4ceb32 100644 --- a/pkgs/by-name/dh/dhcping/package.nix +++ b/pkgs/by-name/dh/dhcping/package.nix @@ -4,13 +4,13 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dhcping"; version = "1.2"; src = fetchurl { sha256 = "0sk4sg3hn88n44dxikipf3ggfj3ixrp22asb7nry9p0bkfaqdvrj"; - url = "https://www.mavetju.org/download/dhcping-${version}.tar.gz"; + url = "https://www.mavetju.org/download/dhcping-${finalAttrs.version}.tar.gz"; }; enableParallelBuilding = true; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "dhcping"; }; -} +}) diff --git a/pkgs/by-name/dh/dhewm3/package.nix b/pkgs/by-name/dh/dhewm3/package.nix index 063bd11942cf..03e314492d1d 100644 --- a/pkgs/by-name/dh/dhewm3/package.nix +++ b/pkgs/by-name/dh/dhewm3/package.nix @@ -17,14 +17,14 @@ makeDesktopItem, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dhewm3"; version = "1.5.4"; src = fetchFromGitHub { owner = "dhewm"; repo = "dhewm3"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-losqnxnjRPOczjrRPyyOxCeg9TNScXLcXADgo9Bxm5k="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/dh/dhex/package.nix b/pkgs/by-name/dh/dhex/package.nix index 845541bafbfe..c3ae0517edb2 100644 --- a/pkgs/by-name/dh/dhex/package.nix +++ b/pkgs/by-name/dh/dhex/package.nix @@ -5,12 +5,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dhex"; version = "0.69"; src = fetchurl { - url = "http://www.dettus.net/dhex/dhex_${version}.tar.gz"; + url = "http://www.dettus.net/dhex/dhex_${finalAttrs.version}.tar.gz"; sha256 = "06y4lrp29f2fh303ijk1xhspa1d4x4dm6hnyw3dd8szi3k6hnwsj"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "dhex"; }; -} +}) diff --git a/pkgs/by-name/di/diamond/package.nix b/pkgs/by-name/di/diamond/package.nix index 2f457fc6932e..80e54beb7250 100644 --- a/pkgs/by-name/di/diamond/package.nix +++ b/pkgs/by-name/di/diamond/package.nix @@ -6,14 +6,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "diamond"; version = "2.1.14"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-nTMfWpXTsdcas0VwZzyU6ix4reNQX7EoyYRZ1wUN2pM="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/di/diction/package.nix b/pkgs/by-name/di/diction/package.nix index f0c6dd42461e..25dad74f8ecb 100644 --- a/pkgs/by-name/di/diction/package.nix +++ b/pkgs/by-name/di/diction/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "diction"; version = "1.14"; src = fetchurl { - url = "https://www.moria.de/~michael/comp/diction/diction-${version}.tar.gz"; + url = "https://www.moria.de/~michael/comp/diction/diction-${finalAttrs.version}.tar.gz"; hash = "sha256-2gEvs6XLplZtI4zahpsM7NvvBFJ4DE02gQCoQEcv1/w="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/di/dictu/package.nix b/pkgs/by-name/di/dictu/package.nix index dc49f45147b0..b8b99593affc 100644 --- a/pkgs/by-name/di/dictu/package.nix +++ b/pkgs/by-name/di/dictu/package.nix @@ -14,14 +14,14 @@ assert enableLTO -> stdenv.cc.isGNU; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dictu"; version = "0.25.0"; src = fetchFromGitHub { owner = "dictu-lang"; repo = "dictu"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Tahi2K8Q/KPc9MN7yWhkqp/MzXfzJzrGSsvnTCyI03U="; }; @@ -93,4 +93,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dictu.x86_64-darwin }; -} +}) diff --git a/pkgs/by-name/di/diff-so-fancy/package.nix b/pkgs/by-name/di/diff-so-fancy/package.nix index 9a5c31ab441a..24bbe74f7d25 100644 --- a/pkgs/by-name/di/diff-so-fancy/package.nix +++ b/pkgs/by-name/di/diff-so-fancy/package.nix @@ -9,14 +9,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "diff-so-fancy"; version = "1.4.4"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-yF+LI1lsE1qwOc3u7mtc+uu0N/8m4bZD5qP+xFraaTI="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "diff-so-fancy"; }; -} +}) diff --git a/pkgs/by-name/di/diffstat/package.nix b/pkgs/by-name/di/diffstat/package.nix index 7aa1b6e3ed81..3c4ede5b1f66 100644 --- a/pkgs/by-name/di/diffstat/package.nix +++ b/pkgs/by-name/di/diffstat/package.nix @@ -6,14 +6,14 @@ directoryListingUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "diffstat"; version = "1.68"; src = fetchurl { urls = [ - "https://invisible-island.net/archives/diffstat/diffstat-${version}.tgz" - "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz" + "https://invisible-island.net/archives/diffstat/diffstat-${finalAttrs.version}.tgz" + "https://invisible-mirror.net/archives/diffstat/diffstat-${finalAttrs.version}.tgz" ]; hash = "sha256-ifkpSorHT8728bmsQI9D6+340gjj7+C5m0rMFtxlgsc="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/di/digitemp/package.nix b/pkgs/by-name/di/digitemp/package.nix index 4c96b8128413..d3f654b72813 100644 --- a/pkgs/by-name/di/digitemp/package.nix +++ b/pkgs/by-name/di/digitemp/package.nix @@ -4,14 +4,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "digitemp"; version = "3.7.2"; src = fetchFromGitHub { owner = "bcl"; repo = "digitemp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "19zka5fcdxhhginaspak76l984iqq9v2j6qrwvi5mvca7bcj8f72"; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/di/ding-libs/package.nix b/pkgs/by-name/di/ding-libs/package.nix index 2f375904165e..5c50f6c7ba0f 100644 --- a/pkgs/by-name/di/ding-libs/package.nix +++ b/pkgs/by-name/di/ding-libs/package.nix @@ -5,12 +5,12 @@ check, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ding-libs"; version = "0.6.1"; src = fetchurl { - url = "https://releases.pagure.org/SSSD/ding-libs/ding-libs-${version}.tar.gz"; + url = "https://releases.pagure.org/SSSD/ding-libs/ding-libs-${finalAttrs.version}.tar.gz"; sha256 = "1h97mx2jdv4caiz4r7y8rxfsq78fx0k4jjnfp7x2s7xqvqks66d3"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { lib.licenses.lgpl3 ]; }; -} +}) diff --git a/pkgs/by-name/di/dinit/package.nix b/pkgs/by-name/di/dinit/package.nix index c16d3f20b07f..0f802630ac5f 100644 --- a/pkgs/by-name/di/dinit/package.nix +++ b/pkgs/by-name/di/dinit/package.nix @@ -7,14 +7,14 @@ util-linuxMinimal, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dinit"; version = "0.20.0"; src = fetchFromGitHub { owner = "davmac314"; repo = "dinit"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; # fix for case-insensitive filesystems postFetch = '' [ -f "$out/BUILD" ] && rm "$out/BUILD" @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/di/diod/package.nix b/pkgs/by-name/di/diod/package.nix index bbc3c89e6e1d..1645cc6a8ed1 100644 --- a/pkgs/by-name/di/diod/package.nix +++ b/pkgs/by-name/di/diod/package.nix @@ -13,19 +13,19 @@ let lua = lua5_1; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "diod"; version = "1.1.0"; src = fetchFromGitHub { owner = "chaos"; repo = "diod"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Fz+qvgw5ipyAcZlWBGkmSHuGrZ95i5OorLN3dkdsYKU="; }; postPatch = '' - sed -i configure.ac -e '/git describe/c ${version})' + sed -i configure.ac -e '/git describe/c ${finalAttrs.version})' ''; nativeBuildInputs = [ @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/di/dippi/package.nix b/pkgs/by-name/di/dippi/package.nix index 079a34d1c51e..8f601fddf0d9 100644 --- a/pkgs/by-name/di/dippi/package.nix +++ b/pkgs/by-name/di/dippi/package.nix @@ -14,14 +14,14 @@ desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dippi"; version = "4.2.0"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "dippi"; - rev = version; + rev = finalAttrs.version; hash = "sha256-iA7ymByLVrkOatW4Y79pGV7GhlS8G2gHY6PHpOfMq8g="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ zendo ]; }; -} +}) diff --git a/pkgs/by-name/di/dirb/package.nix b/pkgs/by-name/di/dirb/package.nix index c0093d379193..dbf59823052d 100644 --- a/pkgs/by-name/di/dirb/package.nix +++ b/pkgs/by-name/di/dirb/package.nix @@ -10,12 +10,12 @@ let major = "2"; minor = "22"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dirb"; version = "${major}.${minor}"; src = fetchurl { - url = "mirror://sourceforge/dirb/${version}/dirb${major}${minor}.tar.gz"; + url = "mirror://sourceforge/dirb/${finalAttrs.version}/dirb${major}${minor}.tar.gz"; sha256 = "0b7wc2gvgnyp54rxf1n9arn6ymrvdb633v6b3ah138hw4gg8lx7k"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ gpl2Only ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/di/directfb/package.nix b/pkgs/by-name/di/directfb/package.nix index 5fc7e7458b68..60d6a257f7d9 100644 --- a/pkgs/by-name/di/directfb/package.nix +++ b/pkgs/by-name/di/directfb/package.nix @@ -21,14 +21,14 @@ SDL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "directfb"; version = "1.7.7"; src = fetchFromGitHub { owner = "deniskropp"; repo = "DirectFB"; - rev = "DIRECTFB_${lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "DIRECTFB_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; sha256 = "0bs3yzb7hy3mgydrj8ycg7pllrd2b6j0gxj596inyr7ihssr3i0y"; }; @@ -144,4 +144,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/di/directx-headers/package.nix b/pkgs/by-name/di/directx-headers/package.nix index 8190a6c58d8b..d60f635a4397 100644 --- a/pkgs/by-name/di/directx-headers/package.nix +++ b/pkgs/by-name/di/directx-headers/package.nix @@ -5,14 +5,14 @@ meson, ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "directx-headers"; version = "1.618.2"; src = fetchFromGitHub { owner = "microsoft"; repo = "DirectX-Headers"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-zKlKUnPHUCDYRBIFU2gpOUvx1d5ZoMy1vYMdByaMIyA="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ k900 ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/di/direvent/package.nix b/pkgs/by-name/di/direvent/package.nix index e257ea0c0140..80c722a028df 100644 --- a/pkgs/by-name/di/direvent/package.nix +++ b/pkgs/by-name/di/direvent/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "direvent"; version = "5.4"; src = fetchurl { - url = "mirror://gnu/direvent/direvent-${version}.tar.gz"; + url = "mirror://gnu/direvent/direvent-${finalAttrs.version}.tar.gz"; sha256 = "sha256-HbvGGSqrZ+NFclFIYD1XDGooKDgMlkIVdir5FSTXlbo="; }; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ puffnfresh ]; }; -} +}) diff --git a/pkgs/by-name/di/dirvish/package.nix b/pkgs/by-name/di/dirvish/package.nix index 712950bfe804..8ffcb503974f 100644 --- a/pkgs/by-name/di/dirvish/package.nix +++ b/pkgs/by-name/di/dirvish/package.nix @@ -7,12 +7,12 @@ perlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dirvish"; version = "1.2.1"; src = fetchurl { - url = "http://dirvish.org/dirvish${version}.tgz"; + url = "http://dirvish.org/dirvish${finalAttrs.version}.tgz"; sha256 = "6b7f29c3541448db3d317607bda3eb9bac9fb3c51f970611ffe27e9d63507dcd"; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.winpat ]; }; -} +}) diff --git a/pkgs/by-name/di/disarchive/package.nix b/pkgs/by-name/di/disarchive/package.nix index 598a47d1e6e6..406ffca299d1 100644 --- a/pkgs/by-name/di/disarchive/package.nix +++ b/pkgs/by-name/di/disarchive/package.nix @@ -12,12 +12,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "disarchive"; version = "0.5.0"; src = fetchurl { - url = "https://files.ngyro.com/disarchive/disarchive-${version}.tar.gz"; + url = "https://files.ngyro.com/disarchive/disarchive-${finalAttrs.version}.tar.gz"; hash = "sha256-Agt7v5HTpaskXuYmMdGDRIolaqCHUpwd/CfbZCe9Ups="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/di/discord-rpc/package.nix b/pkgs/by-name/di/discord-rpc/package.nix index 293f4ad07a04..3948a05be270 100644 --- a/pkgs/by-name/di/discord-rpc/package.nix +++ b/pkgs/by-name/di/discord-rpc/package.nix @@ -8,14 +8,14 @@ buildExamples ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "discord-rpc"; version = "3.4.0"; src = fetchFromGitHub { owner = "discordapp"; repo = "discord-rpc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "04cxhqdv5r92lrpnhxf8702a8iackdf3sfk1050z7pijbijiql2a"; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/di/discount/package.nix b/pkgs/by-name/di/discount/package.nix index 383000c1401a..528697595f60 100644 --- a/pkgs/by-name/di/discount/package.nix +++ b/pkgs/by-name/di/discount/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.0.1.2"; pname = "discount"; src = fetchFromGitHub { owner = "Orc"; repo = "discount"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-QZmbc3imBlQmFgTjtepEx2HqsfW93yqqUy0LN5WWKwM="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { mainProgram = "markdown"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/di/discourse-mail-receiver/package.nix b/pkgs/by-name/di/discourse-mail-receiver/package.nix index 32b1265f8bbc..794d74da2fa8 100644 --- a/pkgs/by-name/di/discourse-mail-receiver/package.nix +++ b/pkgs/by-name/di/discourse-mail-receiver/package.nix @@ -7,14 +7,14 @@ replace, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "discourse-mail-receiver"; version = "4.1.0"; src = fetchFromGitHub { owner = "discourse"; repo = "mail-receiver"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ob4Hb88odlFf5vSC9qhikhJowo4C5LksVmMuJRMNoI4="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { description = "Helper program which receives incoming mail for Discourse"; }; -} +}) diff --git a/pkgs/by-name/di/disfetch/package.nix b/pkgs/by-name/di/disfetch/package.nix index 744e780dc18f..fdfb04d69736 100644 --- a/pkgs/by-name/di/disfetch/package.nix +++ b/pkgs/by-name/di/disfetch/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "disfetch"; version = "3.7"; src = fetchFromGitHub { owner = "q60"; repo = "disfetch"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-xzOE+Pnx0qb3B9vWWrF5Q0nhUo0QYBUO6j6al8N3deY="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ vel ]; mainProgram = "disfetch"; }; -} +}) diff --git a/pkgs/by-name/di/diskscan/package.nix b/pkgs/by-name/di/diskscan/package.nix index e8bfcd8ce581..b86d841f4978 100644 --- a/pkgs/by-name/di/diskscan/package.nix +++ b/pkgs/by-name/di/diskscan/package.nix @@ -8,14 +8,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "diskscan"; version = "0.21"; src = fetchFromGitHub { owner = "baruch"; repo = "diskscan"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-2y1ncPg9OKxqImBN5O5kXrTsuwZ/Cg/8exS7lWyZY1c="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; mainProgram = "diskscan"; }; -} +}) diff --git a/pkgs/by-name/di/ditaa/package.nix b/pkgs/by-name/di/ditaa/package.nix index 2ecd720729e6..60b104e5ad94 100644 --- a/pkgs/by-name/di/ditaa/package.nix +++ b/pkgs/by-name/di/ditaa/package.nix @@ -5,12 +5,12 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ditaa"; version = "0.11.0"; src = fetchurl { - url = "https://github.com/stathissideris/ditaa/releases/download/v${version}/ditaa-${version}-standalone.jar"; + url = "https://github.com/stathissideris/ditaa/releases/download/v${finalAttrs.version}/ditaa-${finalAttrs.version}-standalone.jar"; sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/lib - cp ${src} "$out/lib/ditaa.jar" + cp ${finalAttrs.src} "$out/lib/ditaa.jar" cat > "$out/bin/ditaa" << EOF #!${stdenv.shell} @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "ditaa"; }; -} +}) diff --git a/pkgs/by-name/dj/djenrandom/package.nix b/pkgs/by-name/dj/djenrandom/package.nix index f7aafdb775f1..b7e868f53c42 100644 --- a/pkgs/by-name/dj/djenrandom/package.nix +++ b/pkgs/by-name/dj/djenrandom/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "djenrandom"; version = "1.0"; src = fetchFromGitHub { owner = "dj-on-github"; repo = "djenrandom"; - rev = "${version}"; + rev = "${finalAttrs.version}"; hash = "sha256-r5UT8z8vvFZDffsl6CqBXuvBaZ/sl1WLxJi26CxkpAw="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "djenrandom"; }; -} +}) diff --git a/pkgs/by-name/dj/djent/package.nix b/pkgs/by-name/dj/djent/package.nix index 141c7aff3509..576fdbfa1161 100644 --- a/pkgs/by-name/dj/djent/package.nix +++ b/pkgs/by-name/dj/djent/package.nix @@ -5,14 +5,14 @@ mpfr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "djent"; version = "1.0"; src = fetchFromGitHub { owner = "dj-on-github"; repo = "djent"; - rev = "${version}"; + rev = "${finalAttrs.version}"; hash = "sha256-inMh7l/6LlrVnIin+L+fj+4Lchk0Xvt09ngVrCuvphE="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { thillux ]; }; -} +}) diff --git a/pkgs/by-name/dj/djvu2pdf/package.nix b/pkgs/by-name/dj/djvu2pdf/package.nix index cb2e4fe7cdaa..915211a0a99a 100644 --- a/pkgs/by-name/dj/djvu2pdf/package.nix +++ b/pkgs/by-name/dj/djvu2pdf/package.nix @@ -8,12 +8,12 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.9.2"; pname = "djvu2pdf"; src = fetchurl { - url = "http://0x2a.at/site/projects/djvu2pdf/djvu2pdf-${version}.tar.gz"; + url = "http://0x2a.at/site/projects/djvu2pdf/djvu2pdf-${finalAttrs.version}.tar.gz"; sha256 = "0v2ax30m7j1yi4m02nzn9rc4sn4vzqh5vywdh96r64j4pwvn5s5g"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "djvu2pdf"; }; -} +}) diff --git a/pkgs/by-name/dk/dkh/package.nix b/pkgs/by-name/dk/dkh/package.nix index f0afd79c69e5..c18a62fee00c 100644 --- a/pkgs/by-name/dk/dkh/package.nix +++ b/pkgs/by-name/dk/dkh/package.nix @@ -5,14 +5,14 @@ fetchFromGitHub, cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dkh"; version = "1.2"; src = fetchFromGitHub { owner = "psi4"; repo = "dkh"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1wb4qmb9f8rnrwnnw1gdhzx1fmhy628bxfrg56khxy3j5ljxkhck"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/dm/dmalloc/package.nix b/pkgs/by-name/dm/dmalloc/package.nix index c65d4d888f03..15066822f76b 100644 --- a/pkgs/by-name/dm/dmalloc/package.nix +++ b/pkgs/by-name/dm/dmalloc/package.nix @@ -6,14 +6,14 @@ dmalloc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dmalloc"; version = "5.6.5"; src = fetchFromGitHub { owner = "j256"; repo = "dmalloc"; - rev = "dmalloc_release_${lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "dmalloc_release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-P63I9s32C3v1q+Sy9joK0HKYb0ebBu9g72tTTwxvkz8="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "dmalloc"; }; -} +}) diff --git a/pkgs/by-name/dm/dmenu-rs/package.nix b/pkgs/by-name/dm/dmenu-rs/package.nix index cb1b5dcb97e5..ddca968f9f32 100644 --- a/pkgs/by-name/dm/dmenu-rs/package.nix +++ b/pkgs/by-name/dm/dmenu-rs/package.nix @@ -37,14 +37,14 @@ let cargoLockFile = if enablePlugins then ./enablePlugins.Cargo.lock else ./Cargo.lock; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dmenu-rs"; version = "5.5.4"; src = fetchFromGitHub { owner = "Shizcow"; repo = "dmenu-rs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-05Ia+GHeL8PzOwR7H+NEVhKJVMPhlIaQLwGfvwOAl0g="; }; @@ -111,4 +111,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; -} +}) diff --git a/pkgs/by-name/dm/dmidecode/package.nix b/pkgs/by-name/dm/dmidecode/package.nix index bb57757bab80..c91077f5fb71 100644 --- a/pkgs/by-name/dm/dmidecode/package.nix +++ b/pkgs/by-name/dm/dmidecode/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dmidecode"; version = "3.7"; src = fetchurl { - url = "mirror://savannah/dmidecode/dmidecode-${version}.tar.xz"; + url = "mirror://savannah/dmidecode/dmidecode-${finalAttrs.version}.tar.xz"; sha256 = "sha256-LDrtEshaHmqUENQG1eQXxFVGbcG8fIkni7Ms98rZHoo="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/dm/dmrconfig/package.nix b/pkgs/by-name/dm/dmrconfig/package.nix index cade048f73a6..f3153fb3748d 100644 --- a/pkgs/by-name/dm/dmrconfig/package.nix +++ b/pkgs/by-name/dm/dmrconfig/package.nix @@ -7,14 +7,14 @@ systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dmrconfig"; version = "1.1"; src = fetchFromGitHub { owner = "sergev"; repo = "dmrconfig"; - rev = version; + rev = finalAttrs.version; sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "VERSION=${version}" + "VERSION=${finalAttrs.version}" "GITCOUNT=0" ]; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "dmrconfig"; }; -} +}) diff --git a/pkgs/by-name/dm/dmtx-utils/package.nix b/pkgs/by-name/dm/dmtx-utils/package.nix index 4736c2b0418c..57ffc292737f 100644 --- a/pkgs/by-name/dm/dmtx-utils/package.nix +++ b/pkgs/by-name/dm/dmtx-utils/package.nix @@ -8,7 +8,7 @@ imagemagick, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dmtx-utils"; version = "0.7.6-unstable-2023-09-21"; @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { meta = { description = "Data matrix command-line utilities"; homepage = "https://github.com/dmtx/dmtx-utils"; - changelog = "https://github.com/dmtx/dmtx-utils/blob/v${version}/ChangeLog"; + changelog = "https://github.com/dmtx/dmtx-utils/blob/v${finalAttrs.version}/ChangeLog"; license = lib.licenses.lgpl2; maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/dn/dnadd/package.nix b/pkgs/by-name/dn/dnadd/package.nix index 544f79326e3e..acf61ac35d53 100644 --- a/pkgs/by-name/dn/dnadd/package.nix +++ b/pkgs/by-name/dn/dnadd/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dnadd"; version = "1.0.0"; src = fetchFromGitHub { owner = "JoeLancaster"; repo = "dnadd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1vzbgz8y9gj4lszsx4iczfbrj373sl4wi43j7rp46zfcbw323d4r"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ joelancaster ]; }; -} +}) diff --git a/pkgs/by-name/dn/dnsdbq/package.nix b/pkgs/by-name/dn/dnsdbq/package.nix index 9070dd89767e..5a45e1f7cb0e 100644 --- a/pkgs/by-name/dn/dnsdbq/package.nix +++ b/pkgs/by-name/dn/dnsdbq/package.nix @@ -8,14 +8,14 @@ stdenv, testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dnsdbq"; version = "2.6.8"; src = fetchFromGitHub { owner = "dnsdb"; repo = "dnsdbq"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-5Pi8xFZXnU3abIsH9m6xqrQ6NnEtAbhMU6HXsOYP0gg="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { mainProgram = "dnsdbq"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/dn/dnsdist/package.nix b/pkgs/by-name/dn/dnsdist/package.nix index 6eb249204cbf..07f3f465b2e4 100644 --- a/pkgs/by-name/dn/dnsdist/package.nix +++ b/pkgs/by-name/dn/dnsdist/package.nix @@ -18,12 +18,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dnsdist"; version = "1.9.10"; src = fetchurl { - url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; + url = "https://downloads.powerdns.com/releases/dnsdist-${finalAttrs.version}.tar.bz2"; hash = "sha256-An3b3uaVxaWXKAV7/EHFsaaR+hx6XokniwnzVTJfvtY="; }; @@ -80,4 +80,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ jojosch ]; }; -} +}) diff --git a/pkgs/by-name/dn/dnsenum/package.nix b/pkgs/by-name/dn/dnsenum/package.nix index fcd24512add5..dfa56e97df6e 100644 --- a/pkgs/by-name/dn/dnsenum/package.nix +++ b/pkgs/by-name/dn/dnsenum/package.nix @@ -7,14 +7,14 @@ perlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dnsenum"; version = "1.2.4.2"; src = fetchFromGitHub { owner = "fwaeytens"; repo = "dnsenum"; - rev = version; + rev = finalAttrs.version; sha256 = "1bg1ljv6klic13wq4r53bg6inhc74kqwm3w210865b1v1n8wj60v"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/dn/dnsperf/package.nix b/pkgs/by-name/dn/dnsperf/package.nix index a69b594b7348..fe4d507a800d 100644 --- a/pkgs/by-name/dn/dnsperf/package.nix +++ b/pkgs/by-name/dn/dnsperf/package.nix @@ -11,14 +11,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dnsperf"; version = "2.14.0"; src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-eDDVNFMjj+0wEBe1qO6r4Bai554Sp+EmP86reJ/VXGk="; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools for DNS benchmaring"; homepage = "https://www.dns-oarc.net/tools/dnsperf"; - changelog = "https://github.com/DNS-OARC/dnsperf/releases/tag/v${version}"; + changelog = "https://github.com/DNS-OARC/dnsperf/releases/tag/v${finalAttrs.version}"; license = lib.licenses.isc; platforms = lib.platforms.unix; mainProgram = "dnsperf"; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { mfrw ]; }; -} +}) diff --git a/pkgs/by-name/do/docbook2mdoc/package.nix b/pkgs/by-name/do/docbook2mdoc/package.nix index e74d29571852..cb3b9f3b16e8 100644 --- a/pkgs/by-name/do/docbook2mdoc/package.nix +++ b/pkgs/by-name/do/docbook2mdoc/package.nix @@ -5,12 +5,12 @@ expat, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "docbook2mdoc"; version = "0.0.9"; src = fetchurl { - url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/docbook2mdoc-${version}.tgz"; + url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/docbook2mdoc-${finalAttrs.version}.tgz"; sha256 = "07il80sg89xf6ym4bry6hxdacfzqgbwkxzyf7bjaihmw5jj0lclk"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ramkromberg ]; mainProgram = "docbook2mdoc"; }; -} +}) diff --git a/pkgs/by-name/do/docbook2odf/package.nix b/pkgs/by-name/do/docbook2odf/package.nix index 2750ced778c3..efa3db05342c 100644 --- a/pkgs/by-name/do/docbook2odf/package.nix +++ b/pkgs/by-name/do/docbook2odf/package.nix @@ -8,12 +8,12 @@ libxslt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "docbook2odf"; version = "0.244"; src = fetchurl { - url = "http://open.comsultia.com/docbook2odf/dwn/docbook2odf-${version}.tar.gz"; + url = "http://open.comsultia.com/docbook2odf/dwn/docbook2odf-${finalAttrs.version}.tar.gz"; sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb"; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "docbook2odf"; }; -} +}) diff --git a/pkgs/by-name/do/docbook2x/package.nix b/pkgs/by-name/do/docbook2x/package.nix index b1d33c450736..fbbe6e3daeb2 100644 --- a/pkgs/by-name/do/docbook2x/package.nix +++ b/pkgs/by-name/do/docbook2x/package.nix @@ -16,12 +16,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "docbook2X"; version = "0.8.8"; src = fetchurl { - url = "mirror://sourceforge/docbook2x/docbook2X-${version}.tar.gz"; + url = "mirror://sourceforge/docbook2x/docbook2X-${finalAttrs.version}.tar.gz"; sha256 = "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0"; }; @@ -99,4 +99,4 @@ stdenv.mkDerivation rec { homepage = "https://docbook2x.sourceforge.net/"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/do/docbook5/package.nix b/pkgs/by-name/do/docbook5/package.nix index d6db5ec896f2..d1148f26e285 100644 --- a/pkgs/by-name/do/docbook5/package.nix +++ b/pkgs/by-name/do/docbook5/package.nix @@ -5,12 +5,12 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "docbook5"; version = "5.0.1"; src = fetchurl { - url = "http://www.docbook.org/xml/${version}/docbook-${version}.zip"; + url = "http://www.docbook.org/xml/${finalAttrs.version}/docbook-${finalAttrs.version}.zip"; sha256 = "1iz3hq1lqgnshvlz4j9gvh4jy1ml74qf90vqf2ikbq0h4i2xzybs"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/do/docbook_xml_ebnf_dtd/package.nix b/pkgs/by-name/do/docbook_xml_ebnf_dtd/package.nix index fe1d11111a92..06127a92fd0c 100644 --- a/pkgs/by-name/do/docbook_xml_ebnf_dtd/package.nix +++ b/pkgs/by-name/do/docbook_xml_ebnf_dtd/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "docbook-xml-ebnf"; version = "1.2b1"; dtd = fetchurl { - url = "https://docbook.org/xml/ebnf/${version}/dbebnf.dtd"; + url = "https://docbook.org/xml/ebnf/${finalAttrs.version}/dbebnf.dtd"; sha256 = "0min5dsc53my13b94g2yd65q1nkjcf4x1dak00bsc4ckf86mrx95"; }; catalog = ./docbook-ebnf.cat; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { meta = { platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/do/docopt_cpp/package.nix b/pkgs/by-name/do/docopt_cpp/package.nix index 3a3d21b92b2e..fb9f661fbefa 100644 --- a/pkgs/by-name/do/docopt_cpp/package.nix +++ b/pkgs/by-name/do/docopt_cpp/package.nix @@ -7,14 +7,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.6.3"; pname = "docopt.cpp"; src = fetchFromGitHub { owner = "docopt"; repo = "docopt.cpp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7"; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/do/dog/package.nix b/pkgs/by-name/do/dog/package.nix index 5520ffb86ebb..b8b89758403a 100644 --- a/pkgs/by-name/do/dog/package.nix +++ b/pkgs/by-name/do/dog/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dog"; version = "1.7"; src = fetchurl { - url = "http://archive.debian.org/debian/pool/main/d/dog/dog_${version}.orig.tar.gz"; + url = "http://archive.debian.org/debian/pool/main/d/dog/dog_${finalAttrs.version}.orig.tar.gz"; sha256 = "3ef25907ec5d1dfb0df94c9388c020b593fbe162d7aaa9bd08f35d2a125af056"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "dog"; }; -} +}) diff --git a/pkgs/by-name/do/doodle/package.nix b/pkgs/by-name/do/doodle/package.nix index 40e425150393..1c85afd7ff4f 100644 --- a/pkgs/by-name/do/doodle/package.nix +++ b/pkgs/by-name/do/doodle/package.nix @@ -6,7 +6,7 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "doodle"; version = "0.7.3"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://grothoff.org/christian/doodle/download/doodle-${version}.tar.gz"; + url = "https://grothoff.org/christian/doodle/download/doodle-${finalAttrs.version}.tar.gz"; sha256 = "sha256-qodp2epYyolg38MNhBV+/NMLmfXjhsn2X9uKTUniv2s="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "doodle"; }; -} +}) diff --git a/pkgs/by-name/do/dool/package.nix b/pkgs/by-name/do/dool/package.nix index 956355eabdee..cc364138b450 100644 --- a/pkgs/by-name/do/dool/package.nix +++ b/pkgs/by-name/do/dool/package.nix @@ -5,14 +5,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dool"; version = "1.3.8"; src = fetchFromGitHub { owner = "scottchiefbaker"; repo = "dool"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-aIGYv8UAC3toQe21xdtPUnsnrJhzbvQLfN/pPU3L2J0="; }; @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { meta = { description = "Python3 compatible clone of dstat"; homepage = "https://github.com/scottchiefbaker/dool"; - changelog = "https://github.com/scottchiefbaker/dool/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/scottchiefbaker/dool/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.matthiasbeyer ]; platforms = lib.platforms.linux; mainProgram = "dool"; }; -} +}) diff --git a/pkgs/by-name/do/doona/package.nix b/pkgs/by-name/do/doona/package.nix index 198db2e01871..24ee22f557e7 100644 --- a/pkgs/by-name/do/doona/package.nix +++ b/pkgs/by-name/do/doona/package.nix @@ -5,7 +5,7 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "doona"; version = "0-unstable-2019-03-08"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -r ${src}/bedmod $out/bin/bedmod - cp ${src}/doona.pl $out/bin/doona + cp -r ${finalAttrs.src}/bedmod $out/bin/bedmod + cp ${finalAttrs.src}/doona.pl $out/bin/doona chmod +x $out/bin/doona ''; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ pamplemousse ]; }; -} +}) diff --git a/pkgs/by-name/do/dosbox/package.nix b/pkgs/by-name/do/dosbox/package.nix index 5d71601a58e0..a9a22b0ee095 100644 --- a/pkgs/by-name/do/dosbox/package.nix +++ b/pkgs/by-name/do/dosbox/package.nix @@ -16,12 +16,12 @@ makeDesktopItem, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dosbox"; version = "0.74-3"; src = fetchurl { - url = "mirror://sourceforge/dosbox/dosbox-${version}.tar.gz"; + url = "mirror://sourceforge/dosbox/dosbox-${finalAttrs.version}.tar.gz"; hash = "sha256-wNE91+0u02O2jeYVR1eB6JHNWC6BYrXDZpE3UCIiJgo="; }; @@ -102,4 +102,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "dosbox"; }; -} +}) diff --git a/pkgs/by-name/do/dosemu_fonts/package.nix b/pkgs/by-name/do/dosemu_fonts/package.nix index 8b568e3efd6c..a9facecc59c4 100644 --- a/pkgs/by-name/do/dosemu_fonts/package.nix +++ b/pkgs/by-name/do/dosemu_fonts/package.nix @@ -7,12 +7,12 @@ mkfontscale, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dosemu-fonts"; version = "1.4.0"; src = fetchurl { - url = "mirror://sourceforge/dosemu/dosemu-${version}.tgz"; + url = "mirror://sourceforge/dosemu/dosemu-${finalAttrs.version}.tgz"; sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { description = "Various fonts from the DOSEmu project"; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/pkgs/by-name/do/dosfstools/package.nix b/pkgs/by-name/do/dosfstools/package.nix index 02fe10faf169..a647a51f4a81 100644 --- a/pkgs/by-name/do/dosfstools/package.nix +++ b/pkgs/by-name/do/dosfstools/package.nix @@ -10,14 +10,14 @@ xxd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dosfstools"; version = "4.2"; src = fetchFromGitHub { owner = "dosfstools"; repo = "dosfstools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-2gxB0lQixiHOHw8uTetHekaM57fvUd9zOzSxWnvUz/c="; }; @@ -51,6 +51,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-compat-symlinks" ]; + outputs = [ + "out" + "doc" + "man" + ]; + nativeCheckInputs = [ xxd ]; doCheck = true; @@ -60,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/do/dotconf/package.nix b/pkgs/by-name/do/dotconf/package.nix index d7fe95d84444..7b91d2c44171 100644 --- a/pkgs/by-name/do/dotconf/package.nix +++ b/pkgs/by-name/do/dotconf/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dotconf"; version = "1.4.1"; src = fetchFromGitHub { owner = "williamh"; repo = "dotconf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-6Du26Ffz08DLGg6uIiPi8Sgjf691MM2kn0qXe3oFeTw="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix index 0d732fb54b3e..3c3b08b13c92 100644 --- a/pkgs/by-name/do/dotenv-cli/package.nix +++ b/pkgs/by-name/do/dotenv-cli/package.nix @@ -8,19 +8,19 @@ nodejs, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dotenv-cli"; version = "11.0.0"; src = fetchFromGitHub { owner = "entropitor"; repo = "dotenv-cli"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-oPgi2l6YNt7WyaOzr7EkjgXOitpw9PY7tmN86bUM88Q="; }; yarnOfflineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-I/DzRBETcusE4YS3nC47I1igsVzophNXoVtcD+upZPc="; }; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { meta = { description = "CLI to load dotenv files"; homepage = "https://github.com/entropitor/dotenv-cli"; - changelog = "https://github.com/entropitor/dotenv-cli/releases/tag/v${version}"; + changelog = "https://github.com/entropitor/dotenv-cli/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "dotenv"; maintainers = with lib.maintainers; [ pyrox0 ]; }; -} +}) diff --git a/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix b/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix index b5644f536fab..7cceb60a6fc5 100644 --- a/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix +++ b/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix @@ -8,14 +8,14 @@ xapian, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dovecot-fts-flatcurve"; version = "1.0.5"; src = fetchFromGitHub { owner = "slusarz"; repo = "dovecot-fts-flatcurve"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-96sR/pl0G0sSjh/YrXdgVgASJPhrL32xHCbBGrDxzoU="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ euxane ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/do/dovecot_pigeonhole/package.nix b/pkgs/by-name/do/dovecot_pigeonhole/package.nix index 9c8f2387f0ad..90d50c6d5d20 100644 --- a/pkgs/by-name/do/dovecot_pigeonhole/package.nix +++ b/pkgs/by-name/do/dovecot_pigeonhole/package.nix @@ -8,12 +8,12 @@ let dovecotMajorMinor = lib.versions.majorMinor dovecot.version; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dovecot-pigeonhole"; version = "0.5.21.1"; src = fetchurl { - url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; + url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${finalAttrs.version}.tar.gz"; hash = "sha256-A3fbKEtiByPeBgQxEV+y53keHfQyFBGvcYIB1pJcRpI="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/dp/dps8m/package.nix b/pkgs/by-name/dp/dps8m/package.nix index ad830e58edb6..b090321428ae 100644 --- a/pkgs/by-name/dp/dps8m/package.nix +++ b/pkgs/by-name/dp/dps8m/package.nix @@ -9,14 +9,14 @@ gnused, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dps8m"; version = "3.1.0"; src = fetchFromGitLab { owner = "dps8m"; repo = "dps8m"; - rev = "R${version}"; + rev = "R${finalAttrs.version}"; hash = "sha256-2PTL9C1sV+UTZibjyxBkQh9Y1xqwawNPwWL4eX0ilvU="; fetchSubmodules = true; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "GE / Honeywell / Bull DPS-8/M mainframe simulator"; homepage = "https://gitlab.com/dps8m/dps8m"; - changelog = "https://gitlab.com/dps8m/dps8m/-/wikis/DPS8M-${src.rev}-Release-Notes"; + changelog = "https://gitlab.com/dps8m/dps8m/-/wikis/DPS8M-${finalAttrs.src.rev}-Release-Notes"; license = lib.licenses.icu; maintainers = with lib.maintainers; [ matthewcroughan @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { mainProgram = "dps8m"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/dr/draco/tinygltf.nix b/pkgs/by-name/dr/draco/tinygltf.nix index 85433ff963ad..49b762f933bb 100644 --- a/pkgs/by-name/dr/draco/tinygltf.nix +++ b/pkgs/by-name/dr/draco/tinygltf.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.8.7"; pname = "tinygltf"; src = fetchFromGitHub { owner = "syoyo"; repo = "tinygltf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-uQlv+mUWnqUJIXnPf2pVuRg1akcXAfqyBIzPPmm4Np4="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jansol ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/dr/dracut/package.nix b/pkgs/by-name/dr/dracut/package.nix index db1a06e68121..2dcac697dc05 100644 --- a/pkgs/by-name/dr/dracut/package.nix +++ b/pkgs/by-name/dr/dracut/package.nix @@ -27,14 +27,14 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dracut"; version = "059"; src = fetchFromGitHub { owner = "dracutdevs"; repo = "dracut"; - rev = version; + rev = finalAttrs.version; hash = "sha256-zSyC2SnSQkmS/mDpBXG2DtVVanRRI9COKQJqYZZCPJM="; }; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { substituteInPlace lsinitrd.sh \ --replace 'dracutbasedir=/usr/lib/dracut' "dracutbasedir=$out/lib/dracut" - echo 'DRACUT_VERSION=${version}' >dracut-version.sh + echo 'DRACUT_VERSION=${finalAttrs.version}' >dracut-version.sh ''; postFixup = '' @@ -116,4 +116,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/dr/dragonfly-reverb/package.nix b/pkgs/by-name/dr/dragonfly-reverb/package.nix index 613e3d9e4edc..f7874ca039fc 100644 --- a/pkgs/by-name/dr/dragonfly-reverb/package.nix +++ b/pkgs/by-name/dr/dragonfly-reverb/package.nix @@ -6,23 +6,42 @@ libGL, pkg-config, libx11, + + buildStandalone ? true, + buildVST3 ? true, + buildLV2 ? true, + buildCLAP ? true, + buildVST2 ? false, # can't distribute }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dragonfly-reverb"; version = "3.2.10"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YXJ4U5J8Za+DlXvp6QduvCHIVC2eRJ3+I/KPihCaIoY="; fetchSubmodules = true; }; - postPatch = '' - patchShebangs dpf/utils/generate-ttl.sh - ''; + postPatch = + let + targets = lib.concatStringsSep " " [ + (lib.optionalString buildStandalone "jack") + (lib.optionalString buildVST3 "vst3") + (lib.optionalString buildLV2 "lv2_sep") + (lib.optionalString buildCLAP "clap") + (lib.optionalString buildVST2 "vst2") + ]; + in + '' + patchShebangs dpf/utils/generate-ttl.sh + + substituteInPlace plugins/*/Makefile \ + --replace-fail "TARGETS = jack lv2_sep vst2 vst3 clap" "TARGETS = ${targets}" + ''; nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -33,27 +52,55 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin - mkdir -p $out/lib/lv2/ - mkdir -p $out/lib/vst/ - mkdir -p $out/lib/vst3/ - mkdir -p $out/lib/clap/ - cd bin - for bin in DragonflyEarlyReflections DragonflyPlateReverb DragonflyHallReverb DragonflyRoomReverb; do - cp -a $bin $out/bin/ - cp -a $bin-vst.so $out/lib/vst/ - cp -a $bin.vst3 $out/lib/vst3/ - cp -a $bin.clap $out/lib/clap/ - cp -a $bin.lv2/ $out/lib/lv2/ ; - done + + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + ''} + + ${lib.optionalString buildLV2 '' + mkdir -p $out/lib/lv2 + ''} + + ${lib.optionalString buildCLAP '' + mkdir -p $out/lib/clap + ''} + + pushd bin + for bin in DragonflyEarlyReflections DragonflyPlateReverb DragonflyHallReverb DragonflyRoomReverb; do + ${lib.optionalString buildStandalone '' + install -Dm755 $bin -t $out/bin + ''} + + ${lib.optionalString buildVST3 '' + cp -r $bin.vst3 $out/lib/vst3 + ''} + + ${lib.optionalString buildLV2 '' + cp -r $bin.lv2 $out/lib/lv2 + ''} + + ${lib.optionalString buildCLAP '' + cp -r $bin.clap $out/lib/clap + ''} + + ${lib.optionalString buildVST2 '' + install -Dm755 $bin-vst.so -t $out/lib/vst + ''} + done + popd + runHook postInstall ''; meta = { homepage = "https://github.com/michaelwillis/dragonfly-reverb"; description = "Hall-style reverb based on freeverb3 algorithms"; - maintainers = [ lib.maintainers.magnetophon ]; + maintainers = with lib.maintainers; [ + magnetophon + mrtnvgr + ]; license = lib.licenses.gpl3Plus; - platforms = [ "x86_64-linux" ]; + platforms = lib.platforms.linux; + badPlatforms = [ lib.systems.inspect.patterns.isAarch ]; }; -} +}) diff --git a/pkgs/by-name/dr/driftnet/package.nix b/pkgs/by-name/dr/driftnet/package.nix index cc9e0a3fc5c9..e98af044791a 100644 --- a/pkgs/by-name/dr/driftnet/package.nix +++ b/pkgs/by-name/dr/driftnet/package.nix @@ -17,14 +17,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "driftnet"; version = "1.6.0"; src = fetchFromGitHub { owner = "deiv"; repo = "driftnet"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-f7EPC/n3CyxVOXC6j43Nnwkgu/aDVst8lQpzfgegDsI="; }; @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { meta = { description = "Watches network traffic, and picks out and displays JPEG and GIF images for display"; homepage = "https://github.com/deiv/driftnet"; - changelog = "https://github.com/deiv/driftnet/releases/tag/v${version}"; + changelog = "https://github.com/deiv/driftnet/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ offline ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "driftnet"; }; -} +}) diff --git a/pkgs/by-name/dr/droidcam/package.nix b/pkgs/by-name/dr/droidcam/package.nix index c6dfa57d1bdf..5e9caf964d96 100644 --- a/pkgs/by-name/dr/droidcam/package.nix +++ b/pkgs/by-name/dr/droidcam/package.nix @@ -12,14 +12,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "droidcam"; version = "2.1.4"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-z/SteW3jYR/VR+HffvTetdGs5oz4qWBNkaqLYiP1V8c="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.suhr ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix index a6001c904174..47f81d6a25bb 100644 --- a/pkgs/by-name/dr/dropbear/package.nix +++ b/pkgs/by-name/dr/dropbear/package.nix @@ -18,12 +18,12 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dropbear"; version = "2025.89"; src = fetchurl { - url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2"; + url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-DR98pxHPwzbcioXmcsq5z9giOgL+LaCkp661jJ4RNjQ="; }; @@ -73,9 +73,9 @@ stdenv.mkDerivation rec { meta = { description = "Small footprint implementation of the SSH 2 protocol"; homepage = "https://matt.ucc.asn.au/dropbear/dropbear.html"; - changelog = "https://github.com/mkj/dropbear/raw/DROPBEAR_${version}/CHANGES"; + changelog = "https://github.com/mkj/dropbear/raw/DROPBEAR_${finalAttrs.version}/CHANGES"; license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/dr/dropwatch/package.nix b/pkgs/by-name/dr/dropwatch/package.nix index aac939d4f3b0..ed6ccc99414a 100644 --- a/pkgs/by-name/dr/dropwatch/package.nix +++ b/pkgs/by-name/dr/dropwatch/package.nix @@ -12,14 +12,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dropwatch"; version = "1.5.5"; src = fetchFromGitHub { owner = "nhorman"; repo = "dropwatch"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+7bT1Gw4ncwLFkrxxbXjNs3KMM1sSQrCqXMYxKso9/4="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ c0bw3b ]; }; -} +}) diff --git a/pkgs/by-name/ds/dsniff/package.nix b/pkgs/by-name/ds/dsniff/package.nix index 5ad808699f30..22069f210ab6 100644 --- a/pkgs/by-name/ds/dsniff/package.nix +++ b/pkgs/by-name/ds/dsniff/package.nix @@ -76,7 +76,7 @@ let ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dsniff"; version = "2.4b1"; # upstream is so old that nearly every distribution packages the beta version. @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "pkg-security-team"; repo = "dsniff"; - tag = "debian/${version}+debian-35"; + tag = "debian/${finalAttrs.version}+debian-35"; hash = "sha256-RVv9USAHTVYnGgKygIPgfXpfjCYigJvScuzc2+1Uzfw="; name = "dsniff.tar.gz"; }; @@ -129,4 +129,4 @@ stdenv.mkDerivation rec { # bsd and solaris should work as well platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ds/dsvpn/package.nix b/pkgs/by-name/ds/dsvpn/package.nix index 6d9b619bd535..3765a787e298 100644 --- a/pkgs/by-name/ds/dsvpn/package.nix +++ b/pkgs/by-name/ds/dsvpn/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dsvpn"; version = "0.1.4"; src = fetchFromGitHub { owner = "jedisct1"; repo = "dsvpn"; - rev = version; + rev = finalAttrs.version; sha256 = "1gbj3slwmq990qxsbsaxasi98alnnzv3adp6f8w8sxd4gi6qxhdh"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "dsvpn"; }; -} +}) diff --git a/pkgs/by-name/dt/dtach/package.nix b/pkgs/by-name/dt/dtach/package.nix index 9e359d43f594..552026083c58 100644 --- a/pkgs/by-name/dt/dtach/package.nix +++ b/pkgs/by-name/dt/dtach/package.nix @@ -5,12 +5,12 @@ fetchpatch2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dtach"; version = "0.9"; src = fetchurl { - url = "mirror://sourceforge/project/dtach/dtach/${version}/dtach-${version}.tar.gz"; + url = "mirror://sourceforge/project/dtach/dtach/${finalAttrs.version}/dtach-${finalAttrs.version}.tar.gz"; sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "dtach"; }; -} +}) diff --git a/pkgs/by-name/dt/dtcmp/package.nix b/pkgs/by-name/dt/dtcmp/package.nix index 14f0c1a8b149..bb3029c34339 100644 --- a/pkgs/by-name/dt/dtcmp/package.nix +++ b/pkgs/by-name/dt/dtcmp/package.nix @@ -8,14 +8,14 @@ lwgrp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dtcmp"; version = "1.1.5"; src = fetchFromGitHub { owner = "LLNL"; repo = "dtcmp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Dc+c8JCc5D23CtpwiWkHCqngywEZXw7cYsRiSYiQdWk="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/dt/dterm/package.nix b/pkgs/by-name/dt/dterm/package.nix index 5766e9d78589..50c70acd933e 100644 --- a/pkgs/by-name/dt/dterm/package.nix +++ b/pkgs/by-name/dt/dterm/package.nix @@ -5,12 +5,12 @@ readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dterm"; version = "0.5"; src = fetchurl { - url = "http://www.knossos.net.nz/downloads/dterm-${version}.tgz"; + url = "http://www.knossos.net.nz/downloads/dterm-${finalAttrs.version}.tgz"; hash = "sha256-lFM7558e7JZeWYhtXwCjXLZ1xdsdiUGfJTu3LxQKvds="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "dterm"; }; -} +}) diff --git a/pkgs/by-name/du/duc/package.nix b/pkgs/by-name/du/duc/package.nix index 4c195ed8aa8b..e1efe100bd30 100644 --- a/pkgs/by-name/du/duc/package.nix +++ b/pkgs/by-name/du/duc/package.nix @@ -13,14 +13,14 @@ assert enableCairo -> cairo != null && pango != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "duc"; version = "1.4.6"; src = fetchFromGitHub { owner = "zevv"; repo = "duc"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-hZ8bhPXS/trt6ZePjfuwx8PEfv0xCBqSJxRonLB7Ui0="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "duc"; }; -} +}) diff --git a/pkgs/by-name/du/dump/package.nix b/pkgs/by-name/du/dump/package.nix index 873f9cd51873..e1861a1ad197 100644 --- a/pkgs/by-name/du/dump/package.nix +++ b/pkgs/by-name/du/dump/package.nix @@ -11,12 +11,12 @@ readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dump"; version = "0.4b51"; src = fetchurl { - url = "mirror://sourceforge/dump/dump-${version}.tar.gz"; + url = "mirror://sourceforge/dump/dump-${finalAttrs.version}.tar.gz"; sha256 = "sha256-huaDpzNVNMkVzwpQUlPay/RrYiSnD79or3RgsWPkU+s="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/du/dumptorrent/package.nix b/pkgs/by-name/du/dumptorrent/package.nix index d30888501282..c62f21f08306 100644 --- a/pkgs/by-name/du/dumptorrent/package.nix +++ b/pkgs/by-name/du/dumptorrent/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dumptorrent"; version = "1.2"; src = fetchurl { - url = "mirror://sourceforge/dumptorrent/dumptorrent-${version}.tar.gz"; + url = "mirror://sourceforge/dumptorrent/dumptorrent-${finalAttrs.version}.tar.gz"; sha256 = "073h03bmpfdy15qh37lvppayld2747i4acpyk0pm5nf2raiak0zm"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "dumptorrent"; }; -} +}) diff --git a/pkgs/by-name/du/duo-unix/package.nix b/pkgs/by-name/du/duo-unix/package.nix index 9cce892d6dd4..0ba3cf5f09dc 100644 --- a/pkgs/by-name/du/duo-unix/package.nix +++ b/pkgs/by-name/du/duo-unix/package.nix @@ -7,12 +7,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "duo-unix"; version = "2.2.1"; src = fetchurl { - url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; + url = "https://dl.duosecurity.com/duo_unix-${finalAttrs.version}.tar.gz"; sha256 = "sha256-43a+BYWzw9ETpYjxlSXjV83uJG1prrjoYMv0/dv5AMo="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/du/dupd/package.nix b/pkgs/by-name/du/dupd/package.nix index 2abbce1fddb7..f70593f8ea51 100644 --- a/pkgs/by-name/du/dupd/package.nix +++ b/pkgs/by-name/du/dupd/package.nix @@ -11,14 +11,14 @@ # Instead of writing directly into $HOME, we change the default db location # from $HOME/.dupd_sqlite to $HOME/.cache/dupd.sqlite3 -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dupd"; version = "1.7.3"; src = fetchFromGitHub { owner = "jvirkki"; repo = "dupd"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ZiQroJ5fjBCIjU+M8KRA0N3Mrg9h0NVtfYUIS4cYyhw="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ peterhoeg ]; mainProgram = "dupd"; }; -} +}) diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix index 571599913ff8..88d12d8f043e 100644 --- a/pkgs/by-name/du/duperemove/package.nix +++ b/pkgs/by-name/du/duperemove/package.nix @@ -14,14 +14,14 @@ duperemove, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "duperemove"; version = "0.15.2"; src = fetchFromGitHub { owner = "markfasheh"; repo = "duperemove"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Y3HIqq61bLfZi4XR2RtSyuCPmcWrTxeWvqpTh+3hUjc="; }; @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" - "VERSION=v${version}" + "VERSION=v${finalAttrs.version}" ]; passthru.tests.version = testers.testVersion { package = duperemove; command = "duperemove --version"; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; meta = { @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "duperemove"; }; -} +}) diff --git a/pkgs/by-name/dv/dvdauthor/package.nix b/pkgs/by-name/dv/dvdauthor/package.nix index 53ce43ecf80c..be88da4feeb2 100644 --- a/pkgs/by-name/dv/dvdauthor/package.nix +++ b/pkgs/by-name/dv/dvdauthor/package.nix @@ -15,12 +15,12 @@ bison, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dvdauthor"; version = "0.7.2"; src = fetchurl { - url = "mirror://sourceforge/dvdauthor/dvdauthor-${version}.tar.gz"; + url = "mirror://sourceforge/dvdauthor/dvdauthor-${finalAttrs.version}.tar.gz"; hash = "sha256-MCCpLen3jrNvSLbyLVoAHEcQeCZjSnhaYt/NCA9hLrc="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/dv/dvdstyler/package.nix b/pkgs/by-name/dv/dvdstyler/package.nix index b81f27483f04..ff6ef0bd0110 100644 --- a/pkgs/by-name/dv/dvdstyler/package.nix +++ b/pkgs/by-name/dv/dvdstyler/package.nix @@ -35,12 +35,12 @@ let inherit (lib) optionals makeBinPath; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dvdstyler"; version = "3.3b4"; src = fetchurl { - url = "mirror://sourceforge/project/dvdstyler/dvdstyler-devel/${version}/DVDStyler-${version}.tar.bz2"; + url = "mirror://sourceforge/project/dvdstyler/dvdstyler-devel/${finalAttrs.version}/DVDStyler-${finalAttrs.version}.tar.bz2"; hash = "sha256-JCaKcE7jkTxT57KKePs8gmgQedoOcP5NEQ2FwIDS2Ho="; }; @@ -131,4 +131,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "dvdstyler"; }; -} +}) diff --git a/pkgs/by-name/dw/dwdiff/package.nix b/pkgs/by-name/dw/dwdiff/package.nix index 882c2016d3ed..ae7302711853 100644 --- a/pkgs/by-name/dw/dwdiff/package.nix +++ b/pkgs/by-name/dw/dwdiff/package.nix @@ -7,12 +7,12 @@ icu, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dwdiff"; version = "2.1.4"; src = fetchurl { - url = "https://os.ghalkes.nl/dist/dwdiff-${version}.tar.bz2"; + url = "https://os.ghalkes.nl/dist/dwdiff-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-3xb+xE3LRn1lpCRqQ2KPk3QZlsF3PpMLkMbd4i3Vjgo="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ onny ]; }; -} +}) diff --git a/pkgs/by-name/dw/dwz/package.nix b/pkgs/by-name/dw/dwz/package.nix index e660f627d204..da4cc9bb4e2a 100644 --- a/pkgs/by-name/dw/dwz/package.nix +++ b/pkgs/by-name/dw/dwz/package.nix @@ -8,12 +8,12 @@ gdb, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dwz"; version = "0.16"; src = fetchurl { - url = "https://www.sourceware.org/ftp/dwz/releases/dwz-${version}.tar.gz"; + url = "https://www.sourceware.org/ftp/dwz/releases/dwz-${finalAttrs.version}.tar.gz"; hash = "sha256-R1hT4bSebtjMLQqQnHpPwcxXHrzPxmJ4/UM0Lb4n1Q4="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jbcrail ]; platforms = [ lib.systems.inspect.patterns.isElf ]; }; -} +}) diff --git a/pkgs/by-name/dy/dynamic-colors/package.nix b/pkgs/by-name/dy/dynamic-colors/package.nix index 17df2cc22ee4..2d453bcab36d 100644 --- a/pkgs/by-name/dy/dynamic-colors/package.nix +++ b/pkgs/by-name/dy/dynamic-colors/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dynamic-colors"; version = "0.2.5"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "dynamic-colors"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-jSdwq9WwYZP8MK6z7zJa0q93xfanr6iuvAt8YQkQxxE="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "dynamic-colors"; }; -} +}) diff --git a/pkgs/by-name/dy/dynamips/package.nix b/pkgs/by-name/dy/dynamips/package.nix index cd4699600a19..59d53f71ac96 100644 --- a/pkgs/by-name/dy/dynamips/package.nix +++ b/pkgs/by-name/dy/dynamips/package.nix @@ -9,14 +9,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dynamips"; version = "0.2.23"; src = fetchFromGitHub { owner = "GNS3"; repo = "dynamips"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0="; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { routers. ''; homepage = "https://github.com/GNS3/dynamips"; - changelog = "https://github.com/GNS3/dynamips/releases/tag/v${version}"; + changelog = "https://github.com/GNS3/dynamips/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; mainProgram = "dynamips"; maintainers = with lib.maintainers; [ @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/dy/dyncall/package.nix b/pkgs/by-name/dy/dyncall/package.nix index dcede20c1d82..86e45b132439 100644 --- a/pkgs/by-name/dy/dyncall/package.nix +++ b/pkgs/by-name/dy/dyncall/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dyncall"; version = "1.4"; src = fetchurl { - url = "https://www.dyncall.org/r${version}/dyncall-${version}.tar.gz"; + url = "https://www.dyncall.org/r${finalAttrs.version}/dyncall-${finalAttrs.version}.tar.gz"; # https://www.dyncall.org/r1.4/SHA256 sha256 = "sha256-FEN9u+87bckkg/ZQfq+CWrl5ZKie7K6Ms0emvsnDKq4="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.isc; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/dz/dzen2/package.nix b/pkgs/by-name/dz/dzen2/package.nix index ae7910ad2c0b..549bf4e6f732 100644 --- a/pkgs/by-name/dz/dzen2/package.nix +++ b/pkgs/by-name/dz/dzen2/package.nix @@ -9,7 +9,7 @@ libXpm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dzen2"; version = "0.9.5"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://github.com/robm/dzen/tarball/master/dzen2-${version}git.tar.gz"; + url = "https://github.com/robm/dzen/tarball/master/dzen2-${finalAttrs.version}git.tar.gz"; sha256 = "d4f7943cd39dc23fd825eb684b49dc3484860fa8443d30b06ee38af72a53b556"; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { description = "X notification utility"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/e1/e16/package.nix b/pkgs/by-name/e1/e16/package.nix index 12320c6b52e8..d2e70a0beefa 100644 --- a/pkgs/by-name/e1/e16/package.nix +++ b/pkgs/by-name/e1/e16/package.nix @@ -21,12 +21,12 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "e16"; version = "1.0.31"; src = fetchurl { - url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz"; + url = "mirror://sourceforge/enlightenment/e16-${finalAttrs.version}.tar.xz"; hash = "sha256-ZQTsIy/BiO/xUiCu+bc2n406F0unAinxyYLjVRfUSiQ="; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index c8404e721196..8031453475ca 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -57,14 +57,14 @@ let ; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "easyeffects"; version = "8.0.9"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cFMbeJeEIDP7uiNi+rRKErgHtjP/PbPKASo+M2qogZQ="; }; @@ -148,7 +148,7 @@ stdenv.mkDerivation rec { meta = { description = "Audio effects for PipeWire applications"; homepage = "https://github.com/wwmm/easyeffects"; - changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/src/contents/docs/community/CHANGELOG.md"; + changelog = "https://github.com/wwmm/easyeffects/blob/v${finalAttrs.version}/src/contents/docs/community/CHANGELOG.md"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ getchoo @@ -158,4 +158,4 @@ stdenv.mkDerivation rec { mainProgram = "easyeffects"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ea/easypdkprog/package.nix b/pkgs/by-name/ea/easypdkprog/package.nix index ebd7713b6681..345928fe46fc 100644 --- a/pkgs/by-name/ea/easypdkprog/package.nix +++ b/pkgs/by-name/ea/easypdkprog/package.nix @@ -5,14 +5,14 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "easypdkprog"; version = "1.3"; src = fetchFromGitHub { owner = "free-pdk"; repo = "easy-pdk-programmer-software"; - rev = version; + rev = finalAttrs.version; sha256 = "0hc3gdmn6l01z63hzzwdhbdyy288gh5v219bsfm8fb1498vpnd6f"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ david-sawatzke ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ea/easyrpg-player/package.nix b/pkgs/by-name/ea/easyrpg-player/package.nix index 7174c5be81c5..7938b789d073 100644 --- a/pkgs/by-name/ea/easyrpg-player/package.nix +++ b/pkgs/by-name/ea/easyrpg-player/package.nix @@ -126,6 +126,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.all; - mainProgram = lib.optionalString stdenv.hostPlatform.isDarwin "EasyRPG Player"; + mainProgram = if stdenv.hostPlatform.isDarwin then "EasyRPG Player" else "easyrpg-player"; }; } diff --git a/pkgs/by-name/ea/easyrsa/package.nix b/pkgs/by-name/ea/easyrsa/package.nix index a395b9697e99..2c88029a56ff 100644 --- a/pkgs/by-name/ea/easyrsa/package.nix +++ b/pkgs/by-name/ea/easyrsa/package.nix @@ -7,14 +7,14 @@ runtimeShell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "easyrsa"; version = "3.2.5"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "easy-rsa"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-GD4KL8CqQ8U0ISrLm8zlnfi1AuYK0AZLiLuufEhZ7B0="; }; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/easyrsa \ --replace /usr/ $out/ \ - --replace '~VER~' '${version}' \ - --replace '~GITHEAD~' 'v${version}' \ + --replace '~VER~' '${finalAttrs.version}' \ + --replace '~GITHEAD~' 'v${finalAttrs.version}' \ --replace '~DATE~' '1970-01-01' # Wrap it with the correct OpenSSL binary. @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/eb/ebook_tools/package.nix b/pkgs/by-name/eb/ebook_tools/package.nix index 367a22630b0b..601500756a76 100644 --- a/pkgs/by-name/eb/ebook_tools/package.nix +++ b/pkgs/by-name/eb/ebook_tools/package.nix @@ -8,12 +8,12 @@ libzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ebook-tools"; version = "0.2.2"; src = fetchurl { - url = "mirror://sourceforge/ebook-tools/ebook-tools-${version}.tar.gz"; + url = "mirror://sourceforge/ebook-tools/ebook-tools-${finalAttrs.version}.tar.gz"; sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/ec/ecasound/package.nix b/pkgs/by-name/ec/ecasound/package.nix index 4d991d2a7fbe..b643c8aa7fe5 100644 --- a/pkgs/by-name/ec/ecasound/package.nix +++ b/pkgs/by-name/ec/ecasound/package.nix @@ -22,12 +22,12 @@ # The error is # /nix/store/*-lilv-0.24.10/include/lilv-0/lilv/lilvmm.hpp:272:53: error: 'nullptr' was not declared in this scope -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ecasound"; version = "2.9.3"; src = fetchurl { - url = "https://ecasound.seul.org/download/ecasound-${version}.tar.gz"; + url = "https://ecasound.seul.org/download/ecasound-${finalAttrs.version}.tar.gz"; sha256 = "1m7njfjdb7sqf0lhgc4swihgdr4snkg8v02wcly08wb5ar2fr2s6"; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { ]; homepage = "http://nosignal.fi/ecasound/"; }; -} +}) diff --git a/pkgs/by-name/ec/eclib/package.nix b/pkgs/by-name/ec/eclib/package.nix index 4a58e66eaf1b..e8f40208bfd3 100644 --- a/pkgs/by-name/ec/eclib/package.nix +++ b/pkgs/by-name/ec/eclib/package.nix @@ -15,7 +15,7 @@ assert withFlint -> flint != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eclib"; version = "20250627"; # upgrade might break the sage interface # sage tests to run: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # # see https://github.com/JohnCremona/eclib/issues/64#issuecomment-789788561 # for upstream's explanation of the above - url = "https://github.com/JohnCremona/eclib/releases/download/${version}/eclib-${version}.tar.bz2"; + url = "https://github.com/JohnCremona/eclib/releases/download/${finalAttrs.version}/eclib-${finalAttrs.version}.tar.bz2"; hash = "sha256-uI1LUmEuSRxUFZRtnjXyBiyhAV7n+74LYfFY+nTLS8k="; }; buildInputs = [ @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.sage ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ec/ecopcr/package.nix b/pkgs/by-name/ec/ecopcr/package.nix index 27f8b07f0e59..a6f86ca72d6c 100644 --- a/pkgs/by-name/ec/ecopcr/package.nix +++ b/pkgs/by-name/ec/ecopcr/package.nix @@ -7,12 +7,12 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ecopcr"; version = "1.0.1"; src = fetchurl { - url = "https://git.metabarcoding.org/obitools/ecopcr/-/archive/ecopcr_v${version}/ecopcr-ecopcr_v${version}.tar.gz"; + url = "https://git.metabarcoding.org/obitools/ecopcr/-/archive/ecopcr_v${finalAttrs.version}/ecopcr-ecopcr_v${finalAttrs.version}.tar.gz"; hash = "sha256-ssvWpi7HuuRRAkpqqrX3ijLuBqM3QsrmrG+t7/m6fZA="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { license = lib.licenses.cecill20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ed/edmarketconnector/package.nix b/pkgs/by-name/ed/edmarketconnector/package.nix index 15aac51508ca..0bf83b5c809c 100644 --- a/pkgs/by-name/ed/edmarketconnector/package.nix +++ b/pkgs/by-name/ed/edmarketconnector/package.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "edmarketconnector"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "EDCD"; repo = "EDMarketConnector"; tag = "Release/${finalAttrs.version}"; - hash = "sha256-MBbm6537HEYKql42//EzEy1Iwi6W3rX/4hFYrRVaAbw="; + hash = "sha256-kWxen2CTmccI6FMoIZIvgI0Sk5TIL09onxTB3iY60I4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ee/eepers/package.nix b/pkgs/by-name/ee/eepers/package.nix index d109a13515b2..78d4bcb413a0 100644 --- a/pkgs/by-name/ee/eepers/package.nix +++ b/pkgs/by-name/ee/eepers/package.nix @@ -8,14 +8,14 @@ wayland, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eepers"; version = "1.3"; src = fetchFromGitHub { owner = "tsoding"; repo = "eepers"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KG7ci327qlTtlN4yV54P8Q34ExFLJfTGMTZxN3RtZbc="; }; @@ -72,10 +72,10 @@ stdenv.mkDerivation rec { meta = { description = "Simple Turn-based Game"; homepage = "https://github.com/tsoding/eepers"; - changelog = "https://github.com/tsoding/eepers/blob/${src.rev}/CHANGELOG.txt"; + changelog = "https://github.com/tsoding/eepers/blob/${finalAttrs.src.rev}/CHANGELOG.txt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "eepers"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ef/efitools/package.nix b/pkgs/by-name/ef/efitools/package.nix index 9c060b374e96..89c451277b8e 100644 --- a/pkgs/by-name/ef/efitools/package.nix +++ b/pkgs/by-name/ef/efitools/package.nix @@ -9,7 +9,7 @@ help2man, fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "efitools"; version = "1.9.2"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; src = fetchzip { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-v${version}.tar.gz"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-v${finalAttrs.version}.tar.gz"; sha256 = "0jabgl2pxvfl780yvghq131ylpf82k7banjz0ksjhlm66ik8gb1i"; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ef/efivar/package.nix b/pkgs/by-name/ef/efivar/package.nix index 85ed7dc3265d..bdc7a06b9503 100644 --- a/pkgs/by-name/ef/efivar/package.nix +++ b/pkgs/by-name/ef/efivar/package.nix @@ -8,7 +8,7 @@ mandoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "efivar"; version = "39"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rhboot"; repo = "efivar"; - rev = version; + rev = finalAttrs.version; hash = "sha256-s/1k5a3n33iLmSpKQT5u08xoj8ypjf2Vzln88OBrqf0="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { # See https://github.com/NixOS/nixpkgs/issues/388309 broken = stdenv.hostPlatform.is32bit; }; -} +}) diff --git a/pkgs/by-name/eg/eggdrop/package.nix b/pkgs/by-name/eg/eggdrop/package.nix index 29aa8b1c62a8..f7270926c323 100644 --- a/pkgs/by-name/eg/eggdrop/package.nix +++ b/pkgs/by-name/eg/eggdrop/package.nix @@ -5,12 +5,12 @@ tcl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eggdrop"; version = "1.9.5"; src = fetchurl { - url = "https://ftp.eggheads.org/pub/eggdrop/source/${lib.versions.majorMinor version}/eggdrop-${version}.tar.gz"; + url = "https://ftp.eggheads.org/pub/eggdrop/source/${lib.versions.majorMinor finalAttrs.version}/eggdrop-${finalAttrs.version}.tar.gz"; hash = "sha256-4mkY6opk2YV1ecW2DGYaM38gdz7dgwhrNWUlvrWBc2o="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { homepage = "https://www.eggheads.org"; description = "Internet Relay Chat (IRC) bot"; }; -} +}) diff --git a/pkgs/by-name/eg/egl-wayland/package.nix b/pkgs/by-name/eg/egl-wayland/package.nix index 337d9b147289..2ddfe076adaa 100644 --- a/pkgs/by-name/eg/egl-wayland/package.nix +++ b/pkgs/by-name/eg/egl-wayland/package.nix @@ -14,7 +14,7 @@ wayland-protocols, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "egl-wayland"; version = "1.1.21"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Nvidia"; repo = "egl-wayland"; - rev = version; + rev = finalAttrs.version; hash = "sha256-a98DzmzCG6DlLJ1HCl/LeD21Q7yyNbTce1poOoAnTjA="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ hedning ]; }; -} +}) diff --git a/pkgs/by-name/eg/eglexternalplatform/package.nix b/pkgs/by-name/eg/eglexternalplatform/package.nix index 2ec8c102ec2f..8fe33c583934 100644 --- a/pkgs/by-name/eg/eglexternalplatform/package.nix +++ b/pkgs/by-name/eg/eglexternalplatform/package.nix @@ -6,14 +6,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eglexternalplatform"; version = "1.2.1"; src = fetchFromGitHub { owner = "Nvidia"; repo = "eglexternalplatform"; - rev = version; + rev = finalAttrs.version; hash = "sha256-tDKh1oSnOSG/XztHHYCwg1tDB7M6olOtJ8te+uan9ko="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ hedning ]; }; -} +}) diff --git a/pkgs/by-name/eg/egoboo/package.nix b/pkgs/by-name/eg/egoboo/package.nix index 91c9a44935ed..062188aa520f 100644 --- a/pkgs/by-name/eg/egoboo/package.nix +++ b/pkgs/by-name/eg/egoboo/package.nix @@ -10,7 +10,7 @@ SDL_ttf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { # pf5234 (a developer?) at freenode #egoboo told me that I better use 2.7.3 until # they fix more, because it even has at least one bugs less than 2.7.4. # 2.8.0 does not start properly on linux @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "2.7.3"; src = fetchurl { - url = "mirror://sourceforge/egoboo/egoboo-${version}.tar.gz"; + url = "mirror://sourceforge/egoboo/egoboo-${finalAttrs.version}.tar.gz"; sha256 = "18cjgp9kakrsa90jcb4cl8hhh9k57mi5d1sy5ijjpd3p7zl647hd"; }; @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { # The user will need to have all the files in '.' to run egoboo, with # writeable controls.txt and setup.txt installPhase = '' - mkdir -p $out/share/egoboo-${version} - cp -v game/egoboo $out/share/egoboo-${version} + mkdir -p $out/share/egoboo-${finalAttrs.version} + cp -v game/egoboo $out/share/egoboo-${finalAttrs.version} cd .. - cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/egoboo-${version} + cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/egoboo-${finalAttrs.version} ''; buildInputs = [ @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { # maintainers = [ ]; # platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ei/eiciel/package.nix b/pkgs/by-name/ei/eiciel/package.nix index 229ef3e9470d..a5d3dad1092f 100644 --- a/pkgs/by-name/ei/eiciel/package.nix +++ b/pkgs/by-name/ei/eiciel/package.nix @@ -14,7 +14,7 @@ gtk4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eiciel"; version = "0.10.1"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rofirrim"; repo = "eiciel"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-gpuxx1Ts9HCO+3C+Z3k1tVA+1Mip8/Bd+FvWisVdsVY="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "eiciel"; }; -} +}) diff --git a/pkgs/by-name/ei/eigen2/package.nix b/pkgs/by-name/ei/eigen2/package.nix index fa28930070f8..660d758f827f 100644 --- a/pkgs/by-name/ei/eigen2/package.nix +++ b/pkgs/by-name/ei/eigen2/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eigen"; version = "2.0.17"; src = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = version; + rev = finalAttrs.version; hash = "sha256-C1Bu2H4zxd/2QVzz9AOdoCSRwOYjF41Vr/0S8Fm2kzQ="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ei/eigen_3_4_0/package.nix b/pkgs/by-name/ei/eigen_3_4_0/package.nix index edf197fbea54..774c9e89e651 100644 --- a/pkgs/by-name/ei/eigen_3_4_0/package.nix +++ b/pkgs/by-name/ei/eigen_3_4_0/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eigen"; version = "3.4.0"; src = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = version; + rev = finalAttrs.version; hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/el/elastic/package.nix b/pkgs/by-name/el/elastic/package.nix index d2457424acfe..d11ea67fb7f7 100644 --- a/pkgs/by-name/el/elastic/package.nix +++ b/pkgs/by-name/el/elastic/package.nix @@ -17,7 +17,7 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "elastic"; version = "0.1.9"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "elastic"; - rev = version; + rev = finalAttrs.version; hash = "sha256-jK9RcZ5U1Dwkpu1mlfq/l4347eRCd3Y/KDYYIIkGytk="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ _0xMRTT ]; teams = [ lib.teams.gnome-circle ]; }; -} +}) diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index 522dbb0fef13..4d97a1db6c19 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.12.8"; + "version" = "1.12.9"; "hashes" = { - "desktopSrcHash" = "sha256-J+ITqHLxbmhhjFnyfBlHFzxrPeIvsCv+iaxa8DiWorM="; - "desktopYarnHash" = "sha256-coa2AMNGLDtqcrQJDc/DDkcaWBCLa76VTKJLGlr7dpQ="; + "desktopSrcHash" = "sha256-VBlKFknwafXar05kEpwv0+9EwUPe9WQRMn8S8uhX2U8="; + "desktopYarnHash" = "sha256-tBO8rtz5/8OxmGsPmMEATqNVuBEcNp6L6lJCaJdPlNY="; }; } diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index 68f55011557f..bd10d6850309 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,8 +1,8 @@ { - "version" = "1.12.8"; + "version" = "1.12.9"; "hashes" = { - "webSrcHash" = "sha256-c1vrFEe0kEpCXs67oeZPv0xqmL3YaqAvD1nqoTQXlzk="; - "webYarnHash" = "sha256-Vo0SkCUPVQsVCgVILT+uvjbExDpYk4/DRfWdiisbf1o="; - "webSharedComponentsYarnHash" = "sha256-8wvjoanSd5KLDW6MbwY+3Ch9rzWpukeQEvYzMxXsbKA="; + "webSrcHash" = "sha256-txG91VN4b0ZtUnQp4IfN47YAn1WBI9UUxemReachcDo="; + "webYarnHash" = "sha256-Y2AvBlS7qdVUXalKet3Ud4a6MA4MKHM4ffRhB7Uq8Co="; + "webSharedComponentsYarnHash" = "sha256-yeFFVVMWyPN3BqOY46KAxPv7VRVrsFvPan5arTNd/GM"; }; } diff --git a/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix index f5188c0adb7f..de04b461617b 100644 --- a/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix +++ b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix @@ -13,14 +13,14 @@ hicolor-icon-theme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "elementary-xfce-icon-theme"; version = "0.22"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-snNh6883YUmzU1OG8jLf41/0NrEzfwFikyVtX1JeNdw="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.xfce ]; }; -} +}) diff --git a/pkgs/by-name/el/elfio/package.nix b/pkgs/by-name/el/elfio/package.nix index f84730de258a..a479c71f8ecd 100644 --- a/pkgs/by-name/el/elfio/package.nix +++ b/pkgs/by-name/el/elfio/package.nix @@ -6,14 +6,14 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "elfio"; version = "3.10"; src = fetchFromGitHub { owner = "serge1"; repo = "elfio"; - rev = "Release_${version}"; + rev = "Release_${finalAttrs.version}"; sha256 = "sha256-DuZhkiHXdCplRiOy1Gsu7voVPdCbFt+4qFqlOeOeWQw="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ prusnak ]; }; -} +}) diff --git a/pkgs/by-name/el/elfkickers/package.nix b/pkgs/by-name/el/elfkickers/package.nix index e7ff8f1652b2..800659329644 100644 --- a/pkgs/by-name/el/elfkickers/package.nix +++ b/pkgs/by-name/el/elfkickers/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "elfkickers"; version = "3.2"; src = fetchurl { - url = "https://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz"; + url = "https://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${finalAttrs.version}.tar.gz"; sha256 = "sha256-m4HmxT4MlPwZjZiC63NxVvNtVlFS3DIRiJfHewaiaHw="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/el/elkhound/package.nix b/pkgs/by-name/el/elkhound/package.nix index a771e2497104..0e7bdf87035c 100644 --- a/pkgs/by-name/el/elkhound/package.nix +++ b/pkgs/by-name/el/elkhound/package.nix @@ -8,7 +8,7 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "elkhound"; version = "0-unstable-2020-04-13"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" ''; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; nativeBuildInputs = [ bison @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "elkhound"; }; -} +}) diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix index 8f9679a0ee11..8a45c1061056 100644 --- a/pkgs/by-name/el/ell/package.nix +++ b/pkgs/by-name/el/ell/package.nix @@ -9,7 +9,7 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ell"; version = "0.81"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; - rev = version; + rev = finalAttrs.version; hash = "sha256-NopI9aDtpEbf2JlboLTIg/9zXaZelfYhF0/RgwUgakI="; }; @@ -61,11 +61,11 @@ stdenv.mkDerivation rec { longDescription = '' The Embedded Linux* Library (ELL) provides core, low-level functionality for system daemons. It typically has no dependencies other than the Linux kernel, C standard library, and libdl (for dynamic linking). While ELL is designed to be efficient and compact enough for use on embedded Linux platforms, it is not limited to resource-constrained systems. ''; - changelog = "https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=${version}"; + changelog = "https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=${finalAttrs.version}"; license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ mic92 ]; }; -} +}) diff --git a/pkgs/by-name/el/elogind/package.nix b/pkgs/by-name/el/elogind/package.nix index 0b0400c56d43..b08378bb96a1 100644 --- a/pkgs/by-name/el/elogind/package.nix +++ b/pkgs/by-name/el/elogind/package.nix @@ -35,14 +35,14 @@ enableSystemd ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "elogind"; version = "255.5"; src = fetchFromGitHub { owner = "elogind"; repo = "elogind"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-4KZr/NiiGVwzdDROhiX3GEQTUyIGva6ezb+xC2U3bkg="; }; @@ -159,4 +159,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ nh2 ]; }; -} +}) diff --git a/pkgs/by-name/el/elpa/package.nix b/pkgs/by-name/el/elpa/package.nix index 2fda624d90e0..53df2f856f05 100644 --- a/pkgs/by-name/el/elpa/package.nix +++ b/pkgs/by-name/el/elpa/package.nix @@ -26,14 +26,14 @@ assert blas.isILP64 == lapack.isILP64; assert blas.isILP64 == scalapack.isILP64; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "elpa"; version = "2025.06.002"; passthru = { inherit (blas) isILP64; }; src = fetchurl { - url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; + url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${finalAttrs.version}/elpa-${finalAttrs.version}.tar.gz"; sha256 = "sha256-3jGAwG4rDbtWk56ErRpf0WhEZb04rSGWeS0PQCiTf9o="; }; @@ -130,4 +130,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/em/emboss/package.nix b/pkgs/by-name/em/emboss/package.nix index 128aab262e39..83177cc85da2 100644 --- a/pkgs/by-name/em/emboss/package.nix +++ b/pkgs/by-name/em/emboss/package.nix @@ -11,12 +11,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "emboss"; version = "6.6.0"; src = fetchurl { - url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-${version}.tar.gz"; + url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-${finalAttrs.version}.tar.gz"; sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e"; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { # The last successful Darwin Hydra build was in 2024 broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix index 54acc7547db2..f41baf09ac01 100644 --- a/pkgs/by-name/em/emmylua-doc-cli/package.nix +++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix @@ -6,18 +6,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_doc_cli"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-bdvJInMuWJq7MZa+4wrKBn0myLTHCayhDAhB8Stjp6A="; + hash = "sha256-aC7NrmzL6Ri7oB7jW+uSzbWTXfAUrk0zXH7t6ewukLU="; }; buildAndTestSubdir = "crates/emmylua_doc_cli"; - cargoHash = "sha256-bF6bdTbcHDecj+wVoNsaKBzsz96d3vo6cqp5MjSbT4E="; + cargoHash = "sha256-znpZt/1ss3EcimFSADQi2/14z2etKbv78QQoT823U9Y="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/em/emojify/package.nix b/pkgs/by-name/em/emojify/package.nix index 186074da829a..44c73b08c1ee 100644 --- a/pkgs/by-name/em/emojify/package.nix +++ b/pkgs/by-name/em/emojify/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "emojify"; version = "2.2.0"; src = fetchFromGitHub { owner = "mrowa44"; repo = "emojify"; - rev = version; + rev = finalAttrs.version; hash = "sha256-6cV+S8wTqJxPGsxiJ3hP6/CYPMWdF3qnz4ddL+F/oJU="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "emojify"; }; -} +}) diff --git a/pkgs/by-name/em/empty/package.nix b/pkgs/by-name/em/empty/package.nix index c6dff73c9e8a..b6c3309b846b 100644 --- a/pkgs/by-name/em/empty/package.nix +++ b/pkgs/by-name/em/empty/package.nix @@ -5,12 +5,12 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "empty"; version = "0.6.21b"; src = fetchzip { - url = "mirror://sourceforge/empty/empty/empty-${version}.tgz"; + url = "mirror://sourceforge/empty/empty/empty-${finalAttrs.version}.tgz"; sha256 = "1rkixh2byr70pdxrwr4lj1ckh191rjny1m5xbjsa7nqw1fw6c2xs"; stripRoot = false; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.djwf ]; mainProgram = "empty"; }; -} +}) diff --git a/pkgs/by-name/em/emulsion-palette/package.nix b/pkgs/by-name/em/emulsion-palette/package.nix index e9b90da1dbbe..c4022725f028 100644 --- a/pkgs/by-name/em/emulsion-palette/package.nix +++ b/pkgs/by-name/em/emulsion-palette/package.nix @@ -14,14 +14,14 @@ desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "emulsion-palette"; version = "3.3.9"; src = fetchFromGitHub { owner = "lainsce"; repo = "emulsion"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-xG7yZKbbNao/pzFhdTMof/lw9K12NKZi47YRaEd65ok="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/en/encfs/package.nix b/pkgs/by-name/en/encfs/package.nix index 58ee6ee82f9b..ba1f655747fe 100644 --- a/pkgs/by-name/en/encfs/package.nix +++ b/pkgs/by-name/en/encfs/package.nix @@ -13,13 +13,13 @@ gtest, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "encfs"; version = "1.9.5"; src = fetchFromGitHub { sha256 = "099rjb02knr6yz7przlnyj62ic0ag5ncs7vvcc36ikyqrmpqsdch"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; repo = "encfs"; owner = "vgough"; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { # The last successful Darwin Hydra build was in 2024 broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/en/enchant_2/package.nix b/pkgs/by-name/en/enchant_2/package.nix index 1ce5f5b2360c..eb682080aab5 100644 --- a/pkgs/by-name/en/enchant_2/package.nix +++ b/pkgs/by-name/en/enchant_2/package.nix @@ -23,7 +23,7 @@ assert withAppleSpell -> stdenv.hostPlatform.isDarwin; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "enchant"; version = "2.6.9"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://github.com/rrthomas/enchant/releases/download/v${version}/enchant-${version}.tar.gz"; + url = "https://github.com/rrthomas/enchant/releases/download/v${finalAttrs.version}/enchant-${finalAttrs.version}.tar.gz"; hash = "sha256-2aWhDcmzikOzoPoix27W67fgnrU1r/YpVK/NvUDv/2s="; }; @@ -91,4 +91,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jtojnar ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/en/enchive/package.nix b/pkgs/by-name/en/enchive/package.nix index 51f7113b09dd..5acb597f7167 100644 --- a/pkgs/by-name/en/enchive/package.nix +++ b/pkgs/by-name/en/enchive/package.nix @@ -4,13 +4,13 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "enchive"; version = "3.5"; src = fetchFromGitHub { owner = "skeeto"; repo = "enchive"; - rev = version; + rev = finalAttrs.version; sha256 = "0fdrfc5l42lj2bvmv9dmkmhmm7qiszwk7cmdvnqad3fs7652g0qa"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.nico202 ]; }; -} +}) diff --git a/pkgs/by-name/en/encpipe/package.nix b/pkgs/by-name/en/encpipe/package.nix index e6b9f0ffd35f..ec739068e058 100644 --- a/pkgs/by-name/en/encpipe/package.nix +++ b/pkgs/by-name/en/encpipe/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "encpipe"; version = "0.5"; src = fetchFromGitHub { owner = "jedisct1"; repo = "encpipe"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YlEKSWzZuQyDi0mbwJh9Dfn4gKiOeqihSHPt4yY6YdY="; fetchSubmodules = true; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "encpipe"; }; -} +}) diff --git a/pkgs/by-name/en/endeavour/package.nix b/pkgs/by-name/en/endeavour/package.nix index c551a2fdf603..a42b5119e33c 100644 --- a/pkgs/by-name/en/endeavour/package.nix +++ b/pkgs/by-name/en/endeavour/package.nix @@ -21,7 +21,7 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "endeavour"; version = "43.0"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "Endeavour"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-1mCTw+nJ1w7RdCXfPCO31t1aYOq9Bki3EaXsHiiveD0="; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix index 17ad129bba8b..ed153ed6991a 100644 --- a/pkgs/by-name/en/endless-sky/package.nix +++ b/pkgs/by-name/en/endless-sky/package.nix @@ -18,14 +18,14 @@ minizip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "endless-sky"; version = "0.10.16"; src = fetchFromGitHub { owner = "endless-sky"; repo = "endless-sky"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-QO7Yv8H7hvavyOG/G9+HZh+a7XlCAf7fyPlszvOF91M="; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; # Maybe other non-darwin Unix }; -} +}) diff --git a/pkgs/by-name/en/endlessh/package.nix b/pkgs/by-name/en/endlessh/package.nix index 01bc2ab030f6..474217993cd7 100644 --- a/pkgs/by-name/en/endlessh/package.nix +++ b/pkgs/by-name/en/endlessh/package.nix @@ -7,14 +7,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "endlessh"; version = "1.1"; src = fetchFromGitHub { owner = "skeeto"; repo = "endlessh"; - rev = version; + rev = finalAttrs.version; hash = "sha256-yHQzDrjZycDL/2oSQCJjxbZQJ30FoixVG1dnFyTKPH4="; }; @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { meta = { description = "SSH tarpit that slowly sends an endless banner"; homepage = "https://github.com/skeeto/endlessh"; - changelog = "https://github.com/skeeto/endlessh/releases/tag/${version}"; + changelog = "https://github.com/skeeto/endlessh/releases/tag/${finalAttrs.version}"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ azahi ]; platforms = lib.platforms.unix; mainProgram = "endlessh"; }; -} +}) diff --git a/pkgs/by-name/en/enjarify/package.nix b/pkgs/by-name/en/enjarify/package.nix index 10de71381857..4fa597312e7f 100644 --- a/pkgs/by-name/en/enjarify/package.nix +++ b/pkgs/by-name/en/enjarify/package.nix @@ -6,14 +6,14 @@ runtimeShell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "enjarify"; version = "1.0.3"; src = fetchFromGitHub { owner = "google"; repo = "enjarify"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-VDBC5n2jWLNJsilX+PV1smL5JeBDj23jYFRwdObXwYs="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "enjarify"; }; -} +}) diff --git a/pkgs/by-name/en/enscript/package.nix b/pkgs/by-name/en/enscript/package.nix index 0c6296adc0c9..2ef594bf8e3f 100644 --- a/pkgs/by-name/en/enscript/package.nix +++ b/pkgs/by-name/en/enscript/package.nix @@ -6,12 +6,12 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "enscript"; version = "1.6.6"; src = fetchurl { - url = "mirror://gnu/enscript/enscript-${version}.tar.gz"; + url = "mirror://gnu/enscript/enscript-${finalAttrs.version}.tar.gz"; sha256 = "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd"; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "enscript"; }; -} +}) diff --git a/pkgs/by-name/en/entr/package.nix b/pkgs/by-name/en/entr/package.nix index 030b655478f3..497658013547 100644 --- a/pkgs/by-name/en/entr/package.nix +++ b/pkgs/by-name/en/entr/package.nix @@ -5,12 +5,12 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "entr"; version = "5.7"; src = fetchurl { - url = "https://eradman.com/entrproject/code/entr-${version}.tar.gz"; + url = "https://eradman.com/entrproject/code/entr-${finalAttrs.version}.tar.gz"; hash = "sha256-kMXZQ4IMcM7zfrQaOCpupPXdf9le/vE7K1Ug0yD10Gc="; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://eradman.com/entrproject/"; description = "Run arbitrary commands when files change"; - changelog = "https://github.com/eradman/entr/raw/${version}/NEWS"; + changelog = "https://github.com/eradman/entr/raw/${finalAttrs.version}/NEWS"; license = lib.licenses.isc; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "entr"; }; -} +}) diff --git a/pkgs/by-name/en/entt/package.nix b/pkgs/by-name/en/entt/package.nix index b9a3232344e3..0db42a3a6d18 100644 --- a/pkgs/by-name/en/entt/package.nix +++ b/pkgs/by-name/en/entt/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "entt"; version = "3.14.0"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-IPAM7fr/tvSOMKWUbXbloNAnlp5t7J0ynSsTMZ2jKYs="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/en/entwine/package.nix b/pkgs/by-name/en/entwine/package.nix index 0c277b830e24..f3114d2ed054 100644 --- a/pkgs/by-name/en/entwine/package.nix +++ b/pkgs/by-name/en/entwine/package.nix @@ -11,14 +11,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "entwine"; version = "3.2.1"; src = fetchFromGitHub { owner = "connormanning"; repo = "entwine"; - rev = version; + rev = finalAttrs.version; hash = "sha256-K/mR3Js5F6JeS9xvEOhzX4sXGK/Zo+1mHCXDSaBdV2M="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "entwine"; }; -} +}) diff --git a/pkgs/by-name/en/enum4linux/package.nix b/pkgs/by-name/en/enum4linux/package.nix index b70bb94e5f07..ec327bff958f 100644 --- a/pkgs/by-name/en/enum4linux/package.nix +++ b/pkgs/by-name/en/enum4linux/package.nix @@ -8,14 +8,14 @@ openldap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "enum4linux"; version = "0.9.1"; src = fetchFromGitHub { owner = "CiscoCXSecurity"; repo = "enum4linux"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/R0P4Ft9Y0LZwKwhDGAe36UKviih6CNbJbj1lcNKEkM="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fishi0x01 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/en/envchain/package.nix b/pkgs/by-name/en/envchain/package.nix index 9e4b486420b2..228fa7c95fd6 100644 --- a/pkgs/by-name/en/envchain/package.nix +++ b/pkgs/by-name/en/envchain/package.nix @@ -9,14 +9,14 @@ readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "envchain"; version = "1.1.0"; src = fetchFromGitHub { owner = "sorah"; repo = "envchain"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-QUy38kJzMbYOyT86as4/yq2ctcszSnB8a3eVWxgd4Fo="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "envchain"; }; -} +}) diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index 22e6d087b77f..9cd4f036a6cc 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -1,15 +1,14 @@ { lib, - stdenv, + stdenvNoCC, autoPatchelfHook, fetchurl, - makeWrapper, nixosTests, versionCheckHook, }: let version = "1.37.0"; - inherit (stdenv.hostPlatform) system; + inherit (stdenvNoCC.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; plat = @@ -26,7 +25,7 @@ let } .${system} or throwSystem; in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "envoy-bin"; inherit version; @@ -36,21 +35,24 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ makeWrapper ]; + + strictDeps = true; dontUnpack = true; + dontConfigure = true; dontBuild = true; installPhase = '' runHook preInstall + mkdir -p $out/bin install -m755 $src $out/bin/envoy + runHook postInstall ''; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - versionCheckProgram = "${placeholder "out"}/bin/envoy"; passthru = { tests.envoy-bin = nixosTests.envoy-bin; diff --git a/pkgs/by-name/en/envypn-font/package.nix b/pkgs/by-name/en/envypn-font/package.nix index 991c27d9b2e6..2535b2db9a22 100644 --- a/pkgs/by-name/en/envypn-font/package.nix +++ b/pkgs/by-name/en/envypn-font/package.nix @@ -7,12 +7,12 @@ fonttosfnt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "envypn-font"; version = "1.7.1"; src = fetchurl { - url = "https://ywstd.fr/files/p/envypn-font/envypn-font-${version}.tar.gz"; + url = "https://ywstd.fr/files/p/envypn-font/envypn-font-${finalAttrs.version}.tar.gz"; sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ erdnaxe ]; }; -} +}) diff --git a/pkgs/by-name/en/enyo-launcher/package.nix b/pkgs/by-name/en/enyo-launcher/package.nix index 7db29bca5f6a..4646a2a84ab9 100644 --- a/pkgs/by-name/en/enyo-launcher/package.nix +++ b/pkgs/by-name/en/enyo-launcher/package.nix @@ -5,14 +5,14 @@ cmake, qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "enyo-launcher"; version = "2.0.7"; src = fetchFromGitLab { owner = "sdcofer70"; repo = "enyo-launcher"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Ig1b+JylRlxhl5k5ys9SOGMYw3eUxXyoVXt3YNeWNqI="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.usrfriendly ]; }; -} +}) diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix index 66970fd86564..eed14f08bc98 100644 --- a/pkgs/by-name/eo/eog/package.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -32,7 +32,7 @@ gi-docgen, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eog"; version = "49.1"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/eog/${lib.versions.major version}/eog-${version}.tar.xz"; + url = "mirror://gnome/sources/eog/${lib.versions.major finalAttrs.version}/eog-${finalAttrs.version}.tar.xz"; hash = "sha256-+t0S4UupzSvmmJ37zvQAAWRbY0QM7tjgSGewdYewZtw="; }; @@ -132,10 +132,10 @@ stdenv.mkDerivation rec { meta = { description = "GNOME image viewer"; homepage = "https://gitlab.gnome.org/GNOME/eog"; - changelog = "https://gitlab.gnome.org/GNOME/eog/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/eog/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.gpl2Plus; teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; mainProgram = "eog"; }; -} +}) diff --git a/pkgs/by-name/eo/eos-installer/package.nix b/pkgs/by-name/eo/eos-installer/package.nix index 548611c96f3a..7b3fa20efef0 100644 --- a/pkgs/by-name/eo/eos-installer/package.nix +++ b/pkgs/by-name/eo/eos-installer/package.nix @@ -17,14 +17,14 @@ xz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eos-installer"; version = "5.1.0"; src = fetchFromGitHub { owner = "endlessm"; repo = "eos-installer"; - tag = "Release_${version}"; + tag = "Release_${finalAttrs.version}"; sha256 = "BqvZglzFJabGXkI8hnLiw1r+CvM7kSKQPj8IKYBB6S4="; fetchSubmodules = true; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { mainProgram = "gnome-image-installer"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/eo/eot_utilities/package.nix b/pkgs/by-name/eo/eot_utilities/package.nix index d14456f33bab..5daf11caa63c 100644 --- a/pkgs/by-name/eo/eot_utilities/package.nix +++ b/pkgs/by-name/eo/eot_utilities/package.nix @@ -5,12 +5,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eot_utilities"; version = "1.1"; src = fetchurl { - url = "https://www.w3.org/Tools/eot-utils/eot-utilities-${version}.tar.gz"; + url = "https://www.w3.org/Tools/eot-utils/eot-utilities-${finalAttrs.version}.tar.gz"; sha256 = "0cb41riabss23hgfg7vxhky09d6zqwjy1nxdvr3l2bh5qzd4kvaf"; }; @@ -22,4 +22,4 @@ stdenv.mkDerivation rec { license = lib.licenses.w3c; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/ep/epeg/package.nix b/pkgs/by-name/ep/epeg/package.nix index 49fe09db21e9..4ff57c36c543 100644 --- a/pkgs/by-name/ep/epeg/package.nix +++ b/pkgs/by-name/ep/epeg/package.nix @@ -10,14 +10,14 @@ libexif, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "epeg"; version = "0.9.3"; src = fetchFromGitHub { owner = "mattes"; repo = "epeg"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-lttqarR8gScNIlSrc5uU3FLfvwxxJ2A1S4oESUW7oIw="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nh2 ]; mainProgram = "epeg"; }; -} +}) diff --git a/pkgs/by-name/ep/epm/package.nix b/pkgs/by-name/ep/epm/package.nix index 860622b297c6..35d36a1e7737 100644 --- a/pkgs/by-name/ep/epm/package.nix +++ b/pkgs/by-name/ep/epm/package.nix @@ -6,14 +6,14 @@ rpm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "epm"; version = "5.0.0"; src = fetchFromGitHub { owner = "jimjag"; repo = "epm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-o4B5lWBeve+U70FDgF1DrtNrXxaEY4etkPpwbqF7fmc="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ep/epstool/package.nix b/pkgs/by-name/ep/epstool/package.nix index 7c37dcc99c1b..042bab703142 100644 --- a/pkgs/by-name/ep/epstool/package.nix +++ b/pkgs/by-name/ep/epstool/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.09"; pname = "epstool"; src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}.orig.tar.xz"; + url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${finalAttrs.version}.orig.tar.xz"; hash = "sha256-HoUknRpE+UGLH5Wjrr2LB4TauOSd62QXrJuZbKCPYBE="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "epstool"; }; -} +}) diff --git a/pkgs/by-name/ep/epub2txt2/package.nix b/pkgs/by-name/ep/epub2txt2/package.nix index c7809c39a2f8..f66645095dab 100644 --- a/pkgs/by-name/ep/epub2txt2/package.nix +++ b/pkgs/by-name/ep/epub2txt2/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "epub2txt2"; version = "2.08"; src = fetchFromGitHub { owner = "kevinboone"; repo = "epub2txt2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-YFaXkcIdat2cn1ITYFyG1hxbbepqcxvyJ6ZzDo4dVYI="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.leonid ]; mainProgram = "epub2txt"; }; -} +}) diff --git a/pkgs/by-name/ep/epubcheck/package.nix b/pkgs/by-name/ep/epubcheck/package.nix index 8dfa45563ab5..b4f59b2fc8aa 100644 --- a/pkgs/by-name/ep/epubcheck/package.nix +++ b/pkgs/by-name/ep/epubcheck/package.nix @@ -6,12 +6,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "epubcheck"; version = "5.3.0"; src = fetchzip { - url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip"; + url = "https://github.com/w3c/epubcheck/releases/download/v${finalAttrs.version}/epubcheck-${finalAttrs.version}.zip"; sha256 = "sha256-wROsu/s0EuNQQsbMtxWVIwDZvDozBk/kfwxhivCIRAo="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ eadwu ]; }; -} +}) diff --git a/pkgs/by-name/er/eresi/package.nix b/pkgs/by-name/er/eresi/package.nix index 0e2783ad658b..97b7e50c295e 100644 --- a/pkgs/by-name/er/eresi/package.nix +++ b/pkgs/by-name/er/eresi/package.nix @@ -8,14 +8,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eresi"; version = "0.83-a3-phoenix"; src = fetchFromGitHub { owner = "thorkill"; repo = "eresi"; - rev = version; + rev = finalAttrs.version; sha256 = "0a5a7mh2zw9lcdrl8n1mqccrc0xcgj7743l7l4kslkh722fxv625"; }; @@ -92,4 +92,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/thorkill/eresi"; # Formerly http://www.eresi-project.org/ platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/er/ergo/package.nix b/pkgs/by-name/er/ergo/package.nix index ab2414a1365b..d713be97b7b6 100644 --- a/pkgs/by-name/er/ergo/package.nix +++ b/pkgs/by-name/er/ergo/package.nix @@ -7,12 +7,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ergo"; version = "6.0.2"; src = fetchurl { - url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; + url = "https://github.com/ergoplatform/ergo/releases/download/v${finalAttrs.version}/ergo-${finalAttrs.version}.jar"; sha256 = "sha256-9igU/BTWMbCM4Zzd1+HrjwYMZ8Os+k/fqokxtnCSO04="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ mmahut ]; mainProgram = "ergo"; }; -} +}) diff --git a/pkgs/by-name/er/ergoscf/package.nix b/pkgs/by-name/er/ergoscf/package.nix index b3d9d02ad18f..322f6915cae3 100644 --- a/pkgs/by-name/er/ergoscf/package.nix +++ b/pkgs/by-name/er/ergoscf/package.nix @@ -6,12 +6,12 @@ lapack, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ergoscf"; version = "3.8.2"; src = fetchurl { - url = "http://www.ergoscf.org/source/tarfiles/ergo-${version}.tar.gz"; + url = "http://www.ergoscf.org/source/tarfiles/ergo-${finalAttrs.version}.tar.gz"; sha256 = "sha256-U0NVREEZ8HI0Q0ZcbwvZsYA76PWMh7bqgDG1uaUc01c="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/es/es/package.nix b/pkgs/by-name/es/es/package.nix index b747d8e792bb..d9a04958c8a7 100644 --- a/pkgs/by-name/es/es/package.nix +++ b/pkgs/by-name/es/es/package.nix @@ -7,13 +7,13 @@ bison, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "es"; version = "0.9.2"; src = fetchurl { - url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz"; + url = "https://github.com/wryun/es-shell/releases/download/v${finalAttrs.version}/es-${finalAttrs.version}.tar.gz"; sha256 = "sha256-ySZIK0IITpA+uHHuHrDO/Ana5vGt64QI3Z6TMDXE9d0="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { passthru = { shellPath = "/bin/es"; }; -} +}) diff --git a/pkgs/by-name/es/eschalot/package.nix b/pkgs/by-name/es/eschalot/package.nix index b0d84faea926..e8c6afe49bd0 100644 --- a/pkgs/by-name/es/eschalot/package.nix +++ b/pkgs/by-name/es/eschalot/package.nix @@ -5,7 +5,7 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eschalot"; version = "1.2.0.20191006"; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { meta = { description = "Tor hidden service name generator"; - homepage = src.meta.homepage; + homepage = finalAttrs.src.meta.homepage; license = lib.licenses.isc; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/by-name/es/esdm/package.nix b/pkgs/by-name/es/esdm/package.nix index 2c96a1aefc77..2092cf4f8585 100644 --- a/pkgs/by-name/es/esdm/package.nix +++ b/pkgs/by-name/es/esdm/package.nix @@ -55,14 +55,14 @@ assert cryptoBackend == "openssl" || cryptoBackend == "botan"; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "esdm"; version = "1.2.1"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "esdm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-41vc5mB2MiQJu0HXFzSjiudlu1sRj2IP8FcFPQfu5uo="; }; @@ -139,4 +139,4 @@ stdenv.mkDerivation rec { thillux ]; }; -} +}) diff --git a/pkgs/by-name/es/esh/package.nix b/pkgs/by-name/es/esh/package.nix index 2b681fcc005d..e682d0f7c818 100644 --- a/pkgs/by-name/es/esh/package.nix +++ b/pkgs/by-name/es/esh/package.nix @@ -10,14 +10,14 @@ esh, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "esh"; version = "0.1.1"; src = fetchFromGitHub { owner = "jirutka"; repo = "esh"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1ddaji5nplf1dyvgkrhqjy8m5djaycqcfhjv30yprj1avjymlj6w"; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ mnacamura ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/es/espeakup/package.nix b/pkgs/by-name/es/espeakup/package.nix index 3fe87c511371..08639d30962a 100644 --- a/pkgs/by-name/es/espeakup/package.nix +++ b/pkgs/by-name/es/espeakup/package.nix @@ -11,14 +11,14 @@ systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "espeakup"; version = "0.90"; src = fetchFromGitHub { owner = "linux-speakup"; repo = "espeakup"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Qjdg1kParsnpb8Lv51wXLdrLufxtbBTsP8B3t53islI="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "espeakup"; }; -} +}) diff --git a/pkgs/by-name/es/esptool-ck/package.nix b/pkgs/by-name/es/esptool-ck/package.nix index f47ca4ed54fa..adf84ba5ce4b 100644 --- a/pkgs/by-name/es/esptool-ck/package.nix +++ b/pkgs/by-name/es/esptool-ck/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "esptool-ck"; version = "0.4.13"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1cb81b30a71r7i0gmkh2qagfx9lhq0myq5i37fk881bq6g7i5n2k"; }; - makeFlags = [ "VERSION=${version}" ]; + makeFlags = [ "VERSION=${finalAttrs.version}" ]; installPhase = '' mkdir -p $out/bin @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "esptool"; }; -} +}) diff --git a/pkgs/by-name/es/essentia-extractor/package.nix b/pkgs/by-name/es/essentia-extractor/package.nix index 9c079565d391..f51ef466fc98 100644 --- a/pkgs/by-name/es/essentia-extractor/package.nix +++ b/pkgs/by-name/es/essentia-extractor/package.nix @@ -17,12 +17,12 @@ let throwSystem = throw "Unsupported system: ${stdenv.system}"; arch = arch_table.${stdenv.system} or throwSystem; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "essentia-extractor"; version = "2.1_beta2"; src = fetchurl { - url = "https://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz"; + url = "https://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${finalAttrs.version}-${arch}.tar.gz"; sha256 = sha_table.${stdenv.system} or throwSystem; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "streaming_extractor_music"; }; -} +}) diff --git a/pkgs/by-name/et/et/package.nix b/pkgs/by-name/et/et/package.nix index 90e40833417f..c4267c32d924 100644 --- a/pkgs/by-name/et/et/package.nix +++ b/pkgs/by-name/et/et/package.nix @@ -7,14 +7,14 @@ gdk-pixbuf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "et"; version = "0.1.2"; src = fetchFromGitHub { owner = "oxzi"; repo = "et"; - rev = version; + rev = finalAttrs.version; sha256 = "0i0lgmnly8n7y4y6pb10pxgxyz8s5zk26k8z1g1578v1wan01lnq"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ oxzi ]; }; -} +}) diff --git a/pkgs/by-name/et/etcd/README.md b/pkgs/by-name/et/etcd/README.md index 9bbfded958e1..7f24f26c6474 100644 --- a/pkgs/by-name/et/etcd/README.md +++ b/pkgs/by-name/et/etcd/README.md @@ -19,7 +19,7 @@ After every NixOS release, the unsupported etcd versions should be removed by et ## User guidelines on etcd upgrades -Before upgrading a NixOS release, certify to upgrade etcd to the latest version in the current used release. +Before upgrading a NixOS release, make sure to upgrade etcd to the latest version in the current used release. Manual steps might be required for the upgrade. diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix index d74baa3baa10..98d93face05c 100644 --- a/pkgs/by-name/et/eternal-terminal/package.nix +++ b/pkgs/by-name/et/eternal-terminal/package.nix @@ -11,14 +11,14 @@ catch2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eternal-terminal"; version = "6.2.11"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; - tag = "et-v${version}"; + tag = "et-v${finalAttrs.version}"; hash = "sha256-d3mCZQO12NUQjGIOX1FWTLUq+adMTNb9QYCSU3ibZMY="; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "Remote shell that automatically reconnects without interrupting the session"; homepage = "https://eternalterminal.dev/"; - changelog = "https://github.com/MisterTea/EternalTerminal/releases/tag/et-v${version}"; + changelog = "https://github.com/MisterTea/EternalTerminal/releases/tag/et-v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dezgeg @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/et/etherape/package.nix b/pkgs/by-name/et/etherape/package.nix index 3cfad5e9cde7..6dd181e18be8 100644 --- a/pkgs/by-name/et/etherape/package.nix +++ b/pkgs/by-name/et/etherape/package.nix @@ -11,11 +11,11 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "etherape"; version = "0.9.21"; src = fetchurl { - url = "mirror://sourceforge/etherape/etherape-${version}.tar.gz"; + url = "mirror://sourceforge/etherape/etherape-${finalAttrs.version}.tar.gz"; sha256 = "sha256-SckN87uIDTxg36xERMqPxdaLqPNrgg7V+Hc4HJoHF1w="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [ symphorien ]; }; -} +}) diff --git a/pkgs/by-name/et/ethq/package.nix b/pkgs/by-name/et/ethq/package.nix index 140ec4f03ae9..592ba1ce7349 100644 --- a/pkgs/by-name/et/ethq/package.nix +++ b/pkgs/by-name/et/ethq/package.nix @@ -5,14 +5,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ethq"; version = "0.7.0"; src = fetchFromGitHub { owner = "isc-projects"; repo = "ethq"; - tag = "v${builtins.replaceStrings [ "." ] [ "_" ] version}"; + tag = "v${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-ye5ep9EM9Sq/NqNZHENPmFZefVBx1BGrPm3YEG1NcSc="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/et/ethtool/package.nix b/pkgs/by-name/et/ethtool/package.nix index 4e2a94d6f303..cdb6ad61e124 100644 --- a/pkgs/by-name/et/ethtool/package.nix +++ b/pkgs/by-name/et/ethtool/package.nix @@ -7,12 +7,12 @@ writeScript, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ethtool"; version = "6.15"; src = fetchurl { - url = "mirror://kernel/software/network/ethtool/ethtool-${version}.tar.xz"; + url = "mirror://kernel/software/network/ethtool/ethtool-${finalAttrs.version}.tar.xz"; hash = "sha256-lHfDZRFNkQEgquxTNqHRYZbIM9hIb3xtpnvt71eICt4="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bjornfor ]; mainProgram = "ethtool"; }; -} +}) diff --git a/pkgs/by-name/et/ettercap/package.nix b/pkgs/by-name/et/ettercap/package.nix index ffdc9ba85cde..a34721462648 100644 --- a/pkgs/by-name/et/ettercap/package.nix +++ b/pkgs/by-name/et/ettercap/package.nix @@ -22,7 +22,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ettercap"; version = "0.8.4-unstable-2025-07-16"; @@ -83,9 +83,9 @@ stdenv.mkDerivation rec { analysis. ''; homepage = "https://www.ettercap-project.org/"; - changelog = "https://github.com/Ettercap/ettercap/releases/tag/${version}"; + changelog = "https://github.com/Ettercap/ettercap/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/eu/eureka-editor/package.nix b/pkgs/by-name/eu/eureka-editor/package.nix index c611c410683f..91457a4052c0 100644 --- a/pkgs/by-name/eu/eureka-editor/package.nix +++ b/pkgs/by-name/eu/eureka-editor/package.nix @@ -10,12 +10,12 @@ libGLU, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eureka-editor"; version = "1.27b"; src = fetchzip { - url = "mirror://sourceforge/eureka-editor/Eureka/${lib.versions.majorMinor version}/eureka-${version}-source.tar.gz"; + url = "mirror://sourceforge/eureka-editor/Eureka/${lib.versions.majorMinor finalAttrs.version}/eureka-${finalAttrs.version}-source.tar.gz"; sha256 = "075w7xxsgbgh6dhndc1pfxb2h1s5fhsw28yl1c025gmx9bb4v3bf"; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; badPlatforms = lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/ev/evemu/package.nix b/pkgs/by-name/ev/evemu/package.nix index f4c97955388d..763f227d6a20 100644 --- a/pkgs/by-name/ev/evemu/package.nix +++ b/pkgs/by-name/ev/evemu/package.nix @@ -8,7 +8,7 @@ libevdev, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "evemu"; version = "2.7.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # each time it is downloaded :/ src = fetchgit { url = "git://git.freedesktop.org/git/evemu"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-SQDaARuqBMBVlUz+Nw6mjdxaZfVOukmzTlIqy8U2rus="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ev/eventstat/package.nix b/pkgs/by-name/ev/eventstat/package.nix index f7c9c1ce88ec..5cd57e92f705 100644 --- a/pkgs/by-name/ev/eventstat/package.nix +++ b/pkgs/by-name/ev/eventstat/package.nix @@ -5,14 +5,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eventstat"; version = "0.06.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "eventstat"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-lCtXILpZn1/laRnsfE5DlQQQKKvfHxOJu87SkpWKeTE="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix index 7981f9df002d..1ce3c238d3f6 100644 --- a/pkgs/by-name/ev/everest-bin/package.nix +++ b/pkgs/by-name/ev/everest-bin/package.nix @@ -8,15 +8,15 @@ let pname = "everest"; - version = "6129"; + version = "6157"; phome = "$out/lib/Celeste"; in stdenvNoCC.mkDerivation { inherit pname version; src = fetchzip { - url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6129.0/main.zip"; + url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6157.0/main.zip"; extension = "zip"; - hash = "sha256-6Pvnvt7ZVQRIKpyBZt18rcqy8DL42WGhR7IF2O9zFLc="; + hash = "sha256-glGxQGp1zLg2wHeJBZUEbzTkCd3hU0GKBJo5SVuqXw4="; }; buildInputs = [ icu diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix index d33b7a1d7dd7..e48d43c7de60 100644 --- a/pkgs/by-name/ev/everest/package.nix +++ b/pkgs/by-name/ev/everest/package.nix @@ -11,7 +11,7 @@ let pname = "everest"; - version = "6129"; + version = "6157"; phome = "$out/lib/Celeste"; in buildDotnetModule { @@ -20,11 +20,11 @@ buildDotnetModule { src = fetchFromGitHub { owner = "EverestAPI"; repo = "Everest"; - rev = "04aa4228786ba8448455f1962f9714c08ad28383"; + rev = "44350f94f150bfa9b0ffb3cf979eeaf6146cab34"; fetchSubmodules = true; # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty. - hash = "sha256-p/zcqqKOwqumEY6RRH26FV3j7VQ3q2uFWm6IBEtLrgA="; + hash = "sha256-2cbeheBQLcGBUS20CUMNuDgVHqgtWFRAObkTcRZ4xCk="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/by-name/ev/evil-winrm/package.nix b/pkgs/by-name/ev/evil-winrm/package.nix index 8179f1edd858..d1e8cb0de4dd 100644 --- a/pkgs/by-name/ev/evil-winrm/package.nix +++ b/pkgs/by-name/ev/evil-winrm/package.nix @@ -33,14 +33,14 @@ let activate = 1 ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "evil-winrm"; version = "3.7"; src = fetchFromGitHub { owner = "Hackplayers"; repo = "evil-winrm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jr8glS732UvSt+qFkhhLFZUB7OIRpRj3SzXm6mVikrE="; }; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { description = "WinRM shell for hacking/pentesting"; mainProgram = "evil-winrm"; homepage = "https://github.com/Hackplayers/evil-winrm"; - changelog = "https://github.com/Hackplayers/evil-winrm/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Hackplayers/evil-winrm/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/pkgs/by-name/ev/evtest/package.nix b/pkgs/by-name/ev/evtest/package.nix index 1b9343aa7f84..d4be04e8b00f 100644 --- a/pkgs/by-name/ev/evtest/package.nix +++ b/pkgs/by-name/ev/evtest/package.nix @@ -7,7 +7,7 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "evtest"; version = "1.36"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "libevdev"; repo = "evtest"; - tag = "evtest-${version}"; + tag = "evtest-${finalAttrs.version}"; sha256 = "sha256-M7AGcHklErfRIOu64+OU397OFuqkAn4dqZxx7sDfklc="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "evtest"; }; -} +}) diff --git a/pkgs/by-name/ex/exaile/package.nix b/pkgs/by-name/ex/exaile/package.nix index ba78350786b1..c339b4192f91 100644 --- a/pkgs/by-name/ex/exaile/package.nix +++ b/pkgs/by-name/ex/exaile/package.nix @@ -34,14 +34,14 @@ wikipediaSupport ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "exaile"; version = "4.2.1"; src = fetchFromGitHub { owner = "exaile"; repo = "exaile"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-eH7JhoGd5jiaye8ZLx836tgEXsRpEd3D3z6gvnVrbIs="; }; @@ -120,4 +120,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ryneeverett ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ex/exfatprogs/package.nix b/pkgs/by-name/ex/exfatprogs/package.nix index 092a03bde873..37f3d88a06da 100644 --- a/pkgs/by-name/ex/exfatprogs/package.nix +++ b/pkgs/by-name/ex/exfatprogs/package.nix @@ -7,14 +7,14 @@ file, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "exfatprogs"; version = "1.3.1"; src = fetchFromGitHub { owner = "exfatprogs"; repo = "exfatprogs"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-AwY5TkQRfWjkkcleymNN580mKGxIdZ0O30tt6yBbo5M="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ yuannan ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ex/exif/package.nix b/pkgs/by-name/ex/exif/package.nix index 46bedb6cd676..db88bf9b73e5 100644 --- a/pkgs/by-name/ex/exif/package.nix +++ b/pkgs/by-name/ex/exif/package.nix @@ -10,14 +10,14 @@ libintl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "exif"; version = "0.6.22"; src = fetchFromGitHub { owner = "libexif"; repo = "exif"; - rev = "exif-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; + rev = "exif-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}-release"; sha256 = "1xlb1gdwxm3rmw7vlrynhvjp9dkwmvw23mxisdbdmma7ah2nda3i"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; mainProgram = "exif"; }; -} +}) diff --git a/pkgs/by-name/ex/exiv2/package.nix b/pkgs/by-name/ex/exiv2/package.nix index 83aaab70b309..f37a79d8ac95 100644 --- a/pkgs/by-name/ex/exiv2/package.nix +++ b/pkgs/by-name/ex/exiv2/package.nix @@ -18,7 +18,7 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "exiv2"; version = "0.28.7"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "exiv2"; repo = "exiv2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-a7nPjDjTcwsQeypARvy2rRsv9jpasSSxSyCTLWNDDtA="; }; @@ -115,4 +115,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ wegank ]; }; -} +}) diff --git a/pkgs/by-name/ex/exoscale-cli/package.nix b/pkgs/by-name/ex/exoscale-cli/package.nix index 7f67c14216b8..5fa9084f862d 100644 --- a/pkgs/by-name/ex/exoscale-cli/package.nix +++ b/pkgs/by-name/ex/exoscale-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.90.1"; + version = "1.91.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-mRHENBxxumb0eO74N0f04GItlI0jcsKnug45uLxuMdI="; + sha256 = "sha256-I8MzW81ai6qKN0Xk+/jHK7TcicUJdPwNE09McuxHwy4="; }; vendorHash = null; diff --git a/pkgs/by-name/ex/expected-lite/package.nix b/pkgs/by-name/ex/expected-lite/package.nix index 5f5ebe2cad5d..e0a3828f6a0e 100644 --- a/pkgs/by-name/ex/expected-lite/package.nix +++ b/pkgs/by-name/ex/expected-lite/package.nix @@ -6,14 +6,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "expected-lite"; version = "0.10.0"; src = fetchFromGitHub { owner = "martinmoene"; repo = "expected-lite"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-nxwdymBNbd+RuL8rKi2Fx2gC68TnJe7WnoN0O01lecQ="; }; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { Expected objects in C++11 and later in a single-file header-only library ''; homepage = "https://github.com/martinmoene/expected-lite"; - changelog = "https://github.com/martinmoene/expected-lite/blob/${src.rev}/CHANGES.txt"; + changelog = "https://github.com/martinmoene/expected-lite/blob/${finalAttrs.src.rev}/CHANGES.txt"; license = lib.licenses.boost; maintainers = with lib.maintainers; [ azahi ]; }; -} +}) diff --git a/pkgs/by-name/ex/exprtk/package.nix b/pkgs/by-name/ex/exprtk/package.nix index c3a4467ed0dc..ae3298e7fb44 100644 --- a/pkgs/by-name/ex/exprtk/package.nix +++ b/pkgs/by-name/ex/exprtk/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "exprtk"; version = "0.0.3"; src = fetchFromGitHub { owner = "ArashPartow"; repo = "exprtk"; - rev = version; + rev = finalAttrs.version; hash = "sha256-A4UzNYZZGgTJOw9G4Jg1wJZhxguFRohNEcwmwUOAX18="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ex/extra-container/package.nix b/pkgs/by-name/ex/extra-container/package.nix index b3c1fef27393..804fc0c3bf16 100644 --- a/pkgs/by-name/ex/extra-container/package.nix +++ b/pkgs/by-name/ex/extra-container/package.nix @@ -7,14 +7,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "extra-container"; version = "0.14"; src = fetchFromGitHub { owner = "erikarvstedt"; repo = "extra-container"; - rev = version; + rev = finalAttrs.version; hash = "sha256-XGp4HHH6D6ZKiO5RnMzqYJYnZB538EnEflvlTsOKpvo="; }; @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { meta = { description = "Run declarative containers without full system rebuilds"; homepage = "https://github.com/erikarvstedt/extra-container"; - changelog = "https://github.com/erikarvstedt/extra-container/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/erikarvstedt/extra-container/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.erikarvstedt ]; mainProgram = "extra-container"; }; -} +}) diff --git a/pkgs/by-name/ex/extrace/package.nix b/pkgs/by-name/ex/extrace/package.nix index c8330db655f1..6fe6a0470a96 100644 --- a/pkgs/by-name/ex/extrace/package.nix +++ b/pkgs/by-name/ex/extrace/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "extrace"; version = "0.9"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = "extrace"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Jy/Ac3NcqBkW0kHyypMAVUGAQ41qWM96BbLAym06ogM="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.leahneukirchen ]; }; -} +}) diff --git a/pkgs/by-name/ex/extract_url/package.nix b/pkgs/by-name/ex/extract_url/package.nix index 74dce6213902..96a13ab7a562 100644 --- a/pkgs/by-name/ex/extract_url/package.nix +++ b/pkgs/by-name/ex/extract_url/package.nix @@ -17,14 +17,14 @@ let ++ lib.optional uriFindSupport perlPackages.URIFind; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "extract_url"; version = "1.6.2"; src = fetchFromGitHub { owner = "m3m0ryh0l3"; repo = "extracturl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "05589lp15jmcpbj4y9a3hmf6n2gsqrm4ybcyh3hd4j6pc7hmnhny"; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.qyliss ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ex/extractpdfmark/package.nix b/pkgs/by-name/ex/extractpdfmark/package.nix index df1f911c4310..ffda241e9ef6 100644 --- a/pkgs/by-name/ex/extractpdfmark/package.nix +++ b/pkgs/by-name/ex/extractpdfmark/package.nix @@ -9,14 +9,14 @@ texlive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "extractpdfmark"; version = "1.1.1"; src = fetchFromGitHub { owner = "trueroad"; repo = "extractpdfmark"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-pNc/SWAtQWMbB2+lIQkJdBYSZ97iJXK71mS59qQa7Hs="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "extractpdfmark"; }; -} +}) diff --git a/pkgs/by-name/ex/exult/package.nix b/pkgs/by-name/ex/exult/package.nix index cb3dcdf93688..795a56d2f1fa 100644 --- a/pkgs/by-name/ex/exult/package.nix +++ b/pkgs/by-name/ex/exult/package.nix @@ -16,14 +16,14 @@ enableTools ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "exult"; version = "1.12.0"; src = fetchFromGitHub { owner = "exult"; repo = "exult"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-SZwYaqTTWESNRphXefa3JyH988y3WiaIr12yORhiFow="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "exult"; }; -} +}) diff --git a/pkgs/by-name/f2/f2fs-tools/package.nix b/pkgs/by-name/f2/f2fs-tools/package.nix index 3b41245791e8..d8e876fdaf6d 100644 --- a/pkgs/by-name/f2/f2fs-tools/package.nix +++ b/pkgs/by-name/f2/f2fs-tools/package.nix @@ -11,12 +11,12 @@ lzo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "f2fs-tools"; version = "1.16.0"; src = fetchzip { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v${version}.tar.gz"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v${finalAttrs.version}.tar.gz"; hash = "sha256-zNG1F//+BTBzlEc6qNVixyuCB6PMZD5Kf8pVK0ePYiA="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/f3/f3/package.nix b/pkgs/by-name/f3/f3/package.nix index 1089b6325ec4..9143b484cb8f 100644 --- a/pkgs/by-name/f3/f3/package.nix +++ b/pkgs/by-name/f3/f3/package.nix @@ -7,14 +7,14 @@ argp-standalone, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "f3"; version = "9.0"; src = fetchFromGitHub { owner = "AltraMayor"; repo = "f3"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ZajlFGXJcYUVe/wUFfdPYVW8stOo1Aqe8uD2Bm9KIk0="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { makefu ]; }; -} +}) diff --git a/pkgs/by-name/fa/faad2/package.nix b/pkgs/by-name/fa/faad2/package.nix index f36c56084a11..00870ca2f764 100644 --- a/pkgs/by-name/fa/faad2/package.nix +++ b/pkgs/by-name/fa/faad2/package.nix @@ -11,14 +11,14 @@ vlc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "faad2"; version = "2.11.2"; src = fetchFromGitHub { owner = "knik0"; repo = "faad2"; - rev = version; + rev = finalAttrs.version; hash = "sha256-JvmblrmE3doUMUwObBN2b+Ej+CDBWNemBsyYSCXGwo8="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { mainProgram = "faad"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index e1684b995554..73a772ce613f 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "fabric-ai"; - version = "1.4.389"; + version = "1.4.396"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${version}"; - hash = "sha256-WRFXo/boKqadMSrPAa9XFpWVNft6VJHDoZgHHoBZ+PA="; + hash = "sha256-ZclAxFZK/mvzTnr1gn/rczCCJ05LeOXrACJ9yqy9jcg="; }; - vendorHash = "sha256-147i0ZnNtph5DhaxK330kyUkDA4MBcpzrtIJGBEJHHQ="; + vendorHash = "sha256-s7wm7RFbnh9yosWrK5hvrPECYY5nbu3QCdJVe67Sf3c="; # Fabric introduced plugin tests that fail in the nix build sandbox. doCheck = false; diff --git a/pkgs/by-name/fa/fabric-installer/package.nix b/pkgs/by-name/fa/fabric-installer/package.nix index d933068b7313..1b7a7741fc10 100644 --- a/pkgs/by-name/fa/fabric-installer/package.nix +++ b/pkgs/by-name/fa/fabric-installer/package.nix @@ -6,12 +6,12 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fabric-installer"; version = "1.1.0"; src = fetchurl { - url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar"; + url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${finalAttrs.version}/fabric-installer-${finalAttrs.version}.jar"; sha256 = "sha256-wgxAfVyksRmq6XhH6y+7HTTJKWm2R/u7HeL9NsoAc44="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fa/factplusplus/package.nix b/pkgs/by-name/fa/factplusplus/package.nix index 2b2536708ac0..7d60792e99da 100644 --- a/pkgs/by-name/fa/factplusplus/package.nix +++ b/pkgs/by-name/fa/factplusplus/package.nix @@ -5,14 +5,14 @@ jdk, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "factplusplus"; version = "1.6.5"; src = fetchFromBitbucket { owner = "dtsarkov"; repo = "factplusplus"; - rev = "Release-${version}"; + rev = "Release-${finalAttrs.version}"; sha256 = "wzK1QJsNN0Q73NM+vjaE/vLuGf8J1Zu5ZPAkZNiKnME="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { broken = !stdenv.hostPlatform.isLinux; mainProgram = "FaCT++"; }; -} +}) diff --git a/pkgs/by-name/fa/fakechroot/package.nix b/pkgs/by-name/fa/fakechroot/package.nix index d54ecf93b881..9cca417b8644 100644 --- a/pkgs/by-name/fa/fakechroot/package.nix +++ b/pkgs/by-name/fa/fakechroot/package.nix @@ -11,14 +11,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fakechroot"; version = "2.20.1"; src = fetchFromGitHub { owner = "dex4er"; repo = "fakechroot"; - rev = version; + rev = finalAttrs.version; sha256 = "0xgnwazrmrg4gm30xjxdn6sx3lhqvxahrh6gmy3yfswxc30pmg86"; }; @@ -100,4 +100,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fa/fakeroute/package.nix b/pkgs/by-name/fa/fakeroute/package.nix index e31acae0b43d..398a3f2240da 100644 --- a/pkgs/by-name/fa/fakeroute/package.nix +++ b/pkgs/by-name/fa/fakeroute/package.nix @@ -5,12 +5,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fakeroute"; version = "0.3"; src = fetchurl { - url = "https://maxwell.eurofusion.eu/git/rnhmjoj/fakeroute/releases/download/v${version}/fakeroute-${version}.tar.gz"; + url = "https://maxwell.eurofusion.eu/git/rnhmjoj/fakeroute/releases/download/v${finalAttrs.version}/fakeroute-${finalAttrs.version}.tar.gz"; hash = "sha256-DoXGJm8vOlAD6ZuvVAt6bkgfahc8WgyYIXCrgqzfiWg="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "fakeroute"; }; -} +}) diff --git a/pkgs/by-name/fa/fancontrol-gui/package.nix b/pkgs/by-name/fa/fancontrol-gui/package.nix index cdf776561946..dd38a9b4cba7 100644 --- a/pkgs/by-name/fa/fancontrol-gui/package.nix +++ b/pkgs/by-name/fa/fancontrol-gui/package.nix @@ -10,14 +10,14 @@ stdenv, testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fancontrol-gui"; version = "0.8"; src = fetchFromGitHub { owner = "Maldela"; repo = "fancontrol-gui"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hJaU8SL0b6GmTONGSIzUzzbex6KxHf2Np0bCX8YSSVM="; }; @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { meta = { description = "GUI for fancontrol with QT and KDE framework 5"; homepage = "https://github.com/Maldela/fancontrol-gui"; - changelog = "https://github.com/Maldela/fancontrol-gui/releases/tag/v${version}"; + changelog = "https://github.com/Maldela/fancontrol-gui/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; mainProgram = "fancontrol_gui"; maintainers = with lib.maintainers; [ dashietm ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fa/farbfeld/package.nix b/pkgs/by-name/fa/farbfeld/package.nix index dc829432f5a9..a94ed6840c26 100644 --- a/pkgs/by-name/fa/farbfeld/package.nix +++ b/pkgs/by-name/fa/farbfeld/package.nix @@ -8,12 +8,12 @@ libjpeg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "farbfeld"; version = "4"; src = fetchurl { - url = "https://dl.suckless.org/farbfeld/farbfeld-${version}.tar.gz"; + url = "https://dl.suckless.org/farbfeld/farbfeld-${finalAttrs.version}.tar.gz"; sha256 = "0ap7rcngffhdd57jw9j22arzkbrhwh0zpxhwbdfwl8fixlhmkpy7"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix index db3d10bc982d..663337700437 100644 --- a/pkgs/by-name/fa/fasmg/package.nix +++ b/pkgs/by-name/fa/fasmg/package.nix @@ -12,12 +12,12 @@ nix-update, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fasmg"; version = "l04h"; src = fetchzip { - url = "https://flatassembler.net/fasmg.${version}.zip"; + url = "https://flatassembler.net/fasmg.${finalAttrs.version}.zip"; sha256 = "sha256-LPRDNtkNVlA2RFvIncFWaCtJ/gH7uApqJPizeO7BmrM="; stripRoot = false; }; @@ -93,4 +93,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.iamanaws ]; platforms = with lib.platforms; lib.intersectLists (linux ++ darwin) x86; }; -} +}) diff --git a/pkgs/by-name/fa/fast-downward/package.nix b/pkgs/by-name/fa/fast-downward/package.nix index 7b379a5017c8..4203fe5b5bed 100644 --- a/pkgs/by-name/fa/fast-downward/package.nix +++ b/pkgs/by-name/fa/fast-downward/package.nix @@ -8,14 +8,14 @@ cplex, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fast-downward"; version = "24.06.1"; src = fetchFromGitHub { owner = "aibasel"; repo = "downward"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "sha256-JwBdV44h6LAJeIjKHPouvb3ZleydAc55QiuaFGrFx1Y="; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/fa/fastJson/package.nix b/pkgs/by-name/fa/fastJson/package.nix index c7adbcec9ecc..1f86fc65caab 100644 --- a/pkgs/by-name/fa/fastJson/package.nix +++ b/pkgs/by-name/fa/fastJson/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fastjson"; version = "1.2304.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "libfastjson"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WnM6lQjHz0n5BwWWZoDBavURokcaROXJW46RZen9vj4="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/fa/fastcap/package.nix b/pkgs/by-name/fa/fastcap/package.nix index cb2d82d3a355..cc6cb1a41d38 100644 --- a/pkgs/by-name/fa/fastcap/package.nix +++ b/pkgs/by-name/fa/fastcap/package.nix @@ -6,12 +6,12 @@ texliveMedium, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fastcap"; version = "2.0-18Sep92"; src = fetchzip { - url = "https://www.rle.mit.edu/cpg/codes/fastcap-${version}.tgz"; + url = "https://www.rle.mit.edu/cpg/codes/fastcap-${finalAttrs.version}.tgz"; hash = "sha256-fnmC6WNd7xk8fphxkMZUq2+Qz+2mWIP2lvBUBAmUvHI"; stripRoot = false; }; @@ -76,8 +76,8 @@ stdenv.mkDerivation rec { mv bin $out/bin rm $out/bin/README - mkdir -p $doc/share/doc/fastcap-${version} - cp doc/*.pdf $doc/share/doc/fastcap-${version} + mkdir -p $doc/share/doc/fastcap-${finalAttrs.version} + cp doc/*.pdf $doc/share/doc/fastcap-${finalAttrs.version} mkdir -p $out/share/fastcap mv examples $out/share/fastcap @@ -98,4 +98,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "fastcap"; }; -} +}) diff --git a/pkgs/by-name/fa/fastd/package.nix b/pkgs/by-name/fa/fastd/package.nix index 6043c8a06a49..6c53a65b74b4 100644 --- a/pkgs/by-name/fa/fastd/package.nix +++ b/pkgs/by-name/fa/fastd/package.nix @@ -14,14 +14,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fastd"; version = "23"; src = fetchFromGitHub { owner = "neocturne"; repo = "fastd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Sz6VEjKziL/w2a4VWFfMPDYvm7UZh5A/NmzP10rJ2r8="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "fastd"; }; -} +}) diff --git a/pkgs/by-name/fa/fastjet-contrib/package.nix b/pkgs/by-name/fa/fastjet-contrib/package.nix index 2d10599e80c4..0f472c2f2d1c 100644 --- a/pkgs/by-name/fa/fastjet-contrib/package.nix +++ b/pkgs/by-name/fa/fastjet-contrib/package.nix @@ -5,12 +5,12 @@ fastjet, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fastjet-contrib"; version = "1.101"; src = fetchurl { - url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; + url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${finalAttrs.version}.tar.gz"; sha256 = "sha256-2+itIZn3LWTdKfYhj29T793I+z5d2cXRDy/R4j1uRPY="; }; @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { meta = { description = "Third party extensions for FastJet"; homepage = "http://fastjet.fr/"; - changelog = "https://phab.hepforge.org/source/fastjetsvn/browse/contrib/tags/${version}/NEWS?as=source&blame=off"; + changelog = "https://phab.hepforge.org/source/fastjetsvn/browse/contrib/tags/${finalAttrs.version}/NEWS?as=source&blame=off"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fa/fastjet/package.nix b/pkgs/by-name/fa/fastjet/package.nix index c09fc2999519..e50b2f0d491b 100644 --- a/pkgs/by-name/fa/fastjet/package.nix +++ b/pkgs/by-name/fa/fastjet/package.nix @@ -7,12 +7,12 @@ withPython ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fastjet"; version = "3.4.3"; src = fetchurl { - url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; + url = "http://fastjet.fr/repo/fastjet-${finalAttrs.version}.tar.gz"; hash = "sha256-zBdUcb+rhla4xhg6jl6a0F1fdQbkbzISqagjCQW49qM="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; }; -} +}) diff --git a/pkgs/by-name/fa/fastnlo-toolkit/package.nix b/pkgs/by-name/fa/fastnlo-toolkit/package.nix index b6d60316e43c..d717e9208d54 100644 --- a/pkgs/by-name/fa/fastnlo-toolkit/package.nix +++ b/pkgs/by-name/fa/fastnlo-toolkit/package.nix @@ -13,12 +13,12 @@ withPython ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fastnlo-toolkit"; version = "2.5.0-2826"; src = fetchurl { - url = "https://fastnlo.hepforge.org/code/v25/fastnlo_toolkit-${version}.tar.gz"; + url = "https://fastnlo.hepforge.org/code/v25/fastnlo_toolkit-${finalAttrs.version}.tar.gz"; hash = "sha256-7aIMYCOkHC/17CHYiEfrxvtSJxTDivrS7BQ32cGiEy0="; }; @@ -107,4 +107,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/fa/fastp/package.nix b/pkgs/by-name/fa/fastp/package.nix index aa15a3497982..51796920881d 100644 --- a/pkgs/by-name/fa/fastp/package.nix +++ b/pkgs/by-name/fa/fastp/package.nix @@ -7,14 +7,14 @@ isa-l, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fastp"; version = "1.1.0"; src = fetchFromGitHub { owner = "OpenGene"; repo = "fastp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-0hLq6r/XcYkF1J9LpiQ+qxh5MN4vDTRr5JibnIsq2J0="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jbedo ]; platforms = lib.platforms.x86_64; }; -} +}) diff --git a/pkgs/by-name/fa/fastpbkdf2/package.nix b/pkgs/by-name/fa/fastpbkdf2/package.nix index c369db642b39..c940c201395d 100644 --- a/pkgs/by-name/fa/fastpbkdf2/package.nix +++ b/pkgs/by-name/fa/fastpbkdf2/package.nix @@ -5,14 +5,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fastpbkdf2"; version = "1.0.0"; src = fetchFromGitHub { owner = "ctz"; repo = "fastpbkdf2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { license = lib.licenses.cc0; maintainers = with lib.maintainers; [ ledif ]; }; -} +}) diff --git a/pkgs/by-name/fa/fatcat/package.nix b/pkgs/by-name/fa/fatcat/package.nix index 4f4be94920db..15c339aec600 100644 --- a/pkgs/by-name/fa/fatcat/package.nix +++ b/pkgs/by-name/fa/fatcat/package.nix @@ -6,14 +6,14 @@ cmake, gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fatcat"; version = "1.1.1"; src = fetchFromGitHub { owner = "Gregwar"; repo = "fatcat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-/iGNVP7Bz/UZAR+dFxAKMKM9jm07h0x0F3VGpdxlHdk="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ cynerd ]; }; -} +}) diff --git a/pkgs/by-name/fa/fatrace/package.nix b/pkgs/by-name/fa/fatrace/package.nix index 9d98abc7e53c..0972b478c41b 100644 --- a/pkgs/by-name/fa/fatrace/package.nix +++ b/pkgs/by-name/fa/fatrace/package.nix @@ -6,14 +6,14 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fatrace"; version = "0.19.1"; src = fetchFromGitHub { owner = "martinpitt"; repo = "fatrace"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ncLmO7DwkB2nC4K/40ctwRheVVSPDK+zfcGJZvYyuVI="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fa/fatresize/package.nix b/pkgs/by-name/fa/fatresize/package.nix index ae48d5456776..c05a74e9338a 100644 --- a/pkgs/by-name/fa/fatresize/package.nix +++ b/pkgs/by-name/fa/fatresize/package.nix @@ -7,7 +7,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.1.0"; pname = "fatresize"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ya-mouse"; repo = "fatresize"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1vhz84kxfyl0q7mkqn68nvzzly0a4xgzv76m6db0bk7xyczv1qr2"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; mainProgram = "fatresize"; }; -} +}) diff --git a/pkgs/by-name/fa/faustPhysicalModeling/package.nix b/pkgs/by-name/fa/faustPhysicalModeling/package.nix index 789cdae0e3ee..eb724acb31fc 100644 --- a/pkgs/by-name/fa/faustPhysicalModeling/package.nix +++ b/pkgs/by-name/fa/faustPhysicalModeling/package.nix @@ -6,14 +6,14 @@ faust2jaqt, faust2lv2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "faustPhysicalModeling"; version = "2.83.1"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-c1I5ha9QvnC7jKdycAhW/iAzUcEA7NopXAquIS001Y8="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { # compiles stuff for the build platform, difficult to do properly broken = stdenv.hostPlatform != stdenv.buildPlatform; }; -} +}) diff --git a/pkgs/by-name/fa/faustlive/package.nix b/pkgs/by-name/fa/faustlive/package.nix index 5b54b5e55a29..33c9a3553d02 100644 --- a/pkgs/by-name/fa/faustlive/package.nix +++ b/pkgs/by-name/fa/faustlive/package.nix @@ -26,13 +26,13 @@ qt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "faustlive"; version = "2.5.17"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; - tag = version; + tag = finalAttrs.version; hash = "sha256-RqtdDkP63l/30sL5PDocvpar5TI4LdKfeeliSNeOHog="; fetchSubmodules = true; }; @@ -97,4 +97,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ magnetophon ]; }; -} +}) diff --git a/pkgs/by-name/fb/fbcat/package.nix b/pkgs/by-name/fb/fbcat/package.nix index 5f3d106327ac..3ee6d901d38d 100644 --- a/pkgs/by-name/fb/fbcat/package.nix +++ b/pkgs/by-name/fb/fbcat/package.nix @@ -5,14 +5,14 @@ netpbm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fbcat"; version = "0.5.2"; src = fetchFromGitHub { owner = "jwilk"; repo = "fbcat"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ORzcd8XGy2BfwuPK5UX+K5Z+FYkb+tdg/gHl3zHjvbk="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.matthiasbeyer ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fb/fbida/package.nix b/pkgs/by-name/fb/fbida/package.nix index 8f269d0eacea..7bb852386840 100644 --- a/pkgs/by-name/fb/fbida/package.nix +++ b/pkgs/by-name/fb/fbida/package.nix @@ -25,12 +25,12 @@ lirc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fbida"; version = "2.14"; src = fetchurl { - url = "http://dl.bytesex.org/releases/fbida/fbida-${version}.tar.gz"; + url = "http://dl.bytesex.org/releases/fbida/fbida-${finalAttrs.version}.tar.gz"; sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fb/fbmark/package.nix b/pkgs/by-name/fb/fbmark/package.nix index 618123a50e40..7ddc952756d0 100644 --- a/pkgs/by-name/fb/fbmark/package.nix +++ b/pkgs/by-name/fb/fbmark/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fbmark"; version = "0.3"; src = fetchFromGitHub { owner = "caramelli"; repo = "fbmark"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0n2czl2sy1k6r5ri0hp7jgq84xcwrx4x43bqvw1b4na99mqhyahn"; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ davidak ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fb/fbterm/package.nix b/pkgs/by-name/fb/fbterm/package.nix index 7ab8da427b62..5ea5e88d4da5 100644 --- a/pkgs/by-name/fb/fbterm/package.nix +++ b/pkgs/by-name/fb/fbterm/package.nix @@ -12,7 +12,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.7-2"; pname = "fbterm"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "debian"; repo = "fbterm"; - rev = "debian/${version}"; + rev = "debian/${finalAttrs.version}"; hash = "sha256-vRUZgFpA1IkzkLzl7ImT+Yff5XqjFbUlkHmj/hd7XDE="; }; @@ -106,4 +106,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fc/fcft/package.nix b/pkgs/by-name/fc/fcft/package.nix index 40c7f3bbb8d1..a59b2da9f9a2 100644 --- a/pkgs/by-name/fc/fcft/package.nix +++ b/pkgs/by-name/fc/fcft/package.nix @@ -31,7 +31,7 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fcft"; version = "3.3.3"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; - rev = version; + rev = finalAttrs.version; hash = "sha256-MkGlph9WpqH4daov5ZZPO2ua2mUbrsuo8Xk6GoKhoxg="; }; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://codeberg.org/dnkl/fcft"; - changelog = "https://codeberg.org/dnkl/fcft/releases/tag/${version}"; + changelog = "https://codeberg.org/dnkl/fcft/releases/tag/${finalAttrs.version}"; description = "Simple library for font loading and glyph rasterization"; maintainers = with lib.maintainers; [ fionera @@ -94,4 +94,4 @@ stdenv.mkDerivation rec { ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/fc/fcgiwrap/package.nix b/pkgs/by-name/fc/fcgiwrap/package.nix index d29a5f8363b6..a57dc313fe62 100644 --- a/pkgs/by-name/fc/fcgiwrap/package.nix +++ b/pkgs/by-name/fc/fcgiwrap/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fcgiwrap"; version = "1.1.0"; src = fetchFromGitHub { owner = "gnosek"; repo = "fcgiwrap"; - rev = version; + rev = finalAttrs.version; hash = "sha256-znAsZk+aB2XO2NK8Mjc+DLwykYKHolnVQPErlaAx3Oc="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; mainProgram = "fcgiwrap"; }; -} +}) diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix index f0c5bdf8a228..cedfc8083a17 100644 --- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix +++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix @@ -13,14 +13,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fcitx5-mcbopomofo"; version = "2.9.5"; src = fetchFromGitHub { owner = "openvanilla"; repo = "fcitx5-mcbopomofo"; - rev = version; + rev = finalAttrs.version; hash = "sha256-efpVvWchJywKyGu7I6pNRVKJhIv01iKAXFCJ+7kcMwc="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ shiphan ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fc/fcl/package.nix b/pkgs/by-name/fc/fcl/package.nix index 895240b00900..de781eded5c1 100644 --- a/pkgs/by-name/fc/fcl/package.nix +++ b/pkgs/by-name/fc/fcl/package.nix @@ -8,14 +8,14 @@ octomap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fcl"; version = "0.7.0"; src = fetchFromGitHub { owner = "flexible-collision-library"; repo = "fcl"; - rev = version; + rev = finalAttrs.version; sha256 = "0f5lhg6f9np7w16s6wz4mb349bycil1irk8z8ylfjwllxi4n6x7a"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lopsided98 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fc/fcppt/package.nix b/pkgs/by-name/fc/fcppt/package.nix index 75b8bebddc3d..df48ce23a374 100644 --- a/pkgs/by-name/fc/fcppt/package.nix +++ b/pkgs/by-name/fc/fcppt/package.nix @@ -6,14 +6,14 @@ boost, catch2_3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fcppt"; version = "5.0.0"; src = fetchFromGitHub { owner = "freundlich"; repo = "fcppt"; - rev = version; + rev = finalAttrs.version; hash = "sha256-8dBG6LdSngsutBboqb3WVVg3ylayoUYDOJV6p/ZFkoE="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { "x86_64-windows" ]; }; -} +}) diff --git a/pkgs/by-name/fd/fdk-aac-encoder/package.nix b/pkgs/by-name/fd/fdk-aac-encoder/package.nix index 6dd05ddb4182..959d74bfdb01 100644 --- a/pkgs/by-name/fd/fdk-aac-encoder/package.nix +++ b/pkgs/by-name/fd/fdk-aac-encoder/package.nix @@ -7,14 +7,14 @@ fdk_aac, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fdkaac"; version = "1.0.6"; src = fetchFromGitHub { owner = "nu774"; repo = "fdkaac"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-nVVeYk7t4+n/BsOKs744stsvgJd+zNnbASk3bAgFTpk="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.lunik1 ]; }; -} +}) diff --git a/pkgs/by-name/fd/fdm/package.nix b/pkgs/by-name/fd/fdm/package.nix index aa3c45893e85..d6af884afe1c 100644 --- a/pkgs/by-name/fd/fdm/package.nix +++ b/pkgs/by-name/fd/fdm/package.nix @@ -10,14 +10,14 @@ bison, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fdm"; version = "2.2"; src = fetchFromGitHub { owner = "nicm"; repo = "fdm"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/nicm/fdm/releases"; license = lib.licenses.isc; }; -} +}) diff --git a/pkgs/by-name/fd/fdupes/package.nix b/pkgs/by-name/fd/fdupes/package.nix index eb2d34ad3de1..1670297ca335 100644 --- a/pkgs/by-name/fd/fdupes/package.nix +++ b/pkgs/by-name/fd/fdupes/package.nix @@ -9,14 +9,14 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fdupes"; version = "2.4.0"; src = fetchFromGitHub { owner = "adrianlopezroche"; repo = "fdupes"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-epregz+i2mML5zCQErQDJFUFUxnUoqcBlUPGPJ4tcmc="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "fdupes"; }; -} +}) diff --git a/pkgs/by-name/fe/fead/package.nix b/pkgs/by-name/fe/fead/package.nix index 00a617f3933d..c063adcd867a 100644 --- a/pkgs/by-name/fe/fead/package.nix +++ b/pkgs/by-name/fe/fead/package.nix @@ -6,12 +6,12 @@ help2man, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fead"; version = "1.0.0"; src = fetchzip { - url = "https://trong.loang.net/~cnx/fead/snapshot/fead-${version}.tar.gz"; + url = "https://trong.loang.net/~cnx/fead/snapshot/fead-${finalAttrs.version}.tar.gz"; hash = "sha256-cbU379Zz+mwRqEHiDUlGvWheLkkr0YidHeVs/1Leg38="; }; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { description = "Advert generator from web feeds"; homepage = "https://trong.loang.net/~cnx/fead"; license = lib.licenses.agpl3Plus; - changelog = "https://trong.loang.net/~cnx/fead/tag?h=${version}"; + changelog = "https://trong.loang.net/~cnx/fead/tag?h=${finalAttrs.version}"; maintainers = with lib.maintainers; [ McSinyx ]; mainProgram = "fead"; }; -} +}) diff --git a/pkgs/by-name/fe/felix/package.nix b/pkgs/by-name/fe/felix/package.nix index a519acb070c7..0a2210f1ceb2 100644 --- a/pkgs/by-name/fe/felix/package.nix +++ b/pkgs/by-name/fe/felix/package.nix @@ -4,11 +4,11 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "apache-felix"; version = "7.0.5"; src = fetchurl { - url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; + url = "mirror://apache/felix/org.apache.felix.main.distribution-${finalAttrs.version}.tar.gz"; sha256 = "sha256-N9mbkIzMkMV2RLONv15EiosJxMU9iEJvwPWEauPIEe8="; }; buildCommand = '' @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; mainProgram = "felix.jar"; }; -} +}) diff --git a/pkgs/by-name/fe/felix_remoteshell/package.nix b/pkgs/by-name/fe/felix_remoteshell/package.nix index 7d8bbdf5b197..1456434ce2cc 100644 --- a/pkgs/by-name/fe/felix_remoteshell/package.nix +++ b/pkgs/by-name/fe/felix_remoteshell/package.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.1.2"; pname = "apache-felix-remoteshell-bundle"; src = fetchurl { - url = "http://apache.proserve.nl/felix/org.apache.felix.shell.remote-${version}.jar"; + url = "http://apache.proserve.nl/felix/org.apache.felix.shell.remote-${finalAttrs.version}.jar"; sha256 = "147zw5ppn98wfl3pr32isyb267xm3gwsvdfdvjr33m9g2v1z69aq"; }; buildCommand = '' mkdir -p $out/bundle - cp ${src} $out/bundle/org.apache.felix.shell.remote-${version}.jar + cp ${finalAttrs.src} $out/bundle/org.apache.felix.shell.remote-${finalAttrs.version}.jar ''; -} +}) diff --git a/pkgs/by-name/fe/ferm/package.nix b/pkgs/by-name/fe/ferm/package.nix index 1d7da4ea13ca..3f1c7f40ddf4 100644 --- a/pkgs/by-name/fe/ferm/package.nix +++ b/pkgs/by-name/fe/ferm/package.nix @@ -11,12 +11,12 @@ let inherit (lib.versions) majorMinor; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.7"; pname = "ferm"; src = fetchurl { - url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz"; + url = "http://ferm.foo-projects.org/download/${majorMinor finalAttrs.version}/ferm-${finalAttrs.version}.tar.xz"; sha256 = "sha256-wA2RDVOU5pZ1YI617g9QTVz9pB6ZCi2akbqsbfk+P5I="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ mic92 ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix index 0ec9ac574e72..1445eafddbd8 100644 --- a/pkgs/by-name/fe/fermyon-spin/package.nix +++ b/pkgs/by-name/fe/fermyon-spin/package.nix @@ -28,7 +28,7 @@ let packageHash = packageHashes.${system} or (throw "Unsupported system: ${system}"); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fermyon-spin"; version = "3.5.0"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # and not by GitHub (and thus are stable) - this simplifies the update script # by allowing it to use the output of `nix store prefetch-file`. src = fetchurl { - url = "https://github.com/spinframework/spin/releases/download/v${version}/spin-v${version}-${platform}.tar.gz"; + url = "https://github.com/spinframework/spin/releases/download/v${finalAttrs.version}/spin-v${finalAttrs.version}-${platform}.tar.gz"; hash = packageHash; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = builtins.attrNames packageHashes; }; -} +}) diff --git a/pkgs/by-name/fe/fetch-scm/package.nix b/pkgs/by-name/fe/fetch-scm/package.nix index e9644a5e3e7f..1f8ab2c43150 100644 --- a/pkgs/by-name/fe/fetch-scm/package.nix +++ b/pkgs/by-name/fe/fetch-scm/package.nix @@ -5,14 +5,14 @@ guile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fetch-scm"; version = "0.1.6"; src = fetchFromGitHub { owner = "KikyTokamuro"; repo = "fetch.scm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-WdYi8EVxQ6xPtld8JyZlUmgpxroevBehtkRANovMh2E="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ vel ]; mainProgram = "fetch-scm"; }; -} +}) diff --git a/pkgs/by-name/fe/fetchmail/package.nix b/pkgs/by-name/fe/fetchmail/package.nix index a560a4611b07..3c847d4a1144 100644 --- a/pkgs/by-name/fe/fetchmail/package.nix +++ b/pkgs/by-name/fe/fetchmail/package.nix @@ -7,12 +7,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fetchmail"; version = "6.6.2"; src = fetchurl { - url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; + url = "mirror://sourceforge/fetchmail/fetchmail-${finalAttrs.version}.tar.xz"; hash = "sha256-pRCSlewzGeDkXt0AnS2XcEKoMmq1LGqBeoL6mHED5PM="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "fetchmail"; }; -} +}) diff --git a/pkgs/by-name/ff/ff2mpv/package.nix b/pkgs/by-name/ff/ff2mpv/package.nix index f9f865675b50..8adb62b92d9e 100644 --- a/pkgs/by-name/ff/ff2mpv/package.nix +++ b/pkgs/by-name/ff/ff2mpv/package.nix @@ -6,14 +6,14 @@ mpv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ff2mpv"; version = "5.1.0"; src = fetchFromGitHub { owner = "woodruffw"; repo = "ff2mpv"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Xx18EX/MxLrnwZGwMFZJxJURUpjU2P01CQue5XbZ3fw="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "ff2mpv.py"; }; -} +}) diff --git a/pkgs/by-name/ff/ffcast/package.nix b/pkgs/by-name/ff/ffcast/package.nix index 68aab967e3c4..9e1e0575da4f 100644 --- a/pkgs/by-name/ff/ffcast/package.nix +++ b/pkgs/by-name/ff/ffcast/package.nix @@ -14,14 +14,14 @@ xwininfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ffcast"; version = "2.5.1"; src = fetchFromGitHub { owner = "ropery"; repo = "FFcast"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-kxqwDGEguFTFHkQzXctXqxslt0+bYnfUdQ8C/8+eTXo="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ffcast"; }; -} +}) diff --git a/pkgs/by-name/ff/fff/package.nix b/pkgs/by-name/ff/fff/package.nix index 0e7a73972803..0820622f8b20 100644 --- a/pkgs/by-name/ff/fff/package.nix +++ b/pkgs/by-name/ff/fff/package.nix @@ -11,14 +11,14 @@ xdotool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fff"; version = "2.2"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "fff"; - rev = version; + rev = finalAttrs.version; sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ff/ffms/package.nix b/pkgs/by-name/ff/ffms/package.nix index cde639177d03..f0e65482f2f3 100644 --- a/pkgs/by-name/ff/ffms/package.nix +++ b/pkgs/by-name/ff/ffms/package.nix @@ -8,14 +8,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ffms"; version = "5.0"; src = fetchFromGitHub { owner = "FFMS"; repo = "ffms2"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-Ildl8hbKSFGh4MUBK+k8uYMDrOZD9NSMdPAWIIaGy4E="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fg/fgallery/package.nix b/pkgs/by-name/fg/fgallery/package.nix index 845cbec717b7..72628c328675 100644 --- a/pkgs/by-name/fg/fgallery/package.nix +++ b/pkgs/by-name/fg/fgallery/package.nix @@ -20,12 +20,12 @@ # $jpegoptim = 0; # } -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fgallery"; version = "1.9.1"; src = fetchurl { - url = "https://www.thregr.org/~wavexx/software/fgallery/releases/fgallery-${version}.zip"; + url = "https://www.thregr.org/~wavexx/software/fgallery/releases/fgallery-${finalAttrs.version}.zip"; hash = "sha256-FvF0wkRe3wTPUG9/GEBxkaxvZ1B4wEd9kI9rURHKxn0="; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "fgallery"; }; -} +}) diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix index 8111c6370952..88f2bcbeeec8 100644 --- a/pkgs/by-name/fh/fheroes2/package.nix +++ b/pkgs/by-name/fh/fheroes2/package.nix @@ -16,14 +16,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fheroes2"; version = "1.1.13"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ct58Rkc6ORXldINQZVzMuObMl0BMk6QG88oU4tT0WcE="; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fi/fiche/package.nix b/pkgs/by-name/fi/fiche/package.nix index 5fff1716c7c6..b03f121e5f23 100644 --- a/pkgs/by-name/fi/fiche/package.nix +++ b/pkgs/by-name/fi/fiche/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fiche"; version = "0.9.1"; src = fetchFromGitHub { owner = "solusipse"; repo = "fiche"; - rev = version; + rev = finalAttrs.version; sha256 = "1102r39xw17kip7mjp987jy8na333gw9vxv31f7v8q05cr7d7kfb"; }; @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/solusipse/fiche"; - changelog = "https://github.com/solusipse/fiche/releases/tag/${version}"; + changelog = "https://github.com/solusipse/fiche/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.pinpox ]; platforms = lib.platforms.all; mainProgram = "fiche"; }; -} +}) diff --git a/pkgs/by-name/fi/fig2dev/package.nix b/pkgs/by-name/fi/fig2dev/package.nix index e4ab9b3067ce..73444a95bd14 100644 --- a/pkgs/by-name/fi/fig2dev/package.nix +++ b/pkgs/by-name/fi/fig2dev/package.nix @@ -13,12 +13,12 @@ gnused, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fig2dev"; version = "3.2.9a"; src = fetchurl { - url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; + url = "mirror://sourceforge/mcj/fig2dev-${finalAttrs.version}.tar.xz"; hash = "sha256-YeGFOTF2hS8DuQGzsFsZ+8Wtglj/FC89pucLG4NRMyY="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ lesuisse ]; }; -} +}) diff --git a/pkgs/by-name/fi/fiji/package.nix b/pkgs/by-name/fi/fiji/package.nix index 271acf3b8a64..f1e5b74d251f 100644 --- a/pkgs/by-name/fi/fiji/package.nix +++ b/pkgs/by-name/fi/fiji/package.nix @@ -12,12 +12,12 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fiji"; version = "20250408-1717"; src = fetchurl { - url = "https://downloads.imagej.net/fiji/archive/${version}/fiji-nojre.zip"; + url = "https://downloads.imagej.net/fiji/archive/${finalAttrs.version}/fiji-nojre.zip"; sha256 = "sha256-bqVrTBKII58E7WSlQfRPE0Dxd4h/oJALFvIOdAAFZoI="; }; @@ -98,4 +98,4 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ davisrichard437 ]; }; -} +}) diff --git a/pkgs/by-name/fi/filebench/package.nix b/pkgs/by-name/fi/filebench/package.nix index 8d2aab3e39d8..21ea332c3fae 100644 --- a/pkgs/by-name/fi/filebench/package.nix +++ b/pkgs/by-name/fi/filebench/package.nix @@ -7,12 +7,12 @@ flex, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "filebench"; version = "1.4.9.1"; src = fetchurl { - url = "mirror://sourceforge/filebench/filebench-${version}.tar.gz"; + url = "mirror://sourceforge/filebench/filebench-${finalAttrs.version}.tar.gz"; sha256 = "13hmx67lsz367sn8lrvz1780mfczlbiz8v80gig9kpkpf009yksc"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "filebench"; }; -} +}) diff --git a/pkgs/by-name/fi/fileshare/package.nix b/pkgs/by-name/fi/fileshare/package.nix index 69b057bff9c5..d100bd763575 100644 --- a/pkgs/by-name/fi/fileshare/package.nix +++ b/pkgs/by-name/fi/fileshare/package.nix @@ -7,7 +7,7 @@ libmicrohttpd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fileshare"; version = "0.2.4"; @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { domain = "git.tkolb.de"; owner = "Public"; repo = "fileshare"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-00MxPivZngQ2I7Hopz2MipJFnbvSZU0HF2wZucmEWQ4="; }; postPatch = '' - sed -i 's,$(shell git rev-parse --short HEAD),/${version},g' Makefile + sed -i 's,$(shell git rev-parse --short HEAD),/${finalAttrs.version},g' Makefile substituteInPlace Makefile \ --replace-fail pkg-config "${stdenv.cc.targetPrefix}pkg-config" \ --replace-fail gcc "${stdenv.cc.targetPrefix}cc" @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "fileshare"; }; -} +}) diff --git a/pkgs/by-name/fi/filter-audio/package.nix b/pkgs/by-name/fi/filter-audio/package.nix index 41e488501d0d..5239a915e199 100644 --- a/pkgs/by-name/fi/filter-audio/package.nix +++ b/pkgs/by-name/fi/filter-audio/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "filter-audio"; version = "0.0.1"; src = fetchFromGitHub { owner = "irungentoo"; repo = "filter_audio"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1dv4pram317c1w97cjsv9f6r8cdxhgri7ib0v364z08pk7r2avfn"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/fi/filtr/package.nix b/pkgs/by-name/fi/filtr/package.nix index 07d318c5ae7f..09738ab1d6cd 100644 --- a/pkgs/by-name/fi/filtr/package.nix +++ b/pkgs/by-name/fi/filtr/package.nix @@ -16,6 +16,9 @@ libXrandr, libXtst, writableTmpDirAsHomeHook, + + buildVST3 ? true, + buildLV2 ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "COPY_PLUGIN_AFTER_BUILD" false) - (lib.cmakeFeature "BUILD_STANDALONE" "OFF") + + (lib.cmakeBool "BUILD_STANDALONE" false) + (lib.cmakeBool "BUILD_VST3" buildVST3) + (lib.cmakeBool "BUILD_LV2" buildLV2) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" @@ -76,10 +82,17 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/vst3 $out/lib/lv2 + pushd FILTR_artefacts/Release + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + cp -r VST3/FILT-R.vst3 $out/lib/vst3 + ''} - cp -r "FILTR_artefacts/Release/LV2/FILT-R.lv2" $out/lib/lv2 - cp -r "FILTR_artefacts/Release/VST3/FILT-R.vst3" $out/lib/vst3 + ${lib.optionalString buildLV2 '' + mkdir -p $out/lib/lv2 + cp -r LV2/FILT-R.lv2 $out/lib/lv2 + ''} + popd runHook postInstall ''; @@ -89,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tiagolr/filtr"; changelog = "https://github.com/tiagolr/filtr/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ magnetophon ]; + maintainers = with lib.maintainers; [ + magnetophon + mrtnvgr + ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/fi/find-billy/package.nix b/pkgs/by-name/fi/find-billy/package.nix index ff3c0822a32e..7cdb6dfd7a40 100644 --- a/pkgs/by-name/fi/find-billy/package.nix +++ b/pkgs/by-name/fi/find-billy/package.nix @@ -10,7 +10,7 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "find-billy"; version = "1.1.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "annaaurora"; repo = "Find-Billy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-jKN3lEnLy0aN98S8BN3dcoOgc0RrxNoqfQdeCawKQaU="; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { ]; maintainers = [ lib.maintainers.annaaurora ]; }; -} +}) diff --git a/pkgs/by-name/fi/find-cursor/package.nix b/pkgs/by-name/fi/find-cursor/package.nix index a8012d07cc64..c13e901dc427 100644 --- a/pkgs/by-name/fi/find-cursor/package.nix +++ b/pkgs/by-name/fi/find-cursor/package.nix @@ -11,14 +11,14 @@ git, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "find-cursor"; version = "1.8"; src = fetchFromGitHub { owner = "arp242"; repo = "find-cursor"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/Dw4bOTCnpCbeI0YJ5DJ9Q2AGBognylUk7xYGn0KIA8="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.yanganto ]; mainProgram = "find-cursor"; }; -} +}) diff --git a/pkgs/by-name/fi/findnewest/package.nix b/pkgs/by-name/fi/findnewest/package.nix index 2cdd81f72a4f..35f7b6d1cea3 100644 --- a/pkgs/by-name/fi/findnewest/package.nix +++ b/pkgs/by-name/fi/findnewest/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "findnewest"; version = "0.3"; src = fetchFromGitHub { owner = "0-wiz-0"; repo = "findnewest"; - rev = "findnewest-${version}"; + rev = "findnewest-${finalAttrs.version}"; sha256 = "1x1cbn2b27h5r0ah5xc06fkalfdci2ngrgd4wibxjw0h88h0nvgq"; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { mainProgram = "fn"; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/by-name/fi/fio/package.nix b/pkgs/by-name/fi/fio/package.nix index 4450b03001df..7ce40f35ccb2 100644 --- a/pkgs/by-name/fi/fio/package.nix +++ b/pkgs/by-name/fi/fio/package.nix @@ -14,14 +14,14 @@ libnbd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fio"; version = "3.41"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; - rev = "fio-${version}"; + rev = "fio-${finalAttrs.version}"; sha256 = "sha256-m4JskjSc/KHjID+6j/hbhnGzehPxMxA3m2Iyn49bJDU="; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fi/firejail/package.nix b/pkgs/by-name/fi/firejail/package.nix index 1975d2a676e0..881e83f4f5d5 100644 --- a/pkgs/by-name/fi/firejail/package.nix +++ b/pkgs/by-name/fi/firejail/package.nix @@ -9,14 +9,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "firejail"; version = "0.9.76"; src = fetchFromGitHub { owner = "netblue30"; repo = "firejail"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-0zb5olSuXOHeRj4dqeevubedjqOuDnUEBQaD/vOj2CM="; }; @@ -101,4 +101,4 @@ stdenv.mkDerivation rec { homepage = "https://firejail.wordpress.com/"; mainProgram = "firejail"; }; -} +}) diff --git a/pkgs/by-name/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix index a42428b4e197..c8a900b678bc 100644 --- a/pkgs/by-name/fi/firewalld/package.nix +++ b/pkgs/by-name/fi/firewalld/package.nix @@ -43,14 +43,14 @@ let ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "firewalld"; version = "2.4.0"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-P48qdgvcF3BQZ5h+HaylHb70ECa2bmEvYiAi9CeH0qs="; }; @@ -167,4 +167,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ prince213 ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fi/fityk/package.nix b/pkgs/by-name/fi/fityk/package.nix index 0793e847e9a8..670a46b802b2 100644 --- a/pkgs/by-name/fi/fityk/package.nix +++ b/pkgs/by-name/fi/fityk/package.nix @@ -14,14 +14,14 @@ swig, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fityk"; version = "1.3.2"; src = fetchFromGitHub { owner = "wojdyr"; repo = "fityk"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-m2RaZMYT6JGwa3sOUVsBIzCdZetTbiygaInQWoJ4m1o="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { homepage = "https://fityk.nieto.pl/"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fl/flann/package.nix b/pkgs/by-name/fl/flann/package.nix index 7d17227a14af..b17f5925ae7f 100644 --- a/pkgs/by-name/fl/flann/package.nix +++ b/pkgs/by-name/fl/flann/package.nix @@ -11,14 +11,14 @@ enablePython ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flann"; version = "1.9.1"; src = fetchFromGitHub { owner = "flann-lib"; repo = "flann"; - rev = version; + rev = finalAttrs.version; sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc"; }; @@ -87,4 +87,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix index bfa24d0e9469..afc85deac707 100644 --- a/pkgs/by-name/fl/flare/engine.nix +++ b/pkgs/by-name/fl/flare/engine.nix @@ -10,14 +10,14 @@ SDL2_ttf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flare-engine"; version = "1.14"; src = fetchFromGitHub { owner = "flareteam"; repo = "flare-engine"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { license = [ lib.licenses.gpl3Plus ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix index 59bd9a52d19d..9a34465fbd36 100644 --- a/pkgs/by-name/fl/flare/game.nix +++ b/pkgs/by-name/fl/flare/game.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flare-game"; version = "1.14"; src = fetchFromGitHub { owner = "flareteam"; repo = "flare-game"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = [ lib.licenses.cc-by-sa-30 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fl/flat-remix-gnome/package.nix b/pkgs/by-name/fl/flat-remix-gnome/package.nix index 435deb5f38c5..01bad631b51a 100644 --- a/pkgs/by-name/fl/flat-remix-gnome/package.nix +++ b/pkgs/by-name/fl/flat-remix-gnome/package.nix @@ -11,14 +11,14 @@ let # https://github.com/daniruiz/flat-remix-gnome/blob/20250926/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flat-remix-gnome"; version = "20250926"; src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix-gnome"; - rev = version; + rev = finalAttrs.version; hash = "sha256-6K/BQqVOeDeJuUi0+NgCFeerX5sSy+nKapYxIQfbKFQ="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.vanilla ]; }; -} +}) diff --git a/pkgs/by-name/fl/flat-remix-gtk/package.nix b/pkgs/by-name/fl/flat-remix-gtk/package.nix index 78d10be7b506..e2764fe1a3f4 100644 --- a/pkgs/by-name/fl/flat-remix-gtk/package.nix +++ b/pkgs/by-name/fl/flat-remix-gtk/package.nix @@ -5,14 +5,14 @@ gtk-engine-murrine, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flat-remix-gtk"; version = "20240730"; src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix-gtk"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-EWe84bLG14RkCNbHp0S5FbUQ5/Ye/KbCk3gPTsGg9oQ="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.mkg20001 ]; }; -} +}) diff --git a/pkgs/by-name/fl/flatcc/package.nix b/pkgs/by-name/fl/flatcc/package.nix index 16e6095f3a45..9629f3e14bf5 100644 --- a/pkgs/by-name/fl/flatcc/package.nix +++ b/pkgs/by-name/fl/flatcc/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flatcc"; version = "0.6.1"; src = fetchFromGitHub { owner = "dvidelabs"; repo = "flatcc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-0/IZ7eX6b4PTnlSSdoOH0FsORGK9hrLr1zlr/IHsJFQ="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { license = [ lib.licenses.asl20 ]; maintainers = with lib.maintainers; [ onny ]; }; -} +}) diff --git a/pkgs/by-name/fl/flexcpp/package.nix b/pkgs/by-name/fl/flexcpp/package.nix index 56ce0c5aa113..2983ef60d21b 100644 --- a/pkgs/by-name/fl/flexcpp/package.nix +++ b/pkgs/by-name/fl/flexcpp/package.nix @@ -7,13 +7,13 @@ yodl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flexc++"; version = "2.05.00"; src = fetchFromGitHub { sha256 = "0s25d9jsfsqvm34rwf48cxwz23aq1zja3cqlzfz3z33p29wwazwz"; - rev = version; + rev = finalAttrs.version; repo = "flexcpp"; owner = "fbb-git"; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fl/flips/package.nix b/pkgs/by-name/fl/flips/package.nix index f677641f8d15..3dcaf3a11f77 100644 --- a/pkgs/by-name/fl/flips/package.nix +++ b/pkgs/by-name/fl/flips/package.nix @@ -11,7 +11,7 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flips"; version = "198"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { domain = "git.disroot.org"; owner = "Sir_Walrus"; repo = "Flips"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-zYGDcUbtzstk1sTKgX2Mna0rzH7z6Dic+OvjZLI1umI="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "flips"; }; -} +}) diff --git a/pkgs/by-name/fl/flock/package.nix b/pkgs/by-name/fl/flock/package.nix index da29b2c60f74..cae8ac8a8697 100644 --- a/pkgs/by-name/fl/flock/package.nix +++ b/pkgs/by-name/fl/flock/package.nix @@ -7,14 +7,14 @@ ronn, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flock"; version = "0.4.0"; src = fetchFromGitHub { owner = "discoteq"; repo = "flock"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-cCpckORtogs6Nt7c5q2+z0acXAnALdLV6uzxa5ng3s4="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.isc; }; -} +}) diff --git a/pkgs/by-name/fl/florist/package.nix b/pkgs/by-name/fl/florist/package.nix index b04148b63da7..e211498e7ce8 100644 --- a/pkgs/by-name/fl/florist/package.nix +++ b/pkgs/by-name/fl/florist/package.nix @@ -6,14 +6,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { name = "florist"; version = "24.2"; src = fetchFromGitHub { owner = "adacore"; repo = "florist"; - rev = "refs/heads/${version}"; + rev = "refs/heads/${finalAttrs.version}"; hash = "sha256-EFGmcQfWpxEWfsAoQrHegTlizl6siE8obKx+fCpVwUQ="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lutzberger ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fl/flowtime/package.nix b/pkgs/by-name/fl/flowtime/package.nix index 01d6a9b28d10..2075ccabce59 100644 --- a/pkgs/by-name/fl/flowtime/package.nix +++ b/pkgs/by-name/fl/flowtime/package.nix @@ -16,14 +16,14 @@ appstream-glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flowtime"; version = "6.5"; src = fetchFromGitHub { owner = "Diego-Ivan"; repo = "Flowtime"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-J0Pscv0ZOpA/LV2mPTLOmDPQpfZhizTghatGnrJHToE="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fl/flvstreamer/package.nix b/pkgs/by-name/fl/flvstreamer/package.nix index dfe18eebd698..a209189b660e 100644 --- a/pkgs/by-name/fl/flvstreamer/package.nix +++ b/pkgs/by-name/fl/flvstreamer/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flvstreamer"; version = "2.1c1"; src = fetchurl { - url = "mirror://savannah/flvstreamer/source/flvstreamer-${version}.tar.gz"; + url = "mirror://savannah/flvstreamer/source/flvstreamer-${finalAttrs.version}.tar.gz"; sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix index ed17abbf1141..bcc2ec0a419f 100644 --- a/pkgs/by-name/fl/fly/package.nix +++ b/pkgs/by-name/fl/fly/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "fly"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - hash = "sha256-rJpmFO5kpn9It1j8EKb2ZyMnKQ+n4iCuAVFB8nVk6+k="; + hash = "sha256-fwWYZHtirrH0neNMFJzgjxUFAggBRWzFjQVJg68Tfrs="; }; vendorHash = "sha256-Ymxe64xtstMKISIHHCY5Z8RX3FxoS/8ocSZomcr4NXA="; diff --git a/pkgs/by-name/fl/flycast/package.nix b/pkgs/by-name/fl/flycast/package.nix index 19511deb6a1a..6fa6a6ce8356 100644 --- a/pkgs/by-name/fl/flycast/package.nix +++ b/pkgs/by-name/fl/flycast/package.nix @@ -16,14 +16,14 @@ vulkan-loader, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flycast"; version = "2.5"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OnlSkwPDUrpj9uEPEAxZO1iSgd5ZiQUJLneu14v9pKQ="; fetchSubmodules = true; }; @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/flyinghead/flycast"; - changelog = "https://github.com/flyinghead/flycast/releases/tag/v${version}"; + changelog = "https://github.com/flyinghead/flycast/releases/tag/v${finalAttrs.version}"; description = "Multi-platform Sega Dreamcast, Naomi and Atomiswave emulator"; mainProgram = "flycast"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/fl/flywheel-cli/package.nix b/pkgs/by-name/fl/flywheel-cli/package.nix index a047dd7e089a..dfc2a3b68421 100644 --- a/pkgs/by-name/fl/flywheel-cli/package.nix +++ b/pkgs/by-name/fl/flywheel-cli/package.nix @@ -23,19 +23,19 @@ let } .${system} or throwSystem; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flywheel-cli"; version = "16.2.0"; src = fetchurl { - url = "https://storage.googleapis.com/flywheel-dist/cli/${version}/fw-${os}_amd64-${version}.zip"; + url = "https://storage.googleapis.com/flywheel-dist/cli/${finalAttrs.version}/fw-${os}_amd64-${finalAttrs.version}.zip"; inherit sha256; }; nativeBuildInputs = [ unzip ]; unpackPhase = '' - unzip ${src} + unzip ${finalAttrs.src} ''; installPhase = '' @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/fm/fm-tune/package.nix b/pkgs/by-name/fm/fm-tune/package.nix index dae3f2d66fcc..29dbe906f52c 100644 --- a/pkgs/by-name/fm/fm-tune/package.nix +++ b/pkgs/by-name/fm/fm-tune/package.nix @@ -7,14 +7,14 @@ soapysdr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fm-tune"; version = "1.1"; src = fetchFromGitHub { owner = "viraptor"; repo = "fm_tune"; - rev = version; + rev = finalAttrs.version; hash = "sha256-pwL2G1Ni1Ixw/N0diSoGGIoVrtmF92mWZ5i57OOvkX4="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ viraptor ]; mainProgram = "fm_tune"; }; -} +}) diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix index 9230c32f88a2..9ac88a8bd702 100644 --- a/pkgs/by-name/fn/fna3d/package.nix +++ b/pkgs/by-name/fn/fna3d/package.nix @@ -9,14 +9,14 @@ useSDL3 ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fna3d"; version = "26.01"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FNA3D"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-MlSaB7PNw3lBIgbLlU1o2lk4LGIJDLRzxddZYSju5jY="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ mrtnvgr ]; }; -} +}) diff --git a/pkgs/by-name/fn/fnlfmt/package.nix b/pkgs/by-name/fn/fnlfmt/package.nix index 9d00ae87dccb..783b5e6daf56 100644 --- a/pkgs/by-name/fn/fnlfmt/package.nix +++ b/pkgs/by-name/fn/fnlfmt/package.nix @@ -6,14 +6,14 @@ luaPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fnlfmt"; version = "0.3.2"; src = fetchFromSourcehut { owner = "~technomancy"; repo = "fnlfmt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-wbeWAv4xhxh7M6tRd9qpgBRtg1/fqg0AUPvh2M5f60Q="; }; @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { meta = { description = "Formatter for Fennel"; - homepage = src.meta.homepage; - changelog = "${src.meta.homepage}/tree/${version}/changelog.md"; + homepage = finalAttrs.src.meta.homepage; + changelog = "${finalAttrs.src.meta.homepage}/tree/${finalAttrs.version}/changelog.md"; license = lib.licenses.mit; platforms = lua.meta.platforms; maintainers = with lib.maintainers; [ chiroptical ]; mainProgram = "fnlfmt"; }; -} +}) diff --git a/pkgs/by-name/fn/fnotifystat/package.nix b/pkgs/by-name/fn/fnotifystat/package.nix index 42cb3fa73b35..d720ff1e905c 100644 --- a/pkgs/by-name/fn/fnotifystat/package.nix +++ b/pkgs/by-name/fn/fnotifystat/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fnotifystat"; version = "0.03.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "fnotifystat"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-UGww0/m+JMftQyAguc8UpPrtIphjCq9TINabFaAKN0A="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ womfoo ]; }; -} +}) diff --git a/pkgs/by-name/fo/focus-stack/package.nix b/pkgs/by-name/fo/focus-stack/package.nix index 57c9d30c2a4b..ee64a9be26b4 100644 --- a/pkgs/by-name/fo/focus-stack/package.nix +++ b/pkgs/by-name/fo/focus-stack/package.nix @@ -8,14 +8,14 @@ opencv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "focus-stack"; version = "1.5"; src = fetchFromGitHub { owner = "PetteriAimonen"; repo = "focus-stack"; - rev = version; + rev = finalAttrs.version; hash = "sha256-hIaK8hjeuu6w/8nh9DHOffqZufQdqB1/VQRezCPQIPk="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ paperdigits ]; mainProgram = "focus-stack"; }; -} +}) diff --git a/pkgs/by-name/fo/foliate/package.nix b/pkgs/by-name/fo/foliate/package.nix index c1d379b0a1c3..97c1d60ebaaa 100644 --- a/pkgs/by-name/fo/foliate/package.nix +++ b/pkgs/by-name/fo/foliate/package.nix @@ -18,14 +18,14 @@ libadwaita, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "foliate"; version = "3.3.0"; src = fetchFromGitHub { owner = "johnfactotum"; repo = "foliate"; - tag = version; + tag = finalAttrs.version; hash = "sha256-QpWJDwatT4zOAPF+dn+Sm5xivk9SIZOvexj0M/Nyu24="; fetchSubmodules = true; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple and modern GTK eBook reader"; homepage = "https://johnfactotum.github.io/foliate"; - changelog = "https://github.com/johnfactotum/foliate/releases/tag/${version}"; + changelog = "https://github.com/johnfactotum/foliate/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ onny @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "foliate"; }; -} +}) diff --git a/pkgs/by-name/fo/folio/package.nix b/pkgs/by-name/fo/folio/package.nix index ea9d78ac61f8..0512b3246231 100644 --- a/pkgs/by-name/fo/folio/package.nix +++ b/pkgs/by-name/fo/folio/package.nix @@ -14,14 +14,14 @@ gtksourceview5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "folio"; version = "25.02"; src = fetchFromGitHub { owner = "toolstack"; repo = "Folio"; - tag = version; + tag = finalAttrs.version; hash = "sha256-u7HieTsbSohCjpLNyeY/ZZdmpQWulZaCkxOV5a5QyBY="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fo/foma/package.nix b/pkgs/by-name/fo/foma/package.nix index ee4ebe8b40ed..9b11bd232994 100644 --- a/pkgs/by-name/fo/foma/package.nix +++ b/pkgs/by-name/fo/foma/package.nix @@ -9,7 +9,7 @@ readline, zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "foma"; version = "0.10.0alpha-unstable-2025-09-10"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hash = "sha256-CXRZNcEgsjD/9PowNynPyfLVbk8KDe3T52UetYMwC6w="; }; - sourceRoot = "${src.name}/foma"; + sourceRoot = "${finalAttrs.src.name}/foma"; outputs = [ "out" @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.tckmn ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/fo/fomp/package.nix b/pkgs/by-name/fo/fomp/package.nix index e0b8a88d6515..3b84bbf520ae 100644 --- a/pkgs/by-name/fo/fomp/package.nix +++ b/pkgs/by-name/fo/fomp/package.nix @@ -10,14 +10,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fomp"; version = "1.2.4"; src = fetchFromGitLab { owner = "drobilla"; repo = "fomp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8rkAV+RJS9vQV+9+swclAP0QBjBDT2tKeLWHxwpUrlk="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fo/fondu/package.nix b/pkgs/by-name/fo/fondu/package.nix index e13ce1b4920f..f4094ef60f69 100644 --- a/pkgs/by-name/fo/fondu/package.nix +++ b/pkgs/by-name/fo/fondu/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "060102"; pname = "fondu"; src = fetchurl { - url = "http://fondu.sourceforge.net/fondu_src-${version}.tgz"; + url = "http://fondu.sourceforge.net/fondu_src-${finalAttrs.version}.tgz"; sha256 = "152prqad9jszjmm4wwqrq83zk13ypsz09n02nrk1gg0fcxfm7fr2"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/fo/font-config-info/package.nix b/pkgs/by-name/fo/font-config-info/package.nix index e8719442beab..9ee14d3d1762 100644 --- a/pkgs/by-name/fo/font-config-info/package.nix +++ b/pkgs/by-name/fo/font-config-info/package.nix @@ -7,14 +7,14 @@ xsettingsd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "font-config-info"; version = "1.0.0"; src = fetchFromGitHub { owner = "derat"; repo = "font-config-info"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "14z7hg9c7q8wliyqv68kp080mmk2rh6kpww6pn87hy7lwq20l2b7"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ romildo ]; mainProgram = "font-config-info"; }; -} +}) diff --git a/pkgs/by-name/fo/fontpreview/package.nix b/pkgs/by-name/fo/fontpreview/package.nix index 1e1f271d02bb..846018f6abe0 100644 --- a/pkgs/by-name/fo/fontpreview/package.nix +++ b/pkgs/by-name/fo/fontpreview/package.nix @@ -10,14 +10,14 @@ getopt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fontpreview"; version = "1.0.6"; src = fetchFromGitHub { owner = "sdushantha"; repo = "fontpreview"; - rev = version; + rev = finalAttrs.version; sha256 = "0g3i2k6n2yhp88rrcf0hp6ils7836db7hx73hw9qnpcbmckz0i4w"; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.erictapen ]; mainProgram = "fontpreview"; }; -} +}) diff --git a/pkgs/by-name/fo/foo2zjs/package.nix b/pkgs/by-name/fo/foo2zjs/package.nix index 0deb8f939bd4..05d65d856f91 100644 --- a/pkgs/by-name/fo/foo2zjs/package.nix +++ b/pkgs/by-name/fo/foo2zjs/package.nix @@ -11,12 +11,12 @@ time, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "foo2zjs"; version = "20210116"; src = fetchurl { - url = "http://www.loegria.net/mirrors/foo2zjs/foo2zjs-${version}.tar.gz"; + url = "http://www.loegria.net/mirrors/foo2zjs/foo2zjs-${finalAttrs.version}.tar.gz"; sha256 = "14x3wizvncdy0xgvmcx541qanwb7bg76abygqy17bxycn1zh5r1x"; }; @@ -94,4 +94,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index 1df971d8bb8d..bf90ea627b69 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage { pname = "forecast"; - version = "0-unstable-2026-01-22"; + version = "0-unstable-2026-01-27"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "forecast"; - rev = "c9d170dbf397d977346a61492612f2f2c5acb6a7"; - hash = "sha256-tOp79Qx7U5q1mFZy4Wh0BOu8+G42j5zGLQ79r+U4Qx8="; + rev = "b82babc843d5e9c58a6635d3b1941ac185ae4906"; + hash = "sha256-QoZ854+2/4+VMZbOI/M167qjDPahtzbV/NH8Y46uBs8="; }; cargoHash = "sha256-di7zjwI0/6NB2cAih3d7iqwSb+o/607jbgJN1MtbZX8="; diff --git a/pkgs/by-name/fo/forkstat/package.nix b/pkgs/by-name/fo/forkstat/package.nix index 0d4bb0acd162..0c04fbd21f31 100644 --- a/pkgs/by-name/fo/forkstat/package.nix +++ b/pkgs/by-name/fo/forkstat/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "forkstat"; version = "0.04.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "forkstat"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-HHyGjhu8yaBvDncloW8ST2L4iUU2ik2ydW1z9pFhfrw="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ womfoo ]; }; -} +}) diff --git a/pkgs/by-name/fo/formatter/package.nix b/pkgs/by-name/fo/formatter/package.nix index 25497b404728..76b3a38bb64f 100644 --- a/pkgs/by-name/fo/formatter/package.nix +++ b/pkgs/by-name/fo/formatter/package.nix @@ -21,14 +21,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "formatter"; version = "0.4.0"; src = fetchFromGitHub { owner = "Djaler"; repo = "Formatter"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-8lZ0jUwHuc3Kntz73Btj6dJvkW2bvShu2KWTSQszbJo="; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; mainProgram = "com.github.djaler.formatter"; }; -} +}) diff --git a/pkgs/by-name/fo/four-in-a-row/package.nix b/pkgs/by-name/fo/four-in-a-row/package.nix index 332d3178b182..0105fb4ea85c 100644 --- a/pkgs/by-name/fo/four-in-a-row/package.nix +++ b/pkgs/by-name/fo/four-in-a-row/package.nix @@ -18,12 +18,12 @@ desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "four-in-a-row"; version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/four-in-a-row/${lib.versions.majorMinor version}/four-in-a-row-${version}.tar.xz"; + url = "mirror://gnome/sources/four-in-a-row/${lib.versions.majorMinor finalAttrs.version}/four-in-a-row-${finalAttrs.version}.tar.xz"; hash = "sha256-IdJ2m4BBFNHPDzN0Jv2IGB7O/WCSz1YmN+s31xYwUYI="; }; @@ -57,11 +57,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/four-in-a-row"; - changelog = "https://gitlab.gnome.org/GNOME/four-in-a-row/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/four-in-a-row/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Make lines of the same color to win"; mainProgram = "four-in-a-row"; teams = [ lib.teams.gnome ]; license = lib.licenses.gpl2; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fo/foxotron/package.nix b/pkgs/by-name/fo/foxotron/package.nix index 43f2d003ef8d..fceb3fd10547 100644 --- a/pkgs/by-name/fo/foxotron/package.nix +++ b/pkgs/by-name/fo/foxotron/package.nix @@ -18,14 +18,14 @@ alsa-lib, fontconfig, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "foxotron"; version = "2024-09-23"; src = fetchFromGitHub { owner = "Gargaj"; repo = "Foxotron"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-OnZWoiQ5ASKQV73/W6nl17B2ANwqCy/PlybHbNwrOyQ="; }; @@ -113,4 +113,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "Foxotron"; }; -} +}) diff --git a/pkgs/by-name/fp/fpart/package.nix b/pkgs/by-name/fp/fpart/package.nix index 514245493c08..1858a238e017 100644 --- a/pkgs/by-name/fp/fpart/package.nix +++ b/pkgs/by-name/fp/fpart/package.nix @@ -6,14 +6,14 @@ fts, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fpart"; version = "1.7.0"; src = fetchFromGitHub { owner = "martymac"; repo = "fpart"; - rev = "fpart-${version}"; + rev = "fpart-${finalAttrs.version}"; sha256 = "sha256-BQGSKDSuK2iB0o2v8I+XOwhYtU/0QtMevt4pgIfRhNQ="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/fp/fping/package.nix b/pkgs/by-name/fp/fping/package.nix index ea2346a1d1e6..2fe6932db5aa 100644 --- a/pkgs/by-name/fp/fping/package.nix +++ b/pkgs/by-name/fp/fping/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fping"; version = "5.5"; src = fetchurl { - url = "https://www.fping.org/dist/fping-${version}.tar.gz"; + url = "https://www.fping.org/dist/fping-${finalAttrs.version}.tar.gz"; hash = "sha256-FcTjK2xV/xBbr+A+jJHHyhsu2jG/mnEnMmu4eIfuGP4="; }; @@ -18,13 +18,18 @@ stdenv.mkDerivation rec { "--enable-ipv4" ]; + outputs = [ + "out" + "man" + ]; + meta = { description = "Send ICMP echo probes to network hosts"; homepage = "http://fping.org/"; - changelog = "https://github.com/schweikert/fping/releases/tag/v${version}"; + changelog = "https://github.com/schweikert/fping/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd0; mainProgram = "fping"; maintainers = with lib.maintainers; [ fab ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/fp/fplll/package.nix b/pkgs/by-name/fp/fplll/package.nix index 1b50e0744532..1e1795c34b79 100644 --- a/pkgs/by-name/fp/fplll/package.nix +++ b/pkgs/by-name/fp/fplll/package.nix @@ -9,14 +9,14 @@ mpfr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fplll"; version = "5.5.0"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-WvjXaCnUMioSmLlWmLV673mhRjnF+8DU9MqgUmBgaFQ="; }; @@ -36,14 +36,14 @@ stdenv.mkDerivation rec { changelog = [ # Some release notes are added to the github tags, though they are not # always complete. - "https://github.com/fplll/fplll/releases/tag/${version}" + "https://github.com/fplll/fplll/releases/tag/${finalAttrs.version}" # Releases are announced on this mailing list. Unfortunately it is not # possible to generate a direct link to the most recent announcement, but # this search should find it. - "https://groups.google.com/forum/#!searchin/fplll-devel/FPLLL$20${version}" + "https://groups.google.com/forum/#!searchin/fplll-devel/FPLLL$20${finalAttrs.version}" ]; license = lib.licenses.lgpl21Plus; teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fp/fpm2/package.nix b/pkgs/by-name/fp/fpm2/package.nix index 28c0f6cffbb7..bbcc7f46de56 100644 --- a/pkgs/by-name/fp/fpm2/package.nix +++ b/pkgs/by-name/fp/fpm2/package.nix @@ -10,12 +10,12 @@ nettle, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fpm2"; version = "0.90.1"; src = fetchurl { - url = "https://als.regnet.cz/fpm2/download/fpm2-${version}.tar.xz"; + url = "https://als.regnet.cz/fpm2/download/fpm2-${finalAttrs.version}.tar.xz"; sha256 = "sha256-G6PF5wlEc19jtqOxBTp/10dQiFYPDO/W6v9Oyzz1lZA="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ hce ]; }; -} +}) diff --git a/pkgs/by-name/fp/fpp/package.nix b/pkgs/by-name/fp/fpp/package.nix index c065782c33ea..5c5b645db904 100644 --- a/pkgs/by-name/fp/fpp/package.nix +++ b/pkgs/by-name/fp/fpp/package.nix @@ -6,14 +6,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fpp"; version = "0.9.5"; src = fetchFromGitHub { owner = "facebook"; repo = "PathPicker"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-4BkdGvG/RyF3JBnd/X5r5nboEHG4aqahcYHDunMv2zU="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "fpp"; }; -} +}) diff --git a/pkgs/by-name/fr/freac/package.nix b/pkgs/by-name/fr/freac/package.nix index 5361edb24f94..ce322a272121 100644 --- a/pkgs/by-name/fr/freac/package.nix +++ b/pkgs/by-name/fr/freac/package.nix @@ -9,14 +9,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freac"; version = "1.1.7"; src = fetchFromGitHub { owner = "enzo1982"; repo = "freac"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-bHoRxxhSM7ipRkiBG7hEa1Iw8Z3tOHQ/atngC/3X1a4="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { homepage = "https://www.freac.org/"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index 64d3471da57f..0e237120cb03 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -9,12 +9,12 @@ pkg-config, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "free42"; version = "3.3.11"; src = fetchurl { - url = "https://thomasokken.com/free42/upstream/free42-nologo-${version}.tgz"; + url = "https://thomasokken.com/free42/upstream/free42-nologo-${finalAttrs.version}.tgz"; hash = "sha256-Y9tV06K+1tZmoNBLS5tsOoLPjS2unTe8c0AYkHgDVVo="; }; @@ -117,4 +117,4 @@ stdenv.mkDerivation rec { mainProgram = "free42dec"; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/fr/freebayes/package.nix b/pkgs/by-name/fr/freebayes/package.nix index eaba4b381c39..dfcad223285a 100644 --- a/pkgs/by-name/fr/freebayes/package.nix +++ b/pkgs/by-name/fr/freebayes/package.nix @@ -7,15 +7,15 @@ xz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freebayes"; version = "1.3.1"; src = fetchFromGitHub { - name = "freebayes-${version}-src"; + name = "freebayes-${finalAttrs.version}-src"; owner = "ekg"; repo = "freebayes"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "035nriknjqq8gvil81vvsmvqwi35v80q8h1cw24vd1gdyn1x7bys"; fetchSubmodules = true; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jdagilliland ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/fr/freenect/package.nix b/pkgs/by-name/fr/freenect/package.nix index 165d914c9ebd..437aa1f39da1 100644 --- a/pkgs/by-name/fr/freenect/package.nix +++ b/pkgs/by-name/fr/freenect/package.nix @@ -12,14 +12,14 @@ libXmu, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freenect"; version = "0.7.5"; src = fetchFromGitHub { owner = "OpenKinect"; repo = "libfreenect"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-PpJGFWrlQ5sK7TJxQNoPujw1MxWRjphvblwOqnF+mSg="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bennofs ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/fr/freenet/package.nix b/pkgs/by-name/fr/freenet/package.nix index 394a76eab253..0fd742f85905 100644 --- a/pkgs/by-name/fr/freenet/package.nix +++ b/pkgs/by-name/fr/freenet/package.nix @@ -26,8 +26,8 @@ let name = "freenet-seednodes"; owner = "hyphanet"; repo = "seedrefs"; - rev = "8e8b3574b63e649e03f67d23d3dfa461b7a0ba4a"; - hash = "sha256-OCXBfhgheOH8XZjUhvJpNQ1I73rCwUfgyl/xkZt3JeM="; + rev = "b34dbc4d021c58c4a108214a71a9e1ab986c4e14"; + hash = "sha256-c04gKNPZtiIdmKmPJ71iXIEXzOoBMw32I2rAsN1+a8Q="; postFetch = '' cat $out/* > $out/seednodes.fref ''; @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "freenet"; - version = "01503"; + version = "01504"; src = fetchFromGitHub { - owner = "freenet"; + owner = "hyphanet"; repo = "fred"; tag = "build${version}"; - hash = "sha256-SjHQssCwPjSoaxsLmaov4bRoz+6XSlHfiOoxWxlRn60="; + hash = "sha256-a+yRsJ4+gi2UiVeWLsbTgFbzekCSnOJO++9fLVWX0C0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/freepats/package.nix b/pkgs/by-name/fr/freepats/package.nix index 1245690c816a..d1c1a97baedb 100644 --- a/pkgs/by-name/fr/freepats/package.nix +++ b/pkgs/by-name/fr/freepats/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freepats"; version = "20060219"; src = fetchurl { - url = "https://freepats.zenvoid.org/freepats-${version}.tar.bz2"; + url = "https://freepats.zenvoid.org/freepats-${finalAttrs.version}.tar.bz2"; sha256 = "12iw36rd94zirll96cd5k0va7p5hxmf2shvjlhzihcmjaw8flq82"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/fr/freepv/package.nix b/pkgs/by-name/fr/freepv/package.nix index 61d1dfeb005a..ef2d48c49ddc 100644 --- a/pkgs/by-name/fr/freepv/package.nix +++ b/pkgs/by-name/fr/freepv/package.nix @@ -14,12 +14,12 @@ libXxf86vm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freepv"; version = "0.3.0"; src = fetchurl { - url = "mirror://sourceforge/freepv/freepv-${version}.tar.gz"; + url = "mirror://sourceforge/freepv/freepv-${finalAttrs.version}.tar.gz"; sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { homepage = "https://freepv.sourceforge.net/"; license = [ lib.licenses.lgpl21 ]; }; -} +}) diff --git a/pkgs/by-name/fr/freeswitch/package.nix b/pkgs/by-name/fr/freeswitch/package.nix index 3b88653441ef..1b43feeca048 100644 --- a/pkgs/by-name/fr/freeswitch/package.nix +++ b/pkgs/by-name/fr/freeswitch/package.nix @@ -107,13 +107,13 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freeswitch"; version = "1.10.12"; src = fetchFromGitHub { owner = "signalwire"; repo = "freeswitch"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-uOO+TpKjJkdjEp4nHzxcHtZOXqXzpkIF3dno1AX17d8="; }; @@ -195,4 +195,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/fr/freetalk/package.nix b/pkgs/by-name/fr/freetalk/package.nix index e6b177f404d7..08ab6f55073f 100644 --- a/pkgs/by-name/fr/freetalk/package.nix +++ b/pkgs/by-name/fr/freetalk/package.nix @@ -17,12 +17,12 @@ texinfo, argp-standalone, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freetalk"; version = "4.2"; src = fetchurl { - url = "mirror://gnu/freetalk/freetalk-${version}.tar.gz"; + url = "mirror://gnu/freetalk/freetalk-${finalAttrs.version}.tar.gz"; hash = "sha256-u1tPKacGry+JGYeAIgDia3N7zs5EM4FyQZdV8e7htYA="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; downloadPage = "https://www.gnu.org/software/freetalk/"; }; -} +}) diff --git a/pkgs/by-name/fr/freexl/package.nix b/pkgs/by-name/fr/freexl/package.nix index 7c8e7fc80d3c..d50aaa0a38c8 100644 --- a/pkgs/by-name/fr/freexl/package.nix +++ b/pkgs/by-name/fr/freexl/package.nix @@ -9,12 +9,12 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freexl"; version = "2.0.0"; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/freexl-${version}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/freexl-${finalAttrs.version}.tar.gz"; hash = "sha256-F2cF8d5Yq3we679cbeRqt2/Ni4VlCNvSj1ZI98bhp/A="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ sikmir ]; }; -} +}) diff --git a/pkgs/by-name/fr/frei0r/package.nix b/pkgs/by-name/fr/frei0r/package.nix index 352ba334de67..586010b65ecd 100644 --- a/pkgs/by-name/fr/frei0r/package.nix +++ b/pkgs/by-name/fr/frei0r/package.nix @@ -11,14 +11,14 @@ cudaPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "frei0r-plugins"; version = "2.5.1"; src = fetchFromGitHub { owner = "dyne"; repo = "frei0r"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-3gUWvO5izOrJt+XwcNBNiLfu+iMqo4nuPbx++TYzao0="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix index 7edfe42ae493..84b3f06cf358 100644 --- a/pkgs/by-name/fr/fresh-editor/package.nix +++ b/pkgs/by-name/fr/fresh-editor/package.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "fresh"; - version = "0.1.90"; + version = "0.1.97"; src = fetchFromGitHub { owner = "sinelaw"; repo = "fresh"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZJ6T1LUeuuaGu4l5mVUNcmtId3qleP5PE4lY+fGGnaE="; + hash = "sha256-iXa+hMXPIsRYaTUTBE3hWx08NG0igRFew6OaEpFDUjg="; }; - cargoHash = "sha256-tHuesoVUZ5OC9R662T4q0W8deXM/Gzvl0WEpHIltBOM="; + cargoHash = "sha256-I7/M1wo3s+6M1AKc4JReMb9tHuLuzQlHIXVPdigCvFQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix index 95bb1e5ee3a6..8227890003a2 100644 --- a/pkgs/by-name/fr/fricas/package.nix +++ b/pkgs/by-name/fr/fricas/package.nix @@ -12,14 +12,14 @@ libXdmcp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fricas"; version = "1.3.12"; src = fetchFromGitHub { owner = "fricas"; repo = "fricas"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-GUGJR65K1bPC0D36l4Yyj3GOsWtUrSKLu6JnlfjHzDc="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sprock ]; }; -} +}) diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 84b51095aa9e..2f93c2bf5806 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -13,14 +13,14 @@ }: let - version = "0.16.3"; + version = "0.16.4"; src = fetchFromGitHub { name = "frigate-${version}-source"; owner = "blakeblackshear"; repo = "frigate"; tag = "v${version}"; - hash = "sha256-gbEUmo28vjYsfIlHSBaLTUh9kK5rM17hkfKBQ9KhiBU="; + hash = "sha256-TPiCT/z0YuoQkQsxyZsRMQa0XwqMLCgwMbrASOKrMjA="; }; frigate-web = callPackage ./web.nix { diff --git a/pkgs/by-name/fr/frotz/package.nix b/pkgs/by-name/fr/frotz/package.nix index 1b30be141957..75d60c2eaa82 100644 --- a/pkgs/by-name/fr/frotz/package.nix +++ b/pkgs/by-name/fr/frotz/package.nix @@ -13,7 +13,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "frotz"; version = "2.54"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { domain = "gitlab.com"; owner = "DavidGriffith"; repo = "frotz"; - rev = version; + rev = finalAttrs.version; hash = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8="; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://davidgriffith.gitlab.io/frotz/"; - changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS"; + changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${finalAttrs.version}/NEWS"; description = "Z-machine interpreter for Infocom games and other interactive fiction"; mainProgram = "frotz"; platforms = lib.platforms.unix; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { ]; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/fs/fsearch/package.nix b/pkgs/by-name/fs/fsearch/package.nix index 3075f2a02623..d0f680af21ff 100644 --- a/pkgs/by-name/fs/fsearch/package.nix +++ b/pkgs/by-name/fs/fsearch/package.nix @@ -14,14 +14,14 @@ icu, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fsearch"; version = "0.2.3"; src = fetchFromGitHub { owner = "cboxdoerfer"; repo = "fsearch"; - rev = version; + rev = finalAttrs.version; hash = "sha256-VBcoDxh4ip2zLBcXVHDe9s1lVRQF4bZJKsGUt6sPcos="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { mainProgram = "fsearch"; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/fsearch.x86_64-darwin }; -} +}) diff --git a/pkgs/by-name/fs/fsharp/package.nix b/pkgs/by-name/fs/fsharp/package.nix index 716d637a84e8..ead61ec12c19 100644 --- a/pkgs/by-name/fs/fsharp/package.nix +++ b/pkgs/by-name/fs/fsharp/package.nix @@ -12,14 +12,14 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fsharp"; version = "4.0.1.1"; src = fetchFromGitHub { owner = "fsharp"; repo = "fsharp"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-dgTEM2aL8lVjVMuW0+HLc+TUA39IiuBv/RfHYNURh5s="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/fs/fsmark/package.nix b/pkgs/by-name/fs/fsmark/package.nix index 1b2b6bb8f63f..d8fc32a2c0b1 100644 --- a/pkgs/by-name/fs/fsmark/package.nix +++ b/pkgs/by-name/fs/fsmark/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fsmark"; version = "3.3"; src = fetchurl { - url = "mirror://sourceforge/fsmark/${version}/fs_mark-${version}.tar.gz"; + url = "mirror://sourceforge/fsmark/${finalAttrs.version}/fs_mark-${finalAttrs.version}.tar.gz"; sha256 = "15f8clcz49qsfijdmcz165ysp8v4ybsm57d3dxhhlnq1bp1i9w33"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "fs_mark"; }; -} +}) diff --git a/pkgs/by-name/fs/fsmon/package.nix b/pkgs/by-name/fs/fsmon/package.nix index 4e55fc183e50..de9a0ff6b586 100644 --- a/pkgs/by-name/fs/fsmon/package.nix +++ b/pkgs/by-name/fs/fsmon/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fsmon"; version = "1.8.8"; src = fetchFromGitHub { owner = "nowsecure"; repo = "fsmon"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WxOPNc939qwrdDNC3v3pmcltd8MnM8Gsu8t6VR/ZWYY="; }; @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { meta = { description = "FileSystem Monitor utility"; homepage = "https://github.com/nowsecure/fsmon"; - changelog = "https://github.com/nowsecure/fsmon/releases/tag/${version}"; + changelog = "https://github.com/nowsecure/fsmon/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dezgeg ]; platforms = lib.platforms.linux; mainProgram = "fsmon"; }; -} +}) diff --git a/pkgs/by-name/fs/fsnotifier/package.nix b/pkgs/by-name/fs/fsnotifier/package.nix index 151b6ae7b2f6..d5e9bba7874b 100644 --- a/pkgs/by-name/fs/fsnotifier/package.nix +++ b/pkgs/by-name/fs/fsnotifier/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2024.2.0"; pname = "fsnotifier"; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { # fix for hard-links in nix-store, https://github.com/JetBrains/intellij-community/pull/2171 patches = [ ./fsnotifier.patch ]; - sourceRoot = "${src.name}/native/fsNotifier/linux"; + sourceRoot = "${finalAttrs.src.name}/native/fsNotifier/linux"; buildPhase = '' mkdir -p $out/bin - $CC -O2 -Wall -Wextra -Wpedantic -D "VERSION=\"${version}\"" -std=c11 main.c inotify.c util.c -o fsnotifier + $CC -O2 -Wall -Wextra -Wpedantic -D "VERSION=\"${finalAttrs.version}\"" -std=c11 main.c inotify.c util.c -o fsnotifier cp fsnotifier $out/bin/fsnotifier ''; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fs/fstrcmp/package.nix b/pkgs/by-name/fs/fstrcmp/package.nix index 289b218dab6c..0a282b5247d4 100644 --- a/pkgs/by-name/fs/fstrcmp/package.nix +++ b/pkgs/by-name/fs/fstrcmp/package.nix @@ -8,12 +8,12 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fstrcmp"; version = "0.7"; src = fetchzip { - url = "https://sourceforge.net/projects/fstrcmp/files/fstrcmp/${version}/fstrcmp-${version}.D001.tar.gz"; + url = "https://sourceforge.net/projects/fstrcmp/files/fstrcmp/${finalAttrs.version}/fstrcmp-${finalAttrs.version}.D001.tar.gz"; sha256 = "0yg3y3k0wz50gmhgigfi2dx725w1gc8snb95ih7vpcnj6kabgz9a"; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.sephalon ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fs/fstrm/package.nix b/pkgs/by-name/fs/fstrm/package.nix index 6831dde02c7e..b23fc9136cf8 100644 --- a/pkgs/by-name/fs/fstrm/package.nix +++ b/pkgs/by-name/fs/fstrm/package.nix @@ -8,14 +8,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fstrm"; version = "0.6.1"; src = fetchFromGitHub { owner = "farsightsec"; repo = "fstrm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/WFP2g3Vuf/qaY8pprY8XFAlpEE+0SJUlFNWfa+7ZlE="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fs/fswatch/package.nix b/pkgs/by-name/fs/fswatch/package.nix index 0db8cc50e0a9..5a691c945a30 100644 --- a/pkgs/by-name/fs/fswatch/package.nix +++ b/pkgs/by-name/fs/fswatch/package.nix @@ -10,14 +10,14 @@ texinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fswatch"; version = "1.18.3"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-C/NHDhhRTQppu8xRWe9fy1+KIutyoRbkkabUtGlJ1fE="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/fs/fswebcam/package.nix b/pkgs/by-name/fs/fswebcam/package.nix index 131e256f0eef..6276e526b8fd 100644 --- a/pkgs/by-name/fs/fswebcam/package.nix +++ b/pkgs/by-name/fs/fswebcam/package.nix @@ -6,12 +6,12 @@ gd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fswebcam"; version = "20200725"; src = fetchurl { - url = "https://www.sanslogic.co.uk/fswebcam/files/fswebcam-${version}.tar.gz"; + url = "https://www.sanslogic.co.uk/fswebcam/files/fswebcam-${finalAttrs.version}.tar.gz"; sha256 = "1dazsrcaw9s30zz3jpxamk9lkff5dkmflp1s0jjjvdbwa0k6k6ii"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/pkgs/by-name/ft/ft2-clone/package.nix b/pkgs/by-name/ft/ft2-clone/package.nix index faaf00f6d1df..76a75f49da0a 100644 --- a/pkgs/by-name/ft/ft2-clone/package.nix +++ b/pkgs/by-name/ft/ft2-clone/package.nix @@ -9,14 +9,14 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ft2-clone"; version = "2.03"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-kOSH9jEdS3wU2XAEh7fh5XIuIU7zqqWrpcBZqKEZM84="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.littleEndian; mainProgram = "ft2-clone"; }; -} +}) diff --git a/pkgs/by-name/ft/ftgl/package.nix b/pkgs/by-name/ft/ftgl/package.nix index 6a7fef29f5af..41614a636126 100644 --- a/pkgs/by-name/ft/ftgl/package.nix +++ b/pkgs/by-name/ft/ftgl/package.nix @@ -11,14 +11,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ftgl"; version = "2.4.0"; src = fetchFromGitHub { owner = "frankheckenbach"; repo = "ftgl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-6TDNGoMeBLnucmHRgEDIVWcjlJb7N0sTluqBwRMMWn4="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fu/fujprog/package.nix b/pkgs/by-name/fu/fujprog/package.nix index 0d6428a70c0e..87363e2402c7 100644 --- a/pkgs/by-name/fu/fujprog/package.nix +++ b/pkgs/by-name/fu/fujprog/package.nix @@ -8,14 +8,14 @@ libusb-compat-0_1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fujprog"; version = "4.8"; src = fetchFromGitHub { owner = "kost"; repo = "fujprog"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5"; }; @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ trepetti ]; platforms = lib.platforms.all; - changelog = "https://github.com/kost/fujprog/releases/tag/v${version}"; + changelog = "https://github.com/kost/fujprog/releases/tag/v${finalAttrs.version}"; }; -} +}) diff --git a/pkgs/by-name/fu/funambol/package.nix b/pkgs/by-name/fu/funambol/package.nix index cd2c0d75d060..08ea16d01d73 100644 --- a/pkgs/by-name/fu/funambol/package.nix +++ b/pkgs/by-name/fu/funambol/package.nix @@ -8,12 +8,12 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "funambol-client-cpp"; version = "9.0.0"; src = fetchurl { - url = "mirror://sourceforge/funambol/funambol-client-sdk-${version}.zip"; + url = "mirror://sourceforge/funambol/funambol-client-sdk-${finalAttrs.version}.zip"; sha256 = "1667gahz30i5r8kbv7w415z0hbgm6f6pln1137l5skapi1if6r73"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Only; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/fu/functionalplus/package.nix b/pkgs/by-name/fu/functionalplus/package.nix index a6be05246ca6..4521f5d81e87 100644 --- a/pkgs/by-name/fu/functionalplus/package.nix +++ b/pkgs/by-name/fu/functionalplus/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "functionalplus"; version = "0.2.25"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "FunctionalPlus"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-eKCOi5g8YdKgxaI/mLlqB2m1zwrU9DOSrQF+PW2DBBQ="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/fu/fuse-archive/package.nix b/pkgs/by-name/fu/fuse-archive/package.nix index ce3b9b338cfd..6fe0271e0591 100644 --- a/pkgs/by-name/fu/fuse-archive/package.nix +++ b/pkgs/by-name/fu/fuse-archive/package.nix @@ -8,14 +8,14 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fuse-archive"; version = "1.10"; src = fetchFromGitHub { owner = "google"; repo = "fuse-archive"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Fta/IYKWsB4ZuPOWtGO6p6l03eoRXaO0lIGaCU3SRag="; }; @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { inherit (fuse.meta) platforms; description = "Serve an archive or a compressed file as a read-only FUSE file system"; homepage = "https://github.com/google/fuse-archive"; - changelog = "https://github.com/google/fuse-archive/releases/tag/v${version}"; + changelog = "https://github.com/google/fuse-archive/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ icyrockcom ]; mainProgram = "fuse-archive"; }; -} +}) diff --git a/pkgs/by-name/fu/fusee-interfacee-tk/package.nix b/pkgs/by-name/fu/fusee-interfacee-tk/package.nix index 7c9383715a9f..78023218153a 100644 --- a/pkgs/by-name/fu/fusee-interfacee-tk/package.nix +++ b/pkgs/by-name/fu/fusee-interfacee-tk/package.nix @@ -12,14 +12,14 @@ let ps.pyusb ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fusee-interfacee-tk"; version = "1.0.1"; src = fetchFromGitHub { owner = "nh-server"; repo = "fusee-interfacee-tk"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; sha256 = "0ngwbwsj999flprv14xvhk7lp51nprrvcnlbnbk6y4qx5casm5md"; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ kristian-brucaj ]; license = lib.licenses.gpl2; }; -} +}) diff --git a/pkgs/by-name/fu/fuzzylite/package.nix b/pkgs/by-name/fu/fuzzylite/package.nix index 7e8393369001..16f75d9c5b8e 100644 --- a/pkgs/by-name/fu/fuzzylite/package.nix +++ b/pkgs/by-name/fu/fuzzylite/package.nix @@ -8,7 +8,7 @@ unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fuzzylite"; version = "6.0-unstable-2025-08-30"; @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { description = "Fuzzy logic control library in C++"; mainProgram = "fuzzylite"; homepage = "https://fuzzylite.com"; - changelog = "https://github.com/fuzzylite/fuzzylite/${src.rev}/release/CHANGELOG"; + changelog = "https://github.com/fuzzylite/fuzzylite/${finalAttrs.src.rev}/release/CHANGELOG"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ azahi ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/fv/fvwm2/package.nix b/pkgs/by-name/fv/fvwm2/package.nix index 62413aaa4952..d886799f2ab2 100644 --- a/pkgs/by-name/fv/fvwm2/package.nix +++ b/pkgs/by-name/fv/fvwm2/package.nix @@ -23,14 +23,14 @@ enableGestures ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fvwm"; version = "2.7.0"; src = fetchFromGitHub { owner = "fvwmorg"; repo = "fvwm"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KcuX8las1n8UUE/BOHj7WOeZjva5hxgpFHtATMUk3bg="; }; @@ -80,10 +80,10 @@ stdenv.mkDerivation rec { meta = { homepage = "http://fvwm.org"; - changelog = "https://github.com/fvwmorg/fvwm/releases/tag/${src.rev}"; + changelog = "https://github.com/fvwmorg/fvwm/releases/tag/${finalAttrs.src.rev}"; description = "Multiple large virtual desktop window manager"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ edanaher ]; }; -} +}) diff --git a/pkgs/by-name/fw/fwknop/package.nix b/pkgs/by-name/fw/fwknop/package.nix index 0631d7ef0c5b..9ffdb5905061 100644 --- a/pkgs/by-name/fw/fwknop/package.nix +++ b/pkgs/by-name/fw/fwknop/package.nix @@ -15,14 +15,14 @@ buildClient ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fwknop"; version = "2.6.11"; src = fetchFromGitHub { owner = "mrash"; repo = "fwknop"; - tag = version; + tag = finalAttrs.version; hash = "sha256-jnEBRJCt7pAmXRIBVT2OwJqT5Zr/JaRgPDqccx0W/9o="; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/fz/fzy/package.nix b/pkgs/by-name/fz/fzy/package.nix index c1046a49df6b..a6e3698aab53 100644 --- a/pkgs/by-name/fz/fzy/package.nix +++ b/pkgs/by-name/fz/fzy/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fzy"; version = "1.1"; src = fetchFromGitHub { owner = "jhawthorn"; repo = "fzy"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ZGAt8rW21WFGuf/nE44ZrL68L/RmTYCBzuXWhidqJB8="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "fzy"; }; -} +}) diff --git a/pkgs/by-name/g3/g3kb-switch/package.nix b/pkgs/by-name/g3/g3kb-switch/package.nix index 73ad6649e8a5..550d98d4e264 100644 --- a/pkgs/by-name/g3/g3kb-switch/package.nix +++ b/pkgs/by-name/g3/g3kb-switch/package.nix @@ -6,13 +6,13 @@ glib, fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "g3kb-switch"; version = "1.5"; src = fetchFromGitHub { owner = "lyokha"; repo = "g3kb-switch"; - rev = version; + rev = finalAttrs.version; hash = "sha256-kTJfV0xQmWuxibUlfC1qJX2J2nrZ4wimdf/nGciQq0Y="; }; @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/lyokha/g3kb-switch"; - changelog = "https://github.com/lyokha/g3kb-switch/releases/tag/${src.rev}"; + changelog = "https://github.com/lyokha/g3kb-switch/releases/tag/${finalAttrs.src.rev}"; description = "CLI keyboard layout switcher for GNOME Shell"; mainProgram = "g3kb-switch"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ Freed-Wu ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ga/gabutdm/package.nix b/pkgs/by-name/ga/gabutdm/package.nix index d841db14aef9..0719d1a08cea 100644 --- a/pkgs/by-name/ga/gabutdm/package.nix +++ b/pkgs/by-name/ga/gabutdm/package.nix @@ -19,14 +19,14 @@ aria2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gabutdm"; version = "2.7.0"; src = fetchFromGitHub { owner = "gabutakut"; repo = "gabutdm"; - rev = version; + rev = finalAttrs.version; hash = "sha256-nzhEJiGBH+semfwLPdpIfPNGQLorqPwwmiAUNM91Br4="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ga/galen/package.nix b/pkgs/by-name/ga/galen/package.nix index da7484e915a2..2ec44d138d8d 100644 --- a/pkgs/by-name/ga/galen/package.nix +++ b/pkgs/by-name/ga/galen/package.nix @@ -6,14 +6,14 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "galen"; version = "2.4.4"; inherit jre8; src = fetchurl { - url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip"; + url = "https://github.com/galenframework/galen/releases/download/galen-${finalAttrs.version}/galen-bin-${finalAttrs.version}.zip"; sha256 = "13dq8cf0yy24vym6z7p8hb0mybgpcl4j5crsaq8a6pjfxz6d17mq"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/ga/game-music-emu/package.nix b/pkgs/by-name/ga/game-music-emu/package.nix index 3cd720d8dca5..54eee2b237f9 100644 --- a/pkgs/by-name/ga/game-music-emu/package.nix +++ b/pkgs/by-name/ga/game-music-emu/package.nix @@ -7,14 +7,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.6.4"; pname = "game-music-emu"; src = fetchFromGitHub { owner = "libgme"; repo = "game-music-emu"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qGNWFFUUjv2R5e/nQrriAyDJCARISqNB8e5/1zEJ3fk="; }; nativeBuildInputs = [ @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ga/gammu/package.nix b/pkgs/by-name/ga/gammu/package.nix index 6806cf3a58a3..755dd55ee684 100644 --- a/pkgs/by-name/ga/gammu/package.nix +++ b/pkgs/by-name/ga/gammu/package.nix @@ -20,14 +20,14 @@ libpq ? null, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gammu"; version = "1.42.0"; src = fetchFromGitHub { owner = "gammu"; repo = "gammu"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-aeaGHVxOMiXRU6RHws+oAnzdO9RY1jw/X/xuGfSt76I="; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix index 52e4c876d4ba..9e5f33a67b5f 100644 --- a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix +++ b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix @@ -19,7 +19,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gancio-plugin-telegram-bridge"; version = "1.0.6"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { domain = "framagit.org"; owner = "bcn.convocala"; repo = "gancio-plugin-telegram-bridge"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-J7FIfJjounrq/hPQk58mYXigjD7BZQWoE4aGi0eJ4sY="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jbgi ]; }; -} +}) diff --git a/pkgs/by-name/ga/ganttproject-bin/package.nix b/pkgs/by-name/ga/ganttproject-bin/package.nix index c3a566812da0..1dff9cf909b4 100644 --- a/pkgs/by-name/ga/ganttproject-bin/package.nix +++ b/pkgs/by-name/ga/ganttproject-bin/package.nix @@ -11,12 +11,12 @@ let enableJavaFX = true; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ganttproject-bin"; version = "3.3.3316"; src = fetchzip { - url = "https://dl.ganttproject.biz/ganttproject-${version}/ganttproject-${version}.zip"; + url = "https://dl.ganttproject.biz/ganttproject-${finalAttrs.version}/ganttproject-${finalAttrs.version}.zip"; stripRoot = false; hash = "sha256-tiEq/xdC0gXiUInLS9xGR/vI/BpdSA+mSf5yukuejc4="; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { icon = "ganttproject"; desktopName = "GanttProject"; genericName = "Shedule and manage projects"; - comment = meta.description; + comment = finalAttrs.meta.description; categories = [ "Office" ]; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ganttproject"; }; -} +}) diff --git a/pkgs/by-name/ga/gargoyle/package.nix b/pkgs/by-name/ga/gargoyle/package.nix index facbb232f59c..831fe0ce1e34 100644 --- a/pkgs/by-name/ga/gargoyle/package.nix +++ b/pkgs/by-name/ga/gargoyle/package.nix @@ -18,14 +18,14 @@ qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gargoyle"; version = "2023.1"; src = fetchFromGitHub { owner = "garglk"; repo = "garglk"; - tag = version; + tag = finalAttrs.version; hash = "sha256-XsN5FXWJb3DSOjipxr/HW9R7QS+7iEaITERTrbGEMwA="; }; @@ -91,4 +91,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ga/gate12/package.nix b/pkgs/by-name/ga/gate12/package.nix index 835daa5ad547..8b58b9ce722f 100644 --- a/pkgs/by-name/ga/gate12/package.nix +++ b/pkgs/by-name/ga/gate12/package.nix @@ -16,6 +16,9 @@ libXrandr, libXtst, writableTmpDirAsHomeHook, + + buildVST3 ? true, + buildLV2 ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "COPY_PLUGIN_AFTER_BUILD" false) - (lib.cmakeFeature "BUILD_STANDALONE" "OFF") + + (lib.cmakeBool "BUILD_STANDALONE" false) + (lib.cmakeBool "BUILD_VST3" buildVST3) + (lib.cmakeBool "BUILD_LV2" buildLV2) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" @@ -76,10 +82,17 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/vst3 $out/lib/lv2 + pushd GATE12_artefacts/Release + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + cp -r VST3/GATE-12.vst3 $out/lib/vst3 + ''} - cp -r "GATE12_artefacts/Release/LV2/GATE-12.lv2" $out/lib/lv2 - cp -r "GATE12_artefacts/Release/VST3/GATE-12.vst3" $out/lib/vst3 + ${lib.optionalString buildLV2 '' + mkdir -p $out/lib/lv2 + cp -r LV2/GATE-12.lv2 $out/lib/lv2 + ''} + popd runHook postInstall ''; @@ -89,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tiagolr/gate12"; changelog = "https://github.com/tiagolr/gate12/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ magnetophon ]; + maintainers = with lib.maintainers; [ + magnetophon + mrtnvgr + ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ga/gatk/package.nix b/pkgs/by-name/ga/gatk/package.nix index b343f9fb6711..5348d9b147ad 100644 --- a/pkgs/by-name/ga/gatk/package.nix +++ b/pkgs/by-name/ga/gatk/package.nix @@ -7,11 +7,11 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gatk"; version = "4.6.2.0"; src = fetchzip { - url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; + url = "https://github.com/broadinstitute/gatk/releases/download/${finalAttrs.version}/gatk-${finalAttrs.version}.zip"; sha256 = "sha256-I2p7BLh4q0i8qn1fTbzsaKVnCkMrPIxEpBUjOxNxgxI="; }; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - install -m755 -D $src/gatk-package-${version}-local.jar $out/bin/ - install -m755 -D $src/gatk-package-${version}-spark.jar $out/bin/ + install -m755 -D $src/gatk-package-${finalAttrs.version}-local.jar $out/bin/ + install -m755 -D $src/gatk-package-${finalAttrs.version}-spark.jar $out/bin/ install -m755 -D $src/gatk $out/bin/ ''; postFixup = '' @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { genome data from any organism, with any level of ploidy. ''; }; -} +}) diff --git a/pkgs/by-name/ga/gav/package.nix b/pkgs/by-name/ga/gav/package.nix index 00793115b786..829f65c86793 100644 --- a/pkgs/by-name/ga/gav/package.nix +++ b/pkgs/by-name/ga/gav/package.nix @@ -8,12 +8,12 @@ SDL_net, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gav"; version = "0.9.0"; src = fetchurl { - url = "mirror://sourceforge/gav/gav-${version}.tar.gz"; + url = "mirror://sourceforge/gav/gav-${finalAttrs.version}.tar.gz"; sha256 = "8f0deb8b2cd775b339229054f4f282583a4cfbcba9d27a6213cf910bab944f3e"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ga/gaw/package.nix b/pkgs/by-name/ga/gaw/package.nix index a4bab64143d5..0269c21f82d6 100644 --- a/pkgs/by-name/ga/gaw/package.nix +++ b/pkgs/by-name/ga/gaw/package.nix @@ -9,17 +9,17 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gaw3"; version = "20250128"; # https://www.rvq.fr/php/ndl.php?id=gaw.* # https://www.rvq.fr/php/ndl.php?id=gaw3-20250128.tar.gz src = - runCommandLocal "gaw3-${version}.tar.gz" + runCommandLocal "gaw3-${finalAttrs.version}.tar.gz" { BASE = "https://www.rvq.fr/php/ndl.php"; - FNAME = "gaw3-${version}.tar.gz"; + FNAME = "gaw3-${finalAttrs.version}.tar.gz"; nativeBuildInputs = [ htmlq @@ -92,4 +92,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fbeffa ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gb/gbdfed/package.nix b/pkgs/by-name/gb/gbdfed/package.nix index d0f182ac7331..7f3a0c30622c 100644 --- a/pkgs/by-name/gb/gbdfed/package.nix +++ b/pkgs/by-name/gb/gbdfed/package.nix @@ -7,12 +7,12 @@ gtk2-x11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.6"; pname = "gbdfed"; src = fetchurl { - url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/gbdfed-${version}.tar.bz2"; + url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/gbdfed-${finalAttrs.version}.tar.bz2"; sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "gbdfed"; }; -} +}) diff --git a/pkgs/by-name/gb/gbenchmark/package.nix b/pkgs/by-name/gb/gbenchmark/package.nix index 495a3d5f6081..6cc1617193ee 100644 --- a/pkgs/by-name/gb/gbenchmark/package.nix +++ b/pkgs/by-name/gb/gbenchmark/package.nix @@ -8,14 +8,14 @@ prometheus-cpp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gbenchmark"; version = "1.9.4"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-P7wJcKkIBoWtN9FCRticpBzYbEZPq71a0iW/2oDTZRU="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.freebsd; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/gc/gcab/package.nix b/pkgs/by-name/gc/gcab/package.nix index 3e57dcdc2dc4..961dc2c9d970 100644 --- a/pkgs/by-name/gc/gcab/package.nix +++ b/pkgs/by-name/gc/gcab/package.nix @@ -17,7 +17,7 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gcab"; version = "1.6"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gcab/${lib.versions.majorMinor version}/gcab-${version}.tar.xz"; + url = "mirror://gnome/sources/gcab/${lib.versions.majorMinor finalAttrs.version}/gcab-${finalAttrs.version}.tar.xz"; hash = "sha256-LwyWFVd8QSaQniUfneBibD7noVI3bBW1VE3xD8h+Vgs="; }; @@ -87,4 +87,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gc/gcfflasher/package.nix b/pkgs/by-name/gc/gcfflasher/package.nix index c92f4e88cc87..37ac0b0a1b5a 100644 --- a/pkgs/by-name/gc/gcfflasher/package.nix +++ b/pkgs/by-name/gc/gcfflasher/package.nix @@ -7,14 +7,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gcfflasher"; version = "4.11.0"; src = fetchFromGitHub { owner = "dresden-elektronik"; repo = "gcfflasher"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nYLGKem4+Ty2QyhDQIyo9wLEKrbumYKuoGIA9Ore7XM="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "GCFFlasher"; }; -} +}) diff --git a/pkgs/by-name/gc/gcolor3/package.nix b/pkgs/by-name/gc/gcolor3/package.nix index 65a3f2ad0eee..f5d59f37624e 100644 --- a/pkgs/by-name/gc/gcolor3/package.nix +++ b/pkgs/by-name/gc/gcolor3/package.nix @@ -12,7 +12,7 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gcolor3"; version = "2.4.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "gcolor3"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "rHIAjk2m3Lkz11obgNZaapa1Zr2GDH7XzgzuAJmq+MU="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gc/gcr/package.nix b/pkgs/by-name/gc/gcr/package.nix index 49f11feb1e48..035b303ba59e 100644 --- a/pkgs/by-name/gc/gcr/package.nix +++ b/pkgs/by-name/gc/gcr/package.nix @@ -26,7 +26,7 @@ shared-mime-info, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gcr"; version = "3.41.2"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gcr/${lib.versions.majorMinor version}/gcr-${version}.tar.xz"; + url = "mirror://gnome/sources/gcr/${lib.versions.majorMinor finalAttrs.version}/gcr-${finalAttrs.version}.tar.xz"; sha256 = "utEPPFU6DhhUZJq1nFskNNoiyhpUrmE48fU5YVZ+Grc="; }; @@ -129,4 +129,4 @@ stdenv.mkDerivation rec { (G)object oriented way. ''; }; -} +}) diff --git a/pkgs/by-name/gc/gcstar/package.nix b/pkgs/by-name/gc/gcstar/package.nix index df1288c7842f..0f282e663f7e 100644 --- a/pkgs/by-name/gc/gcstar/package.nix +++ b/pkgs/by-name/gc/gcstar/package.nix @@ -6,14 +6,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gcstar"; version = "1.8.0"; src = fetchFromGitLab { owner = "Kerenoc"; repo = "GCstar"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dasj19 ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/gd/gdbuspp/package.nix b/pkgs/by-name/gd/gdbuspp/package.nix index 5bd0db891709..3e6a559e31d6 100644 --- a/pkgs/by-name/gd/gdbuspp/package.nix +++ b/pkgs/by-name/gd/gdbuspp/package.nix @@ -9,13 +9,13 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gdbuspp"; version = "3"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "gdbuspp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-LwEUNBQ7BUyoTm8tBgE4hwL7AbimCY/grQus8lWSI/M="; }; @@ -43,10 +43,10 @@ stdenv.mkDerivation rec { into applications in a more C++ approach, based on the C++17 standard. ''; homepage = "https://codeberg.org/OpenVPN/gdbuspp"; - changelog = "https://codeberg.org/OpenVPN/gdbuspp/releases/tag/v${version}"; + changelog = "https://codeberg.org/OpenVPN/gdbuspp/releases/tag/v${finalAttrs.version}"; license = lib.licenses.agpl3Only; sourceProvenance = [ lib.sourceTypes.fromSource ]; maintainers = [ lib.maintainers.progrm_jarvis ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix b/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix index 3046f380a410..01ef50d256b9 100644 --- a/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix +++ b/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix @@ -12,7 +12,7 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gdk-pixbuf-xlib"; version = "2.40.2"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "Archive"; repo = "gdk-pixbuf-xlib"; - rev = version; + rev = finalAttrs.version; hash = "sha256-b4EUaYzg2NlBMU90dGQivOvkv9KKSzES/ymPqzrelu8="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix index b8d7305f831c..ef6f60a71c88 100644 --- a/pkgs/by-name/ge/geant4/package.nix +++ b/pkgs/by-name/ge/geant4/package.nix @@ -37,12 +37,12 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "11.3.2"; pname = "geant4"; src = fetchurl { - url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; + url = "https://cern.ch/geant4-data/releases/geant4-v${finalAttrs.version}.tar.gz"; hash = "sha256-iSrt10JSYqUKw9PHEX2BwMDaS0CMaIDbr1R4uTAeSIw="; }; @@ -152,4 +152,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ge/geary/package.nix b/pkgs/by-name/ge/geary/package.nix index b741ac74f993..ea99c747f6e1 100644 --- a/pkgs/by-name/ge/geary/package.nix +++ b/pkgs/by-name/ge/geary/package.nix @@ -45,12 +45,12 @@ gsound, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geary"; version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/geary/${lib.versions.major version}/geary-${version}.tar.xz"; + url = "mirror://gnome/sources/geary/${lib.versions.major finalAttrs.version}/geary-${finalAttrs.version}.tar.xz"; hash = "sha256-r60VEwKBfd8Ji15BbnrH8tXupWejuAu5C9PGKv0TuaE="; }; @@ -153,10 +153,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/geary"; - changelog = "https://gitlab.gnome.org/GNOME/geary/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/geary/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Mail client for GNOME 3"; teams = [ lib.teams.gnome ]; license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ge/gebaar-libinput/package.nix b/pkgs/by-name/ge/gebaar-libinput/package.nix index 524eead3ffec..53c2d42d165b 100644 --- a/pkgs/by-name/ge/gebaar-libinput/package.nix +++ b/pkgs/by-name/ge/gebaar-libinput/package.nix @@ -9,14 +9,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gebaar-libinput"; version = "0.0.5"; src = fetchFromGitHub { owner = "Coffee2CodeNL"; repo = "gebaar-libinput"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1kqcgwkia1p195xr082838dvj1gqif9d63i8a52jb0lc32zzizh6"; fetchSubmodules = true; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { lovesegfault ]; }; -} +}) diff --git a/pkgs/by-name/ge/gedit/package.nix b/pkgs/by-name/ge/gedit/package.nix index c6d374972030..df81fb5b2d06 100644 --- a/pkgs/by-name/ge/gedit/package.nix +++ b/pkgs/by-name/ge/gedit/package.nix @@ -26,7 +26,7 @@ vala, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gedit"; version = "49.0"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { group = "World"; owner = "gedit"; repo = "gedit"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-IW3zBQOq/eeIjJbgJooHlOd+6/ZHOG6DUspHUlopG8A="; }; @@ -95,4 +95,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "gedit"; }; -} +}) diff --git a/pkgs/by-name/ge/geeqie/package.nix b/pkgs/by-name/ge/geeqie/package.nix index 7cd1cff35bda..282b44140401 100644 --- a/pkgs/by-name/ge/geeqie/package.nix +++ b/pkgs/by-name/ge/geeqie/package.nix @@ -38,14 +38,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geeqie"; version = "2.5"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-k2FXj2ZKZzB5XpCcWzEv7Q1ozATfU3221XKcOFdWOGU="; }; @@ -186,4 +186,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ge/gef/package.nix b/pkgs/by-name/ge/gef/package.nix index 5f6a9c139fa2..ee5b1b03cb39 100644 --- a/pkgs/by-name/ge/gef/package.nix +++ b/pkgs/by-name/ge/gef/package.nix @@ -23,14 +23,14 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gef"; version = "2025.01"; src = fetchFromGitHub { owner = "hugsy"; repo = "gef"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-JM9zH1wWEdjpBafnxMIFtePjXWf3UOXhBSWZCXEOzKw="; }; @@ -87,4 +87,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ freax13 ]; }; -} +}) diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 444b62acaa4d..c41366b22c02 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -14,18 +14,20 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.23.0"; + version = "0.25.2"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-tl9Iy1M0YxPvUpbIQRl7/P2iRIb5n1cvHEqK2k3OR5I="; + hash = "sha256-2Fl6bkoAgu+KvwVIkQEIAPYKQRYyEQPWMRv3vsfnNA4="; }; nodejs = nodejs_22; - npmDepsHash = "sha256-gPmH/Ym6+UxbpH8CEuDmdZtbR6HqWPjMchs1zlDELDU="; + npmDepsHash = "sha256-4peAAxCws5IjWaiNwkRBiaL+n1fE+zsK0qbk1owueeY="; + + dontPatchElf = stdenv.isDarwin; nativeBuildInputs = [ jq @@ -77,7 +79,13 @@ buildNpmPackage (finalAttrs: { mkdir -p $out/{bin,share/gemini-cli} npm prune --omit=dev - rm node_modules/shell-quote/print.py # remove python demo to prevent python from getting into the closure + + # Remove python files to prevent python from getting into the closure + find node_modules -name "*.py" -delete + # keytar/build has gyp-mac-tool with a Python shebang that gets patched, + # creating a python3 reference in the closure + rm -rf node_modules/keytar/build + cp -r node_modules $out/share/gemini-cli/ rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli @@ -94,6 +102,11 @@ buildNpmPackage (finalAttrs: { ln -s $out/share/gemini-cli/node_modules/@google/gemini-cli/dist/index.js $out/bin/gemini chmod +x "$out/bin/gemini" + # Clean up any remaining references to npmDeps in node_modules metadata + find $out/share/gemini-cli/node_modules -name "package-lock.json" -delete + find $out/share/gemini-cli/node_modules -name ".package-lock.json" -delete + find $out/share/gemini-cli/node_modules -name "config.gypi" -delete + runHook postInstall ''; diff --git a/pkgs/by-name/ge/gen-oath-safe/package.nix b/pkgs/by-name/ge/gen-oath-safe/package.nix index 5daef03f9a56..15b2f0d8a136 100644 --- a/pkgs/by-name/ge/gen-oath-safe/package.nix +++ b/pkgs/by-name/ge/gen-oath-safe/package.nix @@ -12,14 +12,14 @@ yubikey-manager, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gen-oath-safe"; version = "0.11.0"; src = fetchFromSourcehut { owner = "~mcepl"; repo = "gen-oath-safe"; - tag = version; + tag = finalAttrs.version; sha256 = "1914z0jgj7lni0nf3hslkjgkv87mhxdr92cmhmbzhpjgjgr23ydp"; }; nativeBuildInputs = [ makeWrapper ]; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { mainProgram = "gen-oath-safe"; }; -} +}) diff --git a/pkgs/by-name/ge/gen6dns/package.nix b/pkgs/by-name/ge/gen6dns/package.nix index 0de728463b23..9dc3693e6cc6 100644 --- a/pkgs/by-name/ge/gen6dns/package.nix +++ b/pkgs/by-name/ge/gen6dns/package.nix @@ -5,12 +5,12 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gen6dns"; version = "1.3"; src = fetchurl { - url = "https://www.hznet.de/tools/gen6dns-${version}.tar.gz"; + url = "https://www.hznet.de/tools/gen6dns-${finalAttrs.version}.tar.gz"; hash = "sha256-MhYfgzbGPmrhPx89EpObrEkxaII7uz4TbWXeEGF7Xws="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ majiir ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ge/genann/package.nix b/pkgs/by-name/ge/genann/package.nix index e785918de0b5..8cc0dedfa7db 100644 --- a/pkgs/by-name/ge/genann/package.nix +++ b/pkgs/by-name/ge/genann/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "genann"; version = "1.0.0"; src = fetchFromGitHub { owner = "codeplea"; repo = "genann"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0z45ndpd4a64i6jayr4yxfcr5h87bsmhm7lfgnbp35pnfywiclmq"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ge/gencfsm/package.nix b/pkgs/by-name/ge/gencfsm/package.nix index 89bd43c7cd80..710f0b7751be 100644 --- a/pkgs/by-name/ge/gencfsm/package.nix +++ b/pkgs/by-name/ge/gencfsm/package.nix @@ -19,14 +19,14 @@ gobject-introspection, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.9"; pname = "gnome-encfs-manager"; src = fetchurl { url = with lib.versions; - "https://launchpad.net/gencfsm/trunk/${major version}.${minor version}/+download/gnome-encfs-manager_${version}.tar.xz"; + "https://launchpad.net/gencfsm/trunk/${major finalAttrs.version}.${minor finalAttrs.version}/+download/gnome-encfs-manager_${finalAttrs.version}.tar.xz"; sha256 = "RXVwg/xhfAQv3pWp3UylOhMKDh9ZACTuKM4lPrn1dk8="; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.spacefrogg ]; }; -} +}) diff --git a/pkgs/by-name/ge/genext2fs/package.nix b/pkgs/by-name/ge/genext2fs/package.nix index 9f4b7ad0d75f..9969bab78027 100644 --- a/pkgs/by-name/ge/genext2fs/package.nix +++ b/pkgs/by-name/ge/genext2fs/package.nix @@ -6,14 +6,14 @@ libarchive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "genext2fs"; version = "1.5.0"; src = fetchFromGitHub { owner = "bestouff"; repo = "genext2fs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-9LAU5XuCwwEhU985MzZ2X+YYibvyECULQSn9X2jdj5I="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "genext2fs"; }; -} +}) diff --git a/pkgs/by-name/ge/genimage/package.nix b/pkgs/by-name/ge/genimage/package.nix index f64494b37459..c9403ae7c263 100644 --- a/pkgs/by-name/ge/genimage/package.nix +++ b/pkgs/by-name/ge/genimage/package.nix @@ -8,12 +8,12 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "genimage"; version = "19"; src = fetchurl { - url = "https://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz"; + url = "https://public.pengutronix.de/software/genimage/genimage-${finalAttrs.version}.tar.xz"; sha256 = "sha256-fsT8uGVmKosv8gKEgZBE/6hBN788oW+3SXASkbwB8Qg="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "genimage"; }; -} +}) diff --git a/pkgs/by-name/ge/genmap/package.nix b/pkgs/by-name/ge/genmap/package.nix index f3ab17dcbe89..91c157319401 100644 --- a/pkgs/by-name/ge/genmap/package.nix +++ b/pkgs/by-name/ge/genmap/package.nix @@ -7,14 +7,14 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "genmap"; version = "1.3.0"; src = fetchFromGitHub { owner = "cpockrandt"; repo = "genmap"; - rev = "genmap-v${version}"; + rev = "genmap-v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-7sIKBRMNzyCrZ/c2nXkknb6a5YsXe6DRE2IFhp6AviY="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ge/gensio/package.nix b/pkgs/by-name/ge/gensio/package.nix index 4051afc77f00..c15cdc0eb382 100644 --- a/pkgs/by-name/ge/gensio/package.nix +++ b/pkgs/by-name/ge/gensio/package.nix @@ -8,14 +8,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gensio"; version = "3.0.1"; src = fetchFromGitHub { owner = "cminyard"; repo = "gensio"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-rgNolodA+fjnOYP1r5pwRYxngrHJ5/Lv1XUsTIlK5KQ="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { mainProgram = "gensiot"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ge/geogram/package.nix b/pkgs/by-name/ge/geogram/package.nix index 2415e49c51c6..de6a8d83e6fe 100644 --- a/pkgs/by-name/ge/geogram/package.nix +++ b/pkgs/by-name/ge/geogram/package.nix @@ -24,14 +24,14 @@ let hash = "sha256-zUmYI6+0IdDkglLzzWHS8ZKmc5O6aJ2X4IwRBouRIxI="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geogram"; version = "1.9.2"; src = fetchFromGitHub { owner = "BrunoLevy"; repo = "geogram"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-v7ChuE9F/z1MD5OUMiGXZWiGqjMauIka4sNXVDe/yYU="; fetchSubmodules = true; }; @@ -151,4 +151,4 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ tmarkus ]; }; -} +}) diff --git a/pkgs/by-name/ge/geographiclib/package.nix b/pkgs/by-name/ge/geographiclib/package.nix index 4d8ab6b869af..9f915f128d89 100644 --- a/pkgs/by-name/ge/geographiclib/package.nix +++ b/pkgs/by-name/ge/geographiclib/package.nix @@ -6,14 +6,14 @@ doxygen, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geographiclib"; version = "2.7"; src = fetchFromGitHub { owner = "geographiclib"; repo = "geographiclib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xqrt7KeYyYB90kuvn2qmK8VI3RVQuIhNN8qCzV//yko="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.geospatial ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ge/geoip/package.nix b/pkgs/by-name/ge/geoip/package.nix index 5ee72cc8f719..91b15e34cd1f 100644 --- a/pkgs/by-name/ge/geoip/package.nix +++ b/pkgs/by-name/ge/geoip/package.nix @@ -15,14 +15,14 @@ let if lib.isDerivation geoipDatabase then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = drvName; version = "1.6.12"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoip-api-c"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0ixyp3h51alnncr17hqp1p0rlqz9w69nlhm60rbzjjz3vjx52ajv"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; homepage = "https://www.maxmind.com"; }; -} +}) diff --git a/pkgs/by-name/ge/geoipjava/package.nix b/pkgs/by-name/ge/geoipjava/package.nix index bff080287adc..be68dbea92fb 100644 --- a/pkgs/by-name/ge/geoipjava/package.nix +++ b/pkgs/by-name/ge/geoipjava/package.nix @@ -6,12 +6,12 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "GeoIPJava"; version = "1.2.5"; src = fetchurl { - url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-${version}.zip"; + url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-${finalAttrs.version}.zip"; sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; nativeBuildInputs = [ unzip ]; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ge/geomyidae/package.nix b/pkgs/by-name/ge/geomyidae/package.nix index 4c9a9179101b..352b1f472a64 100644 --- a/pkgs/by-name/ge/geomyidae/package.nix +++ b/pkgs/by-name/ge/geomyidae/package.nix @@ -5,12 +5,12 @@ libressl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geomyidae"; version = "0.99"; src = fetchurl { - url = "gopher://bitreich.org/9/scm/geomyidae/tag/geomyidae-v${version}.tar.gz"; + url = "gopher://bitreich.org/9/scm/geomyidae/tag/geomyidae-v${finalAttrs.version}.tar.gz"; hash = "sha256-QnAUqvyi+b14kIjqnreY6adFl62glRiuX9QiVamR6zw="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.athas ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ge/geonkick/package.nix b/pkgs/by-name/ge/geonkick/package.nix index 0515a5f6874f..2083993f076d 100644 --- a/pkgs/by-name/ge/geonkick/package.nix +++ b/pkgs/by-name/ge/geonkick/package.nix @@ -13,14 +13,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geonkick"; version = "3.7.0"; src = fetchFromGitLab { owner = "Geonkick-Synthesizer"; repo = "geonkick"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-8FfgtqFfiO1CKp2t0uXbXEtH6C1bx1EJWagjCfDwIwY="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; mainProgram = "geonkick"; }; -} +}) diff --git a/pkgs/by-name/ge/gerbera/package.nix b/pkgs/by-name/ge/gerbera/package.nix index b5e6ad4aa428..95d214060029 100644 --- a/pkgs/by-name/ge/gerbera/package.nix +++ b/pkgs/by-name/ge/gerbera/package.nix @@ -121,14 +121,14 @@ let inherit (lib) flatten; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gerbera"; version = "3.0.0"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-dszd4WSTjOWwLNha0yq1gtC5kxCrJMhnnhKYaor8JyU="; }; @@ -174,7 +174,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://docs.gerbera.io/"; - changelog = "https://github.com/gerbera/gerbera/releases/tag/v${version}"; + changelog = "https://github.com/gerbera/gerbera/releases/tag/v${finalAttrs.version}"; description = "UPnP Media Server for 2024"; longDescription = '' Gerbera is a Mediatomb fork. @@ -186,4 +186,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "gerbera"; }; -} +}) diff --git a/pkgs/by-name/ge/getdata/package.nix b/pkgs/by-name/ge/getdata/package.nix index 7d4d47d19d0c..b66f8c179e60 100644 --- a/pkgs/by-name/ge/getdata/package.nix +++ b/pkgs/by-name/ge/getdata/package.nix @@ -5,13 +5,13 @@ autoreconfHook, libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "getdata"; version = "0.11.0"; src = fetchFromGitHub { owner = "ketiltrout"; repo = "getdata"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-fuFakbkxDwDp6Z9VITPIB8NiYRSp98Ub1y5SC6W5S1E="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.vbgl ]; homepage = "https://getdata.sourceforge.net/"; }; -} +}) diff --git a/pkgs/by-name/ge/geteltorito/package.nix b/pkgs/by-name/ge/geteltorito/package.nix index a0fe8a036ea3..7b367555cc5e 100644 --- a/pkgs/by-name/ge/geteltorito/package.nix +++ b/pkgs/by-name/ge/geteltorito/package.nix @@ -6,12 +6,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geteltorito"; version = "0.6"; src = fetchurl { - url = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/geteltorito-${version}.tar.gz"; + url = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/geteltorito-${finalAttrs.version}.tar.gz"; sha256 = "1gkbm9ahj2mgqrkrfpibzclsriqgsbsvjh19fr815vpd9f6snkxv"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' # reformat README to ronn markdown cat > README.new < tmp + cat <(echo echo '% git-open (1) Version ${finalAttrs.version} | Git manual') git-open.1.md > tmp mv tmp git-open.1.md pandoc --standalone --to man git-open.1.md -o git-open.1 ''; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "git-open"; }; -} +}) diff --git a/pkgs/by-name/gi/git-quick-stats/package.nix b/pkgs/by-name/gi/git-quick-stats/package.nix index 29b7aed3e80c..eebf32503476 100644 --- a/pkgs/by-name/gi/git-quick-stats/package.nix +++ b/pkgs/by-name/gi/git-quick-stats/package.nix @@ -11,14 +11,14 @@ util-linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "git-quick-stats"; version = "2.8.0"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-YVvlrlNRDDci7fH9LW4NxZcIkakVgvKe9FhJ2gCfoXg="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; mainProgram = "git-quick-stats"; }; -} +}) diff --git a/pkgs/by-name/gi/git-radar/package.nix b/pkgs/by-name/gi/git-radar/package.nix index ddda63be55ac..b9e07e31f906 100644 --- a/pkgs/by-name/gi/git-radar/package.nix +++ b/pkgs/by-name/gi/git-radar/package.nix @@ -6,14 +6,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "git-radar"; version = "0.6"; src = fetchFromGitHub { owner = "michaeldfallen"; repo = "git-radar"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0c3zp8s4w7m4s71qgwk1jyfc8yzw34f2hi43x1w437ypgabwg81j"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ kamilchm ]; mainProgram = "git-radar"; }; -} +}) diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix index 938e2676cb27..913ebe0ba977 100644 --- a/pkgs/by-name/gi/git-repo/package.nix +++ b/pkgs/by-name/gi/git-repo/package.nix @@ -11,14 +11,14 @@ openssh, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "git-repo"; version = "2.59"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-5ffk5B4ZA/Wy2bQNahFaXPFRSZdKz5t6TaGbN00mfxo="; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "repo"; }; -} +}) diff --git a/pkgs/by-name/gi/git-secrets/package.nix b/pkgs/by-name/gi/git-secrets/package.nix index 811d6788c7d7..b32f82e6538e 100644 --- a/pkgs/by-name/gi/git-secrets/package.nix +++ b/pkgs/by-name/gi/git-secrets/package.nix @@ -7,14 +7,14 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "git-secrets"; version = "1.3.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "git-secrets"; - rev = version; + rev = finalAttrs.version; sha256 = "10lnxg0q855zi3d6804ivlrn6dc817kilzdh05mmz8a0ccvm2qc7"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "git-secrets"; }; -} +}) diff --git a/pkgs/by-name/gi/git-subrepo/package.nix b/pkgs/by-name/gi/git-subrepo/package.nix index ad5510fbd2fd..531239b6a62f 100644 --- a/pkgs/by-name/gi/git-subrepo/package.nix +++ b/pkgs/by-name/gi/git-subrepo/package.nix @@ -8,14 +8,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "git-subrepo"; version = "0.4.9"; src = fetchFromGitHub { owner = "ingydotnet"; repo = "git-subrepo"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-Fwh4haGXVDsLexe/1kjUhY4lF6u5cTrAwivZiOkPig0="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ryantrinkle ]; }; -} +}) diff --git a/pkgs/by-name/gi/git-test/package.nix b/pkgs/by-name/gi/git-test/package.nix index 09d9dc40866a..6ac47095bce5 100644 --- a/pkgs/by-name/gi/git-test/package.nix +++ b/pkgs/by-name/gi/git-test/package.nix @@ -6,14 +6,14 @@ git, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "git-test"; version = "1.0.4"; src = fetchFromGitHub { owner = "spotify"; repo = "git-test"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "01h3f0andv1p7pwir3k6n01v92hgr5zbjadfwl144yjw9x37fm2f"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "git-test"; }; -} +}) diff --git a/pkgs/by-name/gi/git-when-merged/package.nix b/pkgs/by-name/gi/git-when-merged/package.nix index f3dec2b4adfc..b79478f6706f 100644 --- a/pkgs/by-name/gi/git-when-merged/package.nix +++ b/pkgs/by-name/gi/git-when-merged/package.nix @@ -5,14 +5,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "git-when-merged"; version = "1.2.1"; src = fetchFromGitHub { owner = "mhagger"; repo = "git-when-merged"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Yp/GNzD+7EPlk/kzZnT1eiSNsSxpYEiZezRbUU3HfLc="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ DamienCassou ]; mainProgram = "git-when-merged"; }; -} +}) diff --git a/pkgs/by-name/gi/gitflow/package.nix b/pkgs/by-name/gi/gitflow/package.nix index 0ef611cbf86a..e534d74980b3 100644 --- a/pkgs/by-name/gi/gitflow/package.nix +++ b/pkgs/by-name/gi/gitflow/package.nix @@ -8,14 +8,14 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gitflow"; version = "1.12.3"; src = fetchFromGitHub { owner = "petervanderdoes"; repo = "gitflow"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ offline ]; }; -} +}) diff --git a/pkgs/by-name/gi/gitg/package.nix b/pkgs/by-name/gi/gitg/package.nix index 60db4a99330a..63ef74da77a5 100644 --- a/pkgs/by-name/gi/gitg/package.nix +++ b/pkgs/by-name/gi/gitg/package.nix @@ -30,12 +30,12 @@ libdazzle, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gitg"; version = "44"; src = fetchurl { - url = "mirror://gnome/sources/gitg/${lib.versions.majorMinor version}/gitg-${version}.tar.xz"; + url = "mirror://gnome/sources/gitg/${lib.versions.majorMinor finalAttrs.version}/gitg-${finalAttrs.version}.tar.xz"; hash = "sha256-NCoxaE2rlnHNNBvT485mWtzuBGDCoIHdxJPNvAMTJTA="; }; @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/gitg"; - changelog = "https://gitlab.gnome.org/GNOME/gitg/-/blob/v${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/gitg/-/blob/v${finalAttrs.version}/NEWS?ref_type=tags"; description = "GNOME GUI client to view git repositories"; mainProgram = "gitg"; maintainers = with lib.maintainers; [ @@ -110,4 +110,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gi/gitnuro/package.nix b/pkgs/by-name/gi/gitnuro/package.nix index 24be877f4e39..1a777e586905 100644 --- a/pkgs/by-name/gi/gitnuro/package.nix +++ b/pkgs/by-name/gi/gitnuro/package.nix @@ -9,19 +9,19 @@ libGL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gitnuro"; version = "1.5.0"; src = fetchurl ( if stdenv.hostPlatform.system == "x86_64-linux" then { - url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-x86_64-${version}.jar"; + url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${finalAttrs.version}/Gitnuro-linux-x86_64-${finalAttrs.version}.jar"; hash = "sha256-EoBjw98O5gO2wTO34KMiFeteryYapZC83MUfIqxtbmQ="; } else if stdenv.hostPlatform.system == "aarch64-linux" then { - url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-arm_aarch64-${version}.jar"; + url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${finalAttrs.version}/Gitnuro-linux-arm_aarch64-${finalAttrs.version}.jar"; hash = "sha256-oAmCapu9xFS1LMasj21q39Q/4yjLh6MZx79tC8Yjlec="; } else @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { icon = "com.jetpackduba.Gitnuro"; desktopName = "Gitnuro"; categories = [ "Development" ]; - comment = meta.description; + comment = finalAttrs.meta.description; }) ]; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ zendo ]; mainProgram = "gitnuro"; }; -} +}) diff --git a/pkgs/by-name/gi/gitstats/package.nix b/pkgs/by-name/gi/gitstats/package.nix index b82ae925a494..7e7b59bf262a 100644 --- a/pkgs/by-name/gi/gitstats/package.nix +++ b/pkgs/by-name/gi/gitstats/package.nix @@ -11,7 +11,7 @@ gnugrep, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gitstats"; version = "2016-01-08"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" - "VERSION=${version}" + "VERSION=${finalAttrs.version}" ]; buildFlags = [ "man" ]; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bjornfor ]; mainProgram = "gitstats"; }; -} +}) diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix index bf9acf118c9e..4e741d33a5ef 100644 --- a/pkgs/by-name/gi/gitstatus/package.nix +++ b/pkgs/by-name/gi/gitstatus/package.nix @@ -11,14 +11,14 @@ let romkatv_libgit2 = callPackage ./romkatv_libgit2.nix { }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gitstatus"; version = "1.5.5"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-b+9bwJ87VV6rbOPobkwMkDXGH34STjYPlt8wCRR5tEc="; }; @@ -140,4 +140,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "gitstatusd"; }; -} +}) diff --git a/pkgs/by-name/gi/gittyup/package.nix b/pkgs/by-name/gi/gittyup/package.nix index e9e94815cae7..c9eb5640288e 100644 --- a/pkgs/by-name/gi/gittyup/package.nix +++ b/pkgs/by-name/gi/gittyup/package.nix @@ -14,14 +14,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gittyup"; version = "1.4.0"; src = fetchFromGitHub { owner = "Murmele"; repo = "Gittyup"; - rev = "gittyup_v${version}"; + rev = "gittyup_v${finalAttrs.version}"; hash = "sha256-anyjHSF0ZCBJTuqNdH49iwngt3zeJZat5XGDsKbiwPE="; fetchSubmodules = true; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/gl/glava/package.nix b/pkgs/by-name/gl/glava/package.nix index 5f30b2ac82ff..ca8691ca493a 100644 --- a/pkgs/by-name/gl/glava/package.nix +++ b/pkgs/by-name/gl/glava/package.nix @@ -34,14 +34,14 @@ let esac ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glava"; version = "1.6.3"; src = fetchFromGitHub { owner = "wacossusca34"; repo = "glava"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0kqkjxmpqkmgby05lsf6c6iwm45n33jk5qy6gi3zvjx4q4yzal1i"; }; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { --replace '$(DESTDIR)$(SHADERDIR)' '$(SHADERDIR)' substituteInPlace Makefile \ - --replace 'unknown' 'v${version}' + --replace 'unknown' 'v${finalAttrs.version}' ''; makeFlags = optional (!enableGlfw) "DISABLE_GLFW=1"; @@ -103,4 +103,4 @@ stdenv.mkDerivation rec { eadwu ]; }; -} +}) diff --git a/pkgs/by-name/gl/glbinding/package.nix b/pkgs/by-name/gl/glbinding/package.nix index 8987d558b75e..9677572b55a6 100644 --- a/pkgs/by-name/gl/glbinding/package.nix +++ b/pkgs/by-name/gl/glbinding/package.nix @@ -6,14 +6,14 @@ libGLU, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glbinding"; version = "3.5.0"; src = fetchFromGitHub { owner = "cginternals"; repo = "glbinding"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-oLtOsiXfl/18rY/89vl9JDDWpPmEELOFKAHuClveU0c="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.mt-caret ]; }; -} +}) diff --git a/pkgs/by-name/gl/glfw2/package.nix b/pkgs/by-name/gl/glfw2/package.nix index 3b96505771c5..ab12c967942f 100644 --- a/pkgs/by-name/gl/glfw2/package.nix +++ b/pkgs/by-name/gl/glfw2/package.nix @@ -8,12 +8,12 @@ libXext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glfw"; version = "2.7.9"; src = fetchurl { - url = "mirror://sourceforge/glfw/glfw-${version}.tar.bz2"; + url = "mirror://sourceforge/glfw/glfw-${finalAttrs.version}.tar.bz2"; sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gl/glib-testing/package.nix b/pkgs/by-name/gl/glib-testing/package.nix index d96ed43ed399..1b58157c8728 100644 --- a/pkgs/by-name/gl/glib-testing/package.nix +++ b/pkgs/by-name/gl/glib-testing/package.nix @@ -12,7 +12,7 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glib-testing"; version = "0.1.1"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "pwithnall"; repo = "libglib-testing"; - rev = version; + rev = finalAttrs.version; sha256 = "U3epLDdLES7MA71z7Q1WXMjzySTFERWBU0u8poObbEo="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jtojnar ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gl/glibmm_2_68/package.nix b/pkgs/by-name/gl/glibmm_2_68/package.nix index 0e4215207ac0..69744a348c83 100644 --- a/pkgs/by-name/gl/glibmm_2_68/package.nix +++ b/pkgs/by-name/gl/glibmm_2_68/package.nix @@ -11,7 +11,7 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glibmm"; version = "2.86.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/glibmm/${lib.versions.majorMinor version}/glibmm-${version}.tar.xz"; + url = "mirror://gnome/sources/glibmm/${lib.versions.majorMinor finalAttrs.version}/glibmm-${finalAttrs.version}.tar.xz"; hash = "sha256-OcDp9toEbWeTkHdO/bmtVkQ2I2c23C94JeYUstQIeCY="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gl/glmark2/package.nix b/pkgs/by-name/gl/glmark2/package.nix index b20f467468e7..004b11f3ee32 100644 --- a/pkgs/by-name/gl/glmark2/package.nix +++ b/pkgs/by-name/gl/glmark2/package.nix @@ -18,14 +18,14 @@ libgbm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glmark2"; version = "2023.01"; src = fetchFromGitHub { owner = "glmark2"; repo = "glmark2"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-WCvc5GqrAdpIKQ4LVqwO6ZGbzBgLCl49NxiGJynIjSQ="; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.wmertens ]; }; -} +}) diff --git a/pkgs/by-name/gl/globalarrays/package.nix b/pkgs/by-name/gl/globalarrays/package.nix index 161675e59669..8372e0459e61 100644 --- a/pkgs/by-name/gl/globalarrays/package.nix +++ b/pkgs/by-name/gl/globalarrays/package.nix @@ -9,14 +9,14 @@ mpi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "globalarrays"; version = "5.9.2"; src = fetchFromGitHub { owner = "GlobalArrays"; repo = "ga"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-leCvbWteOp7z7ORwtljA+KslHUptY2vdupZTmAjsArg="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gl/gloox/package.nix b/pkgs/by-name/gl/gloox/package.nix index 8eb315e6c5c4..46a4f1b755bb 100644 --- a/pkgs/by-name/gl/gloox/package.nix +++ b/pkgs/by-name/gl/gloox/package.nix @@ -10,12 +10,12 @@ libidn, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gloox"; version = "1.0.28"; src = fetchurl { - url = "https://camaya.net/download/gloox-${version}.tar.bz2"; + url = "https://camaya.net/download/gloox-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-WRvRLCSe3gtQoe9rmawN6O+cG6T9Lhhvl6dAIVzFlmw="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { # The last successful Darwin Hydra build was in 2023 broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/gl/glowing-bear/package.nix b/pkgs/by-name/gl/glowing-bear/package.nix index 2f2f4b1e98d6..8e10888b4f05 100644 --- a/pkgs/by-name/gl/glowing-bear/package.nix +++ b/pkgs/by-name/gl/glowing-bear/package.nix @@ -4,12 +4,12 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glowing-bear"; version = "0.9.0"; src = fetchFromGitHub { - rev = version; + rev = finalAttrs.version; owner = "glowing-bear"; repo = "glowing-bear"; sha256 = "0lf0j72m6rwlgqssdxf0m9si99lah08lww7q7i08p5i5lpv6zh2s"; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gl/glpng/package.nix b/pkgs/by-name/gl/glpng/package.nix index 39ef641c4d0d..f63260106698 100644 --- a/pkgs/by-name/gl/glpng/package.nix +++ b/pkgs/by-name/gl/glpng/package.nix @@ -9,13 +9,13 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glpng"; version = "1.47"; src = fetchFromRepoOrCz { repo = "glpng"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-mwh0E8OZKBf6UcRScAeco8dfQ4LJ+7TG0IPuRi3Mzfc="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gl/glslviewer/package.nix b/pkgs/by-name/gl/glslviewer/package.nix index ed3a269789fa..6180075d63b9 100644 --- a/pkgs/by-name/gl/glslviewer/package.nix +++ b/pkgs/by-name/gl/glslviewer/package.nix @@ -15,14 +15,14 @@ ffmpeg_7, ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glslviewer"; version = "3.2.4"; src = fetchFromGitHub { owner = "patriciogonzalezvivo"; repo = "glslViewer"; fetchSubmodules = true; - tag = version; + tag = finalAttrs.version; hash = "sha256-Ve3wmX5+kABCu8IRe4ySrwsBJm47g1zvMqDbqrpQl88="; }; nativeBuildInputs = [ @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/gl/gltron/package.nix b/pkgs/by-name/gl/gltron/package.nix index 4fe74f8b68b1..40095bcd98db 100644 --- a/pkgs/by-name/gl/gltron/package.nix +++ b/pkgs/by-name/gl/gltron/package.nix @@ -12,11 +12,11 @@ SDL_sound, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gltron"; version = "0.70"; src = fetchurl { - url = "mirror://sourceforge/gltron/gltron-${version}-source.tar.gz"; + url = "mirror://sourceforge/gltron/gltron-${finalAttrs.version}-source.tar.gz"; sha256 = "e0c8ebb41a18a1f8d7302a9c2cb466f5b1dd63e9a9966c769075e6b6bdad8bb0"; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/gl/glui/package.nix b/pkgs/by-name/gl/glui/package.nix index 4002e3479fbe..e45437749789 100644 --- a/pkgs/by-name/gl/glui/package.nix +++ b/pkgs/by-name/gl/glui/package.nix @@ -11,14 +11,14 @@ libXmu, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glui"; version = "2.37"; src = fetchFromGitHub { owner = "libglui"; repo = "glui"; - rev = version; + rev = finalAttrs.version; sha256 = "0qg2y8w95s03zay1qsqs8pqxxlg6l9kwm7rrs1qmx0h22sxb360i"; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gl/glusterfs/package.nix b/pkgs/by-name/gl/glusterfs/package.nix index 4a615f3927e4..ebd42589a28e 100644 --- a/pkgs/by-name/gl/glusterfs/package.nix +++ b/pkgs/by-name/gl/glusterfs/package.nix @@ -103,14 +103,14 @@ let xfsprogs # xfs_info ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glusterfs"; version = "11.2"; src = fetchFromGitHub { owner = "gluster"; repo = "glusterfs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-MGTntR9SVmejgpAkZnhJOaIkZeCMNBGaQSorLOStdjo="; }; inherit buildInputs propagatedBuildInputs; @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 preConfigure = '' patchShebangs build-aux/pkg-version - echo "v${version}" > VERSION + echo "v${finalAttrs.version}" > VERSION ./autogen.sh export PYTHON=${python3}/bin/python ''; @@ -266,4 +266,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.raskin ]; platforms = with lib.platforms; linux ++ freebsd; }; -} +}) diff --git a/pkgs/by-name/gl/glyr/package.nix b/pkgs/by-name/gl/glyr/package.nix index 985f54bcc692..b2935c6aa9e7 100644 --- a/pkgs/by-name/gl/glyr/package.nix +++ b/pkgs/by-name/gl/glyr/package.nix @@ -10,14 +10,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.0.10"; pname = "glyr"; src = fetchFromGitHub { owner = "sahib"; repo = "glyr"; - rev = version; + rev = finalAttrs.version; sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr"; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { mainProgram = "glyrc"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gm/gmetronome/package.nix b/pkgs/by-name/gm/gmetronome/package.nix index 749d4834bda7..ab2bfefcc1f0 100644 --- a/pkgs/by-name/gm/gmetronome/package.nix +++ b/pkgs/by-name/gm/gmetronome/package.nix @@ -9,7 +9,7 @@ libpulseaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gmetronome"; version = "0.4.2"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "dqpb"; repo = "gmetronome"; - rev = version; + rev = finalAttrs.version; hash = "sha256-/UWOvVeZILDR29VjBK+mFJt1hzWcOljOr7J7+cMrKtM="; }; @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { meta = { description = "Free software metronome and tempo measurement tool"; homepage = "https://gitlab.gnome.org/dqpb/gmetronome"; - changelog = "https://gitlab.gnome.org/dqpb/gmetronome/-/blob/${src.rev}/NEWS"; + changelog = "https://gitlab.gnome.org/dqpb/gmetronome/-/blob/${finalAttrs.src.rev}/NEWS"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aleksana ]; mainProgram = "gmetronome"; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/gm/gmid/package.nix b/pkgs/by-name/gm/gmid/package.nix index 6bc88339d170..5483d43e8770 100644 --- a/pkgs/by-name/gm/gmid/package.nix +++ b/pkgs/by-name/gm/gmid/package.nix @@ -7,14 +7,14 @@ libevent, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gmid"; version = "2.1.1"; src = fetchFromGitHub { owner = "omar-polo"; repo = "gmid"; - rev = version; + rev = finalAttrs.version; hash = "sha256-JyiGkVF9aRJXgWAwZEnGgaD+IiH3UzamfTAcWyN0now="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sikmir ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnet/package.nix b/pkgs/by-name/gn/gnet/package.nix index 4d79b18f4e47..55eba24e975a 100644 --- a/pkgs/by-name/gn/gnet/package.nix +++ b/pkgs/by-name/gn/gnet/package.nix @@ -9,7 +9,7 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnet"; version = "2.0.8"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "Archive"; repo = "gnet"; - rev = "GNET_${lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "GNET_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-B2H8s1JWNrvVR8qn6UFfAaCXQd0zEpNaLUPET99Ex7M="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-autoar/package.nix b/pkgs/by-name/gn/gnome-autoar/package.nix index 0f1e22be31c1..ec5de715b8c2 100644 --- a/pkgs/by-name/gn/gnome-autoar/package.nix +++ b/pkgs/by-name/gn/gnome-autoar/package.nix @@ -13,7 +13,7 @@ vala, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-autoar"; version = "0.4.5"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/gnome-autoar-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor finalAttrs.version}/gnome-autoar-${finalAttrs.version}.tar.xz"; hash = "sha256-g4xTBvw4v6ovI6viQmL0vxV3HjMD+13LdPW5x6YV2r4="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; description = "Library to integrate compressed files management with GNOME"; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix index 08dd14cf8c41..da9072f1b8b7 100644 --- a/pkgs/by-name/gn/gnome-backgrounds/package.nix +++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix @@ -7,12 +7,12 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-backgrounds"; version = "49.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major finalAttrs.version}/gnome-backgrounds-${finalAttrs.version}.tar.xz"; hash = "sha256-Af4mDeWLoA5Eq6WJqZjjPovHrsxwHfC+5kz0z7pE9LU="; }; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { meta = { description = "Default wallpaper set for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/gnome-backgrounds"; - changelog = "https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.cc-by-sa-30; platforms = lib.platforms.unix; teams = [ lib.teams.gnome ]; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-boxes/package.nix b/pkgs/by-name/gn/gnome-boxes/package.nix index a6f4d2469daa..81b07fc583e0 100644 --- a/pkgs/by-name/gn/gnome-boxes/package.nix +++ b/pkgs/by-name/gn/gnome-boxes/package.nix @@ -48,12 +48,12 @@ libportal-gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-boxes"; version = "49.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major version}/gnome-boxes-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major finalAttrs.version}/gnome-boxes-${finalAttrs.version}.tar.xz"; hash = "sha256-VUeIAd3Qg4IL0yMZKoN04E879CoOcSYy0F5olVMORMo="; }; @@ -139,4 +139,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.gnome ]; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix index c9ce36adfabf..67500d02803a 100644 --- a/pkgs/by-name/gn/gnome-calculator/package.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -25,12 +25,12 @@ libgee, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-calculator"; version = "49.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major finalAttrs.version}/gnome-calculator-${finalAttrs.version}.tar.xz"; hash = "sha256-3fTNLt2hNcQcivaPnAzc2dmpFjy59/jijKLI6B/Ydlc="; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix index 9358ae381d9f..c3f2f04b7c1a 100644 --- a/pkgs/by-name/gn/gnome-calendar/package.nix +++ b/pkgs/by-name/gn/gnome-calendar/package.nix @@ -22,12 +22,12 @@ libadwaita, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-calendar"; version = "49.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major version}/gnome-calendar-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major finalAttrs.version}/gnome-calendar-${finalAttrs.version}.tar.xz"; hash = "sha256-DBEVqylNUyxMGfVs4Neu5T+OoysUMCCd0dntpHqD0sI="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-characters/package.nix b/pkgs/by-name/gn/gnome-characters/package.nix index b537f0cdf421..f6d444760b69 100644 --- a/pkgs/by-name/gn/gnome-characters/package.nix +++ b/pkgs/by-name/gn/gnome-characters/package.nix @@ -20,12 +20,12 @@ gnome-desktop, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-characters"; version = "49.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-characters/${lib.versions.major finalAttrs.version}/gnome-characters-${finalAttrs.version}.tar.xz"; hash = "sha256-eVwP5DTmAtx4M5H7WDDbx9jh6gXKdyEPsUDi9vQKFFw="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-chess/package.nix b/pkgs/by-name/gn/gnome-chess/package.nix index 52df36c8f2da..c05c18d87fdc 100644 --- a/pkgs/by-name/gn/gnome-chess/package.nix +++ b/pkgs/by-name/gn/gnome-chess/package.nix @@ -20,12 +20,12 @@ pango, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-chess"; version = "49.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/gnome-chess-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-chess/${lib.versions.major finalAttrs.version}/gnome-chess-${finalAttrs.version}.tar.xz"; hash = "sha256-xAoABKRz/nSawvpPrZjbZBGNGPn9msAu7Po2TwPb6bA="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-color-manager/package.nix b/pkgs/by-name/gn/gnome-color-manager/package.nix index e16788cb684c..e47c1758c426 100644 --- a/pkgs/by-name/gn/gnome-color-manager/package.nix +++ b/pkgs/by-name/gn/gnome-color-manager/package.nix @@ -21,12 +21,12 @@ exiv2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-color-manager"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-color-manager/${lib.versions.majorMinor version}/gnome-color-manager-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-color-manager/${lib.versions.majorMinor finalAttrs.version}/gnome-color-manager-${finalAttrs.version}.tar.xz"; hash = "sha256-fDwXj6rPy/EdVt4izSZZRqfViqEOPNlowpOOL79Q/e4="; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-common/package.nix b/pkgs/by-name/gn/gnome-common/package.nix index c5aa6f3f92d9..d236eefc72c6 100644 --- a/pkgs/by-name/gn/gnome-common/package.nix +++ b/pkgs/by-name/gn/gnome-common/package.nix @@ -8,12 +8,12 @@ automake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-common"; version = "3.18.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/gnome-common-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor finalAttrs.version}/gnome-common-${finalAttrs.version}.tar.xz"; hash = "sha256-IlaeNwrnVeBFJ7djKL78THO2K/1KVySZ/eEWuDGK+M8="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { meta = { teams = [ lib.teams.gnome ]; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-contacts/package.nix b/pkgs/by-name/gn/gnome-contacts/package.nix index ac37f6d7919d..ab06d7c8de20 100644 --- a/pkgs/by-name/gn/gnome-contacts/package.nix +++ b/pkgs/by-name/gn/gnome-contacts/package.nix @@ -28,12 +28,12 @@ pipewire, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-contacts"; version = "49.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/gnome-contacts-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major finalAttrs.version}/gnome-contacts-${finalAttrs.version}.tar.xz"; hash = "sha256-JfIcZ7wp133vLZzT4i0oRg0StH/ySKIBdzG1TbSF5K8="; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-desktop-testing/package.nix b/pkgs/by-name/gn/gnome-desktop-testing/package.nix index f42d354ec71f..4e5af574cd7f 100644 --- a/pkgs/by-name/gn/gnome-desktop-testing/package.nix +++ b/pkgs/by-name/gn/gnome-desktop-testing/package.nix @@ -9,7 +9,7 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-desktop-testing"; version = "2021.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-desktop-testing"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-PWn4eEZskY0YgMpf6O2dgXNSu8b8T311vFHREv2HE/Q="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.jtojnar ]; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index a220f10b7e52..6de8af9fa7b0 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -29,12 +29,12 @@ xz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-disk-utility"; version = "46.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/gnome-disk-utility-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major finalAttrs.version}/gnome-disk-utility-${finalAttrs.version}.tar.xz"; hash = "sha256-wk6UOaBNcLz640nKE0xwBUNf4rb0UhFN+Hi/8Libv/4="; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "gnome-disks"; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix b/pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix index befa5e4f0a1c..34cc7992f2cb 100644 --- a/pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix +++ b/pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix @@ -14,12 +14,12 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-epub-thumbnailer"; version = "1.8"; src = fetchurl { - url = "mirror://gnome/sources/gnome-epub-thumbnailer/${lib.versions.majorMinor version}/gnome-epub-thumbnailer-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-epub-thumbnailer/${lib.versions.majorMinor finalAttrs.version}/gnome-epub-thumbnailer-${finalAttrs.version}.tar.xz"; sha256 = "sha256-+QYZ1YxpkC8u/1e58AQrRzeGEIP0dZIaMQ/sxhL8oBc="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-extension-manager/package.nix b/pkgs/by-name/gn/gnome-extension-manager/package.nix index b3927611775b..efb881ec34b8 100644 --- a/pkgs/by-name/gn/gnome-extension-manager/package.nix +++ b/pkgs/by-name/gn/gnome-extension-manager/package.nix @@ -23,14 +23,14 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-extension-manager"; version = "0.6.3"; src = fetchFromGitHub { owner = "mjakeman"; repo = "extension-manager"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-d9MmDDtxRDw+z5DqtnsKAWf5fw62CPkhrkGILiVjtzM="; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { mainProgram = "extension-manager"; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix index 330102f59425..33429df08969 100644 --- a/pkgs/by-name/gn/gnome-font-viewer/package.nix +++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -16,12 +16,12 @@ harfbuzz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-font-viewer"; version = "49.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/gnome-font-viewer-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major finalAttrs.version}/gnome-font-viewer-${finalAttrs.version}.tar.xz"; hash = "sha256-fAGJJcKFdxtV19Gm8VcRwMGT10UO2YceINRPJUhWJAQ="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-keyring/package.nix b/pkgs/by-name/gn/gnome-keyring/package.nix index 692b78069077..223cfa31ad28 100644 --- a/pkgs/by-name/gn/gnome-keyring/package.nix +++ b/pkgs/by-name/gn/gnome-keyring/package.nix @@ -23,7 +23,7 @@ useWrappedDaemon ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-keyring"; version = "48.0"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/gnome-keyring-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major finalAttrs.version}/gnome-keyring-${finalAttrs.version}.tar.xz"; hash = "sha256-8gUYySDp6j+cm4tEvoxQ2Nf+7NDdViSWD3e9LKT7650="; }; @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { meta = { description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; homepage = "https://gitlab.gnome.org/GNOME/gnome-keyring"; - changelog = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = [ # Most of the code (some is 2Plus) lib.licenses.lgpl21Plus @@ -129,4 +129,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-klotski/package.nix b/pkgs/by-name/gn/gnome-klotski/package.nix index cb2cf22b3647..8d2795fa5756 100644 --- a/pkgs/by-name/gn/gnome-klotski/package.nix +++ b/pkgs/by-name/gn/gnome-klotski/package.nix @@ -22,12 +22,12 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-klotski"; version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-klotski/${lib.versions.majorMinor version}/gnome-klotski-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-klotski/${lib.versions.majorMinor finalAttrs.version}/gnome-klotski-${finalAttrs.version}.tar.xz"; hash = "sha256-kWN4RWSfPKcJ0p9x7ndblG0REghyCfMiZOj60hoMoOI="; }; @@ -65,11 +65,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/gnome-klotski"; - changelog = "https://gitlab.gnome.org/GNOME/gnome-klotski/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-klotski/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Slide blocks to solve the puzzle"; mainProgram = "gnome-klotski"; teams = [ lib.teams.gnome ]; license = lib.licenses.gpl2; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-logs/package.nix b/pkgs/by-name/gn/gnome-logs/package.nix index e0b4c7d7a1a0..3dce3e45e6d8 100644 --- a/pkgs/by-name/gn/gnome-logs/package.nix +++ b/pkgs/by-name/gn/gnome-logs/package.nix @@ -22,12 +22,12 @@ gsettings-desktop-schemas, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-logs"; version = "49.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/gnome-logs-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-logs/${lib.versions.major finalAttrs.version}/gnome-logs-${finalAttrs.version}.tar.xz"; hash = "sha256-+PV56wu22ajWrl7hQj+UR6+RIAeFF4tQu63UrC0lXUU="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-nettool/package.nix b/pkgs/by-name/gn/gnome-nettool/package.nix index eee7e8331833..a8b0c0d6e640 100644 --- a/pkgs/by-name/gn/gnome-nettool/package.nix +++ b/pkgs/by-name/gn/gnome-nettool/package.nix @@ -20,12 +20,12 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-nettool"; version = "42.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-nettool/${lib.versions.major version}/gnome-nettool-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-nettool/${lib.versions.major finalAttrs.version}/gnome-nettool-${finalAttrs.version}.tar.xz"; hash = "sha256-pU8p7vIDiu5pVRyLGcpPdY5eueIJCkvGtWM9/wGIdR8="; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix index 07d06ca0bec9..63527713b4b4 100644 --- a/pkgs/by-name/gn/gnome-notes/package.nix +++ b/pkgs/by-name/gn/gnome-notes/package.nix @@ -26,12 +26,12 @@ tinysparql, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-notes"; version = "40.2"; src = fetchurl { - url = "mirror://gnome/sources/bijiben/${lib.versions.major version}/bijiben-${version}.tar.xz"; + url = "mirror://gnome/sources/bijiben/${lib.versions.major finalAttrs.version}/bijiben-${finalAttrs.version}.tar.xz"; hash = "sha256-siERvAaVa+81mqzx1u3h5So1sADIgROTZjL4rGztzmc="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-packagekit/package.nix b/pkgs/by-name/gn/gnome-packagekit/package.nix index b8e921d5b1f0..4712d5292ad9 100644 --- a/pkgs/by-name/gn/gnome-packagekit/package.nix +++ b/pkgs/by-name/gn/gnome-packagekit/package.nix @@ -15,12 +15,12 @@ desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-packagekit"; version = "43.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-packagekit/${lib.versions.major version}/gnome-packagekit-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-packagekit/${lib.versions.major finalAttrs.version}/gnome-packagekit-${finalAttrs.version}.tar.xz"; hash = "sha256-zaRVplKpI7LqL3Axa9D92Clve2Lu8/r9nOUMjmbF8ZU="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; description = "Tools for installing software on the GNOME desktop using PackageKit"; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-power-manager/package.nix b/pkgs/by-name/gn/gnome-power-manager/package.nix index c94a373499a3..c3d4b5d66d6e 100644 --- a/pkgs/by-name/gn/gnome-power-manager/package.nix +++ b/pkgs/by-name/gn/gnome-power-manager/package.nix @@ -15,12 +15,12 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-power-manager"; version = "43.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-power-manager/${lib.versions.major version}/gnome-power-manager-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-power-manager/${lib.versions.major finalAttrs.version}/gnome-power-manager-${finalAttrs.version}.tar.xz"; hash = "sha256-faq0i73bMOnfKrplDLYNBeZnyfiFrOagoeeVDgy90y8="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index 9602d1427a3a..2e8de6eac7b9 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -32,12 +32,12 @@ polkit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-remote-desktop"; version = "49.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major finalAttrs.version}/gnome-remote-desktop-${finalAttrs.version}.tar.xz"; hash = "sha256-c9ROHnR04WIVgP9WEs3+HZxIr8+rRUjOkh1cpuLZFq0="; }; @@ -91,11 +91,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop"; - changelog = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "GNOME Remote Desktop server"; mainProgram = "grdctl"; teams = [ lib.teams.gnome ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-screenshot/package.nix b/pkgs/by-name/gn/gnome-screenshot/package.nix index 313ec978f150..ad8c4fb3f46c 100644 --- a/pkgs/by-name/gn/gnome-screenshot/package.nix +++ b/pkgs/by-name/gn/gnome-screenshot/package.nix @@ -21,12 +21,12 @@ gsettings-desktop-schemas, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-screenshot"; version = "41.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-screenshot/${lib.versions.major version}/gnome-screenshot-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-screenshot/${lib.versions.major finalAttrs.version}/gnome-screenshot-${finalAttrs.version}.tar.xz"; hash = "sha256-Stt97JJkKPdCY9V5ZnPPFC5HILbnaPVGio0JM/mMlZc="; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix index 6dab6532395e..4a8c6410c0bb 100644 --- a/pkgs/by-name/gn/gnome-session/ctl.nix +++ b/pkgs/by-name/gn/gnome-session/ctl.nix @@ -10,14 +10,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-session-ctl"; version = "49.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "gnome-session-ctl"; - rev = version; + rev = finalAttrs.version; hash = "sha256-rudb7ioTE5iaou0tzU5i2gWFW06NyWF5W5tjx2b5/0Y="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-sound-recorder/package.nix b/pkgs/by-name/gn/gnome-sound-recorder/package.nix index 34739b77d926..ce0bf322dfcb 100644 --- a/pkgs/by-name/gn/gnome-sound-recorder/package.nix +++ b/pkgs/by-name/gn/gnome-sound-recorder/package.nix @@ -19,12 +19,12 @@ libadwaita, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-sound-recorder"; version = "43.beta"; src = fetchurl { - url = "mirror://gnome/sources/gnome-sound-recorder/${lib.versions.major version}/gnome-sound-recorder-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-sound-recorder/${lib.versions.major finalAttrs.version}/gnome-sound-recorder-${finalAttrs.version}.tar.xz"; hash = "sha256-bbbbmjsbUv0KtU+aW/Tymctx5SoTrF/fw+dOtGmFpOY="; }; @@ -68,9 +68,9 @@ stdenv.mkDerivation rec { description = "Simple and modern sound recorder"; mainProgram = "gnome-sound-recorder"; homepage = "https://gitlab.gnome.org/World/vocalis"; - changelog = "https://gitlab.gnome.org/World/vocalis/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/World/vocalis/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.gpl2Plus; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index 81230546e173..6985d4328410 100644 --- a/pkgs/by-name/gn/gnome-sudoku/package.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -21,12 +21,12 @@ desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-sudoku"; version = "49.3"; src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major finalAttrs.version}/gnome-sudoku-${finalAttrs.version}.tar.xz"; hash = "sha256-ybVGyN/pcWHfXVD1U4GCp0FTYmy8NoBbB4FSjvM7xZU="; }; @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/gnome-sudoku"; - changelog = "https://gitlab.gnome.org/GNOME/gnome-sudoku/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/gnome-sudoku/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Test your logic skills in this number grid puzzle"; mainProgram = "gnome-sudoku"; teams = [ lib.teams.gnome ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-taquin/package.nix b/pkgs/by-name/gn/gnome-taquin/package.nix index 3e4d5e1441eb..ff0b235708bc 100644 --- a/pkgs/by-name/gn/gnome-taquin/package.nix +++ b/pkgs/by-name/gn/gnome-taquin/package.nix @@ -20,12 +20,12 @@ desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-taquin"; version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/gnome-taquin-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor finalAttrs.version}/gnome-taquin-${finalAttrs.version}.tar.xz"; hash = "sha256-lts9j61JeSSnOQrRCKPvckMqHWLSRWyuXhk0BXAYgU8="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gn/gnome-tetravex/package.nix b/pkgs/by-name/gn/gnome-tetravex/package.nix index 541f1dfaf3a5..4051410a3286 100644 --- a/pkgs/by-name/gn/gnome-tetravex/package.nix +++ b/pkgs/by-name/gn/gnome-tetravex/package.nix @@ -17,12 +17,12 @@ desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-tetravex"; version = "3.38.3"; src = fetchurl { - url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/gnome-tetravex-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor finalAttrs.version}/gnome-tetravex-${finalAttrs.version}.tar.xz"; hash = "sha256-g4SawGTUVuHdRrbiAcaGFSYkw9HsS5mTWYWkmqeRcss="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gn/gnu-cim/package.nix b/pkgs/by-name/gn/gnu-cim/package.nix index fe2339f27a1a..a2b81433c18f 100644 --- a/pkgs/by-name/gn/gnu-cim/package.nix +++ b/pkgs/by-name/gn/gnu-cim/package.nix @@ -4,7 +4,7 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnu-cim"; version = "5.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnu/cim/cim-${version}.tar.gz"; + url = "mirror://gnu/cim/cim-${finalAttrs.version}.tar.gz"; hash = "sha256-uQcXtm7EAFA73WnlN+i38+ip0QbDupoIoErlc2mgaak="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { badPlatforms = [ "aarch64-darwin" ]; maintainers = with lib.maintainers; [ pbsds ]; }; -} +}) diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix index b6eb0085202d..3b8be6079788 100644 --- a/pkgs/by-name/gn/gnu-shepherd/package.nix +++ b/pkgs/by-name/gn/gnu-shepherd/package.nix @@ -7,12 +7,12 @@ guile-fibers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnu-shepherd"; version = "1.0.9"; src = fetchurl { - url = "mirror://gnu/shepherd/shepherd-${version}.tar.gz"; + url = "mirror://gnu/shepherd/shepherd-${finalAttrs.version}.tar.gz"; hash = "sha256-5IjFhchBjfbo9HbcqBtykQ8zfJzTYI+0Z95SYABAANY="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ kloenk ]; }; -} +}) diff --git a/pkgs/by-name/gn/gnuapl/package.nix b/pkgs/by-name/gn/gnuapl/package.nix index bd37e1397418..c20c30510bdf 100644 --- a/pkgs/by-name/gn/gnuapl/package.nix +++ b/pkgs/by-name/gn/gnuapl/package.nix @@ -7,12 +7,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnu-apl"; version = "1.9"; src = fetchurl { - url = "mirror://gnu/apl/apl-${version}.tar.gz"; + url = "mirror://gnu/apl/apl-${finalAttrs.version}.tar.gz"; sha256 = "sha256-KRhn8bGTdpOrtXvn2aN2GLA3bj4nCVdIVKe75Suyjrg="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { Jürgen Sauermann. ''; }; -} +}) diff --git a/pkgs/by-name/gn/gnuastro/package.nix b/pkgs/by-name/gn/gnuastro/package.nix index 824deb4449a0..b36d019aaa13 100644 --- a/pkgs/by-name/gn/gnuastro/package.nix +++ b/pkgs/by-name/gn/gnuastro/package.nix @@ -14,12 +14,12 @@ wcslib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnuastro"; version = "0.24"; src = fetchurl { - url = "mirror://gnu/gnuastro/gnuastro-${version}.tar.gz"; + url = "mirror://gnu/gnuastro/gnuastro-${finalAttrs.version}.tar.gz"; hash = "sha256-xOZAHu5dgWGbgtjRimRHhRs24HVBGOv1vfrHoDGU+YE="; }; @@ -44,9 +44,9 @@ stdenv.mkDerivation rec { meta = { description = "GNU astronomy utilities and library"; homepage = "https://www.gnu.org/software/gnuastro/"; - changelog = "https://git.savannah.gnu.org/cgit/gnuastro.git/plain/NEWS?id=gnuastro_v${version}"; + changelog = "https://git.savannah.gnu.org/cgit/gnuastro.git/plain/NEWS?id=gnuastro_v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ sikmir ]; }; -} +}) diff --git a/pkgs/by-name/gn/gnuchess/package.nix b/pkgs/by-name/gn/gnuchess/package.nix index a300854e78f4..361adf6fc113 100644 --- a/pkgs/by-name/gn/gnuchess/package.nix +++ b/pkgs/by-name/gn/gnuchess/package.nix @@ -6,12 +6,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnuchess"; version = "6.3.0"; src = fetchurl { - url = "mirror://gnu/chess/gnuchess-${version}.tar.gz"; + url = "mirror://gnu/chess/gnuchess-${finalAttrs.version}.tar.gz"; sha256 = "sha256-Cze+wgmMKtaVt0Q+XXlE3G3IKE+NAfzDC9uU3QM8ojo="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/gn/gnugo/package.nix b/pkgs/by-name/gn/gnugo/package.nix index b6c994ec4613..34e9254413ef 100644 --- a/pkgs/by-name/gn/gnugo/package.nix +++ b/pkgs/by-name/gn/gnugo/package.nix @@ -5,12 +5,12 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnugo"; version = "3.8"; src = fetchurl { - url = "mirror://gnu/gnugo/gnugo-${version}.tar.gz"; + url = "mirror://gnu/gnugo/gnugo-${finalAttrs.version}.tar.gz"; sha256 = "0wkahvqpzq6lzl5r49a4sd4p52frdmphnqsfdv7gdp24bykdfs6s"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gn/gnumake42/package.nix b/pkgs/by-name/gn/gnumake42/package.nix index 05499df0fa9c..32d8a5cce7d7 100644 --- a/pkgs/by-name/gn/gnumake42/package.nix +++ b/pkgs/by-name/gn/gnumake42/package.nix @@ -9,12 +9,12 @@ assert guileSupport -> (pkg-config != null && guile != null); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnumake"; version = "4.2.1"; src = fetchurl { - url = "mirror://gnu/make/make-${version}.tar.bz2"; + url = "mirror://gnu/make/make-${finalAttrs.version}.tar.bz2"; sha256 = "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { mainProgram = "make"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/gn/gnunet-gtk/package.nix b/pkgs/by-name/gn/gnunet-gtk/package.nix index a174a7b7ee44..75b61bb055e3 100644 --- a/pkgs/by-name/gn/gnunet-gtk/package.nix +++ b/pkgs/by-name/gn/gnunet-gtk/package.nix @@ -51,5 +51,7 @@ stdenv.mkDerivation (finalAttrs: { meta = gnunet.meta // { description = "GNUnet GTK User Interface"; homepage = "https://git.gnunet.org/gnunet-gtk.git"; + # https://www.gnunet.org/en/news/2025-09-0.25.0.html + broken = true; }; }) diff --git a/pkgs/by-name/gn/gnunet/package.nix b/pkgs/by-name/gn/gnunet/package.nix index b9e3204ca23a..b447e54faf7b 100644 --- a/pkgs/by-name/gn/gnunet/package.nix +++ b/pkgs/by-name/gn/gnunet/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnunet"; - version = "0.25.2"; + version = "0.26.2"; src = fetchurl { url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz"; - hash = "sha256-6rdvw105OrFfrbY0T4Q1JcFlYZQAc1qm3eCWb2omwuY="; + hash = "sha256-d7fjcM2EA39XktgSU2vFoQNUCeajSqBo0Iyegb6Ak4k="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix b/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix index 2c1243aef61e..1775a87e33c8 100644 --- a/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix +++ b/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix @@ -10,12 +10,12 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnupg-pkcs11-scd"; version = "0.11.0"; src = fetchurl { - url = "https://github.com/alonbl/gnupg-pkcs11-scd/releases/download/gnupg-pkcs11-scd-${version}/gnupg-pkcs11-scd-${version}.tar.bz2"; + url = "https://github.com/alonbl/gnupg-pkcs11-scd/releases/download/gnupg-pkcs11-scd-${finalAttrs.version}/gnupg-pkcs11-scd-${finalAttrs.version}.tar.bz2"; hash = "sha256-lUeH5WLys9kpQhLDLdDYGizTesolDmaFAC0ok7uVkIc="; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; meta = { - changelog = "https://github.com/alonbl/gnupg-pkcs11-scd/blob/gnupg-pkcs11-scd-${version}/ChangeLog"; + changelog = "https://github.com/alonbl/gnupg-pkcs11-scd/blob/gnupg-pkcs11-scd-${finalAttrs.version}/ChangeLog"; description = "Smart-card daemon to enable the use of PKCS#11 tokens with GnuPG"; mainProgram = "gnupg-pkcs11-scd"; longDescription = '' @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gn/gnupth/package.nix b/pkgs/by-name/gn/gnupth/package.nix index 97ef0550aa60..e30d536ef6df 100644 --- a/pkgs/by-name/gn/gnupth/package.nix +++ b/pkgs/by-name/gn/gnupth/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pth"; version = "2.0.7"; src = fetchurl { - url = "mirror://gnu/pth/pth-${version}.tar.gz"; + url = "mirror://gnu/pth/pth-${finalAttrs.version}.tar.gz"; sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/go/goaccess/package.nix b/pkgs/by-name/go/goaccess/package.nix index 1a242c9ec589..7cafe38a3ee5 100644 --- a/pkgs/by-name/go/goaccess/package.nix +++ b/pkgs/by-name/go/goaccess/package.nix @@ -10,14 +10,14 @@ withGeolocation ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "goaccess"; version = "1.9.4"; src = fetchFromGitHub { owner = "allinurl"; repo = "goaccess"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KevxuZuIrMybNlPZgVDLO0zQe4LfAKxfVBbHnyTUC/o="; }; @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { meta = { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; homepage = "https://goaccess.io"; - changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog"; + changelog = "https://github.com/allinurl/goaccess/raw/v${finalAttrs.version}/ChangeLog"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ederoyd46 ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "goaccess"; }; -} +}) diff --git a/pkgs/by-name/go/gobby/package.nix b/pkgs/by-name/go/gobby/package.nix index a9327bceb535..d97acf362679 100644 --- a/pkgs/by-name/go/gobby/package.nix +++ b/pkgs/by-name/go/gobby/package.nix @@ -23,14 +23,14 @@ let inherit avahiSupport; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gobby"; version = "0.6.0"; src = fetchFromGitHub { owner = "gobby"; repo = "gobby"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "06cbc2y4xkw89jaa0ayhgh7fxr5p2nv3jjs8h2xcbbbgwaw08lk0"; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/go/gocr/package.nix b/pkgs/by-name/go/gocr/package.nix index 5f808d3ae670..a8894378d645 100644 --- a/pkgs/by-name/go/gocr/package.nix +++ b/pkgs/by-name/go/gocr/package.nix @@ -5,12 +5,12 @@ tk, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gocr"; version = "0.52"; src = fetchurl { - url = "https://www-e.uni-magdeburg.de/jschulen/ocr/gocr-${version}.tar.gz"; + url = "https://www-e.uni-magdeburg.de/jschulen/ocr/gocr-${finalAttrs.version}.tar.gz"; sha256 = "11l6gds1lrm8lwrrsxnm5fjlwz8q1xbh896cprrl4psz21in946z"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/go/gom/package.nix b/pkgs/by-name/go/gom/package.nix index 70699b6b92dc..84d8c641770e 100644 --- a/pkgs/by-name/go/gom/package.nix +++ b/pkgs/by-name/go/gom/package.nix @@ -13,7 +13,7 @@ gobject-introspection, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gom"; version = "0.5.5"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gom/${lib.versions.majorMinor version}/gom-${version}.tar.xz"; + url = "mirror://gnome/sources/gom/${lib.versions.majorMinor finalAttrs.version}/gom-${finalAttrs.version}.tar.xz"; sha256 = "rWHwWvIxenqxdx/PqBaYn7ujsYlX0uC13t6e9F8JtTQ="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.gnome ]; }; -} +}) diff --git a/pkgs/by-name/go/goocanvas_2/package.nix b/pkgs/by-name/go/goocanvas_2/package.nix index ab1137530cee..eb479b581b53 100644 --- a/pkgs/by-name/go/goocanvas_2/package.nix +++ b/pkgs/by-name/go/goocanvas_2/package.nix @@ -14,7 +14,7 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "goocanvas"; version = "2.0.4"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/goocanvas/2.0/goocanvas-${version}.tar.xz"; + url = "mirror://gnome/sources/goocanvas/2.0/goocanvas-${finalAttrs.version}.tar.xz"; sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; }; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - attrPath = "goocanvas${lib.versions.major version}"; + attrPath = "goocanvas${lib.versions.major finalAttrs.version}"; packageName = "goocanvas"; versionPolicy = "odd-unstable"; freeze = true; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/go/goodvibes/package.nix b/pkgs/by-name/go/goodvibes/package.nix index b30f0205b847..a1413acae3e5 100644 --- a/pkgs/by-name/go/goodvibes/package.nix +++ b/pkgs/by-name/go/goodvibes/package.nix @@ -16,14 +16,14 @@ desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "goodvibes"; version = "0.8.3"; src = fetchFromGitLab { owner = "goodvibes"; repo = "goodvibes"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Lh4FPH0Bdxg2J4IxsZPs8Zjc7Tcobb4bTpvJzVNIy0Y="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ zendo ]; }; -} +}) diff --git a/pkgs/by-name/go/google-app-engine-go-sdk/package.nix b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix index a1fe19852d99..6cea608e8941 100644 --- a/pkgs/by-name/go/google-app-engine-go-sdk/package.nix +++ b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix @@ -8,18 +8,18 @@ with python3Packages; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "google-app-engine-go-sdk"; version = "1.9.61"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { - url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_amd64-${version}.zip"; + url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_amd64-${finalAttrs.version}.zip"; sha256 = "1i2j9ympl1218akwsmm7yb31v0gibgpzlb657bcravi1irfv1hhs"; } else fetchzip { - url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_darwin_amd64-${version}.zip"; + url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_darwin_amd64-${finalAttrs.version}.zip"; sha256 = "0s8sqyc72lnc7dxd4cl559gyfx83x71jjpsld3i3nbp3mwwamczp"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Google App Engine SDK for Go"; - version = version; + version = finalAttrs.version; homepage = "https://cloud.google.com/appengine/docs/go/"; sourceProvenance = with lib.sourceTypes; [ fromSource @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ lufia ]; }; -} +}) diff --git a/pkgs/by-name/go/google-authenticator/package.nix b/pkgs/by-name/go/google-authenticator/package.nix index 8075dcccb8b6..e135ac97e402 100644 --- a/pkgs/by-name/go/google-authenticator/package.nix +++ b/pkgs/by-name/go/google-authenticator/package.nix @@ -7,14 +7,14 @@ qrencode, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "google-authenticator-libpam"; version = "1.11"; src = fetchFromGitHub { owner = "google"; repo = "google-authenticator-libpam"; - rev = version; + rev = finalAttrs.version; hash = "sha256-cLMX5SdKvyQr3annc/Hhhz6XgY+BypRHASKRh6xTdmo="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ aneeshusa ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/go/google-guest-configs/package.nix b/pkgs/by-name/go/google-guest-configs/package.nix index 0783cdcd4881..f3aae8205d1c 100644 --- a/pkgs/by-name/go/google-guest-configs/package.nix +++ b/pkgs/by-name/go/google-guest-configs/package.nix @@ -14,14 +14,14 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "google-guest-configs"; version = "20211116.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-configs"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-0SRu6p/DsHNNI20mkXJitt/Ee5S2ooiy5hNmD+ndecM="; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/go/google-guest-oslogin/package.nix b/pkgs/by-name/go/google-guest-oslogin/package.nix index 1f3d2d697c1f..b2b9d1c9009b 100644 --- a/pkgs/by-name/go/google-guest-oslogin/package.nix +++ b/pkgs/by-name/go/google-guest-oslogin/package.nix @@ -8,14 +8,14 @@ pam, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "google-guest-oslogin"; version = "20250821.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-oslogin"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-dvLr3rOzHs5gRbllxqmnkLlHUFYv9Hm2vz6AkwZoZy4="; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString [ "-I${json_c.dev}/include/json-c" ]; makeFlags = [ - "VERSION=${version}" + "VERSION=${finalAttrs.version}" "PREFIX=$(out)" "MANDIR=$(out)/share/man" "SYSTEMDDIR=$(out)/etc/systemd/system" @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/go/google-lighthouse/package.nix b/pkgs/by-name/go/google-lighthouse/package.nix index 3cb82ea5048b..5547481f9f09 100644 --- a/pkgs/by-name/go/google-lighthouse/package.nix +++ b/pkgs/by-name/go/google-lighthouse/package.nix @@ -10,19 +10,19 @@ nodejs, makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "google-lighthouse"; version = "12.8.2"; src = fetchFromGitHub { owner = "GoogleChrome"; repo = "lighthouse"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pluMFOyW352tEWjz28jhI4AZcKDB5jhoWIzTWyLxwGY="; }; yarnOfflineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-yQT2JUsu/3ttJU8zUdtlhzUscepISNUr3wlxKHLaz3I="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { mainProgram = "lighthouse"; maintainers = with lib.maintainers; [ theCapypara ]; }; -} +}) diff --git a/pkgs/by-name/go/googlesans-code/package.nix b/pkgs/by-name/go/googlesans-code/package.nix index d57ff08f2d2a..ab563051321a 100644 --- a/pkgs/by-name/go/googlesans-code/package.nix +++ b/pkgs/by-name/go/googlesans-code/package.nix @@ -5,14 +5,14 @@ fontc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "googlesans-code"; version = "6.001"; src = fetchFromGitHub { owner = "googlefonts"; repo = "googlesans-code"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ScFx+uty9x+VTWxw7NJm3M7AYr0C00bdSnJJmFW3Jy0="; }; @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { meta = { description = "Google Sans Code font family"; homepage = "https://github.com/googlefonts/googlesans-code"; - changelog = "https://github.com/googlefonts/googlesans-code/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/googlefonts/googlesans-code/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.ofl; maintainers = with lib.maintainers; [ shiphan ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index ba4625382139..527cf0124410 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -1,20 +1,21 @@ { lib, fetchFromGitHub, - flutter332, + flutter338, autoPatchelfHook, buildGoModule, + keybinder3, libayatana-appindicator, }: let - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "GopeedLab"; repo = "gopeed"; tag = "v${version}"; - hash = "sha256-ze0hoTR3e3Wrgtv2FlM81faXmij61NEcPLzO4WDXIak="; + hash = "sha256-kLWhAQfzqZ9/THYeU/W4YOJYfMnqoTbyobC2P9YYddI="; }; metaCommon = { @@ -29,14 +30,7 @@ let inherit version src; pname = "libgopeed"; - vendorHash = "sha256-rIj4T+NEqWla6/+ofosTwagL4/VMovDp1NEYMuzbOrQ="; - - # Fix C23 compat - preBuild = '' - chmod +w vendor/github.com/anacrolix/go-libutp/utp_types.h - substituteInPlace vendor/github.com/anacrolix/go-libutp/utp_types.h \ - --replace-fail "typedef uint8 bool;" "" - ''; + vendorHash = "sha256-XTVFqKn0JeOC/QFns0GhIYqu1FB+eFg6bgIi4G7Lw1o="; buildPhase = '' runHook preBuild @@ -51,7 +45,7 @@ let meta = metaCommon; }; in -flutter332.buildFlutterApplication { +flutter338.buildFlutterApplication { inherit version src; pname = "gopeed"; @@ -63,7 +57,10 @@ flutter332.buildFlutterApplication { nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ libayatana-appindicator ]; + buildInputs = [ + keybinder3 + libayatana-appindicator + ]; preBuild = '' mkdir -p linux/bundle/lib diff --git a/pkgs/by-name/go/gopeed/pubspec.lock.json b/pkgs/by-name/go/gopeed/pubspec.lock.json index c737f6ecfe51..690da75ee6d7 100644 --- a/pkgs/by-name/go/gopeed/pubspec.lock.json +++ b/pkgs/by-name/go/gopeed/pubspec.lock.json @@ -4,17 +4,11 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", "url": "https://pub.dev" }, "source": "hosted", - "version": "72.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.3.2" + "version": "67.0.0" }, "after_layout": { "dependency": "transitive", @@ -30,11 +24,11 @@ "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.7.0" + "version": "6.4.1" }, "animations": { "dependency": "transitive", @@ -220,11 +214,11 @@ "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "checkable_treeview": { "dependency": "direct main", @@ -260,11 +254,11 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "code_builder": { "dependency": "transitive", @@ -280,11 +274,11 @@ "dependency": "transitive", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.1" }, "contentsize_tabbarview": { "dependency": "direct main", @@ -370,11 +364,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.7" + "version": "2.3.6" }, "desktop_drop": { "dependency": "direct main", @@ -440,11 +434,11 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.3" }, "ffi": { "dependency": "transitive", @@ -526,11 +520,11 @@ "dependency": "direct main", "description": { "name": "flutter_form_builder", - "sha256": "c278ef69b08957d484f83413f0e77b656a39b7a7bb4eb8a295da3a820ecc6545", + "sha256": "ec74389c4af2361a5e9fe9a36fcfe722698be3f681d713cb3ebe099ae15ed863", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.5.0" + "version": "10.2.0" }, "flutter_launcher_icons": { "dependency": "direct dev", @@ -594,11 +588,11 @@ "dependency": "direct main", "description": { "name": "form_builder_validators", - "sha256": "c61ed7b1deecf0e1ebe49e2fa79e3283937c5a21c7e48e3ed9856a4a14e1191a", + "sha256": "1b03c74d1db740890e6af803b43e5ebe56f8fa1ff5609cbf744e8d980dc5f8c6", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.0.0" + "version": "11.2.0" }, "frontend_server_client": { "dependency": "transitive", @@ -660,6 +654,56 @@ "source": "hosted", "version": "2.2.3" }, + "hotkey_manager": { + "dependency": "direct main", + "description": { + "name": "hotkey_manager", + "sha256": "06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.3" + }, + "hotkey_manager_linux": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager_linux", + "sha256": "83676bda8210a3377bc6f1977f193bc1dbdd4c46f1bdd02875f44b6eff9a8473", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "hotkey_manager_macos": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager_macos", + "sha256": "03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "hotkey_manager_platform_interface": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager_platform_interface", + "sha256": "98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "hotkey_manager_windows": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager_windows", + "sha256": "0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "http": { "dependency": "transitive", "description": { @@ -715,11 +759,11 @@ "dependency": "transitive", "description": { "name": "intl", - "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.19.0" + "version": "0.20.2" }, "io": { "dependency": "transitive", @@ -775,31 +819,31 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.5" + "version": "11.0.2" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.10" }, "leak_tracker_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_testing", - "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "lecle_downloads_path_provider": { "dependency": "direct main", @@ -851,25 +895,15 @@ "source": "hosted", "version": "1.3.0" }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.2-main.4" - }, "matcher": { "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -905,11 +939,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.17.0" }, "mime": { "dependency": "transitive", @@ -975,11 +1009,11 @@ "dependency": "direct main", "description": { "name": "open_filex", - "sha256": "ba425ea49affd0a98a234aa9344b9ea5d4c4f7625a1377961eae9fe194c3d523", + "sha256": "9976da61b6a72302cf3b1efbce259200cd40232643a467aac7370addf94d6900", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.0" + "version": "4.7.0" }, "package_config": { "dependency": "transitive", @@ -1015,11 +1049,11 @@ "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_parsing": { "dependency": "transitive", @@ -1336,21 +1370,21 @@ "dependency": "transitive", "description": { "name": "shared_preferences", - "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.5.3" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab", + "sha256": "9f9f3d372d4304723e6136663bb291c0b93f5e4c8a4a6314347f481a33bda2b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.4.7" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -1436,7 +1470,7 @@ "dependency": "transitive", "description": "flutter", "source": "sdk", - "version": "0.0.99" + "version": "0.0.0" }, "source_gen": { "dependency": "transitive", @@ -1482,21 +1516,21 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.1" }, "stream_channel": { "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "transitive", @@ -1542,11 +1576,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.7" }, "timing": { "dependency": "transitive", @@ -1589,6 +1623,16 @@ "source": "hosted", "version": "1.4.0" }, + "uni_platform": { + "dependency": "transitive", + "description": { + "name": "uni_platform", + "sha256": "e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, "uri_to_file": { "dependency": "direct main", "description": { @@ -1723,11 +1767,11 @@ "dependency": "transitive", "description": { "name": "vector_math", - "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.2.0" }, "vm_service": { "dependency": "transitive", @@ -1851,7 +1895,7 @@ } }, "sdks": { - "dart": ">=3.5.0 <4.0.0", - "flutter": ">=3.24.0" + "dart": ">=3.9.0 <4.0.0", + "flutter": ">=3.35.0" } } diff --git a/pkgs/by-name/go/gopher/package.nix b/pkgs/by-name/go/gopher/package.nix index 78fafa6214e5..68fd58df74d5 100644 --- a/pkgs/by-name/go/gopher/package.nix +++ b/pkgs/by-name/go/gopher/package.nix @@ -5,14 +5,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gopher"; version = "3.0.19"; src = fetchFromGitHub { owner = "jgoerzen"; repo = "gopher"; - rev = "release/${version}"; + rev = "release/${finalAttrs.version}"; sha256 = "sha256-8J63TnC3Yq7+64PPLrlPEueMa9D/eWkPsb08t1+rPAA="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ sternenseemann ]; }; -} +}) diff --git a/pkgs/by-name/go/gopro/package.nix b/pkgs/by-name/go/gopro/package.nix index 66cc4c51e0a2..989d10184e87 100644 --- a/pkgs/by-name/go/gopro/package.nix +++ b/pkgs/by-name/go/gopro/package.nix @@ -8,14 +8,14 @@ mplayer, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gopro"; version = "1.0"; src = fetchFromGitHub { owner = "KonradIT"; repo = "gopro-linux"; - rev = version; + rev = finalAttrs.version; sha256 = "0sb9vpiadrq8g4ag828h8mvq01fg0306j0wjwkxdmwfqync1128l"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "gopro"; }; -} +}) diff --git a/pkgs/by-name/go/gorilla-bin/package.nix b/pkgs/by-name/go/gorilla-bin/package.nix index 14a6a5ed14f5..fb7a79e47675 100644 --- a/pkgs/by-name/go/gorilla-bin/package.nix +++ b/pkgs/by-name/go/gorilla-bin/package.nix @@ -13,7 +13,7 @@ libXext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gorilla-bin"; version = "1.5.3.7"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { unpackCmd = '' mkdir gorilla; - cp $curSrc gorilla/gorilla-${version}; + cp $curSrc gorilla/gorilla-${finalAttrs.version}; ''; installPhase = @@ -49,10 +49,10 @@ stdenv.mkDerivation rec { '' mkdir -p $out/opt/password-gorilla mkdir -p $out/bin - cp gorilla-${version} $out/opt/password-gorilla - chmod ugo+x $out/opt/password-gorilla/gorilla-${version} - patchelf --set-interpreter "${interpreter}" "$out/opt/password-gorilla/gorilla-${version}" - makeWrapper "$out/opt/password-gorilla/gorilla-${version}" "$out/bin/gorilla" \ + cp gorilla-${finalAttrs.version} $out/opt/password-gorilla + chmod ugo+x $out/opt/password-gorilla/gorilla-${finalAttrs.version} + patchelf --set-interpreter "${interpreter}" "$out/opt/password-gorilla/gorilla-${finalAttrs.version}" + makeWrapper "$out/opt/password-gorilla/gorilla-${finalAttrs.version}" "$out/bin/gorilla" \ --prefix LD_LIBRARY_PATH : "${libPath}" ''; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/go/gosmore/package.nix b/pkgs/by-name/go/gosmore/package.nix index 0073450267cd..57c9158f9eff 100644 --- a/pkgs/by-name/go/gosmore/package.nix +++ b/pkgs/by-name/go/gosmore/package.nix @@ -8,7 +8,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gosmore"; version = "0-unstable-2014-03-17"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hash = "sha256-MfuJVsyGWspGNAFD6Ktbbyawb4bPwUITe7WkyFs6JxI="; }; - sourceRoot = "${src.name}/applications/rendering/gosmore"; + sourceRoot = "${finalAttrs.src.name}/applications/rendering/gosmore"; buildInputs = [ libxml2 @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/by-name/gp/gpa/package.nix b/pkgs/by-name/gp/gpa/package.nix index 29ec915516d2..d0b5621401d9 100644 --- a/pkgs/by-name/gp/gpa/package.nix +++ b/pkgs/by-name/gp/gpa/package.nix @@ -11,12 +11,12 @@ libassuan, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpa"; version = "0.11.0"; src = fetchurl { - url = "mirror://gnupg/gpa/gpa-${version}.tar.bz2"; + url = "mirror://gnupg/gpa/gpa-${finalAttrs.version}.tar.bz2"; hash = "sha256-Jqj6W/cFQct0Hwxxt8/ikbHqVuq2jusHqpYs71zfM8w="; }; @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; meta = { - changelog = "https://dev.gnupg.org/source/gpa/browse/master/NEWS;gpa-${version}?view=raw"; + changelog = "https://dev.gnupg.org/source/gpa/browse/master/NEWS;gpa-${finalAttrs.version}?view=raw"; description = "Graphical user interface for the GnuPG"; homepage = "https://www.gnupg.org/related_software/gpa/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; mainProgram = "gpa"; }; -} +}) diff --git a/pkgs/by-name/gp/gpick/package.nix b/pkgs/by-name/gp/gpick/package.nix index 4e026df59d28..967aae905238 100644 --- a/pkgs/by-name/gp/gpick/package.nix +++ b/pkgs/by-name/gp/gpick/package.nix @@ -11,14 +11,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpick"; version = "0.3"; src = fetchFromGitHub { owner = "thezbyg"; repo = "gpick"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Z17YpdAAr2wvDFkrAosyCN6Y/wsFVkiB9IDvXuP9lYo="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "gpick"; }; -} +}) diff --git a/pkgs/by-name/gp/gpsbabel/package.nix b/pkgs/by-name/gp/gpsbabel/package.nix index 2e951060c0ae..e2695b1a155f 100644 --- a/pkgs/by-name/gp/gpsbabel/package.nix +++ b/pkgs/by-name/gp/gpsbabel/package.nix @@ -21,14 +21,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpsbabel"; version = "1.8.0"; src = fetchFromGitHub { owner = "gpsbabel"; repo = "gpsbabel"; - rev = "gpsbabel_${lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "gpsbabel_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; sha256 = "sha256-0w8LsO+HwqZF8SQmwd8bCKma9PCM0hAzXhzWR4DgAHs="; }; @@ -171,4 +171,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sikmir ]; mainProgram = "gpsbabel"; }; -} +}) diff --git a/pkgs/by-name/gp/gpsprune/package.nix b/pkgs/by-name/gp/gpsprune/package.nix index 8bb7875ebc29..346fc57e2304 100644 --- a/pkgs/by-name/gp/gpsprune/package.nix +++ b/pkgs/by-name/gp/gpsprune/package.nix @@ -9,12 +9,12 @@ copyDesktopItems, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpsprune"; version = "25"; src = fetchurl { - url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; + url = "https://activityworkshop.net/software/gpsprune/gpsprune_${finalAttrs.version}.jar"; hash = "sha256-8FGOigjHIvj+CZwq0Lht7UZjtmrE5l2Aqx92gZjau44="; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { icon = "gpsprune"; desktopName = "GpsPrune"; genericName = "GPS Data Editor"; - comment = meta.description; + comment = finalAttrs.meta.description; categories = [ "Education" "Geoscience" @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 ${src} $out/share/java/gpsprune.jar + install -Dm644 ${finalAttrs.src} $out/share/java/gpsprune.jar makeWrapper ${jre}/bin/java $out/bin/gpsprune \ --add-flags "-jar $out/share/java/gpsprune.jar" mkdir -p $out/share/pixmaps @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "gpsprune"; }; -} +}) diff --git a/pkgs/by-name/gp/gpuvis/package.nix b/pkgs/by-name/gp/gpuvis/package.nix index 8de03907efd1..802627e8eb6a 100644 --- a/pkgs/by-name/gp/gpuvis/package.nix +++ b/pkgs/by-name/gp/gpuvis/package.nix @@ -11,14 +11,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpuvis"; version = "0.1"; src = fetchFromGitHub { owner = "mikesart"; repo = "gpuvis"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-a9eAYDsiwyzZc4FAPo0wANysisIT4qCHLh2PrYswJtw="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ emantor ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gp/gpx/package.nix b/pkgs/by-name/gp/gpx/package.nix index bc1113b99b20..a3d0aa085014 100644 --- a/pkgs/by-name/gp/gpx/package.nix +++ b/pkgs/by-name/gp/gpx/package.nix @@ -5,7 +5,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpx"; version = "2.6.8"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "markwal"; repo = "GPX"; - rev = version; + rev = finalAttrs.version; sha256 = "1izs8s5npkbfrsyk17429hyl1vyrbj9dp6vmdlbb2vh6mfgl54h8"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.leo60228 ]; }; -} +}) diff --git a/pkgs/by-name/gp/gpxlab/package.nix b/pkgs/by-name/gp/gpxlab/package.nix index 9bb2bf0c2fe8..db43c9bd27cf 100644 --- a/pkgs/by-name/gp/gpxlab/package.nix +++ b/pkgs/by-name/gp/gpxlab/package.nix @@ -5,14 +5,14 @@ qt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpxlab"; version = "0.7.0"; src = fetchFromGitHub { owner = "BourgeoisLab"; repo = "GPXLab"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sikmir ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gr/grandorgue/package.nix b/pkgs/by-name/gr/grandorgue/package.nix index 24e22cf5ee42..f599a2f592fa 100644 --- a/pkgs/by-name/gr/grandorgue/package.nix +++ b/pkgs/by-name/gr/grandorgue/package.nix @@ -20,14 +20,14 @@ includeDemo ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "grandorgue"; version = "3.16.3-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = "grandorgue"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-A6Gc9kCtohz1nWj/fmYsyXM0X3uJxEmDK2N2Dr5CW1U="; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.puzzlewolf ]; mainProgram = "GrandOrgue"; }; -} +}) diff --git a/pkgs/by-name/gr/graphite-cursors/package.nix b/pkgs/by-name/gr/graphite-cursors/package.nix index 0b8f4c78671d..2e7cd0e8aa15 100644 --- a/pkgs/by-name/gr/graphite-cursors/package.nix +++ b/pkgs/by-name/gr/graphite-cursors/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "graphite-cursors"; version = "2021-11-26"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "graphite-cursors"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-Kopl2NweYrq9rhw+0EUMhY/pfGo4g387927TZAhI5/A="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ oluceps ]; }; -} +}) diff --git a/pkgs/by-name/gr/graphwar/package.nix b/pkgs/by-name/gr/graphwar/package.nix index d76d75097412..1522c5428e22 100644 --- a/pkgs/by-name/gr/graphwar/package.nix +++ b/pkgs/by-name/gr/graphwar/package.nix @@ -8,14 +8,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "graphwar"; version = "1.0.0"; src = fetchFromGitHub { owner = "catabriga"; repo = "graphwar"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-t3Y576dXWp2Mj6OSQN5cm9FuNBWNqKq6xxkVRbjIBgE="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { platforms = jdk.meta.platforms; maintainers = with lib.maintainers; [ yrd ]; }; -} +}) diff --git a/pkgs/by-name/gr/gravit/package.nix b/pkgs/by-name/gr/gravit/package.nix index 6701a6f18b63..b763b0e74dc5 100644 --- a/pkgs/by-name/gr/gravit/package.nix +++ b/pkgs/by-name/gr/gravit/package.nix @@ -17,14 +17,14 @@ mesa, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gravit"; version = "0.5.1"; src = fetchFromGitHub { owner = "gak"; repo = "gravit"; - rev = version; + rev = finalAttrs.version; hash = "sha256-JuqnLLD5+Ec8kQI0SK98V1O6TTbGM6+yKn5KCHe85eM="; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { inherit (mesa.meta) platforms; hydraPlatforms = lib.platforms.linux; # darwin times out }; -} +}) diff --git a/pkgs/by-name/gr/grc/package.nix b/pkgs/by-name/gr/grc/package.nix index 3483916652e1..a7ec70c0b522 100644 --- a/pkgs/by-name/gr/grc/package.nix +++ b/pkgs/by-name/gr/grc/package.nix @@ -39,6 +39,11 @@ python3Packages.buildPythonApplication rec { runHook postInstall ''; + outputs = [ + "out" + "man" + ]; + meta = { homepage = "http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"; description = "Generic text colouriser"; diff --git a/pkgs/by-name/gr/greenx/package.nix b/pkgs/by-name/gr/greenx/package.nix index 5bb8e0665cf2..c08356a17058 100644 --- a/pkgs/by-name/gr/greenx/package.nix +++ b/pkgs/by-name/gr/greenx/package.nix @@ -9,14 +9,14 @@ lapack, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "greenx"; version = "2.2"; src = fetchFromGitHub { owner = "nomad-coe"; repo = "greenx"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-otIs2Y79KoEL4ut8YQe7Y27LpmpId8h/X8B6GIg8l+E="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/gr/gremlin-console/package.nix b/pkgs/by-name/gr/gremlin-console/package.nix index 3d0bbba23971..ebd228e80b3a 100644 --- a/pkgs/by-name/gr/gremlin-console/package.nix +++ b/pkgs/by-name/gr/gremlin-console/package.nix @@ -8,11 +8,11 @@ let openjdk = openjdk11; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gremlin-console"; version = "3.8.0"; src = fetchzip { - url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; + url = "https://downloads.apache.org/tinkerpop/${finalAttrs.version}/apache-tinkerpop-gremlin-console-${finalAttrs.version}-bin.zip"; sha256 = "sha256-vTv2a3+Ezd87ph4BnRaypPuUz0/s8DFcHVsKaURucTY="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "gremlin-console"; }; -} +}) diff --git a/pkgs/by-name/gr/gremlin-server/package.nix b/pkgs/by-name/gr/gremlin-server/package.nix index 9c310fbe97f7..8e7adfee898e 100644 --- a/pkgs/by-name/gr/gremlin-server/package.nix +++ b/pkgs/by-name/gr/gremlin-server/package.nix @@ -8,11 +8,11 @@ let openjdk = openjdk11; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gremlin-server"; version = "3.7.0"; src = fetchzip { - url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-server-${version}-bin.zip"; + url = "https://downloads.apache.org/tinkerpop/${finalAttrs.version}/apache-tinkerpop-gremlin-server-${finalAttrs.version}-bin.zip"; sha256 = "sha256-cS7R7Raz5tkrr5DNeW7jbEYDee2OgE4htTXJRnqXlqI="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "gremlin-server"; }; -} +}) diff --git a/pkgs/by-name/gr/greybird/package.nix b/pkgs/by-name/gr/greybird/package.nix index 48cfff2fcedc..29bd35504195 100644 --- a/pkgs/by-name/gr/greybird/package.nix +++ b/pkgs/by-name/gr/greybird/package.nix @@ -12,14 +12,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "greybird"; version = "3.23.4"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "greybird"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-De8y+LRQ26UKrUECLCcbCg7p9Z+aRssQ/7YzegAUPw4="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/gr/gridtracker/package.nix b/pkgs/by-name/gr/gridtracker/package.nix index 236b08be4224..33ba4e8d1034 100644 --- a/pkgs/by-name/gr/gridtracker/package.nix +++ b/pkgs/by-name/gr/gridtracker/package.nix @@ -7,14 +7,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gridtracker"; version = "1.24.0922"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-6WgP13JVOzYnYtCDH3qCQXT70X9j4yqlUb18FFf1aSY="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gr/grig/package.nix b/pkgs/by-name/gr/grig/package.nix index 0dbb126f4e3e..b1b250723845 100644 --- a/pkgs/by-name/gr/grig/package.nix +++ b/pkgs/by-name/gr/grig/package.nix @@ -9,14 +9,14 @@ hamlib_4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "grig"; version = "0.9.0"; src = fetchFromGitHub { owner = "fillods"; repo = "grig"; - rev = "GRIG-${lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "GRIG-${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; sha256 = "sha256-OgIgHW9NMW/xSSti3naIR8AQWUtNSv5bYdOcObStBlM="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { mafo ]; }; -} +}) diff --git a/pkgs/by-name/gr/grilo/package.nix b/pkgs/by-name/gr/grilo/package.nix index ac1129b46b67..50d28a609941 100644 --- a/pkgs/by-name/gr/grilo/package.nix +++ b/pkgs/by-name/gr/grilo/package.nix @@ -22,7 +22,7 @@ totem-pl-parser, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "grilo"; version = "0.3.19"; # if you change minor, also change ./setup-hook.sh @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; src = fetchurl { - url = "mirror://gnome/sources/grilo/${lib.versions.majorMinor version}/grilo-${version}.tar.xz"; + url = "mirror://gnome/sources/grilo/${lib.versions.majorMinor finalAttrs.version}/grilo-${finalAttrs.version}.tar.xz"; sha256 = "CGnIHRmrE5xmfXlWfBTdy2y1y/wBCNBMreKH6ylTZwY="; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gr/grip-search/package.nix b/pkgs/by-name/gr/grip-search/package.nix index e3878bb534f5..feae85beb34c 100644 --- a/pkgs/by-name/gr/grip-search/package.nix +++ b/pkgs/by-name/gr/grip-search/package.nix @@ -9,14 +9,14 @@ catch2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "grip-search"; version = "0.8"; src = fetchFromGitHub { owner = "sc0ty"; repo = "grip"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0bkqarylgzhis6fpj48qbifcd6a26cgnq8784hgnm707rq9kb0rx"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace src/general/config.h --replace-fail "CUSTOM-BUILD" "${version}" + substituteInPlace src/general/config.h --replace-fail "CUSTOM-BUILD" "${finalAttrs.version}" substituteInPlace CMakeLists.txt \ --replace-fail "cmake_minimum_required (VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/gr/grip/package.nix b/pkgs/by-name/gr/grip/package.nix index ffce916f7a0d..2d504a9b1d75 100644 --- a/pkgs/by-name/gr/grip/package.nix +++ b/pkgs/by-name/gr/grip/package.nix @@ -10,12 +10,12 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "grip"; version = "4.2.4"; src = fetchurl { - url = "mirror://sourceforge/grip/grip-${version}.tar.gz"; + url = "mirror://sourceforge/grip/grip-${finalAttrs.version}.tar.gz"; sha256 = "sha256-lXu0mLLfcX8K1EmoFH0vp2cHluyRwhTL0/bW5Ax36mI="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "grip"; }; -} +}) diff --git a/pkgs/by-name/gr/grive2/package.nix b/pkgs/by-name/gr/grive2/package.nix index 7cdf8925d8a0..8c2c7260d9e1 100644 --- a/pkgs/by-name/gr/grive2/package.nix +++ b/pkgs/by-name/gr/grive2/package.nix @@ -13,14 +13,14 @@ libiberty, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.5.3"; pname = "grive2"; src = fetchFromGitHub { owner = "vitalif"; repo = "grive2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-P6gitA5cXfNbNDy4ohRLyXj/5dUXkCkOdE/9rJPzNCg="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "grive"; }; -} +}) diff --git a/pkgs/by-name/gr/grml-zsh-config/package.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix index fc2ce3c691d0..3a5c04f1e085 100644 --- a/pkgs/by-name/gr/grml-zsh-config/package.nix +++ b/pkgs/by-name/gr/grml-zsh-config/package.nix @@ -5,14 +5,14 @@ asciidoctor, txt2tags, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "grml-zsh-config"; version = "0.19.26"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-WZ3eyX9ijsU221I4hEhWUtFmtBQ9jm1QvQZh20gcR/s="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { rvolosatovs ]; }; -} +}) diff --git a/pkgs/by-name/gr/groovy/package.nix b/pkgs/by-name/gr/groovy/package.nix index 62d88f3af0f9..2f898a97000f 100644 --- a/pkgs/by-name/gr/groovy/package.nix +++ b/pkgs/by-name/gr/groovy/package.nix @@ -13,12 +13,12 @@ # at runtime, need jdk -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "groovy"; version = "5.0.2"; src = fetchurl { - url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip"; + url = "mirror://apache/groovy/${finalAttrs.version}/distribution/apache-groovy-binary-${finalAttrs.version}.zip"; sha256 = "sha256-cPgvEbG3ZOIH3PVWiILHjcdyk/MHgWJCOUo/enTyDoE="; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { desktopName = "Groovy Console"; exec = "groovyConsole"; icon = "groovy"; - comment = meta.description; + comment = finalAttrs.meta.description; terminal = false; startupNotify = false; categories = [ "Development" ]; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/gr/grpc-tools/package.nix b/pkgs/by-name/gr/grpc-tools/package.nix index 6d0a1d2294f2..137c13f421d5 100644 --- a/pkgs/by-name/gr/grpc-tools/package.nix +++ b/pkgs/by-name/gr/grpc-tools/package.nix @@ -6,19 +6,19 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "grpc-tools"; version = "1.13.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-node"; - tag = "grpc-tool@${version}"; + tag = "grpc-tool@${finalAttrs.version}"; hash = "sha256-bLG7hIKr0maFu/at4Vmf59YMwGAnAEOdPbRlGLasm2k="; fetchSubmodules = true; }; - sourceRoot = "${src.name}/packages/grpc-tools"; + sourceRoot = "${finalAttrs.src.name}/packages/grpc-tools"; nativeBuildInputs = [ cmake ]; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.nzhang-zh ]; }; -} +}) diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index 2763b6a619f6..9eff6acea234 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/pkgs/by-name/gr/grpc/package.nix @@ -23,7 +23,7 @@ # This package should be updated together with all related python grpc packages # to ensure compatibility. # nixpkgs-update: no auto update -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "grpc"; version = "1.76.0"; # N.B: if you change this, please update: # pythonPackages.grpcio @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-f25ccZC0pJw00ETgxBtXU6+0OnlJsV7zXjK/ayiCIJY="; fetchSubmodules = true; }; @@ -139,6 +139,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lnl7 ]; homepage = "https://grpc.io/"; platforms = lib.platforms.all; - changelog = "https://github.com/grpc/grpc/releases/tag/v${version}"; + changelog = "https://github.com/grpc/grpc/releases/tag/v${finalAttrs.version}"; }; -} +}) diff --git a/pkgs/by-name/gr/grpc_cli/package.nix b/pkgs/by-name/gr/grpc_cli/package.nix index 638ce231df31..47662a9c3f42 100644 --- a/pkgs/by-name/gr/grpc_cli/package.nix +++ b/pkgs/by-name/gr/grpc_cli/package.nix @@ -9,13 +9,13 @@ numactl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "grpc_cli"; version = "1.75.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-SnKK52VLO4MM/ftfmzRV/LeLfOucdIyHMyWk6EKRfvM="; fetchSubmodules = true; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "grpc_cli"; }; -} +}) diff --git a/pkgs/by-name/gr/grsync/package.nix b/pkgs/by-name/gr/grsync/package.nix index 3b2b625b198d..514a194af9f7 100644 --- a/pkgs/by-name/gr/grsync/package.nix +++ b/pkgs/by-name/gr/grsync/package.nix @@ -12,12 +12,12 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.3.1"; pname = "grsync"; src = fetchurl { - url = "mirror://sourceforge/grsync/grsync-${version}.tar.gz"; + url = "mirror://sourceforge/grsync/grsync-${finalAttrs.version}.tar.gz"; sha256 = "sha256-M8wOJdqmLlunCRyuo8g6jcdNxddyHEUB00nyEMSzxtM="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { mainProgram = "grsync"; maintainers = [ lib.maintainers.kuznero ]; }; -} +}) diff --git a/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix b/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix index 570330b23671..cba93b573066 100644 --- a/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix +++ b/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gruvbox-dark-gtk"; version = "1.0.2"; src = fetchFromGitHub { owner = "jmattheis"; repo = "gruvbox-dark-gtk"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-C681o89MTGNp1l3DLQsRpH9HQdmdCXZzk0F0rNhcyL4="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.nomisiv ]; }; -} +}) diff --git a/pkgs/by-name/gs/gsimplecal/package.nix b/pkgs/by-name/gs/gsimplecal/package.nix index 443c18f0ff38..470d3d692631 100644 --- a/pkgs/by-name/gs/gsimplecal/package.nix +++ b/pkgs/by-name/gs/gsimplecal/package.nix @@ -8,14 +8,14 @@ gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gsimplecal"; version = "2.5.2"; src = fetchFromGitHub { owner = "dmedvinsky"; repo = "gsimplecal"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-OaXZ/ch/Os6oi6V75Sy+QHeIGolwtieecFuLy4998yc="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "gsimplecal"; }; -} +}) diff --git a/pkgs/by-name/gs/gsoap/package.nix b/pkgs/by-name/gs/gsoap/package.nix index e534ca3cf575..af156cdb3726 100644 --- a/pkgs/by-name/gs/gsoap/package.nix +++ b/pkgs/by-name/gs/gsoap/package.nix @@ -17,12 +17,12 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gsoap"; version = "${majorVersion}.108"; src = fetchurl { - url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip"; + url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${finalAttrs.version}.zip"; sha256 = "0x58bwlclk7frv03kg8bp0pm7zl784samvbzskrnr7dl5v866nvl"; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { veprbl ]; }; -} +}) diff --git a/pkgs/by-name/gs/gsocket/package.nix b/pkgs/by-name/gs/gsocket/package.nix index 1b82e6095053..5740bfacb81a 100644 --- a/pkgs/by-name/gs/gsocket/package.nix +++ b/pkgs/by-name/gs/gsocket/package.nix @@ -6,14 +6,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gsocket"; version = "1.4.43"; src = fetchFromGitHub { owner = "hackerschoice"; repo = "gsocket"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7ph7YaY8rbfzvEh1ABgl3Jg15d6WBP4pywFn/nXjPKY="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.msm ]; }; -} +}) diff --git a/pkgs/by-name/gs/gss/package.nix b/pkgs/by-name/gs/gss/package.nix index cb1f7dd16ad6..cfec67533056 100644 --- a/pkgs/by-name/gs/gss/package.nix +++ b/pkgs/by-name/gs/gss/package.nix @@ -16,7 +16,7 @@ shishi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gss"; version = "1.0.4"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # # https://lists.gnu.org/archive/html/help-libidn/2021-07/msg00009.html src = fetchzip { - url = "https://gitweb.git.savannah.gnu.org/gitweb/?p=gss.git;a=snapshot;h=v${version};sf=tgz"; + url = "https://gitweb.git.savannah.gnu.org/gitweb/?p=gss.git;a=snapshot;h=v${finalAttrs.version};sf=tgz"; extension = "tar.gz"; hash = "sha256-yT19kwAhGzbIoMjRbrrsn6CyvkMH5v1nxxWpnGYmZUw="; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/gt/gt5/package.nix b/pkgs/by-name/gt/gt5/package.nix index f25f70e331d8..0e13ae1eab61 100644 --- a/pkgs/by-name/gt/gt5/package.nix +++ b/pkgs/by-name/gt/gt5/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gt5"; version = "1.4.0"; src = fetchurl { - url = "mirror://sourceforge/gt5/gt5-${version}.tar.gz"; + url = "mirror://sourceforge/gt5/gt5-${finalAttrs.version}.tar.gz"; sha256 = "0gm0gzyp4d9rxqddbaskbz5zvmlhyr4nyb5x9g7x4abyyxqjlnkq"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; all; mainProgram = "gt5"; }; -} +}) diff --git a/pkgs/by-name/gt/gthree/package.nix b/pkgs/by-name/gt/gthree/package.nix index a7188aab27d9..9e4881b49168 100644 --- a/pkgs/by-name/gt/gthree/package.nix +++ b/pkgs/by-name/gt/gthree/package.nix @@ -17,7 +17,7 @@ json-glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gthree"; version = "0.9.0"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "alexlarsson"; repo = "gthree"; - rev = version; + rev = finalAttrs.version; sha256 = "09fcnjc3j21lh5fjf067wm35sb4qni4vgzing61kixnn2shy79iy"; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gthree.x86_64-darwin }; -} +}) diff --git a/pkgs/by-name/gt/gti/package.nix b/pkgs/by-name/gt/gti/package.nix index e5633ed0a873..2d6842d29534 100644 --- a/pkgs/by-name/gt/gti/package.nix +++ b/pkgs/by-name/gt/gti/package.nix @@ -5,14 +5,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gti"; version = "1.9.1"; src = fetchFromGitHub { owner = "rwos"; repo = "gti"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-DUDCFcaB38Xkp3lLfEhjGC0j430dphXFBVhGzm7/Bp0="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "gti"; }; -} +}) diff --git a/pkgs/by-name/gt/gtk-server/package.nix b/pkgs/by-name/gt/gtk-server/package.nix index 2726dda47c04..1c45fa07bbc1 100644 --- a/pkgs/by-name/gt/gtk-server/package.nix +++ b/pkgs/by-name/gt/gtk-server/package.nix @@ -9,12 +9,12 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk-server"; version = "2.4.6"; src = fetchurl { - url = "https://www.gtk-server.org/stable/gtk-server-${version}.tar.gz"; + url = "https://www.gtk-server.org/stable/gtk-server-${finalAttrs.version}.tar.gz"; sha256 = "sha256-sFL3y068oXDKgkEUcNnGVsNSPBdI1NzpsqdYJfmOQoA="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gt/gtk-sharp-2_0/package.nix b/pkgs/by-name/gt/gtk-sharp-2_0/package.nix index 9034d06c3217..9306c9795ca2 100644 --- a/pkgs/by-name/gt/gtk-sharp-2_0/package.nix +++ b/pkgs/by-name/gt/gtk-sharp-2_0/package.nix @@ -16,7 +16,7 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk-sharp"; version = "2.12.45"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mono"; repo = "gtk-sharp"; - rev = version; + rev = finalAttrs.version; sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg"; }; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - ./bootstrap-${lib.versions.majorMinor version} + ./bootstrap-${lib.versions.majorMinor finalAttrs.version} ''; env.NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; @@ -80,4 +80,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.gpl2; }; -} +}) diff --git a/pkgs/by-name/gt/gtk-sharp-beans/package.nix b/pkgs/by-name/gt/gtk-sharp-beans/package.nix index ea90d636bc02..c1e51246fe2a 100644 --- a/pkgs/by-name/gt/gtk-sharp-beans/package.nix +++ b/pkgs/by-name/gt/gtk-sharp-beans/package.nix @@ -10,7 +10,7 @@ gio-sharp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk-sharp-beans"; version = "2.14.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "mono"; repo = "gtk-sharp-beans"; - rev = version; + rev = finalAttrs.version; sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.lgpl21; }; -} +}) diff --git a/pkgs/by-name/gt/gtk_engines/package.nix b/pkgs/by-name/gt/gtk_engines/package.nix index a4d9e10bc486..67d2b4c60dc2 100644 --- a/pkgs/by-name/gt/gtk_engines/package.nix +++ b/pkgs/by-name/gt/gtk_engines/package.nix @@ -7,12 +7,12 @@ gtk2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk-engines"; version = "2.20.2"; src = fetchurl { - url = "mirror://gnome/sources/gtk-engines/${lib.versions.majorMinor version}/gtk-engines-${version}.tar.bz2"; + url = "mirror://gnome/sources/gtk-engines/${lib.versions.majorMinor finalAttrs.version}/gtk-engines-${finalAttrs.version}.tar.bz2"; sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gt/gtkhash/package.nix b/pkgs/by-name/gt/gtkhash/package.nix index 86f50df8c159..7fe44f708c6e 100644 --- a/pkgs/by-name/gt/gtkhash/package.nix +++ b/pkgs/by-name/gt/gtkhash/package.nix @@ -15,14 +15,14 @@ libgcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtkhash"; version = "1.5"; src = fetchFromGitHub { repo = "gtkhash"; owner = "gtkhash"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-XpgTolpTSsW3i0xk19tt4cn9qANoeiq7YnBBR6g8ioU="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { mainProgram = "gtkhash"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gt/gtkhtml/package.nix b/pkgs/by-name/gt/gtkhtml/package.nix index c7cf2b3dfc9d..df62645e59f5 100644 --- a/pkgs/by-name/gt/gtkhtml/package.nix +++ b/pkgs/by-name/gt/gtkhtml/package.nix @@ -14,12 +14,12 @@ gsettings-desktop-schemas, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtkhtml"; version = "4.10.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/gtkhtml-${version}.tar.xz"; + url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor finalAttrs.version}/gtkhtml-${finalAttrs.version}.tar.xz"; hash = "sha256-yjtkJPssesXZy4/a+2kxj6LoJcnPbtF9HjjZsp5WBsM="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/gt/gtkmm2/package.nix b/pkgs/by-name/gt/gtkmm2/package.nix index 02da63e96792..41c6b7ae2325 100644 --- a/pkgs/by-name/gt/gtkmm2/package.nix +++ b/pkgs/by-name/gt/gtkmm2/package.nix @@ -10,12 +10,12 @@ atkmm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtkmm"; version = "2.24.5"; src = fetchurl { - url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor version}/gtkmm-${version}.tar.xz"; + url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor finalAttrs.version}/gtkmm-${finalAttrs.version}.tar.xz"; sha256 = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gt/gtkmm3/package.nix b/pkgs/by-name/gt/gtkmm3/package.nix index d261bd1ef552..ce5d82602a49 100644 --- a/pkgs/by-name/gt/gtkmm3/package.nix +++ b/pkgs/by-name/gt/gtkmm3/package.nix @@ -17,12 +17,12 @@ gdk-pixbuf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtkmm"; version = "3.24.10"; src = fetchurl { - url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor version}/gtkmm-${version}.tar.xz"; + url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor finalAttrs.version}/gtkmm-${finalAttrs.version}.tar.xz"; sha256 = "erfiJmgIcW4mw5kkrOH7RtqGwX7znZiWJMQjFLMrWnY="; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gt/gtkmm4/package.nix b/pkgs/by-name/gt/gtkmm4/package.nix index 2a426090e29d..2ab6e28fe6fe 100644 --- a/pkgs/by-name/gt/gtkmm4/package.nix +++ b/pkgs/by-name/gt/gtkmm4/package.nix @@ -17,7 +17,7 @@ xvfb-run, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtkmm"; version = "4.20.0"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor version}/gtkmm-${version}.tar.xz"; + url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor finalAttrs.version}/gtkmm-${finalAttrs.version}.tar.xz"; hash = "sha256-2q2b+bcPkJdfkXgfx6ZWySOpE3QmH1dsiDzTrr1ZyDM="; }; @@ -95,4 +95,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gt/gtkradiant/package.nix b/pkgs/by-name/gt/gtkradiant/package.nix index d54d037eaf76..d27750786c0f 100644 --- a/pkgs/by-name/gt/gtkradiant/package.nix +++ b/pkgs/by-name/gt/gtkradiant/package.nix @@ -180,7 +180,7 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtkradiant"; version = "unstable-2023-04-24"; @@ -242,7 +242,7 @@ stdenv.mkDerivation rec { name = "gtkradiant"; exec = "gtkradiant"; desktopName = "GtkRadiant"; - comment = meta.description; + comment = finalAttrs.meta.description; categories = [ "Development" ]; icon = "gtkradiant"; # includes its own splash screen @@ -283,4 +283,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ astro ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gt/gtkspell3/package.nix b/pkgs/by-name/gt/gtkspell3/package.nix index 0d379530af3a..a60b78877a82 100644 --- a/pkgs/by-name/gt/gtkspell3/package.nix +++ b/pkgs/by-name/gt/gtkspell3/package.nix @@ -12,7 +12,7 @@ vala, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtkspell"; version = "3.0.10"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.xz"; + url = "mirror://sourceforge/gtkspell/gtkspell3-${finalAttrs.version}.tar.xz"; sha256 = "0cjp6xdcnzh6kka42w9g0w2ihqjlq8yl8hjm9wsfnixk6qwgch5h"; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/gt/gtkterm/package.nix b/pkgs/by-name/gt/gtkterm/package.nix index ed837b3aaff6..a472701272bd 100644 --- a/pkgs/by-name/gt/gtkterm/package.nix +++ b/pkgs/by-name/gt/gtkterm/package.nix @@ -12,14 +12,14 @@ pcre2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtkterm"; version = "1.3.1"; src = fetchFromGitHub { owner = "wvdakker"; repo = "gtkterm"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-oGqOXIu5P3KfdV6Unm7Nz+BRhb5Z6rne0+e0wZ2EcAI="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "gtkterm"; }; -} +}) diff --git a/pkgs/by-name/gu/guff/package.nix b/pkgs/by-name/gu/guff/package.nix index 401bb15a481b..5a2005e93c0e 100644 --- a/pkgs/by-name/gu/guff/package.nix +++ b/pkgs/by-name/gu/guff/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guff"; version = "0.1.0"; src = fetchFromGitHub { owner = "silentbicycle"; repo = "guff"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0n8mc9j3044j4b3vgc94ryd2j9ik6g73fqja54yxfdfrks4ksyds"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "guff"; }; -} +}) diff --git a/pkgs/by-name/gu/guile-avahi/package.nix b/pkgs/by-name/gu/guile-avahi/package.nix index ff847a50f5bf..5636e28929fd 100644 --- a/pkgs/by-name/gu/guile-avahi/package.nix +++ b/pkgs/by-name/gu/guile-avahi/package.nix @@ -11,13 +11,13 @@ guile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-avahi"; version = "0.4.1"; src = fetchgit { url = "git://git.sv.gnu.org/guile-avahi.git"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Yr+OiqaGv6DgsjxSoc4sAjy4OO/D+Q50vdSTPEeIrV8="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/guile-config/package.nix b/pkgs/by-name/gu/guile-config/package.nix index b2ddd60adf11..05caeaa724c0 100644 --- a/pkgs/by-name/gu/guile-config/package.nix +++ b/pkgs/by-name/gu/guile-config/package.nix @@ -8,14 +8,14 @@ guile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-config"; version = "0.5.1"; src = fetchFromGitLab { owner = "a-sassmannshausen"; repo = "guile-config"; - rev = version; + rev = finalAttrs.version; hash = "sha256-n4ukGCyIx5G1ITfKSqS6FGJ6dnDBsyxXKSFNi81E4Gg="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sikmir ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/guile-fibers/package.nix b/pkgs/by-name/gu/guile-fibers/package.nix index d25821b11467..37d1e50eba55 100644 --- a/pkgs/by-name/gu/guile-fibers/package.nix +++ b/pkgs/by-name/gu/guile-fibers/package.nix @@ -9,14 +9,14 @@ texinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-fibers"; version = "1.3.1"; src = fetchFromGitHub { owner = "wingo"; repo = "fibers"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-jJKA5JEHsmqQ/IKb1aNmOtoVaGKNjcgTKyo5VCiJbXM="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/guile-gcrypt/package.nix b/pkgs/by-name/gu/guile-gcrypt/package.nix index e716c456c034..b449cf0922cc 100644 --- a/pkgs/by-name/gu/guile-gcrypt/package.nix +++ b/pkgs/by-name/gu/guile-gcrypt/package.nix @@ -9,7 +9,7 @@ texinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-gcrypt"; version = "0.5.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { domain = "notabug.org"; owner = "cwebber"; repo = "guile-gcrypt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-YPzOKFwKxEbu4+tW1Pu6EeALArTUEfM/bSQPth5eBX4="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ethancedwards8 ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/guile-gnutls/package.nix b/pkgs/by-name/gu/guile-gnutls/package.nix index ccf83b132745..8e33074de73f 100644 --- a/pkgs/by-name/gu/guile-gnutls/package.nix +++ b/pkgs/by-name/gu/guile-gnutls/package.nix @@ -10,12 +10,12 @@ texinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-gnutls"; version = "5.0.1"; src = fetchurl { - url = "mirror://gnu/gnutls/guile-gnutls-${version}.tar.gz"; + url = "mirror://gnu/gnutls/guile-gnutls-${finalAttrs.version}.tar.gz"; hash = "sha256-zABn8+60IbwXJHFAlipJCG31RQ8NPnHFW/VBotK57ys="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/guile-goblins/package.nix b/pkgs/by-name/gu/guile-goblins/package.nix index d3dbab8e9611..74af100c7678 100644 --- a/pkgs/by-name/gu/guile-goblins/package.nix +++ b/pkgs/by-name/gu/guile-goblins/package.nix @@ -10,12 +10,12 @@ texinfo, pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-goblins"; version = "0.17.0"; src = fetchurl { - url = "https://spritely.institute/files/releases/guile-goblins/guile-goblins-${version}.tar.gz"; + url = "https://spritely.institute/files/releases/guile-goblins/guile-goblins-${finalAttrs.version}.tar.gz"; hash = "sha256-IFZEB/HbBx1EDAO8+0xB/UB3iyogyzKbE+pbfbWrU5o="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/guile-hall/package.nix b/pkgs/by-name/gu/guile-hall/package.nix index 5d656466fdae..2ff9151135e2 100644 --- a/pkgs/by-name/gu/guile-hall/package.nix +++ b/pkgs/by-name/gu/guile-hall/package.nix @@ -10,14 +10,14 @@ guile-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-hall"; version = "0.4.1"; src = fetchFromGitLab { owner = "a-sassmannshausen"; repo = "guile-hall"; - rev = version; + rev = finalAttrs.version; hash = "sha256-TUCN8kW44X6iGbSJURurcz/Tc2eCH1xgmXH1sMOMOXs="; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { installCheckPhase = '' runHook preInstallCheck export HOME=$TMPDIR - $out/bin/hall --version | grep ${version} > /dev/null + $out/bin/hall --version | grep ${finalAttrs.version} > /dev/null runHook postInstallCheck ''; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sikmir ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/guile-lzlib/package.nix b/pkgs/by-name/gu/guile-lzlib/package.nix index 32eb144609f4..5a37bb872d52 100644 --- a/pkgs/by-name/gu/guile-lzlib/package.nix +++ b/pkgs/by-name/gu/guile-lzlib/package.nix @@ -10,12 +10,12 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-lzlib"; version = "0.3.0"; src = fetchurl { - url = "https://notabug.org/guile-lzlib/guile-lzlib/archive/${version}.tar.gz"; + url = "https://notabug.org/guile-lzlib/guile-lzlib/archive/${finalAttrs.version}.tar.gz"; hash = "sha256-p/mcjSoUPgXqItstyLnObCfK6UIWK0XuMBXtkCevD/I="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/guile-lzma/package.nix b/pkgs/by-name/gu/guile-lzma/package.nix index c1a214795cc3..24937c6df93f 100644 --- a/pkgs/by-name/gu/guile-lzma/package.nix +++ b/pkgs/by-name/gu/guile-lzma/package.nix @@ -8,12 +8,12 @@ scheme-bytestructures, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-lzma"; version = "0.1.1"; src = fetchurl { - url = "https://files.ngyro.com/guile-lzma/guile-lzma-${version}.tar.gz"; + url = "https://files.ngyro.com/guile-lzma/guile-lzma-${finalAttrs.version}.tar.gz"; hash = "sha256-K4ZoltZy7U05AI9LUzZ1DXiXVgoGZ4Nl9cWnK9L8zl4="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/guile-quickcheck/package.nix b/pkgs/by-name/gu/guile-quickcheck/package.nix index bb52f836238c..c42ba9c6825b 100644 --- a/pkgs/by-name/gu/guile-quickcheck/package.nix +++ b/pkgs/by-name/gu/guile-quickcheck/package.nix @@ -6,12 +6,12 @@ guile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-quickcheck"; version = "0.1.0"; src = fetchurl { - url = "https://files.ngyro.com/guile-quickcheck/guile-quickcheck-${version}.tar.gz"; + url = "https://files.ngyro.com/guile-quickcheck/guile-quickcheck-${finalAttrs.version}.tar.gz"; hash = "sha256-y5msW+mbQ7YeucRS2VNUPokOKoP8g6ysKJ2UMWiIvA4="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/guile-sdl2/package.nix b/pkgs/by-name/gu/guile-sdl2/package.nix index b8500ecdda84..456f9c5fab15 100644 --- a/pkgs/by-name/gu/guile-sdl2/package.nix +++ b/pkgs/by-name/gu/guile-sdl2/package.nix @@ -11,12 +11,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-sdl2"; version = "0.8.0"; src = fetchurl { - url = "https://files.dthompson.us/releases/guile-sdl2/guile-sdl2-${version}.tar.gz"; + url = "https://files.dthompson.us/releases/guile-sdl2/guile-sdl2-${finalAttrs.version}.tar.gz"; hash = "sha256-V/XrpFrqOxS5mAphtIt2e3ewflK+HdLFEqOmix98p+w="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/gu/guile-semver/package.nix b/pkgs/by-name/gu/guile-semver/package.nix index c3d39b672ce6..163f77cd61d7 100644 --- a/pkgs/by-name/gu/guile-semver/package.nix +++ b/pkgs/by-name/gu/guile-semver/package.nix @@ -8,12 +8,12 @@ guile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-semver"; version = "0.1.1"; src = fetchurl { - url = "https://files.ngyro.com/guile-semver/guile-semver-${version}.tar.gz"; + url = "https://files.ngyro.com/guile-semver/guile-semver-${finalAttrs.version}.tar.gz"; hash = "sha256-T3kJGTdf6yBKjqLtqSopHZu03kyOscZ3Z4RYmoYlN4E="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/guile-zlib/package.nix b/pkgs/by-name/gu/guile-zlib/package.nix index 1d7110610736..3815bb8b5224 100644 --- a/pkgs/by-name/gu/guile-zlib/package.nix +++ b/pkgs/by-name/gu/guile-zlib/package.nix @@ -9,7 +9,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-zlib"; version = "0.2.2"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { domain = "notabug.org"; owner = "guile-zlib"; repo = "guile-zlib"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-aaZhwHimQq408DNtHy442kh/EYdRdxP0Z1tQGDKmkmc="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/guile-zstd/package.nix b/pkgs/by-name/gu/guile-zstd/package.nix index 403430708abd..68866a483a8e 100644 --- a/pkgs/by-name/gu/guile-zstd/package.nix +++ b/pkgs/by-name/gu/guile-zstd/package.nix @@ -9,7 +9,7 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-zstd"; version = "0.1.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { domain = "notabug.org"; owner = "guile-zstd"; repo = "guile-zstd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-IAyDoqb7qHAy666hxs6CCZrFnfwwV8AaR92XlQQ6FLE="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix index 73d771b9b823..6c8524460ec7 100644 --- a/pkgs/by-name/gu/gumbo/package.nix +++ b/pkgs/by-name/gu/gumbo/package.nix @@ -5,7 +5,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gumbo"; version = "0.13.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "gumbo-parser"; repo = "gumbo-parser"; - rev = version; + rev = finalAttrs.version; hash = "sha256-8mri7mLZkuIZgzE6p0yc41bNNyzGTV9V90OiA/9TkkU="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/by-name/gu/gummi/package.nix b/pkgs/by-name/gu/gummi/package.nix index 8c7af62fde9f..fb2c52c5262d 100644 --- a/pkgs/by-name/gu/gummi/package.nix +++ b/pkgs/by-name/gu/gummi/package.nix @@ -14,14 +14,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.8.3"; pname = "gummi"; src = pkgs.fetchFromGitHub { owner = "alexandervdm"; repo = "gummi"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-71n71KjLmICp4gznd27NlbyA3kayje3hYk/cwkOXEO0="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ flokli ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/gu/gupnp-av/package.nix b/pkgs/by-name/gu/gupnp-av/package.nix index 67f872eef703..9ab6982ea828 100644 --- a/pkgs/by-name/gu/gupnp-av/package.nix +++ b/pkgs/by-name/gu/gupnp-av/package.nix @@ -13,7 +13,7 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gupnp-av"; version = "0.14.4"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp-av/${lib.versions.majorMinor version}/gupnp-av-${version}.tar.xz"; + url = "mirror://gnome/sources/gupnp-av/${lib.versions.majorMinor finalAttrs.version}/gupnp-av-${finalAttrs.version}.tar.xz"; sha256 = "Idl0sydctdz1uKodmj/IDn7cpwaTX2+9AEx5eHE4+Mc="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gu/gutenprint/package.nix b/pkgs/by-name/gu/gutenprint/package.nix index da41904663f0..e992fc85411c 100644 --- a/pkgs/by-name/gu/gutenprint/package.nix +++ b/pkgs/by-name/gu/gutenprint/package.nix @@ -15,12 +15,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gutenprint"; version = "5.3.5"; src = fetchurl { - url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.xz"; + url = "mirror://sourceforge/gimp-print/gutenprint-${finalAttrs.version}.tar.xz"; hash = "sha256-9an0feKFMLGuIGnPvGR6mmQbruq+gJuw7ys+xblmjXA="; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; isGutenprint = true; }; -} +}) diff --git a/pkgs/by-name/gv/gv/package.nix b/pkgs/by-name/gv/gv/package.nix index 1038447e9720..5efb38dbda01 100644 --- a/pkgs/by-name/gv/gv/package.nix +++ b/pkgs/by-name/gv/gv/package.nix @@ -10,12 +10,12 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gv"; version = "3.7.4"; src = fetchurl { - url = "mirror://gnu/gv/gv-${version}.tar.gz"; + url = "mirror://gnu/gv/gv-${finalAttrs.version}.tar.gz"; sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/gv/gvpe/package.nix b/pkgs/by-name/gv/gvpe/package.nix index 9eefaaa0d851..53a6bcb9f2b4 100644 --- a/pkgs/by-name/gv/gvpe/package.nix +++ b/pkgs/by-name/gv/gvpe/package.nix @@ -10,12 +10,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gvpe"; version = "3.1"; src = fetchurl { - url = "https://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; + url = "https://ftp.gnu.org/gnu/gvpe/gvpe-${finalAttrs.version}.tar.gz"; sha256 = "sha256-8evVctclu5QOCAdxocEIZ8NQnc2DFvYRSBRQPcux6LM="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ freebsd; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/gw/gwc/package.nix b/pkgs/by-name/gw/gwc/package.nix index 602986105379..148623357d6a 100644 --- a/pkgs/by-name/gw/gwc/package.nix +++ b/pkgs/by-name/gw/gwc/package.nix @@ -12,14 +12,14 @@ fftw, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gwc"; version = "0.22-06"; src = fetchFromGitHub { owner = "AlisterH"; repo = "gwc"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-hRwy++gZiW/olIIeiVTpdIjPLIHgvgVUGEaUX9tpFbY="; }; @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { meta = { description = "GUI application for removing noise (hiss, pops and clicks) from audio files"; homepage = "https://github.com/AlisterH/gwc/"; - changelog = "https://github.com/AlisterH/gwc/blob/${version}/Changelog"; + changelog = "https://github.com/AlisterH/gwc/blob/${finalAttrs.version}/Changelog"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gw/gwyddion/package.nix b/pkgs/by-name/gw/gwyddion/package.nix index f092370b80da..6d3c6cab5fb5 100644 --- a/pkgs/by-name/gw/gwyddion/package.nix +++ b/pkgs/by-name/gw/gwyddion/package.nix @@ -32,11 +32,11 @@ libGL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gwyddion"; version = "2.69"; src = fetchurl { - url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; + url = "mirror://sourceforge/gwyddion/gwyddion-${finalAttrs.version}.tar.xz"; sha256 = "sha256-WX62tR7ldaB/NQzAVzvHTQBaNJDZgyrRNqNp5w0w76Y="; }; @@ -89,4 +89,4 @@ stdenv.mkDerivation rec { # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; -} +}) diff --git a/pkgs/by-name/gx/gxplugins-lv2/package.nix b/pkgs/by-name/gx/gxplugins-lv2/package.nix index 1113c158c481..0f5f7bb2b065 100644 --- a/pkgs/by-name/gx/gxplugins-lv2/package.nix +++ b/pkgs/by-name/gx/gxplugins-lv2/package.nix @@ -9,14 +9,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "GxPlugins.lv2"; version = "1.0"; src = fetchFromGitHub { owner = "brummer10"; repo = "GxPlugins.lv2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag="; fetchSubmodules = true; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index 6aac6b724567..d91f7c34de20 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -23,14 +23,14 @@ zmusic, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gzdoom"; version = "4.14.2"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; - rev = "g${version}"; + rev = "g${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-kYw+r08v/Q/hphJuvjn38Dj5mZRijE6pWKoEZBlN5P4="; }; @@ -67,10 +67,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace tools/updaterevision/UpdateRevision.cmake \ - --replace-fail "ret_var(Tag)" "ret_var(\"${src.rev}\")" \ + --replace-fail "ret_var(Tag)" "ret_var(\"${finalAttrs.src.rev}\")" \ --replace-fail "ret_var(Timestamp)" "ret_var(\"1970-00-00 00:00:00 +0000\")" \ - --replace-fail "ret_var(Hash)" "ret_var(\"${src.rev}\")" \ - --replace-fail "" "${src.rev}" + --replace-fail "ret_var(Hash)" "ret_var(\"${finalAttrs.src.rev}\")" \ + --replace-fail "" "${finalAttrs.src.rev}" ''; # Apple dropped GL support @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { name = "gzdoom"; exec = "gzdoom"; desktopName = "GZDoom"; - comment = meta.description; + comment = finalAttrs.meta.description; icon = "gzdoom"; categories = [ "Game" ]; }) @@ -126,4 +126,4 @@ stdenv.mkDerivation rec { r4v3n6101 ]; }; -} +}) diff --git a/pkgs/by-name/gz/gzrt/package.nix b/pkgs/by-name/gz/gzrt/package.nix index 9876b9ac7737..034f340604b5 100644 --- a/pkgs/by-name/gz/gzrt/package.nix +++ b/pkgs/by-name/gz/gzrt/package.nix @@ -5,12 +5,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gzrt"; version = "0.8"; src = fetchurl { - url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${version}.tar.gz"; + url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${finalAttrs.version}.tar.gz"; sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/h/h/package.nix b/pkgs/by-name/h/h/package.nix index d9d822d3334e..e4b75325face 100644 --- a/pkgs/by-name/h/h/package.nix +++ b/pkgs/by-name/h/h/package.nix @@ -5,14 +5,14 @@ ruby, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "h"; version = "1.1.1"; src = fetchFromGitHub { owner = "zimbatm"; repo = "h"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Iv+BqM6AF7wD5yyFSvA5pkG2yfQrNp6aBFV1OCUom5c="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.zimbatm ]; }; -} +}) diff --git a/pkgs/by-name/ha/hackrf/package.nix b/pkgs/by-name/ha/hackrf/package.nix index fedb36f3a808..9c5fe0cb5d70 100644 --- a/pkgs/by-name/ha/hackrf/package.nix +++ b/pkgs/by-name/ha/hackrf/package.nix @@ -9,14 +9,14 @@ fftwSinglePrec, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hackrf"; version = "2024.02.1"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "hackrf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-b3nGrk2P6ZLYBSCSD7c0aIApCh3ZoVDcFftybqm4vx0="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ sjmackenzie ]; }; -} +}) diff --git a/pkgs/by-name/ha/hactool/package.nix b/pkgs/by-name/ha/hactool/package.nix index b0ccdfb0bf37..587f2c792b7a 100644 --- a/pkgs/by-name/ha/hactool/package.nix +++ b/pkgs/by-name/ha/hactool/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hactool"; version = "1.4.0"; src = fetchFromGitHub { owner = "SciresM"; repo = "hactool"; - rev = version; + rev = finalAttrs.version; sha256 = "0305ngsnwm8npzgyhyifasi4l802xnfz19r0kbzzniirmcn4082d"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "hactool"; }; -} +}) diff --git a/pkgs/by-name/ha/hakuneko/package.nix b/pkgs/by-name/ha/hakuneko/package.nix index 06aad1b99b05..93a534d2d5b2 100644 --- a/pkgs/by-name/ha/hakuneko/package.nix +++ b/pkgs/by-name/ha/hakuneko/package.nix @@ -28,18 +28,18 @@ let name = "hakuneko-desktop"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hakuneko"; version = "6.1.7"; src = { "x86_64-linux" = fetchurl { - url = "https://github.com/manga-download/hakuneko/releases/download/v${version}/hakuneko-desktop_${version}_linux_amd64.deb"; + url = "https://github.com/manga-download/hakuneko/releases/download/v${finalAttrs.version}/hakuneko-desktop_${finalAttrs.version}_linux_amd64.deb"; sha256 = "06bb17d7a06bb0601053eaaf423f9176f06ff3636cc43ffc024438e1962dcd02"; }; "i686-linux" = fetchurl { - url = "https://github.com/manga-download/hakuneko/releases/download/v${version}/hakuneko-desktop_${version}_linux_i386.deb"; + url = "https://github.com/manga-download/hakuneko/releases/download/v${finalAttrs.version}/hakuneko-desktop_${finalAttrs.version}_linux_i386.deb"; sha256 = "32017d26bafffaaf0a83dd6954d3926557014af4022a972371169c56c0e3d98b"; }; } @@ -102,4 +102,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "hakuneko"; }; -} +}) diff --git a/pkgs/by-name/ha/hal-hardware-analyzer/package.nix b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix index 359f2e2d69c8..c61f8c3d8500 100644 --- a/pkgs/by-name/ha/hal-hardware-analyzer/package.nix +++ b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix @@ -19,14 +19,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "4.5.0"; pname = "hal-hardware-analyzer"; src = fetchFromGitHub { owner = "emsec"; repo = "hal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4HLM/7JCDxWRWusGL4lUa8KXCn9pe3Vkr+lOxHOraNU="; }; @@ -66,10 +66,10 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; cmakeFlags = with lib.versions; [ - "-DHAL_VERSION_RETURN=${version}" - "-DHAL_VERSION_MAJOR=${major version}" - "-DHAL_VERSION_MINOR=${minor version}" - "-DHAL_VERSION_PATCH=${patch version}" + "-DHAL_VERSION_RETURN=${finalAttrs.version}" + "-DHAL_VERSION_MAJOR=${major finalAttrs.version}" + "-DHAL_VERSION_MINOR=${minor finalAttrs.version}" + "-DHAL_VERSION_PATCH=${patch finalAttrs.version}" "-DHAL_VERSION_TWEAK=0" "-DHAL_VERSION_ADDITIONAL_COMMITS=0" "-DHAL_VERSION_DIRTY=false" @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/emsec/hal/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/emsec/hal/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Comprehensive reverse engineering and manipulation framework for gate-level netlists"; mainProgram = "hal"; homepage = "https://github.com/emsec/hal"; @@ -109,4 +109,4 @@ stdenv.mkDerivation rec { ris ]; }; -} +}) diff --git a/pkgs/by-name/ha/half/package.nix b/pkgs/by-name/ha/half/package.nix index 06651364202e..7d5b6037c4c5 100644 --- a/pkgs/by-name/ha/half/package.nix +++ b/pkgs/by-name/ha/half/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.2.0"; pname = "half"; src = fetchzip { - url = "mirror://sourceforge/half/${version}/half-${version}.zip"; + url = "mirror://sourceforge/half/${finalAttrs.version}/half-${finalAttrs.version}.zip"; sha256 = "sha256-ZdGgBMZylFgkvs/XVBnvgBY2EYSHRLY3S4YwXjshpOY="; stripRoot = false; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ha/halfempty/package.nix b/pkgs/by-name/ha/halfempty/package.nix index 2647a889a2b1..f0550d84e6f9 100644 --- a/pkgs/by-name/ha/halfempty/package.nix +++ b/pkgs/by-name/ha/halfempty/package.nix @@ -9,14 +9,14 @@ scowl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "halfempty"; version = "0.40"; src = fetchFromGitHub { owner = "googleprojectzero"; repo = "halfempty"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-YGq6fneAMo2jCpLPrjzRJ0eeOsStKaK5L+lwQfqcfpY="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ asl20 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ha/halibut/package.nix b/pkgs/by-name/ha/halibut/package.nix index 5e0062258135..0369aa6d0dbf 100644 --- a/pkgs/by-name/ha/halibut/package.nix +++ b/pkgs/by-name/ha/halibut/package.nix @@ -7,12 +7,12 @@ fetchpatch2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "halibut"; version = "1.3"; src = fetchurl { - url = "https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${version}/halibut-${version}.tar.gz"; + url = "https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${finalAttrs.version}/halibut-${finalAttrs.version}.tar.gz"; sha256 = "0ciikn878vivs4ayvwvr63nnhpcg12m8023xv514zxqpdxlzg85a"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix; mainProgram = "halibut"; }; -} +}) diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 0e6314d322f8..a5660bc2980a 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -6,11 +6,11 @@ # official jre size is 500MB, but temurin-jre-bin is 100MB. temurin-jre-bin, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "halo"; version = "2.22.11"; src = fetchurl { - url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; + url = "https://github.com/halo-dev/halo/releases/download/v${finalAttrs.version}/halo-${finalAttrs.version}.jar"; hash = "sha256-22Fp1OMLBU/d6zCZ3zpT4FisTc9OPEC2POfEtLJhHxA="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { mainProgram = "halo"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; -} +}) diff --git a/pkgs/by-name/ha/hamlib_4/package.nix b/pkgs/by-name/ha/hamlib_4/package.nix index 087fab80f324..1eade7399d8e 100644 --- a/pkgs/by-name/ha/hamlib_4/package.nix +++ b/pkgs/by-name/ha/hamlib_4/package.nix @@ -21,12 +21,12 @@ let python3 = python311; # needs distutils and imp in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hamlib"; version = "4.6.2"; src = fetchurl { - url = "mirror://sourceforge/hamlib/hamlib-${version}.tar.gz"; + url = "mirror://sourceforge/hamlib/hamlib-${finalAttrs.version}.tar.gz"; hash = "sha256-sqxz9E3RFh6V/e5slSdhRHV2R7+S1/2zae4v5B7Ueug="; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ relrod ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/ha/hammer/package.nix b/pkgs/by-name/ha/hammer/package.nix index 48516bb4ea0f..364d8bf48789 100644 --- a/pkgs/by-name/ha/hammer/package.nix +++ b/pkgs/by-name/ha/hammer/package.nix @@ -7,7 +7,7 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hammer"; version = "nightly_20220416"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { domain = "gitlab.special-circumstanc.es"; owner = "hammer"; repo = "hammer"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-xMZhUnycGeHkNZfHQ2d9mETti8HwGHZNskFqh9f0810="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ azahi ]; }; -} +}) diff --git a/pkgs/by-name/ha/hans/package.nix b/pkgs/by-name/ha/hans/package.nix index f53260712a0b..b39eb61879d2 100644 --- a/pkgs/by-name/ha/hans/package.nix +++ b/pkgs/by-name/ha/hans/package.nix @@ -5,13 +5,13 @@ net-tools, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hans"; version = "1.1"; src = fetchFromGitHub { sha256 = "sha256-r6IDs8Seys94LBNnedcfVX5aW8x//ZN0Yh/DGTg8niA="; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; repo = "hans"; owner = "friedrich"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "hans"; }; -} +}) diff --git a/pkgs/by-name/ha/harminv/package.nix b/pkgs/by-name/ha/harminv/package.nix index ccb1b06b39c1..7fcddde46393 100644 --- a/pkgs/by-name/ha/harminv/package.nix +++ b/pkgs/by-name/ha/harminv/package.nix @@ -11,14 +11,14 @@ assert !blas.isILP64; assert !lapack.isILP64; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "harminv"; version = "1.4.2"; src = fetchFromGitHub { owner = "NanoComp"; repo = "harminv"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-HV8xylK2IOvbONYGgyaqAabp6xA7/uvN4DU7upIlZh0="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ha/hashcash/package.nix b/pkgs/by-name/ha/hashcash/package.nix index 3b457166f480..805874178de2 100644 --- a/pkgs/by-name/ha/hashcash/package.nix +++ b/pkgs/by-name/ha/hashcash/package.nix @@ -5,14 +5,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hashcash"; version = "1.22"; buildInputs = [ openssl ]; src = fetchurl { - url = "http://www.hashcash.org/source/hashcash-${version}.tgz"; + url = "http://www.hashcash.org/source/hashcash-${finalAttrs.version}.tgz"; sha256 = "15kqaimwb2y8wvzpn73021bvay9mz1gqqfc40gk4hj6f84nz34h1"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ kisonecat ]; }; -} +}) diff --git a/pkgs/by-name/ha/hashcat-utils/package.nix b/pkgs/by-name/ha/hashcat-utils/package.nix index 609dba87e06b..b2078a4098da 100644 --- a/pkgs/by-name/ha/hashcat-utils/package.nix +++ b/pkgs/by-name/ha/hashcat-utils/package.nix @@ -4,18 +4,18 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hashcat-utils"; version = "1.10"; src = fetchFromGitHub { owner = "hashcat"; repo = "hashcat-utils"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-S2aRNTJMQO/YXdCHexKQ+gZnZp2vGvsvhD5O7t3tfhw="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; installPhase = '' runHook preInstall @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ha/hashcat/package.nix b/pkgs/by-name/ha/hashcat/package.nix index 36ecdcfe92e2..31987ce3c8da 100644 --- a/pkgs/by-name/ha/hashcat/package.nix +++ b/pkgs/by-name/ha/hashcat/package.nix @@ -19,12 +19,12 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hashcat"; version = "7.1.2"; src = fetchurl { - url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; + url = "https://hashcat.net/files/hashcat-${finalAttrs.version}.tar.gz"; sha256 = "sha256-lUamMm10dTC0T8wHm6utQDBKh/MtPJCAAW1Ys5z8i5Y="; }; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" "COMPTIME=1337" - "VERSION_TAG=${version}" + "VERSION_TAG=${finalAttrs.version}" "USE_SYSTEM_OPENCL=1" "USE_SYSTEM_XXHASH=1" "USE_SYSTEM_ZLIB=1" @@ -127,4 +127,4 @@ stdenv.mkDerivation rec { zimbatm ]; }; -} +}) diff --git a/pkgs/by-name/ha/hashdeep/package.nix b/pkgs/by-name/ha/hashdeep/package.nix index f0a225e9bfe1..23461426a98d 100644 --- a/pkgs/by-name/ha/hashdeep/package.nix +++ b/pkgs/by-name/ha/hashdeep/package.nix @@ -6,14 +6,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hashdeep"; version = "4.4"; src = fetchFromGitHub { owner = "jessek"; repo = "hashdeep"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "0m2b042ndikavmplv3qjdhfj44hl1h8car83c192xi9nv5ahi7mf"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.karantan ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ha/hashi-ui/package.nix b/pkgs/by-name/ha/hashi-ui/package.nix index 783d357d984d..4f1639cc1fe2 100644 --- a/pkgs/by-name/ha/hashi-ui/package.nix +++ b/pkgs/by-name/ha/hashi-ui/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hashi-ui"; version = "1.3.8"; src = fetchurl { - url = "https://github.com/jippi/hashi-ui/releases/download/v${version}/hashi-ui-linux-amd64"; + url = "https://github.com/jippi/hashi-ui/releases/download/v${finalAttrs.version}/hashi-ui-linux-amd64"; sha256 = "999a34b6e99657ffc7e6c98a15b8ea744c28420e891a8802c7d99b737752dfb6"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; mainProgram = "hashi-ui"; }; -} +}) diff --git a/pkgs/by-name/ha/hashit/package.nix b/pkgs/by-name/ha/hashit/package.nix index f66815471aa3..0d287e9f492a 100644 --- a/pkgs/by-name/ha/hashit/package.nix +++ b/pkgs/by-name/ha/hashit/package.nix @@ -15,14 +15,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hashit"; version = "1.1.0"; src = fetchFromGitHub { owner = "artemanufrij"; repo = "hashit"; - rev = version; + rev = finalAttrs.version; sha256 = "1s8fbzg1z2ypn55xg1pfm5xh15waq55fkp49j8rsqiq8flvg6ybf"; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "com.github.artemanufrij.hashit"; }; -} +}) diff --git a/pkgs/by-name/ha/haveged/package.nix b/pkgs/by-name/ha/haveged/package.nix index 7b9fd31fa5f9..cccefa02e042 100644 --- a/pkgs/by-name/ha/haveged/package.nix +++ b/pkgs/by-name/ha/haveged/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "haveged"; version = "1.9.19"; src = fetchFromGitHub { owner = "jirka-h"; repo = "haveged"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-tq4OXLlyC6exJEZ80H1gQQRBgYGbu+3kGz99RxsyauI="; }; @@ -39,10 +39,10 @@ stdenv.mkDerivation rec { the barriers to using haveged for other tasks. ''; homepage = "https://github.com/jirka-h/haveged"; - changelog = "https://raw.githubusercontent.com/jirka-h/haveged/v${version}/ChangeLog"; + changelog = "https://raw.githubusercontent.com/jirka-h/haveged/v${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; # fails to build since v1.9.15 }; -} +}) diff --git a/pkgs/by-name/hb/hblock/package.nix b/pkgs/by-name/hb/hblock/package.nix index 8180482005e9..fb7959f3c321 100644 --- a/pkgs/by-name/hb/hblock/package.nix +++ b/pkgs/by-name/hb/hblock/package.nix @@ -9,14 +9,14 @@ gnugrep, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hblock"; version = "3.5.1"; src = fetchFromGitHub { owner = "hectorm"; repo = "hblock"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-cke3MppQm8p8B9+5IcvCplw6CtyRbgq46wHqli7U77I="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ alanpearce ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/hc/hcxtools/package.nix b/pkgs/by-name/hc/hcxtools/package.nix index 3f1ff1a14b02..ac3af3116b92 100644 --- a/pkgs/by-name/hc/hcxtools/package.nix +++ b/pkgs/by-name/hc/hcxtools/package.nix @@ -8,14 +8,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hcxtools"; version = "7.0.1"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxtools"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-WV5+1PQF999qSIMrIYApmIx6C+ovbKOtJDFglzxzSB4="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ dywedir ]; }; -} +}) diff --git a/pkgs/by-name/hd/hdaps-gl/package.nix b/pkgs/by-name/hd/hdaps-gl/package.nix index 20d091a7dff0..ef5ea97e5956 100644 --- a/pkgs/by-name/hd/hdaps-gl/package.nix +++ b/pkgs/by-name/hd/hdaps-gl/package.nix @@ -8,13 +8,13 @@ libGLU, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hdaps-gl"; version = "0.0.7"; src = fetchFromGitHub { owner = "linux-thinkpad"; repo = "hdaps-gl"; - rev = version; + rev = finalAttrs.version; sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.symphorien ]; mainProgram = "hdaps-gl"; }; -} +}) diff --git a/pkgs/by-name/hd/hdapsd/package.nix b/pkgs/by-name/hd/hdapsd/package.nix index 7239e9b3d5d1..c0411c5e541d 100644 --- a/pkgs/by-name/hd/hdapsd/package.nix +++ b/pkgs/by-name/hd/hdapsd/package.nix @@ -6,12 +6,12 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hdapsd"; version = "20250908"; src = fetchurl { - url = "https://github.com/linux-thinkpad/hdapsd/releases/download/${version}/hdapsd-${version}.tar.gz"; + url = "https://github.com/linux-thinkpad/hdapsd/releases/download/${finalAttrs.version}/hdapsd-${finalAttrs.version}.tar.gz"; hash = "sha256-qENcOFJ9x5CkN72ZkTx/OL+gpwAYJlJomKvAjTklDYQ="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/hd/hdate/package.nix b/pkgs/by-name/hd/hdate/package.nix index cb7b8fcf4ada..f54a9f2951e6 100644 --- a/pkgs/by-name/hd/hdate/package.nix +++ b/pkgs/by-name/hd/hdate/package.nix @@ -4,11 +4,11 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.6.02"; pname = "hdate"; src = fetchurl { - url = "https://sourceforge.net/projects/libhdate/files/libhdate/libhdate-${version}/libhdate-${version}.tar.bz2"; + url = "https://sourceforge.net/projects/libhdate/files/libhdate/libhdate-${finalAttrs.version}/libhdate-${finalAttrs.version}.tar.bz2"; sha256 = "3c930a8deb57c01896dc37f0d7804e5a330ee8e88c4ff610b71f9d2b02c17762"; }; meta = { @@ -17,4 +17,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ CharlesHD ]; }; -} +}) diff --git a/pkgs/by-name/hd/hddtemp/package.nix b/pkgs/by-name/hd/hddtemp/package.nix index f2917aa97f8d..7e8aadce0940 100644 --- a/pkgs/by-name/hd/hddtemp/package.nix +++ b/pkgs/by-name/hd/hddtemp/package.nix @@ -10,12 +10,12 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hddtemp"; version = "0.3-beta15"; src = fetchurl { - url = "mirror://savannah/hddtemp/hddtemp-${version}.tar.bz2"; + url = "mirror://savannah/hddtemp/hddtemp-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-YYVBWEBUCT1TvootnoHJcXTzDwCvkcuHAKl+RC1571s="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "hddtemp"; }; -} +}) diff --git a/pkgs/by-name/hd/hdf5-blosc/package.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix index 24f3b7acc10d..0a99cb5ee163 100644 --- a/pkgs/by-name/hd/hdf5-blosc/package.nix +++ b/pkgs/by-name/hd/hdf5-blosc/package.nix @@ -8,14 +8,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hdf5-blosc"; version = "1.0.1"; src = fetchFromGitHub { owner = "Blosc"; repo = "hdf5-blosc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-pM438hUEdzdZEGYxoKlBAHi1G27auj9uGSeiXwVPAE8="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Blosc/hdf5-blosc"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/hd/hdhomerun-config-gui/package.nix b/pkgs/by-name/hd/hdhomerun-config-gui/package.nix index 455c759225ae..b9388f958137 100644 --- a/pkgs/by-name/hd/hdhomerun-config-gui/package.nix +++ b/pkgs/by-name/hd/hdhomerun-config-gui/package.nix @@ -7,12 +7,12 @@ gtk2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hdhomerun-config-gui"; version = "20250506"; src = fetchurl { - url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz"; + url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${finalAttrs.version}.tgz"; sha256 = "sha256-bmAdPR5r2mKCncQSSHZ6GYtAk3scHpatnmXGy+a/654="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.louisdk1 ]; mainProgram = "hdhomerun_config_gui"; }; -} +}) diff --git a/pkgs/by-name/hd/hdrmerge/package.nix b/pkgs/by-name/hd/hdrmerge/package.nix index 0d7e173363e2..14ea7ed9ba4e 100644 --- a/pkgs/by-name/hd/hdrmerge/package.nix +++ b/pkgs/by-name/hd/hdrmerge/package.nix @@ -13,7 +13,7 @@ copyDesktopItems, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hdrmerge"; version = "0.5.0-unstable-2025-04-26"; src = fetchFromGitHub { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { name = "HDRMerge"; genericName = "HDR raw image merge"; desktopName = "HDRMerge"; - comment = meta.description; + comment = finalAttrs.meta.description; icon = "hdrmerge"; exec = "hdrmerge %F"; categories = [ "Graphics" ]; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.paperdigits ]; }; -} +}) diff --git a/pkgs/by-name/hd/hdt/package.nix b/pkgs/by-name/hd/hdt/package.nix index 07dfd80c2ed9..e2924cedb1df 100644 --- a/pkgs/by-name/hd/hdt/package.nix +++ b/pkgs/by-name/hd/hdt/package.nix @@ -10,14 +10,14 @@ serd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hdt"; version = "1.3.3"; src = fetchFromGitHub { owner = "rdfhdt"; repo = "hdt-cpp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1vsq80jnix6cy78ayag7v8ajyw7h8dqyad1q6xkf2hzz3skvr34z"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.koslambrou ]; }; -} +}) diff --git a/pkgs/by-name/he/headset/package.nix b/pkgs/by-name/he/headset/package.nix index 53b0710e3f27..3f17b75a67e0 100644 --- a/pkgs/by-name/he/headset/package.nix +++ b/pkgs/by-name/he/headset/package.nix @@ -7,12 +7,12 @@ electron, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "headset"; version = "4.2.1"; src = fetchurl { - url = "https://github.com/headsetapp/headset-electron/releases/download/v${version}/headset_${version}_amd64.deb"; + url = "https://github.com/headsetapp/headset-electron/releases/download/v${finalAttrs.version}/headset_${finalAttrs.version}_amd64.deb"; hash = "sha256-81gsIq74sggauE6g8pM6z05KTmsbe49CZa9aRQEDwMo="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ muscaln ]; mainProgram = "headset"; }; -} +}) diff --git a/pkgs/by-name/he/headsetcontrol/package.nix b/pkgs/by-name/he/headsetcontrol/package.nix index e02604015fbc..f638dfd74510 100644 --- a/pkgs/by-name/he/headsetcontrol/package.nix +++ b/pkgs/by-name/he/headsetcontrol/package.nix @@ -7,14 +7,14 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "headsetcontrol"; version = "3.1.0"; src = fetchFromGitHub { owner = "Sapd"; repo = "HeadsetControl"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-9LUqYV0MMTtlFYZCEn81kML5F46GDYWYwoKpO0UORcQ="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ leixb ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/he/health-check/package.nix b/pkgs/by-name/he/health-check/package.nix index 098e979e50cc..13143da94ad6 100644 --- a/pkgs/by-name/he/health-check/package.nix +++ b/pkgs/by-name/he/health-check/package.nix @@ -6,14 +6,14 @@ libbsd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "health-check"; version = "0.04.01"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "health-check"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-sBhFH9BNRQ684ydqh8p4TtFwO+Aygu4Ke4+/nNMlZ/E="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/he/helio-workstation/package.nix b/pkgs/by-name/he/helio-workstation/package.nix index ce0ab0ec5a6b..5a0e29c4af7a 100644 --- a/pkgs/by-name/he/helio-workstation/package.nix +++ b/pkgs/by-name/he/helio-workstation/package.nix @@ -18,14 +18,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "helio-workstation"; version = "3.17"; src = fetchFromGitHub { owner = "helio-fm"; repo = "helio-workstation"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-uEo4dxwc1HksYGU5ssYp3rLugszSir2kKo4XxgqvSno="; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.suhr ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/he/help2man/package.nix b/pkgs/by-name/he/help2man/package.nix index 222f74529b94..aee62e34cb57 100644 --- a/pkgs/by-name/he/help2man/package.nix +++ b/pkgs/by-name/he/help2man/package.nix @@ -12,12 +12,12 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "help2man"; version = "1.49.3"; src = fetchurl { - url = "mirror://gnu/help2man/help2man-${version}.tar.xz"; + url = "mirror://gnu/help2man/help2man-${finalAttrs.version}.tar.xz"; sha256 = "sha256-TX5P3vLspq/geiaCFRzqeHgeCk6PliIULZ9wwIOi/U8="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/he/hepmc2/package.nix b/pkgs/by-name/he/hepmc2/package.nix index b83cdfc5a91c..a8ffe2f615d5 100644 --- a/pkgs/by-name/he/hepmc2/package.nix +++ b/pkgs/by-name/he/hepmc2/package.nix @@ -5,12 +5,12 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hepmc"; version = "2.06.11"; src = fetchurl { - url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC-${version}.tar.gz"; + url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC-${finalAttrs.version}.tar.gz"; sha256 = "1pp89bs05nv60wjk1690ndwh4dsd5mk20bzsd4a2lklysdifvb6f"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; }; -} +}) diff --git a/pkgs/by-name/he/herbe/package.nix b/pkgs/by-name/he/herbe/package.nix index 0849a544791d..9c74d9aacd1a 100644 --- a/pkgs/by-name/he/herbe/package.nix +++ b/pkgs/by-name/he/herbe/package.nix @@ -9,14 +9,14 @@ extraLibs ? [ ], }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "herbe"; version = "1.0.0"; src = fetchFromGitHub { owner = "dudik"; repo = "herbe"; - rev = version; + rev = finalAttrs.version; sha256 = "0358i5jmmlsvy2j85ij7m1k4ar2jr5lsv7y1c58dlf9710h186cv"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wishfort36 ]; mainProgram = "herbe"; }; -} +}) diff --git a/pkgs/by-name/he/herbstluftwm/package.nix b/pkgs/by-name/he/herbstluftwm/package.nix index 1e569ae5645f..4f7b6fec3ab9 100644 --- a/pkgs/by-name/he/herbstluftwm/package.nix +++ b/pkgs/by-name/he/herbstluftwm/package.nix @@ -24,12 +24,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "herbstluftwm"; version = "0.9.5"; src = fetchurl { - url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; + url = "https://herbstluftwm.org/tarballs/herbstluftwm-${finalAttrs.version}.tar.gz"; sha256 = "sha256-stRgCQnlvs5a1jgY37MLsZ/SrJ9ShHsaenStQEBxgQU="; }; @@ -138,4 +138,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thibautmarty ]; }; -} +}) diff --git a/pkgs/by-name/he/hercules/package.nix b/pkgs/by-name/he/hercules/package.nix index 9cbfe138b56d..1bd6b9ecbd62 100644 --- a/pkgs/by-name/he/hercules/package.nix +++ b/pkgs/by-name/he/hercules/package.nix @@ -106,14 +106,14 @@ let done ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hercules"; version = "4.8"; src = fetchFromGitHub { owner = "SDL-Hercules-390"; repo = "hyperion"; - rev = "Release_${version}"; + rev = "Release_${finalAttrs.version}"; hash = "sha256-3Go5m4/K8d4Vu7Yi8ULQpX83d44fu9XzmG/gClWeUKo="; }; @@ -158,4 +158,4 @@ stdenv.mkDerivation rec { vifino ]; }; -} +}) diff --git a/pkgs/by-name/he/hevea/package.nix b/pkgs/by-name/he/hevea/package.nix index ba31818f024b..b3f0985c59d2 100644 --- a/pkgs/by-name/he/hevea/package.nix +++ b/pkgs/by-name/he/hevea/package.nix @@ -5,12 +5,12 @@ ocamlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hevea"; version = "2.37"; src = fetchurl { - url = "https://hevea.inria.fr/distri/hevea-${version}.tar.gz"; + url = "https://hevea.inria.fr/distri/hevea-${finalAttrs.version}.tar.gz"; sha256 = "sha256-tuk/B/WBedZbTrfoxKXV9otKJfEEwCmmL8kVTpPhr1k="; }; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = { description = "Quite complete and fast LATEX to HTML translator"; homepage = "https://hevea.inria.fr/"; - changelog = "https://github.com/maranget/hevea/raw/v${version}/CHANGES"; + changelog = "https://github.com/maranget/hevea/raw/v${finalAttrs.version}/CHANGES"; license = lib.licenses.qpl; maintainers = with lib.maintainers; [ pSub ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/he/hexbinhex/package.nix b/pkgs/by-name/he/hexbinhex/package.nix index ec0dd6db3325..4aa8264aec4d 100644 --- a/pkgs/by-name/he/hexbinhex/package.nix +++ b/pkgs/by-name/he/hexbinhex/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hexbinhex"; version = "1.1"; src = fetchFromGitHub { owner = "dj-on-github"; repo = "hexbinhex"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-nfOmiF+t5QtAl1I7CSz26C9SGo7ZkdSziO2eiHbk6pA="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/dj-on-github/hexbinhex"; - changelog = "https://github.com/dj-on-github/hexbinhex/releases/tag/${src.rev}"; + changelog = "https://github.com/dj-on-github/hexbinhex/releases/tag/${finalAttrs.src.rev}"; description = '' Six utility programs to convert between hex, binary, ascii-binary and the oddball NIST format for 90B testing. @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { thillux ]; }; -} +}) diff --git a/pkgs/by-name/he/hexchat/package.nix b/pkgs/by-name/he/hexchat/package.nix index 2991989c85a4..3cf5cf778b59 100644 --- a/pkgs/by-name/he/hexchat/package.nix +++ b/pkgs/by-name/he/hexchat/package.nix @@ -21,14 +21,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hexchat"; version = "2.16.2"; src = fetchFromGitHub { owner = "hexchat"; repo = "hexchat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rgaXqXbBWlfSyz+CT0jRLyfGOR1cYYnRhEAu7AsaWus="; }; @@ -87,4 +87,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ romildo ]; }; -} +}) diff --git a/pkgs/by-name/he/hexcurse/package.nix b/pkgs/by-name/he/hexcurse/package.nix index d296ff01f50b..2c27ee1fc5d2 100644 --- a/pkgs/by-name/he/hexcurse/package.nix +++ b/pkgs/by-name/he/hexcurse/package.nix @@ -6,14 +6,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hexcurse"; version = "1.60.0"; src = fetchFromGitHub { owner = "LonnyGomes"; repo = "hexcurse"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk"; }; buildInputs = [ ncurses ]; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "hexcurse"; }; -} +}) diff --git a/pkgs/by-name/he/hexd/package.nix b/pkgs/by-name/he/hexd/package.nix index 577e00a57239..4ff4b506ddad 100644 --- a/pkgs/by-name/he/hexd/package.nix +++ b/pkgs/by-name/he/hexd/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hexd"; version = "1.1.0"; src = fetchFromGitHub { owner = "FireyFly"; repo = "hexd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-b/dROBQVPEiMBTcu4MTi6Lf6ChkFZqZrJ1V0j54rrFY="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "hexd"; }; -} +}) diff --git a/pkgs/by-name/he/hexio/package.nix b/pkgs/by-name/he/hexio/package.nix index 6c7b296e508f..67867a7d79a2 100644 --- a/pkgs/by-name/he/hexio/package.nix +++ b/pkgs/by-name/he/hexio/package.nix @@ -6,14 +6,14 @@ pth, python3Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hexio"; version = "1.1"; src = fetchFromGitLab { owner = "vanrein"; repo = "hexio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jp7VHT08Rhw5nUtNpqkRHDHT0R51PCBy0cKb1sI6zkg="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/hh/hhpc/package.nix b/pkgs/by-name/hh/hhpc/package.nix index b0eb04ec6b3f..6547ff2315bb 100644 --- a/pkgs/by-name/hh/hhpc/package.nix +++ b/pkgs/by-name/hh/hhpc/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hhpc"; version = "0.3.1"; src = fetchFromGitHub { owner = "aktau"; repo = "hhpc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1djsw1r38mh6zx0rbyn2cfa931hyddib4fl3i27c4z7xinl709ss"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; mainProgram = "hhpc"; }; -} +}) diff --git a/pkgs/by-name/hi/hid-listen/package.nix b/pkgs/by-name/hi/hid-listen/package.nix index ec1ed6626b84..4c9ddfa0b437 100644 --- a/pkgs/by-name/hi/hid-listen/package.nix +++ b/pkgs/by-name/hi/hid-listen/package.nix @@ -3,13 +3,13 @@ stdenv, fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hid-listen"; version = "1.01"; src = fetchzip { - name = "hid_listen_${version}"; - url = "https://www.pjrc.com/teensy/hid_listen_${version}.zip"; + name = "hid_listen_${finalAttrs.version}"; + url = "https://www.pjrc.com/teensy/hid_listen_${finalAttrs.version}.zip"; sha256 = "0sd4dvi39fl4vy880mg531ryks5zglfz5mdyyqr7x6qv056ffx9w"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "hid_listen"; }; -} +}) diff --git a/pkgs/by-name/hi/highfive/package.nix b/pkgs/by-name/hi/highfive/package.nix index fd9b2b60af4b..202d6239c11a 100644 --- a/pkgs/by-name/hi/highfive/package.nix +++ b/pkgs/by-name/hi/highfive/package.nix @@ -12,14 +12,14 @@ assert mpiSupport -> mpi != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; version = "2.10.1"; src = fetchFromGitHub { owner = "BlueBrain"; repo = "HighFive"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Nv+nbel/xGlGTB8sKF0EM1xwz/ZEri5uGB7ma6Ba6fo="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ robertodr ]; }; -} +}) diff --git a/pkgs/by-name/hi/highscore-mednafen/package.nix b/pkgs/by-name/hi/highscore-mednafen/package.nix index 8f5ba7d3ec83..af5b3a86db61 100644 --- a/pkgs/by-name/hi/highscore-mednafen/package.nix +++ b/pkgs/by-name/hi/highscore-mednafen/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "highscore-mednafen"; - version = "0-unstable-2026-01-05"; + version = "0-unstable-2026-01-28"; src = fetchFromGitHub { owner = "highscore-emu"; repo = "mednafen-highscore"; - rev = "fc1d23378594c5ed6aa1d89d555b4276214e1e11"; - hash = "sha256-YHVV6/8JTESLtGA5jFozE5IhXHB4RaUaT2yvFd7wGo8="; + rev = "2e8e49ee3155b2497b6a79f815f097e46e23ac0e"; + hash = "sha256-XGJpKQIBJ0Xu7w9FPc8xw8EKRLb5Y+0bhy8z8OuPOIg="; }; sourceRoot = "${finalAttrs.src.name}/highscore"; diff --git a/pkgs/by-name/hi/hime/package.nix b/pkgs/by-name/hi/hime/package.nix index 82573a063ef3..82e5f2e999db 100644 --- a/pkgs/by-name/hi/hime/package.nix +++ b/pkgs/by-name/hi/hime/package.nix @@ -13,14 +13,14 @@ anthy, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hime"; version = "0.9.11"; src = fetchFromGitHub { repo = "hime"; owner = "hime-ime"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-fCqet+foQjI+LpTQ/6Egup1GzXELlL2hgbh0dCKLwPI="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ yanganto ]; }; -} +}) diff --git a/pkgs/by-name/hi/hiredis/package.nix b/pkgs/by-name/hi/hiredis/package.nix index 6ef8b0c2f16e..2ad7a1c14aac 100644 --- a/pkgs/by-name/hi/hiredis/package.nix +++ b/pkgs/by-name/hi/hiredis/package.nix @@ -5,14 +5,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hiredis"; version = "1.2.0"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ZxUITm3OcbERcvaNqGQU46bEfV+jN6safPalG0TVfBg="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix index 74c6dcb55ea6..e91edb61e306 100644 --- a/pkgs/by-name/ho/homebank/package.nix +++ b/pkgs/by-name/ho/homebank/package.nix @@ -11,11 +11,11 @@ adwaita-icon-theme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "homebank"; version = "5.9.7"; src = fetchurl { - url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; + url = "https://www.gethomebank.org/public/sources/homebank-${finalAttrs.version}.tar.gz"; hash = "sha256-K4/fUSQpow7XpFfPWvR2dWwM/dyfznYA2rlcfwO+JuQ="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/ho/honggfuzz/package.nix b/pkgs/by-name/ho/honggfuzz/package.nix index 9fa9071c091b..c18b2b88f951 100644 --- a/pkgs/by-name/ho/honggfuzz/package.nix +++ b/pkgs/by-name/ho/honggfuzz/package.nix @@ -12,14 +12,14 @@ libblocksruntime, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "honggfuzz"; version = "2.6"; src = fetchFromGitHub { owner = "google"; repo = "honggfuzz"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-/ra6g0qjjC8Lo8/n2XEbwnZ95yDHcGhYd5+TTvQ6FAc="; }; @@ -89,4 +89,4 @@ stdenv.mkDerivation rec { chivay ]; }; -} +}) diff --git a/pkgs/by-name/ho/horst/package.nix b/pkgs/by-name/ho/horst/package.nix index a47e3ea828e5..f7a17e13773a 100644 --- a/pkgs/by-name/ho/horst/package.nix +++ b/pkgs/by-name/ho/horst/package.nix @@ -8,14 +8,14 @@ libnl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "horst"; version = "5.1"; src = fetchFromGitHub { owner = "br101"; repo = "horst"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "horst"; }; -} +}) diff --git a/pkgs/by-name/ho/hostname-debian/package.nix b/pkgs/by-name/ho/hostname-debian/package.nix index f2a804d91683..225abf7f01f9 100644 --- a/pkgs/by-name/ho/hostname-debian/package.nix +++ b/pkgs/by-name/ho/hostname-debian/package.nix @@ -4,7 +4,7 @@ fetchFromGitLab, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hostname-debian"; version = "3.25"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "meskes"; repo = "hostname"; - tag = "debian/${version}"; + tag = "debian/${finalAttrs.version}"; hash = "sha256-Yq8P5bF/RRZnWuFW0y2u08oZrydAKfopOtbrwbeIu3w="; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = { - changelog = "https://salsa.debian.org/meskes/hostname/-/blob/${src.tag}/debian/changelog"; + changelog = "https://salsa.debian.org/meskes/hostname/-/blob/${finalAttrs.src.tag}/debian/changelog"; description = "Utility to set/show the host name or domain name"; longDescription = '' This package provides commands which can be used to display the system's @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ posch ]; platforms = lib.platforms.gnu; }; -} +}) diff --git a/pkgs/by-name/ho/hotpatch/package.nix b/pkgs/by-name/ho/hotpatch/package.nix index c413a0410137..4134e78afa8e 100644 --- a/pkgs/by-name/ho/hotpatch/package.nix +++ b/pkgs/by-name/ho/hotpatch/package.nix @@ -5,7 +5,7 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hotpatch"; version = "0.2"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "Hot patching executables on Linux using .so file injection"; mainProgram = "hotpatcher"; - homepage = src.meta.homepage; + homepage = finalAttrs.src.meta.homepage; license = lib.licenses.bsd3; maintainers = [ ]; platforms = [ @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/ho/hotspot/package.nix b/pkgs/by-name/ho/hotspot/package.nix index f433feb0fc42..7deeee3fb609 100644 --- a/pkgs/by-name/ho/hotspot/package.nix +++ b/pkgs/by-name/ho/hotspot/package.nix @@ -16,14 +16,14 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hotspot"; version = "1.5.1"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-O2wp19scyHIwIY2AzKmPmorGXDH249/OhSg+KtzOYhI="; fetchSubmodules = true; }; @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { then displays the result in a graphical way. ''; homepage = "https://github.com/KDAB/hotspot"; - changelog = "https://github.com/KDAB/hotspot/releases/tag/v${version}"; + changelog = "https://github.com/KDAB/hotspot/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ gpl2Only gpl3Only @@ -107,4 +107,4 @@ stdenv.mkDerivation rec { tmarkus ]; }; -} +}) diff --git a/pkgs/by-name/ho/howard-hinnant-date/package.nix b/pkgs/by-name/ho/howard-hinnant-date/package.nix index da53f7150228..e5f03cab4a5b 100644 --- a/pkgs/by-name/ho/howard-hinnant-date/package.nix +++ b/pkgs/by-name/ho/howard-hinnant-date/package.nix @@ -8,14 +8,14 @@ replaceVars, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "howard-hinnant-date"; version = "3.0.3"; src = fetchFromGitHub { owner = "HowardHinnant"; repo = "date"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-qfrmH3NRyrDVmHRmmWzM5Zz37E7RFXJqaV1Rq2E59qs="; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { substituteInPlace date.pc.in \ --replace '@CMAKE_INSTALL_LIB@' '@CMAKE_INSTALL_FULL_LIBDIR@' \ --replace '@CMAKE_INSTALL_INCLUDE@' '@CMAKE_INSTALL_FULL_INCLUDEDIR@' \ - --replace '@PACKAGE_VERSION@' '${version}' + --replace '@PACKAGE_VERSION@' '${finalAttrs.version}' ''; nativeBuildInputs = [ cmake ]; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix ++ windows; maintainers = with lib.maintainers; [ r-burns ]; }; -} +}) diff --git a/pkgs/by-name/ho/howl/package.nix b/pkgs/by-name/ho/howl/package.nix index ae757c7dd0fb..7f04a9497a48 100644 --- a/pkgs/by-name/ho/howl/package.nix +++ b/pkgs/by-name/ho/howl/package.nix @@ -8,17 +8,17 @@ librsvg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "howl"; version = "0.6"; # Use the release tarball containing pre-downloaded dependencies sources src = fetchurl { - url = "https://github.com/howl-editor/howl/releases/download/${version}/howl-${version}.tgz"; + url = "https://github.com/howl-editor/howl/releases/download/${finalAttrs.version}/howl-${finalAttrs.version}.tgz"; sha256 = "1qc58l3rkr37cj6vhf8c7bnwbz93nscyraz7jxqwjq6k4gj0cjw3"; }; - sourceRoot = "howl-${version}/src"; + sourceRoot = "howl-${finalAttrs.version}/src"; # The Makefile uses "/usr/local" if not explicitly overridden installFlags = [ "PREFIX=$(out)" ]; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/hp/hpcg/package.nix b/pkgs/by-name/hp/hpcg/package.nix index b1fb7dcc1f8c..37e78647b042 100644 --- a/pkgs/by-name/hp/hpcg/package.nix +++ b/pkgs/by-name/hp/hpcg/package.nix @@ -5,12 +5,12 @@ mpi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hpcg"; version = "3.1"; src = fetchurl { - url = "http://www.hpcg-benchmark.org/downloads/hpcg-${version}.tar.gz"; + url = "http://www.hpcg-benchmark.org/downloads/hpcg-${finalAttrs.version}.tar.gz"; sha256 = "197lw2nwmzsmfsbvgvi8z7kj69n374kgfzzp8pkmk7mp2vkk991k"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.markuskowa ]; mainProgram = "xhpcg"; }; -} +}) diff --git a/pkgs/by-name/hp/hpe-ltfs/package.nix b/pkgs/by-name/hp/hpe-ltfs/package.nix index db8b2705403e..9552feca3384 100644 --- a/pkgs/by-name/hp/hpe-ltfs/package.nix +++ b/pkgs/by-name/hp/hpe-ltfs/package.nix @@ -9,18 +9,18 @@ libuuid, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.4.2_Z7550-02501"; pname = "hpe-ltfs"; src = fetchFromGitHub { - rev = version; + rev = finalAttrs.version; owner = "nix-community"; repo = "hpe-ltfs"; sha256 = "193593hsc8nf5dn1fkxhzs1z4fpjh64hdkc8q6n9fgplrpxdlr4s"; }; - sourceRoot = "${src.name}/ltfs"; + sourceRoot = "${finalAttrs.src.name}/ltfs"; # include sys/sysctl.h is deprecated in glibc. The sysctl calls are only used # for Apple to determine the kernel version. Because this build only targets @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; downloadPage = "https://github.com/nix-community/hpe-ltfs"; }; -} +}) diff --git a/pkgs/by-name/hp/hpl/package.nix b/pkgs/by-name/hp/hpl/package.nix index 1b314e176043..dc10078d5d95 100644 --- a/pkgs/by-name/hp/hpl/package.nix +++ b/pkgs/by-name/hp/hpl/package.nix @@ -9,12 +9,12 @@ assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hpl"; version = "2.3"; src = fetchurl { - url = "http://www.netlib.org/benchmark/hpl/hpl-${version}.tar.gz"; + url = "http://www.netlib.org/benchmark/hpl/hpl-${finalAttrs.version}.tar.gz"; sha256 = "0c18c7fzlqxifz1bf3izil0bczv3a7nsv0dn6winy3ik49yw3i9j"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.markuskowa ]; mainProgram = "xhpl"; }; -} +}) diff --git a/pkgs/by-name/hp/hpx/package.nix b/pkgs/by-name/hp/hpx/package.nix index d83564b94bdd..3fb86c2680d4 100644 --- a/pkgs/by-name/hp/hpx/package.nix +++ b/pkgs/by-name/hp/hpx/package.nix @@ -11,14 +11,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hpx"; version = "1.11.0"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-AhByaw1KnEDuRfKiN+/vQMbkG0BJ6Z3+h+QT8scFzAY="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; # lib.platforms.linux; maintainers = with lib.maintainers; [ bobakker ]; }; -} +}) diff --git a/pkgs/by-name/hr/hr/package.nix b/pkgs/by-name/hr/hr/package.nix index 93602154d370..1e586b8d52af 100644 --- a/pkgs/by-name/hr/hr/package.nix +++ b/pkgs/by-name/hr/hr/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hr"; version = "1.5"; src = fetchFromGitHub { owner = "LuRsT"; repo = "hr"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-05num4v8C3n+uieKQJVLOzu9OOMBsUMPqq08Ou6gmYQ="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "hr"; }; -} +}) diff --git a/pkgs/by-name/hs/hsetroot/package.nix b/pkgs/by-name/hs/hsetroot/package.nix index d2ebbce41828..1c24340c9d6e 100644 --- a/pkgs/by-name/hs/hsetroot/package.nix +++ b/pkgs/by-name/hs/hsetroot/package.nix @@ -8,14 +8,14 @@ libXinerama, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hsetroot"; version = "1.0.5"; src = fetchFromGitHub { owner = "himdel"; repo = "hsetroot"; - rev = version; + rev = finalAttrs.version; sha256 = "1jbk5hlxm48zmjzkaq5946s58rqwg1v1ds2sdyd2ba029hmvr722"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/hs/hstr/package.nix b/pkgs/by-name/hs/hstr/package.nix index a92128622780..4975d106f258 100644 --- a/pkgs/by-name/hs/hstr/package.nix +++ b/pkgs/by-name/hs/hstr/package.nix @@ -9,14 +9,14 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hstr"; version = "3.1"; src = fetchFromGitHub { owner = "dvorka"; repo = "hstr"; - rev = version; + rev = finalAttrs.version; hash = "sha256-OuLy1aiEwUJDGy3+UXYF1Vx1nNXic46WIZEM1xrIPfA="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/ht/ht/package.nix b/pkgs/by-name/ht/ht/package.nix index a2fd162ef84e..6e1e3023128a 100644 --- a/pkgs/by-name/ht/ht/package.nix +++ b/pkgs/by-name/ht/ht/package.nix @@ -5,12 +5,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ht"; version = "2.1.0"; src = fetchurl { - url = "mirror://sourceforge/project/hte/ht-source/ht-${version}.tar.bz2"; + url = "mirror://sourceforge/project/hte/ht-source/ht-${finalAttrs.version}.tar.bz2"; sha256 = "0w2xnw3z9ws9qrdpb80q55h6ynhh3aziixcfn45x91bzrbifix9i"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "ht"; }; -} +}) diff --git a/pkgs/by-name/ht/html-tidy/package.nix b/pkgs/by-name/ht/html-tidy/package.nix index fe53847a3024..9c47ba7a636f 100644 --- a/pkgs/by-name/ht/html-tidy/package.nix +++ b/pkgs/by-name/ht/html-tidy/package.nix @@ -8,14 +8,14 @@ html-tidy, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "html-tidy"; version = "5.8.0"; src = fetchFromGitHub { owner = "htacg"; repo = "tidy-html5"; - rev = version; + rev = finalAttrs.version; hash = "sha256-vzVWQodwzi3GvC9IcSQniYBsbkJV20iZanF33A0Gpe0="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ edwtjo ]; mainProgram = "tidy"; }; -} +}) diff --git a/pkgs/by-name/ht/html2text/package.nix b/pkgs/by-name/ht/html2text/package.nix index 80969c8e34a4..1f996d3d620a 100644 --- a/pkgs/by-name/ht/html2text/package.nix +++ b/pkgs/by-name/ht/html2text/package.nix @@ -9,14 +9,14 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "html2text"; version = "2.3.0"; src = fetchFromGitLab { owner = "grobian"; repo = "html2text"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-e/KWyc7lOdWhtFC7ZAD7sYgCsO3JzGkLUThVI7edqIQ="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eikek ]; }; -} +}) diff --git a/pkgs/by-name/ht/htmldoc/package.nix b/pkgs/by-name/ht/htmldoc/package.nix index af5d5ebe7234..ec5ea87621c7 100644 --- a/pkgs/by-name/ht/htmldoc/package.nix +++ b/pkgs/by-name/ht/htmldoc/package.nix @@ -11,13 +11,13 @@ htmldoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "htmldoc"; version = "1.9.21"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "htmldoc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-MZKXEwJdQzn49JIUm4clqKBTtjKu6tBU5Sdq6ESn1k4="; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "Converts HTML files to PostScript and PDF"; homepage = "https://michaelrsweet.github.io/htmldoc"; - changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}"; + changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Only; maintainers = [ ]; platforms = lib.platforms.unix; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { ''; mainProgram = "htmldoc"; }; -} +}) diff --git a/pkgs/by-name/ht/htpdate/package.nix b/pkgs/by-name/ht/htpdate/package.nix index 240b377102f6..a192747bed76 100644 --- a/pkgs/by-name/ht/htpdate/package.nix +++ b/pkgs/by-name/ht/htpdate/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.0.1"; pname = "htpdate"; src = fetchFromGitHub { owner = "twekkel"; repo = "htpdate"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-dl3xlwk2q1DdGrIQsbKwdYDjyhGxpYwQGcd9k91LkxA="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ julienmalka ]; mainProgram = "htpdate"; }; -} +}) diff --git a/pkgs/by-name/ht/httpfs2/package.nix b/pkgs/by-name/ht/httpfs2/package.nix index c4c0bbf04be0..68c050793a5c 100644 --- a/pkgs/by-name/ht/httpfs2/package.nix +++ b/pkgs/by-name/ht/httpfs2/package.nix @@ -12,12 +12,12 @@ libxslt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "httpfs2"; version = "0.1.5"; src = fetchurl { - url = "mirror://sourceforge/httpfs/httpfs2/httpfs2-${version}.tar.gz"; + url = "mirror://sourceforge/httpfs/httpfs2/httpfs2-${finalAttrs.version}.tar.gz"; sha256 = "1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ht/httpunit/package.nix b/pkgs/by-name/ht/httpunit/package.nix index 075c94bc0ba9..2ecfa5f7da20 100644 --- a/pkgs/by-name/ht/httpunit/package.nix +++ b/pkgs/by-name/ht/httpunit/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "httpunit"; version = "1.7"; src = fetchurl { - url = "mirror://sourceforge/httpunit/httpunit-${version}.zip"; + url = "mirror://sourceforge/httpunit/httpunit-${finalAttrs.version}.zip"; sha256 = "09gnayqgizd8cjqayvdpkxrc69ipyxawc96aznfrgdhdiwv8l5zf"; }; @@ -22,4 +22,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/ht/httrack/package.nix b/pkgs/by-name/ht/httrack/package.nix index cd0b843be34a..9fea3afdd19e 100644 --- a/pkgs/by-name/ht/httrack/package.nix +++ b/pkgs/by-name/ht/httrack/package.nix @@ -7,12 +7,12 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.49.2"; pname = "httrack"; src = fetchurl { - url = "https://mirror.httrack.com/httrack-${version}.tar.gz"; + url = "https://mirror.httrack.com/httrack-${finalAttrs.version}.tar.gz"; sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/hu/hubicfuse/package.nix b/pkgs/by-name/hu/hubicfuse/package.nix index 662f49f490fb..acdd7fe3f5d4 100644 --- a/pkgs/by-name/hu/hubicfuse/package.nix +++ b/pkgs/by-name/hu/hubicfuse/package.nix @@ -12,14 +12,14 @@ file, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hubicfuse"; version = "3.0.1"; src = fetchFromGitHub { owner = "TurboGit"; repo = "hubicfuse"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1x988hfffxgvqxh083pv3lj5031fz03sbgiiwrjpaiywfbhm8ffr"; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.jpierre03 ]; }; -} +}) diff --git a/pkgs/by-name/hu/hugin/package.nix b/pkgs/by-name/hu/hugin/package.nix index 1303b917cac8..df621a612cf8 100644 --- a/pkgs/by-name/hu/hugin/package.nix +++ b/pkgs/by-name/hu/hugin/package.nix @@ -34,12 +34,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hugin"; version = "2025.0.1"; src = fetchurl { - url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; + url = "mirror://sourceforge/hugin/hugin-${finalAttrs.version}.tar.bz2"; hash = "sha256-fPjrM6aohIzH+Bb69LyIOJIoiD1VExNtzLXLJDkSq3k="; }; @@ -104,4 +104,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/hy/hyp2mat/package.nix b/pkgs/by-name/hy/hyp2mat/package.nix index 4ab50545da8c..81ebb78e0c2d 100644 --- a/pkgs/by-name/hy/hyp2mat/package.nix +++ b/pkgs/by-name/hy/hyp2mat/package.nix @@ -15,14 +15,14 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hyp2mat"; version = "0.0.18"; src = fetchFromGitHub { owner = "koendv"; repo = "hyp2mat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "03ibk51swxfl7pfrhcrfiffdi4mnf8kla0g1xj1lsrvrjwapfx03"; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ matthuszagh ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/hy/hyperhdr/package.nix b/pkgs/by-name/hy/hyperhdr/package.nix index 0e8670cd6617..cdd183d90168 100644 --- a/pkgs/by-name/hy/hyperhdr/package.nix +++ b/pkgs/by-name/hy/hyperhdr/package.nix @@ -27,14 +27,14 @@ let ; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hyperhdr"; version = "21.0.0.0"; src = fetchFromGitHub { owner = "awawa-dev"; repo = "HyperHDR"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CSggawgUPkpeADc8VXs5FA+ubZAtrtTu0qYgIWA0V/c="; }; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = { description = "Highly optimized open source ambient lighting implementation based on modern digital video and audio stream analysis for Windows, macOS and Linux (x86 and Raspberry Pi / ARM"; homepage = "https://github.com/awawa-dev/HyperHDR"; - changelog = "https://github.com/awawa-dev/HyperHDR/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/awawa-dev/HyperHDR/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ hexa @@ -97,4 +97,4 @@ stdenv.mkDerivation rec { mainProgram = "hyperhdr"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/hy/hypnotix/package.nix b/pkgs/by-name/hy/hypnotix/package.nix index 479326f6f0c3..d93c7ece8d2f 100644 --- a/pkgs/by-name/hy/hypnotix/package.nix +++ b/pkgs/by-name/hy/hypnotix/package.nix @@ -14,14 +14,14 @@ yt-dlp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hypnotix"; version = "5.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; - tag = version; + tag = finalAttrs.version; hash = "sha256-7CPrRMoVM1FaU8aJlnZigTkHa97bDPdwcu4JY7sERJQ="; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace usr/lib/hypnotix/hypnotix.py \ - --replace __DEB_VERSION__ ${version} \ + --replace __DEB_VERSION__ ${finalAttrs.version} \ --replace /usr/bin/yt-dlp ${yt-dlp}/bin/yt-dlp \ --replace /usr/share/circle-flags-svg ${circle-flags}/share/circle-flags-svg \ --replace /usr/share/hypnotix $out/share/hypnotix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = { description = "IPTV streaming application"; homepage = "https://github.com/linuxmint/hypnotix"; - changelog = "https://github.com/linuxmint/hypnotix/blob/${src.tag}/debian/changelog"; + changelog = "https://github.com/linuxmint/hypnotix/blob/${finalAttrs.src.tag}/debian/changelog"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dotlambda @@ -98,4 +98,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "hypnotix"; }; -} +}) diff --git a/pkgs/by-name/hy/hyprfreeze/package.nix b/pkgs/by-name/hy/hyprfreeze/package.nix index 4a5b6638098a..004bfe792e41 100644 --- a/pkgs/by-name/hy/hyprfreeze/package.nix +++ b/pkgs/by-name/hy/hyprfreeze/package.nix @@ -9,14 +9,14 @@ libnotify, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hyprfreeze"; version = "1.2.0"; src = fetchFromGitHub { owner = "Zerodya"; repo = "hyprfreeze"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-omwAWBEnb14ZBux7bvXSJyi7FI1LZ5GaZFn46/bWJA4="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "hyprfreeze"; }; -} +}) diff --git a/pkgs/by-name/hy/hyprlax/package.nix b/pkgs/by-name/hy/hyprlax/package.nix index 415c5627c561..80f47bfd537c 100644 --- a/pkgs/by-name/hy/hyprlax/package.nix +++ b/pkgs/by-name/hy/hyprlax/package.nix @@ -9,14 +9,14 @@ libGL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hyprlax"; version = "2.2.0"; src = fetchFromGitHub { owner = "sandwichfarm"; repo = "hyprlax"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RIeMsQt6MxSTI7TunIxk7wd08sYmr3EvjAQifr+M4e8="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers._6543 ]; mainProgram = "hyprlax"; }; -} +}) diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index 1d75881d1519..63c80826c05b 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -32,22 +32,23 @@ wayland, wayland-protocols, util-linux, + versionCheckHook, }: gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprpaper"; - version = "0.8.1-unstable-2026-01-08"; + version = "0.8.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprpaper"; - rev = "2953d963bec2ea63b4303e269b472524db46a121"; - hash = "sha256-vxAZg+NzAKuWZv2yDrTcXrU+klpAcGFo1FvjYb/CqZ8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-6N1JeQx9/M3XCcxErk24FLMxTgn8GH40fpckP8X3ons="; }; prePatch = '' substituteInPlace src/main.cpp \ - --replace-fail GIT_COMMIT_HASH '"${finalAttrs.src.rev}"' + --replace-fail GIT_COMMIT_HASH '"${finalAttrs.src.tag}"' ''; nativeBuildInputs = [ @@ -86,6 +87,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: { util-linux ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + meta = { inherit (finalAttrs.src.meta) homepage; description = "Blazing fast wayland wallpaper utility"; diff --git a/pkgs/by-name/hy/hyprshutdown/package.nix b/pkgs/by-name/hy/hyprshutdown/package.nix index 92fd6d6ae4f0..a10b21a17b9c 100644 --- a/pkgs/by-name/hy/hyprshutdown/package.nix +++ b/pkgs/by-name/hy/hyprshutdown/package.nix @@ -13,17 +13,17 @@ hyprgraphics, cairo, nix-update-script, - testers, + versionCheckHook, }: gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprshutdown"; - version = "0-unstable-2026-01-27"; + version = "0.1.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprshutdown"; - rev = "9f18be9c4e1a484c65b22dd53280815dc79a5a56"; + tag = "v${finalAttrs.version}"; hash = "sha256-dp5lyZzKsjdqJLfwr0S4ILets8eu1kLfBB2y/LxspsU="; }; @@ -43,20 +43,12 @@ gcc15Stdenv.mkDerivation (finalAttrs: { (glaze.override { enableSSL = false; }) ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--help"; + passthru = { - updateScript = nix-update-script { - # TODO: remove when stable release available - extraArgs = [ "--version=branch" ]; - }; - tests = { - help = testers.runCommand { - name = "${finalAttrs.pname}-help-test"; - nativeBuildInputs = [ finalAttrs.finalPackage ]; - script = '' - '${finalAttrs.meta.mainProgram}' --help && touch "$out" - ''; - }; - }; + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/by-name/hy/hyx/package.nix b/pkgs/by-name/hy/hyx/package.nix index 91e798e815c7..d702a50b165a 100644 --- a/pkgs/by-name/hy/hyx/package.nix +++ b/pkgs/by-name/hy/hyx/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hyx"; version = "2024.02.29"; src = fetchurl { - url = "https://yx7.cc/code/hyx/hyx-${lib.replaceStrings [ "-" ] [ "." ] version}.tar.xz"; + url = "https://yx7.cc/code/hyx/hyx-${lib.replaceStrings [ "-" ] [ "." ] finalAttrs.version}.tar.xz"; sha256 = "sha256-dufx3zsabeet7Rp0d60MIuNqisIQd6UgE7WDZYNHl3E="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fpletz ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/i2/i2c-tools/package.nix b/pkgs/by-name/i2/i2c-tools/package.nix index 96db4848fffc..fa015ee797fa 100644 --- a/pkgs/by-name/i2/i2c-tools/package.nix +++ b/pkgs/by-name/i2/i2c-tools/package.nix @@ -6,12 +6,12 @@ read-edid, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "i2c-tools"; version = "4.4"; src = fetchzip { - url = "https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/snapshot/i2c-tools-v${version}.tar.gz"; + url = "https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/snapshot/i2c-tools-v${finalAttrs.version}.tar.gz"; sha256 = "sha256-Zm83gxdZH2XQCc/Dihp7vumF9WAvKgt6OORns5Mua7M="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.dezgeg ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix index 633baddaa3bf..65f0424b4d93 100644 --- a/pkgs/by-name/i2/i2pd/package.nix +++ b/pkgs/by-name/i2/i2pd/package.nix @@ -10,14 +10,14 @@ miniupnpc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "i2pd"; version = "2.58.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = "i2pd"; - tag = version; + tag = finalAttrs.version; hash = "sha256-moUcivW3YIE2SvjS7rCXTjeCKUW/u/NXWH3VmJ9x6jg="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "i2pd"; }; -} +}) diff --git a/pkgs/by-name/ia/iagno/package.nix b/pkgs/by-name/ia/iagno/package.nix index 8f04ca2748f8..0df48f4f37b3 100644 --- a/pkgs/by-name/ia/iagno/package.nix +++ b/pkgs/by-name/ia/iagno/package.nix @@ -20,12 +20,12 @@ desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iagno"; version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/iagno/${lib.versions.majorMinor version}/iagno-${version}.tar.xz"; + url = "mirror://gnome/sources/iagno/${lib.versions.majorMinor finalAttrs.version}/iagno-${finalAttrs.version}.tar.xz"; hash = "sha256-hLnzLOA4l1iiHWPH6xwifbcRa1HTFJqg6uNQkWjg7SQ="; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ic/icmake/package.nix b/pkgs/by-name/ic/icmake/package.nix index af47abfd7364..df6843d591de 100644 --- a/pkgs/by-name/ic/icmake/package.nix +++ b/pkgs/by-name/ic/icmake/package.nix @@ -7,13 +7,13 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "icmake"; version = "9.03.01"; src = fetchFromGitLab { sha256 = "05r0a69w0hv2qhjpb2bxd0lmp2vv5r2d4iggg6ly4miam0i318jy"; - rev = version; + rev = finalAttrs.version; repo = "icmake"; owner = "fbb-git"; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ic/icon-library/package.nix b/pkgs/by-name/ic/icon-library/package.nix index a468ca12b0ef..923c7453c74d 100644 --- a/pkgs/by-name/ic/icon-library/package.nix +++ b/pkgs/by-name/ic/icon-library/package.nix @@ -18,12 +18,12 @@ libadwaita, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "icon-library"; version = "0.0.19"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/icon-library/uploads/7725604ce39be278abe7c47288085919/icon-library-${version}.tar.xz"; + url = "https://gitlab.gnome.org/World/design/icon-library/uploads/7725604ce39be278abe7c47288085919/icon-library-${finalAttrs.version}.tar.xz"; hash = "sha256-nWGTYoSa0/fxnD0Mb2132LkeB1oa/gj/oIXBbI+FDw8="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ic/icon-slicer/package.nix b/pkgs/by-name/ic/icon-slicer/package.nix index 5a12f452494a..34d08cce01f7 100644 --- a/pkgs/by-name/ic/icon-slicer/package.nix +++ b/pkgs/by-name/ic/icon-slicer/package.nix @@ -6,12 +6,12 @@ gdk-pixbuf, popt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "icon-slicer"; version = "0.3"; src = fetchurl { - url = "https://freedesktop.org/software/icon-slicer/releases/icon-slicer-${version}.tar.gz"; + url = "https://freedesktop.org/software/icon-slicer/releases/icon-slicer-${finalAttrs.version}.tar.gz"; sha256 = "0kdnc08k2rs8llfg7xgvnrsk60x59pv5fqz6kn2ifnn2s1nj3w05"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "icon-slicer"; }; -} +}) diff --git a/pkgs/by-name/ic/icoutils/package.nix b/pkgs/by-name/ic/icoutils/package.nix index b6505b0c768d..ef6db9b85017 100644 --- a/pkgs/by-name/ic/icoutils/package.nix +++ b/pkgs/by-name/ic/icoutils/package.nix @@ -10,12 +10,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "icoutils"; version = "0.32.3"; src = fetchurl { - url = "mirror://savannah/icoutils/icoutils-${version}.tar.bz2"; + url = "mirror://savannah/icoutils/icoutils-${finalAttrs.version}.tar.bz2"; sha256 = "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp"; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/ic/ictree/package.nix b/pkgs/by-name/ic/ictree/package.nix index 83088602f18f..e90343b300e1 100644 --- a/pkgs/by-name/ic/ictree/package.nix +++ b/pkgs/by-name/ic/ictree/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ictree"; version = "1.0.1"; src = fetchFromGitHub { owner = "NikitaIvanovV"; repo = "ictree"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-77Wo6jN8VUGTXBuGL0a9kvSIixdyEQoxqqNsHq9jcWw="; fetchSubmodules = true; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "ictree"; }; -} +}) diff --git a/pkgs/by-name/id/id3/package.nix b/pkgs/by-name/id/id3/package.nix index e0cd063141c5..037c222cb7cd 100644 --- a/pkgs/by-name/id/id3/package.nix +++ b/pkgs/by-name/id/id3/package.nix @@ -5,14 +5,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "id3"; version = "0.81"; src = fetchFromGitHub { owner = "squell"; repo = "id3"; - rev = version; + rev = finalAttrs.version; hash = "sha256-+h1wwgTB7CpbjyUAK+9BNRhmy83D+1I+cZ70E1m3ENk="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "id3"; }; -} +}) diff --git a/pkgs/by-name/id/ideogram/package.nix b/pkgs/by-name/id/ideogram/package.nix index 7cb5784d2640..20cd6b90309e 100644 --- a/pkgs/by-name/id/ideogram/package.nix +++ b/pkgs/by-name/id/ideogram/package.nix @@ -18,14 +18,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ideogram"; version = "1.3.3"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ideogram"; - rev = version; + rev = finalAttrs.version; sha256 = "1zkr7x022khn5g3sq2dkxzy1hiiz66vl81s3i5sb9qr88znh79p1"; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { mainProgram = "com.github.cassidyjames.ideogram"; }; -} +}) diff --git a/pkgs/by-name/id/ideviceinstaller/package.nix b/pkgs/by-name/id/ideviceinstaller/package.nix index 74f584492426..37bb21b9a909 100644 --- a/pkgs/by-name/id/ideviceinstaller/package.nix +++ b/pkgs/by-name/id/ideviceinstaller/package.nix @@ -9,7 +9,7 @@ libzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ideviceinstaller"; version = "1.1.1+date=2023-04-30"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; preAutoreconf = '' - export RELEASE_VERSION=${version} + export RELEASE_VERSION=${finalAttrs.version} ''; meta = { @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "ideviceinstaller"; }; -} +}) diff --git a/pkgs/by-name/id/idevicerestore/package.nix b/pkgs/by-name/id/idevicerestore/package.nix index 05930b51d44d..5b1bad477867 100644 --- a/pkgs/by-name/id/idevicerestore/package.nix +++ b/pkgs/by-name/id/idevicerestore/package.nix @@ -11,7 +11,7 @@ libusbmuxd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "idevicerestore"; version = "1.0.0-unstable-2025-10-02"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; preAutoreconf = '' - export RELEASE_VERSION=${version} + export RELEASE_VERSION=${finalAttrs.version} ''; meta = { @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nh2 ]; mainProgram = "idevicerestore"; }; -} +}) diff --git a/pkgs/by-name/id/idle3tools/package.nix b/pkgs/by-name/id/idle3tools/package.nix index 141da480488e..4cf9a787de75 100644 --- a/pkgs/by-name/id/idle3tools/package.nix +++ b/pkgs/by-name/id/idle3tools/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "idle3-tools"; version = "0.9.1"; src = fetchurl { - url = "mirror://sourceforge/idle3-tools/idle3-tools-${version}.tgz"; + url = "mirror://sourceforge/idle3-tools/idle3-tools-${finalAttrs.version}.tgz"; sha256 = "00ia7xq9yldxyl9gz0mr4xa568nav14p0fnv82f2rbbkg060cy4p"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "idle3ctl"; }; -} +}) diff --git a/pkgs/by-name/id/idsk/package.nix b/pkgs/by-name/id/idsk/package.nix index 1847ecdca64b..ef561dbea547 100644 --- a/pkgs/by-name/id/idsk/package.nix +++ b/pkgs/by-name/id/idsk/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "idsk"; version = "0.20"; src = fetchFromGitHub { owner = "cpcsdk"; repo = "idsk"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rYClWq1Nl3COoG+eOJyFDTvBSzpHpGminU4bndZs6xc="; }; @@ -39,10 +39,10 @@ stdenv.mkDerivation rec { meta = { description = "Manipulating CPC dsk images and files"; homepage = "https://github.com/cpcsdk/idsk"; - changelog = "https://github.com/cpcsdk/idsk/releases/tag/${src.rev}"; + changelog = "https://github.com/cpcsdk/idsk/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; mainProgram = "iDSK"; maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/id/idutils/package.nix b/pkgs/by-name/id/idutils/package.nix index 40658cd3e064..fe61acdbe689 100644 --- a/pkgs/by-name/id/idutils/package.nix +++ b/pkgs/by-name/id/idutils/package.nix @@ -14,12 +14,12 @@ rsync, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "idutils"; version = "4.6"; src = fetchurl { - url = "mirror://gnu/idutils/idutils-${version}.tar.xz"; + url = "mirror://gnu/idutils/idutils-${finalAttrs.version}.tar.xz"; sha256 = "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1"; }; @@ -80,4 +80,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ gfrascadorio ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/if/ifenslave/package.nix b/pkgs/by-name/if/ifenslave/package.nix index 1d37842df637..ef922278a88f 100644 --- a/pkgs/by-name/if/ifenslave/package.nix +++ b/pkgs/by-name/if/ifenslave/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ifenslave"; version = "1.1.0"; src = fetchurl { - url = "mirror://debian/pool/main/i/ifenslave-2.6/ifenslave-2.6_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/i/ifenslave-2.6/ifenslave-2.6_${finalAttrs.version}.orig.tar.gz"; sha256 = "0h9hrmy19zdksl7ys250r158b943ihbgkb95n8p4k8l0vqsby5vr"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/if/ifstat-legacy/package.nix b/pkgs/by-name/if/ifstat-legacy/package.nix index c94dee2e7f5a..2661751510e2 100644 --- a/pkgs/by-name/if/ifstat-legacy/package.nix +++ b/pkgs/by-name/if/ifstat-legacy/package.nix @@ -6,12 +6,12 @@ net-snmp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ifstat-legacy"; version = "1.1"; src = fetchurl { - url = "http://gael.roualland.free.fr/ifstat/ifstat-${version}.tar.gz"; + url = "http://gael.roualland.free.fr/ifstat/ifstat-${finalAttrs.version}.tar.gz"; sha256 = "01zmv6vk5kh5xmd563xws8a1qnxjb6b6kv59yzz9r3rrghxhd6c5"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "ifstat-legacy"; }; -} +}) diff --git a/pkgs/by-name/if/iftop/package.nix b/pkgs/by-name/if/iftop/package.nix index c6ffaabd4ac0..283a214a2082 100644 --- a/pkgs/by-name/if/iftop/package.nix +++ b/pkgs/by-name/if/iftop/package.nix @@ -7,12 +7,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iftop"; version = "1.0pre4"; src = fetchurl { - url = "http://ex-parrot.com/pdw/iftop/download/iftop-${version}.tar.gz"; + url = "http://ex-parrot.com/pdw/iftop/download/iftop-${finalAttrs.version}.tar.gz"; sha256 = "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp"; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "iftop"; }; -} +}) diff --git a/pkgs/by-name/ig/igmpproxy/package.nix b/pkgs/by-name/ig/igmpproxy/package.nix index a510dd42e5b1..9d71c90f3816 100644 --- a/pkgs/by-name/ig/igmpproxy/package.nix +++ b/pkgs/by-name/ig/igmpproxy/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "igmpproxy"; version = "0.4"; src = fetchFromGitHub { owner = "pali"; repo = "igmpproxy"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-kv8XtZ/z8zPHYSZ4k4arn2Y+L2xegr2DwhvlguJV820="; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Daemon that routes multicast using IGMP forwarding"; homepage = "https://github.com/pali/igmpproxy/"; - changelog = "https://github.com/pali/igmpproxy/releases/tag/${version}"; + changelog = "https://github.com/pali/igmpproxy/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.sdier ]; # The maintainer is using this on linux, but if you test it on other platforms @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "igmpproxy"; }; -} +}) diff --git a/pkgs/by-name/ig/igprof/package.nix b/pkgs/by-name/ig/igprof/package.nix index b188a0dfbadf..3cb0885b43f7 100644 --- a/pkgs/by-name/ig/igprof/package.nix +++ b/pkgs/by-name/ig/igprof/package.nix @@ -8,14 +8,14 @@ gdb, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "5.9.18"; pname = "igprof"; src = fetchFromGitHub { owner = "igprof"; repo = "igprof"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-UTrAaH8C79km78Z/7NxvQ6dnl4u4Ki80nORf4bsoSNw="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ktf ]; }; -} +}) diff --git a/pkgs/by-name/ig/igv/package.nix b/pkgs/by-name/ig/igv/package.nix index 3fe5510fa7af..b9015f6a1601 100644 --- a/pkgs/by-name/ig/igv/package.nix +++ b/pkgs/by-name/ig/igv/package.nix @@ -8,11 +8,11 @@ igv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "igv"; version = "2.19.7"; src = fetchzip { - url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; + url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor finalAttrs.version}/IGV_${finalAttrs.version}.zip"; sha256 = "sha256-IkzaQAM+s1boEKo/3ShtbUhihrhxLQCTz8/0lzAyYJA="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { lib.maintainers.rollf ]; }; -} +}) diff --git a/pkgs/by-name/ih/ihp-new/package.nix b/pkgs/by-name/ih/ihp-new/package.nix index 25c6864897f9..eb3e56a032a0 100644 --- a/pkgs/by-name/ih/ihp-new/package.nix +++ b/pkgs/by-name/ih/ihp-new/package.nix @@ -6,19 +6,19 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ihp-new"; version = "1.3.0"; src = fetchFromGitHub { owner = "digitallyinduced"; repo = "ihp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-DmaIr9kF+TG24wVNPVufxC74TYMCLziLYS9hCZHBDTc="; }; dontConfigure = true; - sourceRoot = "${src.name}/ProjectGenerator"; + sourceRoot = "${finalAttrs.src.name}/ProjectGenerator"; nativeBuildInputs = [ makeWrapper ]; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.mpscholten ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ik/iksemel/package.nix b/pkgs/by-name/ik/iksemel/package.nix index 3fc9bf9e1794..e46685aafeba 100644 --- a/pkgs/by-name/ik/iksemel/package.nix +++ b/pkgs/by-name/ik/iksemel/package.nix @@ -9,14 +9,14 @@ texinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iksemel"; version = "1.4.2"; src = fetchFromGitHub { owner = "timothytylee"; repo = "iksemel-1.4"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/il/illum/package.nix b/pkgs/by-name/il/illum/package.nix index 1d8336d97e2f..dd4af58281b4 100644 --- a/pkgs/by-name/il/illum/package.nix +++ b/pkgs/by-name/il/illum/package.nix @@ -10,14 +10,14 @@ udev, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "illum"; version = "0.5"; src = fetchFromGitHub { owner = "jmesmon"; repo = "illum"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "S4lUBeRnZlRUpIxFdN/bh979xvdS7roF6/6Dk0ZUrnM="; fetchSubmodules = true; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Plus; mainProgram = "illum-d"; }; -} +}) diff --git a/pkgs/by-name/im/ima-evm-utils/package.nix b/pkgs/by-name/im/ima-evm-utils/package.nix index c4842222cf94..20f1289ac7dc 100644 --- a/pkgs/by-name/im/ima-evm-utils/package.nix +++ b/pkgs/by-name/im/ima-evm-utils/package.nix @@ -12,14 +12,14 @@ docbook_xsl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ima-evm-utils"; version = "1.6.2"; src = fetchFromGitHub { owner = "linux-integrity"; repo = "ima-evm-utils"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vIu12Flc2DiEqUSKAfoUi7Zg6D25pURvlYKEQKHER4I="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ nickcao ]; }; -} +}) diff --git a/pkgs/by-name/im/imagej/package.nix b/pkgs/by-name/im/imagej/package.nix index 893664d9fb1a..bdc27870bdcf 100644 --- a/pkgs/by-name/im/imagej/package.nix +++ b/pkgs/by-name/im/imagej/package.nix @@ -17,12 +17,12 @@ let sha256 = "sha256-nU2nWI1wxZB/xlOKsZzdUjj+qiCTjO6GwEKYgZ5Risg="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imagej"; version = "153"; src = fetchurl { - url = "https://wsr.imagej.net/distros/cross-platform/ij${version}.zip"; + url = "https://wsr.imagej.net/distros/cross-platform/ij${finalAttrs.version}.zip"; sha256 = "sha256-MGuUdUDuW3s/yGC68rHr6xxzmYScUjdXRawDpc1UQqw="; }; nativeBuildInputs = [ @@ -89,4 +89,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ yuriaisaka ]; mainProgram = "imagej"; }; -} +}) diff --git a/pkgs/by-name/im/imagelol/package.nix b/pkgs/by-name/im/imagelol/package.nix index a7f2e57bfdef..1a4e394293d5 100644 --- a/pkgs/by-name/im/imagelol/package.nix +++ b/pkgs/by-name/im/imagelol/package.nix @@ -8,14 +8,14 @@ stb, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imagelol"; version = "0.2"; src = fetchFromGitHub { owner = "MCRedstoner2004"; repo = "imagelol"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0978zdrfj41jsqm78afyyd1l64iki9nwjvhd8ynii1b553nn4dmd"; fetchSubmodules = true; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "ImageLOL"; }; -} +}) diff --git a/pkgs/by-name/im/imath/package.nix b/pkgs/by-name/im/imath/package.nix index f77102bc5890..f1da63b47c14 100644 --- a/pkgs/by-name/im/imath/package.nix +++ b/pkgs/by-name/im/imath/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imath"; version = "3.2.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-O8IpP2MQ7egDbHIiL5TNBygmQCiS6Q/0VSe0LypsM/g="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ paperdigits ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/im/imgcat/package.nix b/pkgs/by-name/im/imgcat/package.nix index 232f461ca4d9..ad858cfaf1ea 100644 --- a/pkgs/by-name/im/imgcat/package.nix +++ b/pkgs/by-name/im/imgcat/package.nix @@ -6,7 +6,7 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imgcat"; version = "2.6.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "eddieantonio"; repo = "imgcat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-miFjlahTI0GDpgsjnA/K1R4R5654M8AoK78CycoLTqA="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "imgcat"; }; -} +}) diff --git a/pkgs/by-name/im/imgpatchtools/package.nix b/pkgs/by-name/im/imgpatchtools/package.nix index 610682bdf256..d1f51150df3a 100644 --- a/pkgs/by-name/im/imgpatchtools/package.nix +++ b/pkgs/by-name/im/imgpatchtools/package.nix @@ -7,14 +7,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imgpatchtools"; version = "0.3"; src = fetchFromGitHub { owner = "erfanoabdi"; repo = "imgpatchtools"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-7TOkqaXPui14VcSmMmYJ1Wg+s85wrgp+E0XcCB0Ml7M="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/im/imgui-file-dialog/package.nix b/pkgs/by-name/im/imgui-file-dialog/package.nix index 9e0ad4f30025..fdf078f756b3 100644 --- a/pkgs/by-name/im/imgui-file-dialog/package.nix +++ b/pkgs/by-name/im/imgui-file-dialog/package.nix @@ -7,14 +7,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imgui-file-dialog"; version = "0.6.8"; src = fetchFromGitHub { owner = "aiekick"; repo = "ImGuiFileDialog"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-v5ROW4o4of3tUGMN/p/CNH1eWT+RNRlWvhI84HUMEGo="; }; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { meta = { description = "Full featured file dialog for Dear ImGui"; homepage = "https://github.com/aiekick/ImGuiFileDialog"; - changelog = "https://github.com/aiekick/ImGuiFileDialog/releases/tag/v${version}"; + changelog = "https://github.com/aiekick/ImGuiFileDialog/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ZZBaron ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/im/imgui/package.nix b/pkgs/by-name/im/imgui/package.nix index cc1e4ffaa222..7af8ec3963a7 100644 --- a/pkgs/by-name/im/imgui/package.nix +++ b/pkgs/by-name/im/imgui/package.nix @@ -70,7 +70,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imgui"; version = "1.91.4"; outputs = [ @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6j4keBOAzbBDsV0+R4zTNlsltxz2dJDGI43UIrHXDNM="; }; @@ -158,4 +158,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/im/imgur-screenshot/package.nix b/pkgs/by-name/im/imgur-screenshot/package.nix index 8049ce75e8a9..307a5bf4a116 100644 --- a/pkgs/by-name/im/imgur-screenshot/package.nix +++ b/pkgs/by-name/im/imgur-screenshot/package.nix @@ -23,14 +23,14 @@ let xclip ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.0.0"; pname = "imgur-screenshot"; src = fetchFromGitHub { owner = "jomo"; repo = "imgur-screenshot"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0fkhvfraijbrw806pgij41bn1hc3r7l7l3snkicmshxj83lmsd5k"; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "imgur-screenshot"; }; -} +}) diff --git a/pkgs/by-name/im/imgurbash2/package.nix b/pkgs/by-name/im/imgurbash2/package.nix index f890f8e93152..3631ba7200e9 100644 --- a/pkgs/by-name/im/imgurbash2/package.nix +++ b/pkgs/by-name/im/imgurbash2/package.nix @@ -7,14 +7,14 @@ xsel, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imgurbash2"; version = "3.3"; src = fetchFromGitHub { owner = "ram-on"; repo = "imgurbash2"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-7J3LquzcYX0wBR6kshz7VuPv/TftTzKFdWcgsML2DnI="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ram-on/imgurbash2"; mainProgram = "imgurbash2"; }; -} +}) diff --git a/pkgs/by-name/im/iml/package.nix b/pkgs/by-name/im/iml/package.nix index ebcbc34ebee5..16531a4c5e4c 100644 --- a/pkgs/by-name/im/iml/package.nix +++ b/pkgs/by-name/im/iml/package.nix @@ -6,11 +6,11 @@ gmp, blas, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iml"; version = "1.0.5"; src = fetchurl { - url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2"; + url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${finalAttrs.version}.tar.bz2"; sha256 = "0akwhhz9b40bz6lrfxpamp7r7wkk48p455qbn04mfnl9a1l6db8x"; }; buildInputs = [ @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; homepage = "https://cs.uwaterloo.ca/~astorjoh/iml.html"; }; -} +}) diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix index 1d9837eb8845..3c16240a6ba3 100644 --- a/pkgs/by-name/im/immich-cli/package.nix +++ b/pkgs/by-name/im/immich-cli/package.nix @@ -8,13 +8,13 @@ versionCheckHook, pnpmConfigHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "immich-cli"; inherit (immich) version src pnpmDeps; postPatch = '' local -r cli_version="$(jq -r .version cli/package.json)" - test "$cli_version" = ${version} \ + test "$cli_version" = ${finalAttrs.version} \ || (echo "error: update immich-cli version to $cli_version" && exit 1) ''; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { inherit (nodejs.meta) platforms; mainProgram = "immich"; }; -} +}) diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix index 30549a8ee2c9..5441d715bb3a 100644 --- a/pkgs/by-name/im/immich-public-proxy/package.nix +++ b/pkgs/by-name/im/immich-public-proxy/package.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "immich-public-proxy"; - version = "1.14.2"; + version = "1.15.1"; src = fetchFromGitHub { owner = "alangrainger"; repo = "immich-public-proxy"; tag = "v${version}"; - hash = "sha256-+A32kg232mRFRX/7t+etDOKG5bAc9A+Kepvcr+JmDhA="; + hash = "sha256-bZKBKHO6WHzN+TFQDgQGqPNCDAQ26ks8gsNPsrKpW4E="; }; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-PHsKi5wBXZPbTpYIg3pCZSxB7Up/Xtaam1dUGy8zLk0="; + npmDepsHash = "sha256-UGl2ZUb3SQOlT1femMtCxup5998WseDr/laJKlSB6cM="; # patch in absolute nix store paths so the process doesn't need to cwd in $out postPatch = '' diff --git a/pkgs/by-name/im/imwheel/package.nix b/pkgs/by-name/im/imwheel/package.nix index 2fd756c0f52d..4ef9ffbfb422 100644 --- a/pkgs/by-name/im/imwheel/package.nix +++ b/pkgs/by-name/im/imwheel/package.nix @@ -10,12 +10,12 @@ libXtst, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imwheel"; version = "1.0.0pre12"; src = fetchurl { - url = "mirror://sourceforge/imwheel/imwheel-${version}.tar.gz"; + url = "mirror://sourceforge/imwheel/imwheel-${finalAttrs.version}.tar.gz"; sha256 = "2320ed019c95ca4d922968e1e1cbf0c075a914e865e3965d2bd694ca3d57cfe3"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; mainProgram = "imwheel"; }; -} +}) diff --git a/pkgs/by-name/in/inadyn/package.nix b/pkgs/by-name/in/inadyn/package.nix index a7417eb873dc..bb98210c286f 100644 --- a/pkgs/by-name/in/inadyn/package.nix +++ b/pkgs/by-name/in/inadyn/package.nix @@ -9,14 +9,14 @@ libconfuse, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "inadyn"; version = "2.13.0"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-R+DlhRZOwL/hBZAu4L7w7DAoHy1/1m8wsidSxByO74E="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "inadyn"; }; -} +}) diff --git a/pkgs/by-name/in/infamousPlugins/package.nix b/pkgs/by-name/in/infamousPlugins/package.nix index e9cdb6edf73b..bf63c3781a9a 100644 --- a/pkgs/by-name/in/infamousPlugins/package.nix +++ b/pkgs/by-name/in/infamousPlugins/package.nix @@ -15,14 +15,14 @@ zita-resampler, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "infamousPlugins"; version = "0.3.2"; src = fetchFromGitHub { owner = "ssj71"; repo = "infamousPlugins"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-AhW4hLmCxz7yHMdxM6kOvtCXk1jEg/XtyPgt4yk1xqs="; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "infamous-rule"; }; -} +}) diff --git a/pkgs/by-name/in/inform6/package.nix b/pkgs/by-name/in/inform6/package.nix index a2c51a6523b4..a9250f76ba69 100644 --- a/pkgs/by-name/in/inform6/package.nix +++ b/pkgs/by-name/in/inform6/package.nix @@ -5,12 +5,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "inform6"; version = "6.42-r9"; src = fetchurl { - url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz"; + url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${finalAttrs.version}.tar.gz"; sha256 = "sha256-aHYjqjdISnyUxtruDDWD0cHEOxBpvm3+TfNxtGofezQ="; }; @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { (text adventure) games. ''; homepage = "https://gitlab.com/DavidGriffith/inform6unix"; - changelog = "https://gitlab.com/DavidGriffith/inform6unix/-/raw/${version}/NEWS"; + changelog = "https://gitlab.com/DavidGriffith/inform6unix/-/raw/${finalAttrs.version}/NEWS"; license = lib.licenses.artistic2; maintainers = with lib.maintainers; [ ddelabru ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/in/infra-arcana/package.nix b/pkgs/by-name/in/infra-arcana/package.nix index 2709433f56cf..4c657856e545 100644 --- a/pkgs/by-name/in/infra-arcana/package.nix +++ b/pkgs/by-name/in/infra-arcana/package.nix @@ -10,14 +10,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "infra-arcana"; version = "23.0.0"; src = fetchFromGitLab { owner = "martin-tornqvist"; repo = "ia"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-b7YRhoQa298fcP4cXlWhLXajjL0M3Mk4Kbb81iH6s5w="; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.kenran ]; license = lib.licenses.agpl3Plus; }; -} +}) diff --git a/pkgs/by-name/in/inih/package.nix b/pkgs/by-name/in/inih/package.nix index f1e4c50c8b7b..a852a46aaa57 100644 --- a/pkgs/by-name/in/inih/package.nix +++ b/pkgs/by-name/in/inih/package.nix @@ -6,14 +6,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "inih"; version = "62"; src = fetchFromGitHub { owner = "benhoyt"; repo = "inih"; - rev = "r${version}"; + rev = "r${finalAttrs.version}"; hash = "sha256-jnMGOncnH+ffgtyNzA8tZPtxPCR/yq9jmPsJZE4BhXo="; }; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { meta = { description = "Simple .INI file parser in C, good for embedded systems"; homepage = "https://github.com/benhoyt/inih"; - changelog = "https://github.com/benhoyt/inih/releases/tag/r${version}"; + changelog = "https://github.com/benhoyt/inih/releases/tag/r${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ TredwellGit ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/in/initool/package.nix b/pkgs/by-name/in/initool/package.nix index a0c882074f98..aac82f69ea6c 100644 --- a/pkgs/by-name/in/initool/package.nix +++ b/pkgs/by-name/in/initool/package.nix @@ -5,14 +5,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "initool"; version = "1.0.0"; src = fetchFromGitHub { owner = "dbohdan"; repo = "initool"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-PROsyYw8xdnn0PX+3OyUPaybQbTmO88G2koeZhBfwjg="; }; @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dbohdan/initool"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ e1mo ]; - changelog = "https://github.com/dbohdan/initool/releases/tag/v${version}"; + changelog = "https://github.com/dbohdan/initool/releases/tag/v${finalAttrs.version}"; }; -} +}) diff --git a/pkgs/by-name/in/ink/package.nix b/pkgs/by-name/in/ink/package.nix index dd63340c1dec..502c5b4b208c 100644 --- a/pkgs/by-name/in/ink/package.nix +++ b/pkgs/by-name/in/ink/package.nix @@ -5,12 +5,12 @@ libinklevel, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ink"; version = "0.5.3"; src = fetchurl { - url = "mirror://sourceforge/ink/ink-${version}.tar.gz"; + url = "mirror://sourceforge/ink/ink-${finalAttrs.version}.tar.gz"; sha256 = "1fk0b8vic04a3i3vmq73hbk7mzbi57s8ks6ighn3mvr6m2v8yc9d"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ samb96 ]; mainProgram = "ink"; }; -} +}) diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix index c2af1cea3d37..f5d9ea0bafe5 100644 --- a/pkgs/by-name/in/inspircd/package.nix +++ b/pkgs/by-name/in/inspircd/package.nix @@ -149,14 +149,14 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "inspircd"; version = "4.9.0"; src = fetchFromGitHub { owner = "inspircd"; repo = "inspircd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-DoXf0F7tjfQZRFMrVECrlRlJLt7PymjwHSg9+4RLH00="; }; @@ -202,7 +202,7 @@ stdenv.mkDerivation rec { # this manually sets the flags instead of using configureFlags, because otherwise stdenv passes flags like --bindir, which make configure fail ./configure \ --disable-auto-extras \ - --distribution-label nixpkgs${version} \ + --distribution-label nixpkgs${finalAttrs.version} \ --disable-ownership \ --binary-dir ${placeholder "bin"}/bin \ --config-dir /etc/inspircd \ @@ -253,4 +253,4 @@ stdenv.mkDerivation rec { # in binary form. They can be built locally of course. hydraPlatforms = [ ]; }; -} +}) diff --git a/pkgs/by-name/in/intel-cmt-cat/package.nix b/pkgs/by-name/in/intel-cmt-cat/package.nix index 1c013a0e2e05..22d1b89d5fd6 100644 --- a/pkgs/by-name/in/intel-cmt-cat/package.nix +++ b/pkgs/by-name/in/intel-cmt-cat/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "25.04"; pname = "intel-cmt-cat"; src = fetchFromGitHub { owner = "intel"; repo = "intel-cmt-cat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Sbxfa9F+TSv2A8nilrB0PD312v1qN++k8Pezd7wd0PA="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ arkivm ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/in/intel-gmmlib/package.nix b/pkgs/by-name/in/intel-gmmlib/package.nix index bf48641bed44..20f9387152e4 100644 --- a/pkgs/by-name/in/intel-gmmlib/package.nix +++ b/pkgs/by-name/in/intel-gmmlib/package.nix @@ -8,14 +8,14 @@ intel-media-driver, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "intel-gmmlib"; version = "22.9.0"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; - tag = "intel-gmmlib-${version}"; + tag = "intel-gmmlib-${finalAttrs.version}"; hash = "sha256-hgVdUTbPLEKVZpg+73kxpeMQ5gOjBHeRAJgTYds9lYQ="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; -} +}) diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix index dd95a1bbce15..508a673cced8 100644 --- a/pkgs/by-name/in/intel-gpu-tools/package.nix +++ b/pkgs/by-name/in/intel-gpu-tools/package.nix @@ -41,7 +41,7 @@ xorgproto, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "intel-gpu-tools"; version = "2.2"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "drm"; repo = "igt-gpu-tools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Lt/mqx13nHyD5QiDl8oWGiYIiK006uQvbbzHH44LB/0="; }; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "bindnow" ]; meta = { - changelog = "https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/blob/v${version}/NEWS"; + changelog = "https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/blob/v${finalAttrs.version}/NEWS"; homepage = "https://drm.pages.freedesktop.org/igt-gpu-tools/"; description = "Tools for development and testing of the Intel DRM driver"; license = lib.licenses.mit; @@ -109,4 +109,4 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/in/intel-media-driver/package.nix b/pkgs/by-name/in/intel-media-driver/package.nix index c6e2bc6f8e44..c56d7df90fec 100644 --- a/pkgs/by-name/in/intel-media-driver/package.nix +++ b/pkgs/by-name/in/intel-media-driver/package.nix @@ -15,7 +15,7 @@ pkgsi686Linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "intel-media-driver"; version = "25.3.4"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; - rev = "intel-media-${version}"; + rev = "intel-media-${finalAttrs.version}"; hash = "sha256-76FBaeTXSRbUN63AaV0XSj/QFi0UF+K/ig+LFjQQgFQ="; }; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { video post processing for GEN based graphics hardware. ''; homepage = "https://github.com/intel/media-driver"; - changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}"; + changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${finalAttrs.version}"; license = with lib.licenses; [ bsd3 mit @@ -92,4 +92,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; -} +}) diff --git a/pkgs/by-name/io/ioping/package.nix b/pkgs/by-name/io/ioping/package.nix index be78c69a3236..5847a7a261b9 100644 --- a/pkgs/by-name/io/ioping/package.nix +++ b/pkgs/by-name/io/ioping/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ioping"; version = "1.3"; src = fetchFromGitHub { owner = "koct9i"; repo = "ioping"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-9lJEjns8ttjgI52ZXeWgL77GMd7o7IvefBJ5UH9y9ks="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/koct9i/ioping"; mainProgram = "ioping"; }; -} +}) diff --git a/pkgs/by-name/io/ioport/package.nix b/pkgs/by-name/io/ioport/package.nix index 54a25c7ca233..f0543e269e74 100644 --- a/pkgs/by-name/io/ioport/package.nix +++ b/pkgs/by-name/io/ioport/package.nix @@ -5,12 +5,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ioport"; version = "1.2"; src = fetchurl { - url = "https://people.redhat.com/rjones/ioport/files/ioport-${version}.tar.gz"; + url = "https://people.redhat.com/rjones/ioport/files/ioport-${finalAttrs.version}.tar.gz"; sha256 = "1h4d5g78y7kla0zl25jgyrk43wy3m3bygqg0blki357bc55irb3z"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { ]; maintainers = [ lib.maintainers.cleverca22 ]; }; -} +}) diff --git a/pkgs/by-name/io/iortcw/sp.nix b/pkgs/by-name/io/iortcw/sp.nix index 17e2c47783fa..863f61dafdc2 100644 --- a/pkgs/by-name/io/iortcw/sp.nix +++ b/pkgs/by-name/io/iortcw/sp.nix @@ -12,20 +12,20 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iortcw-sp"; version = "1.51c"; src = fetchFromGitHub { owner = "iortcw"; repo = "iortcw"; - rev = version; + rev = finalAttrs.version; sha256 = "0g5wgqb1gm34pd05dj2i8nj3qhsz0831p3m7bsgxpjcg9c00jpyw"; }; enableParallelBuilding = true; - sourceRoot = "${src.name}/SP"; + sourceRoot = "${finalAttrs.src.name}/SP"; makeFlags = [ "USE_INTERNAL_LIBS=0" @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { meta = { description = "Single player version of game engine for Return to Castle Wolfenstein"; - homepage = src.meta.homepage; + homepage = finalAttrs.src.meta.homepage; license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ rjpcasalino ]; }; -} +}) diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix index db722f309e65..aff8a4f8dd85 100644 --- a/pkgs/by-name/io/iosevka-bin/package.nix +++ b/pkgs/by-name/io/iosevka-bin/package.nix @@ -15,12 +15,12 @@ let builtins.attrNames (removeAttrs variantHashes [ "Iosevka" ]) ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "${name}-bin"; version = "34.1.0"; src = fetchurl { - url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; + url = "https://github.com/be5invis/Iosevka/releases/download/v${finalAttrs.version}/PkgTTC-${name}-${finalAttrs.version}.zip"; sha256 = variantHashes.${name} or (throw '' No such variant "${variant}" for package iosevka-bin. @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { }; passthru.updateScript = ./update-bin.sh; -} +}) diff --git a/pkgs/by-name/ip/ip2location-c/package.nix b/pkgs/by-name/ip/ip2location-c/package.nix index 74da564e02d1..7207f8629b7d 100644 --- a/pkgs/by-name/ip/ip2location-c/package.nix +++ b/pkgs/by-name/ip/ip2location-c/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ip2location-c"; version = "8.7.0"; src = fetchFromGitHub { owner = "chrislim2888"; repo = "IP2Location-C-Library"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-kp0tNZPP9u2xxFOmBAdivsVLtyF66o38H6eRrs2/S/Y="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ip/ip2location/package.nix b/pkgs/by-name/ip/ip2location/package.nix index c1dc6cce66fc..f152c6a43c37 100644 --- a/pkgs/by-name/ip/ip2location/package.nix +++ b/pkgs/by-name/ip/ip2location/package.nix @@ -4,13 +4,13 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ip2location"; version = "7.0.0"; src = fetchurl { sha256 = "05zbc02z7vm19byafi05i1rnkxc6yrfkhnm30ly68zzyipkmzx1l"; - url = "https://www.ip2location.com/downloads/ip2location-${version}.tar.gz"; + url = "https://www.ip2location.com/downloads/ip2location-${finalAttrs.version}.tar.gz"; }; enableParallelBuilding = true; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ip2location"; }; -} +}) diff --git a/pkgs/by-name/ip/ip2unix/package.nix b/pkgs/by-name/ip/ip2unix/package.nix index 3ffc7068370d..00fb619f502e 100644 --- a/pkgs/by-name/ip/ip2unix/package.nix +++ b/pkgs/by-name/ip/ip2unix/package.nix @@ -18,14 +18,14 @@ mesonEmulatorHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ip2unix"; version = "2.2.1"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-+p5wQbX35LAjZ4vIE4AhI4M6gQ7gVviqf9jJDAr9xg8"; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.aszlig ]; mainProgram = "ip2unix"; }; -} +}) diff --git a/pkgs/by-name/ip/ipbt/package.nix b/pkgs/by-name/ip/ipbt/package.nix index 75fa7c859f8d..a915146750aa 100644 --- a/pkgs/by-name/ip/ipbt/package.nix +++ b/pkgs/by-name/ip/ipbt/package.nix @@ -6,12 +6,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "20210215.5a9cb02"; pname = "ipbt"; src = fetchurl { - url = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/ipbt-${version}.tar.gz"; + url = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/ipbt-${finalAttrs.version}.tar.gz"; sha256 = "0w6blpv22jjivzr58y440zv6djvi5iccdmj4y2md52fbpjngmsha"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "ipbt"; }; -} +}) diff --git a/pkgs/by-name/ip/ipcalc/package.nix b/pkgs/by-name/ip/ipcalc/package.nix index 4a95a487b609..4323b16a1567 100644 --- a/pkgs/by-name/ip/ipcalc/package.nix +++ b/pkgs/by-name/ip/ipcalc/package.nix @@ -14,14 +14,14 @@ # geoip.dataDir to a directory containing the data files This would typically be # /var/lib/geoip-databases pointing to geoip-legacy/share/GeoIP -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ipcalc"; version = "1.0.3"; src = fetchFromGitLab { owner = "ipcalc"; repo = "ipcalc"; - rev = version; + rev = finalAttrs.version; hash = "sha256-9eaR1zG8tjSGlkpyY1zTHAVgN5ypuyRfeRq6ct6zsLU="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "ipcalc"; }; -} +}) diff --git a/pkgs/by-name/ip/ipmiutil/package.nix b/pkgs/by-name/ip/ipmiutil/package.nix index 2fab40a124f7..0755bd10415a 100644 --- a/pkgs/by-name/ip/ipmiutil/package.nix +++ b/pkgs/by-name/ip/ipmiutil/package.nix @@ -5,12 +5,12 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ipmiutil"; version = "3.2.1"; src = fetchurl { - url = "mirror://sourceforge/project/ipmiutil/ipmiutil-${version}.tar.gz"; + url = "mirror://sourceforge/project/ipmiutil/ipmiutil-${finalAttrs.version}.tar.gz"; sha256 = "sha256-BIEbLmV/+YzTHkS5GnAMnzPEyd2To2yPyYfeH0fCQCQ="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; downloadPage = "https://sourceforge.net/projects/ipmiutil/files/ipmiutil/"; }; -} +}) diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix index 7d365c730506..056136264473 100644 --- a/pkgs/by-name/ip/ipopt/package.nix +++ b/pkgs/by-name/ip/ipopt/package.nix @@ -17,14 +17,14 @@ assert (!blas.isILP64) && (!lapack.isILP64); assert !mumps.mpiSupport; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ipopt"; version = "3.14.19"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; - rev = "releases/${version}"; + rev = "releases/${finalAttrs.version}"; sha256 = "sha256-85fUBMwQtG+RWQYk9YzdZYK3CYcDKgWroo4blhVWBzE="; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { qbisi ]; }; -} +}) diff --git a/pkgs/by-name/ip/iptraf-ng/package.nix b/pkgs/by-name/ip/iptraf-ng/package.nix index f884306eaa4a..29baaf2cc269 100644 --- a/pkgs/by-name/ip/iptraf-ng/package.nix +++ b/pkgs/by-name/ip/iptraf-ng/package.nix @@ -5,14 +5,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.2.2"; pname = "iptraf-ng"; src = fetchFromGitHub { owner = "iptraf-ng"; repo = "iptraf-ng"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-SM1cJYNnZlGl3eWaYd8DlPrV4AL9nck1tjdOn0CHVUw="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ devhell ]; mainProgram = "iptraf-ng"; }; -} +}) diff --git a/pkgs/by-name/ip/iptsd/package.nix b/pkgs/by-name/ip/iptsd/package.nix index dbbe955ef9f6..d40cb5b42910 100644 --- a/pkgs/by-name/ip/iptsd/package.nix +++ b/pkgs/by-name/ip/iptsd/package.nix @@ -16,14 +16,14 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iptsd"; version = "3.1.0"; src = fetchFromGitHub { owner = "linux-surface"; repo = "iptsd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2yYO1xb576IHaJquTrQtmAjJITGdW06I3eHD+HR88xI="; }; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ]; meta = { - changelog = "https://github.com/linux-surface/iptsd/releases/tag/v${version}"; + changelog = "https://github.com/linux-surface/iptsd/releases/tag/v${finalAttrs.version}"; description = "Userspace daemon for Intel Precise Touch & Stylus"; homepage = "https://github.com/linux-surface/iptsd"; license = lib.licenses.gpl2Plus; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ip/ipv6calc/package.nix b/pkgs/by-name/ip/ipv6calc/package.nix index f6bd78b50bd6..4b9cc9d6a144 100644 --- a/pkgs/by-name/ip/ipv6calc/package.nix +++ b/pkgs/by-name/ip/ipv6calc/package.nix @@ -10,14 +10,14 @@ geolite-legacy ? null, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ipv6calc"; version = "4.4.0"; src = fetchFromGitHub { owner = "pbiering"; repo = "ipv6calc"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-+u+7XdW0bS3nE5djdy7I1/NHZdXU9QKukZAvTkWsCK0="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/iq/iqueue/package.nix b/pkgs/by-name/iq/iqueue/package.nix index f76ea8a06e94..d952e1224001 100644 --- a/pkgs/by-name/iq/iqueue/package.nix +++ b/pkgs/by-name/iq/iqueue/package.nix @@ -7,11 +7,11 @@ microsoft-gsl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iqueue"; version = "0.1.0"; src = fetchurl { - url = "https://github.com/twosigma/iqueue/releases/download/v${version}/iqueue-${version}.tar.gz"; + url = "https://github.com/twosigma/iqueue/releases/download/v${finalAttrs.version}/iqueue-${finalAttrs.version}.tar.gz"; sha256 = "0049fnr02k15gr21adav33swrwxrpbananilnrp63vp5zs5v9m4x"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/ir/ircdHybrid/package.nix b/pkgs/by-name/ir/ircdHybrid/package.nix index 9f356b0a685d..4d608618a122 100644 --- a/pkgs/by-name/ir/ircdHybrid/package.nix +++ b/pkgs/by-name/ir/ircdHybrid/package.nix @@ -7,12 +7,12 @@ libxcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ircd-hybrid"; version = "8.2.46"; src = fetchurl { - url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${version}.tgz"; + url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${finalAttrs.version}.tgz"; sha256 = "sha256-pdXI8YiPqC+97XoxNFb1plm4cfLOB+b/getajXPzx0s="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; homepage = "https://www.ircd-hybrid.org/"; }; -} +}) diff --git a/pkgs/by-name/ir/irssi/package.nix b/pkgs/by-name/ir/irssi/package.nix index 4d0843641f1e..a31f93863f41 100644 --- a/pkgs/by-name/ir/irssi/package.nix +++ b/pkgs/by-name/ir/irssi/package.nix @@ -14,14 +14,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "irssi"; version = "1.4.5"; src = fetchFromGitHub { owner = "irssi"; repo = "irssi"; - rev = version; + rev = finalAttrs.version; hash = "sha256-D+KMjkweStMqVhoQoiJPFt/G0vdf7x2FjYCvqGS8UqY="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/is/ised/package.nix b/pkgs/by-name/is/ised/package.nix index df8953f42f46..2dd66434e01f 100644 --- a/pkgs/by-name/is/ised/package.nix +++ b/pkgs/by-name/is/ised/package.nix @@ -4,11 +4,11 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ised"; version = "2.7.1"; src = fetchurl { - url = "mirror://sourceforge/project/ised/ised-${version}.tar.bz2"; + url = "mirror://sourceforge/project/ised/ised-${finalAttrs.version}.tar.bz2"; sha256 = "0fhha61whkkqranqdxg792g0f5kgp5m3m6z1iqcvjh2c34rczbmb"; }; @@ -19,4 +19,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; mainProgram = "ised"; }; -} +}) diff --git a/pkgs/by-name/is/isolate/package.nix b/pkgs/by-name/is/isolate/package.nix index ba66f828709c..86e7f5a6ebfd 100644 --- a/pkgs/by-name/is/isolate/package.nix +++ b/pkgs/by-name/is/isolate/package.nix @@ -10,14 +10,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "isolate"; version = "2.2"; src = fetchFromGitHub { owner = "ioi"; repo = "isolate"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-AacKIRS/Ah1KoE+bz+lK2GPbS3F3ifBGXvvCFWMd7hs="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ virchau13 ]; }; -} +}) diff --git a/pkgs/by-name/is/isomd5sum/package.nix b/pkgs/by-name/is/isomd5sum/package.nix index 75e9c3bb98f5..d15c959acc87 100644 --- a/pkgs/by-name/is/isomd5sum/package.nix +++ b/pkgs/by-name/is/isomd5sum/package.nix @@ -6,14 +6,14 @@ popt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "isomd5sum"; version = "1.2.5"; src = fetchFromGitHub { owner = "rhinstaller"; repo = "isomd5sum"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-c/4CQtAzatfG1Z3SfyB2OZmfJRMnyrZZTqSApsK7R+Q="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ knl ]; }; -} +}) diff --git a/pkgs/by-name/it/ite-backlight/package.nix b/pkgs/by-name/it/ite-backlight/package.nix index ce67e36b49d3..ca2b9ad8b246 100644 --- a/pkgs/by-name/it/ite-backlight/package.nix +++ b/pkgs/by-name/it/ite-backlight/package.nix @@ -11,14 +11,14 @@ microsoft-gsl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ite-backlight"; version = "1.1"; src = fetchFromGitHub { owner = "hexagonal-sun"; repo = "ite-backlight"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1hany4bn93mac9qyz97r1l858d48zdvvmn3mabzr3441ivqr9j0a"; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ hexagonal-sun ]; }; -} +}) diff --git a/pkgs/by-name/it/itsx/package.nix b/pkgs/by-name/it/itsx/package.nix index a110cd7ec7ab..a6d51625e7e8 100644 --- a/pkgs/by-name/it/itsx/package.nix +++ b/pkgs/by-name/it/itsx/package.nix @@ -6,12 +6,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.1.1"; pname = "itsx"; src = fetchurl { - url = "http://microbiology.se/sw/ITSx_${version}.tar.gz"; + url = "http://microbiology.se/sw/ITSx_${finalAttrs.version}.tar.gz"; sha256 = "0lrmy2n3ax7f208k0k8l3yz0j5cpz05hv4hx1nnxzn0c51z1pc31"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bzizou ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/iu/iucode-tool/package.nix b/pkgs/by-name/iu/iucode-tool/package.nix index 79c3db0daade..441c49dd65c6 100644 --- a/pkgs/by-name/iu/iucode-tool/package.nix +++ b/pkgs/by-name/iu/iucode-tool/package.nix @@ -7,14 +7,14 @@ argp-standalone, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iucode-tool"; version = "2.3.1"; src = fetchFromGitLab { owner = "iucode-tool"; repo = "iucode-tool"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ajDpywgyerbvgern0b8T4jJUWisMzwrhwKO1g7iOtBE="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { "i686-linux" ]; }; -} +}) diff --git a/pkgs/by-name/iw/iwgtk/package.nix b/pkgs/by-name/iw/iwgtk/package.nix index 62e513b1f264..ff14613e3d17 100644 --- a/pkgs/by-name/iw/iwgtk/package.nix +++ b/pkgs/by-name/iw/iwgtk/package.nix @@ -11,14 +11,14 @@ qrencode, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iwgtk"; version = "0.9"; src = fetchFromGitHub { owner = "j-lentz"; repo = "iwgtk"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/Nxti4PfYVLnIiBgtAuR3KGI8dULszuSdTp+2DzBfbs="; }; @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight, graphical wifi management utility for Linux"; homepage = "https://github.com/j-lentz/iwgtk"; - changelog = "https://github.com/j-lentz/iwgtk/blob/v${version}/CHANGELOG"; + changelog = "https://github.com/j-lentz/iwgtk/blob/v${finalAttrs.version}/CHANGELOG"; license = lib.licenses.gpl3Only; maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "iwgtk"; }; -} +}) diff --git a/pkgs/by-name/ja/jacoco/package.nix b/pkgs/by-name/ja/jacoco/package.nix index 09d15ed00d08..f8c6f1a82e79 100644 --- a/pkgs/by-name/ja/jacoco/package.nix +++ b/pkgs/by-name/ja/jacoco/package.nix @@ -6,12 +6,12 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jacoco"; version = "0.8.14"; src = fetchzip { - url = "https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/${version}/jacoco-${version}.zip"; + url = "https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/${finalAttrs.version}/jacoco-${finalAttrs.version}.zip"; stripRoot = false; sha256 = "sha256-ysqPAxZK/mcnGiqqqTzfCOCyAcvMMvymFrSme6rFCJE="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ja/jags/package.nix b/pkgs/by-name/ja/jags/package.nix index 2deb7e82eead..23e27b6e4c88 100644 --- a/pkgs/by-name/ja/jags/package.nix +++ b/pkgs/by-name/ja/jags/package.nix @@ -7,12 +7,12 @@ lapack, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "JAGS"; version = "4.3.2"; src = fetchurl { - url = "mirror://sourceforge/mcmc-jags/JAGS-${version}.tar.gz"; + url = "mirror://sourceforge/mcmc-jags/JAGS-${finalAttrs.version}.tar.gz"; sha256 = "sha256-hx9VavQDp8LOag8C8Vz4WlcnY+CT0mZY66xVxKtHL8g="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.andres ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ja/jamulus/package.nix b/pkgs/by-name/ja/jamulus/package.nix index 32166e15f465..ea5a0d8d943c 100644 --- a/pkgs/by-name/ja/jamulus/package.nix +++ b/pkgs/by-name/ja/jamulus/package.nix @@ -6,14 +6,14 @@ libsForQt5, libjack2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jamulus"; version = "3.11.0"; src = fetchFromGitHub { owner = "jamulussoftware"; repo = "jamulus"; - tag = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "r${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-YxXSSVm3n96YzE51cXpWf4z2nQBSguvcEp/kU0a6iBA="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { mainProgram = "jamulus"; maintainers = with lib.maintainers; [ seb314 ]; }; -} +}) diff --git a/pkgs/by-name/ja/janus-gateway/package.nix b/pkgs/by-name/ja/janus-gateway/package.nix index 09e7adada2d3..7bd743c205a6 100644 --- a/pkgs/by-name/ja/janus-gateway/package.nix +++ b/pkgs/by-name/ja/janus-gateway/package.nix @@ -32,14 +32,14 @@ let }); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "janus-gateway"; version = "1.3.3"; src = fetchFromGitHub { owner = "meetecho"; repo = "janus-gateway"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-RxLpvmoQLOu0P0cBKObz8sfSHod8uT4dN9tP3CRLIDs="; }; @@ -101,9 +101,9 @@ stdenv.mkDerivation rec { meta = { description = "General purpose WebRTC server"; homepage = "https://janus.conf.meetecho.com/"; - changelog = "https://github.com/meetecho/janus-gateway/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/meetecho/janus-gateway/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ fpletz ]; }; -} +}) diff --git a/pkgs/by-name/ja/janusgraph/package.nix b/pkgs/by-name/ja/janusgraph/package.nix index faa7bde73eeb..1460a286a5cd 100644 --- a/pkgs/by-name/ja/janusgraph/package.nix +++ b/pkgs/by-name/ja/janusgraph/package.nix @@ -6,12 +6,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "janusgraph"; version = "1.1.0"; src = fetchzip { - url = "https://github.com/JanusGraph/janusgraph/releases/download/v${version}/janusgraph-${version}.zip"; + url = "https://github.com/JanusGraph/janusgraph/releases/download/v${finalAttrs.version}/janusgraph-${finalAttrs.version}.zip"; sha256 = "sha256-gEtiY/FXNCtpVlohcTTuZ1V/EHr/trqYQKYUKy9wN4U="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.ners ]; }; -} +}) diff --git a/pkgs/by-name/jb/jbake/package.nix b/pkgs/by-name/jb/jbake/package.nix index 4e66fb825ec8..5ffaf9a58065 100644 --- a/pkgs/by-name/jb/jbake/package.nix +++ b/pkgs/by-name/jb/jbake/package.nix @@ -6,12 +6,12 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.6.7"; pname = "jbake"; src = fetchzip { - url = "https://github.com/jbake-org/jbake/releases/download/v${version}/jbake-${version}-bin.zip"; + url = "https://github.com/jbake-org/jbake/releases/download/v${finalAttrs.version}/jbake-${finalAttrs.version}-bin.zip"; sha256 = "sha256-kikGnFsParq8g0dzzYtMr2vIJD2ie8PeF6TG2G5K7KE="; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { checkPhase = '' export JAVA_HOME=${jre} - bin/jbake | grep -q "${version}" || (echo "jbake did not return correct version"; exit 1) + bin/jbake | grep -q "${finalAttrs.version}" || (echo "jbake did not return correct version"; exit 1) ''; doCheck = true; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ moaxcp ]; }; -} +}) diff --git a/pkgs/by-name/jb/jbig2dec/package.nix b/pkgs/by-name/jb/jbig2dec/package.nix index 41f358123cec..334cd5a59c2f 100644 --- a/pkgs/by-name/jb/jbig2dec/package.nix +++ b/pkgs/by-name/jb/jbig2dec/package.nix @@ -8,12 +8,12 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jbig2dec"; version = "0.20"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/jbig2dec/archive/${version}/jbig2dec-${version}.tar.gz"; + url = "https://github.com/ArtifexSoftware/jbig2dec/archive/${finalAttrs.version}/jbig2dec-${finalAttrs.version}.tar.gz"; hash = "sha256-qXBTaaZjOrpTJpNFDsgCxWI5fhuCRmLegJ7ekvZ6/yE="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Only; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/jb/jbig2enc/package.nix b/pkgs/by-name/jb/jbig2enc/package.nix index 95b38a0a905a..e7abf22a3e1e 100644 --- a/pkgs/by-name/jb/jbig2enc/package.nix +++ b/pkgs/by-name/jb/jbig2enc/package.nix @@ -13,14 +13,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jbig2enc"; version = "0.30"; src = fetchFromGitHub { owner = "agl"; repo = "jbig2enc"; - rev = version; + rev = finalAttrs.version; hash = "sha256-B19l2NdMq+wWKQ5f/y5aoPiBtQnn6sqpaIoyIq+ugTg="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/agl/jbig2enc"; mainProgram = "jbig2"; }; -} +}) diff --git a/pkgs/by-name/jc/jcal/package.nix b/pkgs/by-name/jc/jcal/package.nix index cc9c5e161ec2..bfef63d4eadc 100644 --- a/pkgs/by-name/jc/jcal/package.nix +++ b/pkgs/by-name/jc/jcal/package.nix @@ -6,14 +6,14 @@ readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jcal"; version = "0.5.1"; src = fetchFromGitHub { owner = "fzerorubigd"; repo = "jcal"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-vJc5uijZlvohEtiS03LYlqtswVE38S9/ejlHrmZ0wqA="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/jd/jdom/package.nix b/pkgs/by-name/jd/jdom/package.nix index fa23e3952404..2337d94d3c93 100644 --- a/pkgs/by-name/jd/jdom/package.nix +++ b/pkgs/by-name/jd/jdom/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jdom"; version = "2.0.6.1"; src = fetchzip { - url = "http://www.jdom.org/dist/binary/jdom-${version}.zip"; + url = "http://www.jdom.org/dist/binary/jdom-${finalAttrs.version}.zip"; stripRoot = false; hash = "sha256-Y++mlO+7N5EU2NhRzLl5x5WXNqu/2tDO/NpNhfRegcg="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.bsdOriginal; }; -} +}) diff --git a/pkgs/by-name/je/jetbrains-runner/package.nix b/pkgs/by-name/je/jetbrains-runner/package.nix index d2b399fd0cf2..90f9b669f785 100644 --- a/pkgs/by-name/je/jetbrains-runner/package.nix +++ b/pkgs/by-name/je/jetbrains-runner/package.nix @@ -6,14 +6,14 @@ kdePackages, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jetbrains-runner"; version = "3.0.7"; src = fetchFromGitHub { owner = "alex1701c"; repo = "JetBrainsRunner"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TaueSAxGiKiPVT26DSy1mzwsw2vBUK3D//vtOLtw2KQ="; fetchSubmodules = true; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ js6pak ]; inherit (kdePackages.krunner.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/jf/jfsutils/package.nix b/pkgs/by-name/jf/jfsutils/package.nix index fdd82a8f0ed3..c536782a6c43 100644 --- a/pkgs/by-name/jf/jfsutils/package.nix +++ b/pkgs/by-name/jf/jfsutils/package.nix @@ -7,12 +7,12 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jfsutils"; version = "1.1.15"; src = fetchurl { - url = "mirror://sourceforge/jfs/jfsutils-${version}.tar.gz"; + url = "mirror://sourceforge/jfs/jfsutils-${finalAttrs.version}.tar.gz"; sha256 = "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4"; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/jf/jftui/package.nix b/pkgs/by-name/jf/jftui/package.nix index 4c3d4ae85c8e..ac0bc0443921 100644 --- a/pkgs/by-name/jf/jftui/package.nix +++ b/pkgs/by-name/jf/jftui/package.nix @@ -8,14 +8,14 @@ yajl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jftui"; version = "0.7.5"; src = fetchFromGitHub { owner = "Aanok"; repo = "jftui"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-0gTJ2uXDcK9zCx6yKS3VxFyxSQZ2l4ydKUI2gYbsiao="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "jftui"; }; -} +}) diff --git a/pkgs/by-name/jg/jgmenu/package.nix b/pkgs/by-name/jg/jgmenu/package.nix index 88b90bd0257d..7ed3fef65fb7 100644 --- a/pkgs/by-name/jg/jgmenu/package.nix +++ b/pkgs/by-name/jg/jgmenu/package.nix @@ -18,14 +18,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jgmenu"; version = "4.5.0"; src = fetchFromGitHub { owner = "johanmalm"; repo = "jgmenu"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-vuSpiZZYe0l5va9dHM54gaoI9x8qXH1gJORUS5489jQ="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/jh/jhiccup/package.nix b/pkgs/by-name/jh/jhiccup/package.nix index 82fed9e5d46d..c0bf87a17d61 100644 --- a/pkgs/by-name/jh/jhiccup/package.nix +++ b/pkgs/by-name/jh/jhiccup/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jhiccup"; version = "2.0.10"; src = fetchzip { - url = "https://www.azul.com/files/jHiccup-${version}-dist.zip"; + url = "https://www.azul.com/files/jHiccup-${finalAttrs.version}-dist.zip"; sha256 = "1hsvi8wjh615fnjf75h7b5afp04chqcgvini30vfcn3m9a5icbgy"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # jHiccup.jar for x in ./jHiccup ./jHiccupLogProcessor; do substituteInPlace $x \ - --replace 'JHICCUP_Version=2.0.5' 'JHICCUP_Version=${version}' \ + --replace 'JHICCUP_Version=2.0.5' 'JHICCUP_Version=${finalAttrs.version}' \ --replace '$INSTALLED_PATH' $out/share/java done @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/ji/jigdo/package.nix b/pkgs/by-name/ji/jigdo/package.nix index 5d73d8c58f61..bc77c76d4412 100644 --- a/pkgs/by-name/ji/jigdo/package.nix +++ b/pkgs/by-name/ji/jigdo/package.nix @@ -8,12 +8,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jigdo"; version = "0.8.2"; src = fetchurl { - url = "https://www.einval.com/~steve/software/jigdo/download/jigdo-${version}.tar.xz"; + url = "https://www.einval.com/~steve/software/jigdo/download/jigdo-${finalAttrs.version}.tar.xz"; hash = "sha256-NvKG2T+mtr94hfSJnJl4lNIdo6YhdlkqwWLZxqhkT54="; }; @@ -40,9 +40,9 @@ stdenv.mkDerivation rec { meta = { description = "Download utility that can fetch files from several sources simultaneously"; homepage = "https://www.einval.com/~steve/software/jigdo/"; - changelog = "https://git.einval.com/cgi-bin/gitweb.cgi?p=jigdo.git;a=blob;f=changelog;hb=refs/tags/${version}"; + changelog = "https://git.einval.com/cgi-bin/gitweb.cgi?p=jigdo.git;a=blob;f=changelog;hb=refs/tags/${finalAttrs.version}"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ji/jing-trang/package.nix b/pkgs/by-name/ji/jing-trang/package.nix index 99ac4447edde..d7c72c56232d 100644 --- a/pkgs/by-name/ji/jing-trang/package.nix +++ b/pkgs/by-name/ji/jing-trang/package.nix @@ -10,14 +10,14 @@ let jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jing-trang"; version = "20181222"; src = fetchFromGitHub { owner = "relaxng"; repo = "jing-trang"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-Krupa3MGk5UaaQsaNpPMZuIUzHJytDiksz9ysCPkFS4="; fetchSubmodules = true; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { ]; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/ji/jirafeau/package.nix b/pkgs/by-name/ji/jirafeau/package.nix index d3b515e41748..d590bc92c420 100644 --- a/pkgs/by-name/ji/jirafeau/package.nix +++ b/pkgs/by-name/ji/jirafeau/package.nix @@ -12,14 +12,14 @@ let ?> ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jirafeau"; version = "4.4.0"; src = fetchFromGitLab { owner = "mojo42"; repo = "Jirafeau"; - rev = version; + rev = finalAttrs.version; hash = "sha256-jJ2r8XTtAzawTVo2A2pDwy7Z6KHeyBkgXXaCPY0w/rg="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ji/jitterentropy-rngd/package.nix b/pkgs/by-name/ji/jitterentropy-rngd/package.nix index d9e2823b2660..8b216f0abfe4 100644 --- a/pkgs/by-name/ji/jitterentropy-rngd/package.nix +++ b/pkgs/by-name/ji/jitterentropy-rngd/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jitterentropy-rngd"; version = "1.2.8"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "jitterentropy-rngd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-LDym636ss3B1G/vrqatu9g5vbVEeDX0JQcxZ/IxGeY0="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Random number generator, which injects entropy to the kernel"; homepage = "https://github.com/smuellerDD/jitterentropy-rngd"; - changelog = "https://github.com/smuellerDD/jitterentropy-rngd/releases/tag/v${version}"; + changelog = "https://github.com/smuellerDD/jitterentropy-rngd/releases/tag/v${finalAttrs.version}"; license = [ lib.licenses.gpl2Only lib.licenses.bsd3 @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ thillux ]; mainProgram = "jitterentropy-rngd"; }; -} +}) diff --git a/pkgs/by-name/ji/jitterentropy/package.nix b/pkgs/by-name/ji/jitterentropy/package.nix index 0c23a9204a98..2415a2e993a7 100644 --- a/pkgs/by-name/ji/jitterentropy/package.nix +++ b/pkgs/by-name/ji/jitterentropy/package.nix @@ -6,14 +6,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jitterentropy"; version = "3.6.3"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "jitterentropy-library"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-A7a0kg9JRiNNKJbLJu5Fbu6ZgCwv3+3oDhZr3jwNXmM="; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides a noise source using the CPU execution timing jitter"; homepage = "https://github.com/smuellerDD/jitterentropy-library"; - changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md"; + changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${finalAttrs.version}/CHANGES.md"; license = with lib.licenses; [ bsd3 # OR gpl2Only @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { c0bw3b ]; }; -} +}) diff --git a/pkgs/by-name/ji/jive/package.nix b/pkgs/by-name/ji/jive/package.nix index 35f86112b61a..e92d27fade9a 100644 --- a/pkgs/by-name/ji/jive/package.nix +++ b/pkgs/by-name/ji/jive/package.nix @@ -5,12 +5,12 @@ makeWrapper, jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jive"; version = "7.46"; src = fetchurl { - url = "https://repo.maven.apache.org/maven2/org/tango-controls/Jive/${version}/Jive-${version}-jar-with-dependencies.jar"; + url = "https://repo.maven.apache.org/maven2/org/tango-controls/Jive/${finalAttrs.version}/Jive-${finalAttrs.version}-jar-with-dependencies.jar"; hash = "sha256-AbxTRFi5dCsN/HENTI/o3hBQKZM+cFtJxT3A8RKpQM4="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.gilice ]; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; }; -} +}) diff --git a/pkgs/by-name/jj/jj-fzf/package.nix b/pkgs/by-name/jj/jj-fzf/package.nix index e785b400f8d7..4a7bf443fbd9 100644 --- a/pkgs/by-name/jj/jj-fzf/package.nix +++ b/pkgs/by-name/jj/jj-fzf/package.nix @@ -14,14 +14,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jj-fzf"; version = "0.34.0"; src = fetchFromGitHub { owner = "tim-janik"; repo = "jj-fzf"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aJyKVMg/yI2CmAx5TxN0w670Rq26ESdLzESgh8Jr4nE="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { mainProgram = "jj-fzf"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/jm/jmol/package.nix b/pkgs/by-name/jm/jmol/package.nix index c45a1b0c35ee..283eeb29c7ba 100644 --- a/pkgs/by-name/jm/jmol/package.nix +++ b/pkgs/by-name/jm/jmol/package.nix @@ -30,16 +30,16 @@ let ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "16.3.45"; pname = "jmol"; src = let - baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; + baseVersion = "${lib.versions.major finalAttrs.version}.${lib.versions.minor finalAttrs.version}"; in fetchurl { - url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; + url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${finalAttrs.version}/Jmol-${finalAttrs.version}-binary.tar.gz"; hash = "sha256-TGL8EU9Ow2rbQpLBbz12AJvO8xHNjmUrlIwIp+4qTgQ="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; teams = [ lib.teams.sage ]; }; -} +}) diff --git a/pkgs/by-name/jm/jmtpfs/package.nix b/pkgs/by-name/jm/jmtpfs/package.nix index abd79b31b874..beb1821d2f3b 100644 --- a/pkgs/by-name/jm/jmtpfs/package.nix +++ b/pkgs/by-name/jm/jmtpfs/package.nix @@ -9,13 +9,13 @@ libmtp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jmtpfs"; version = "0.5"; src = fetchFromGitHub { sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; repo = "jmtpfs"; owner = "JasonFerrara"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.coconnor ]; mainProgram = "jmtpfs"; }; -} +}) diff --git a/pkgs/by-name/jm/jmusicbot/package.nix b/pkgs/by-name/jm/jmusicbot/package.nix index a07971d730f8..98d2bde1881d 100644 --- a/pkgs/by-name/jm/jmusicbot/package.nix +++ b/pkgs/by-name/jm/jmusicbot/package.nix @@ -6,12 +6,12 @@ jre_headless, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "JMusicBot"; version = "0.4.3"; src = fetchurl { - url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar"; + url = "https://github.com/jagrosh/MusicBot/releases/download/${finalAttrs.version}/JMusicBot-${finalAttrs.version}.jar"; sha256 = "sha256-7CHFc94Fe6ip7RY+XJR9gWpZPKM5JY7utHp8C3paU9s="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { inherit (jre_headless.meta) platforms; mainProgram = "JMusicBot"; }; -} +}) diff --git a/pkgs/by-name/jn/jnetmap/package.nix b/pkgs/by-name/jn/jnetmap/package.nix index 3657ba109c26..778b6c15bb79 100644 --- a/pkgs/by-name/jn/jnetmap/package.nix +++ b/pkgs/by-name/jn/jnetmap/package.nix @@ -6,13 +6,13 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jnetmap"; version = "0.5.5"; versionSuffix = "-703"; src = fetchurl { - url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}${versionSuffix}.jar"; + url = "mirror://sourceforge/project/jnetmap/jNetMap%20${finalAttrs.version}/jNetMap-${finalAttrs.version}${finalAttrs.versionSuffix}.jar"; sha256 = "sha256-e4Ssm2Sq/v1YZ7ZudAqgQ7Cz2ffwWbSmLFoKhaZvTPg="; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" mkdir -p "$out/lib" - cp "${src}" "$out/lib/jnetmap.jar" + cp "${finalAttrs.src}" "$out/lib/jnetmap.jar" makeWrapper "${jre}/bin/java" "$out/bin/jnetmap" \ --add-flags "-jar \"$out/lib/jnetmap.jar\"" @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/jn/jnettop/package.nix b/pkgs/by-name/jn/jnettop/package.nix index e824af367bbc..cd00835c8751 100644 --- a/pkgs/by-name/jn/jnettop/package.nix +++ b/pkgs/by-name/jn/jnettop/package.nix @@ -10,12 +10,12 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jnettop"; version = "0.13.0"; src = fetchurl { - url = "http://jnettop.kubs.info/dist/jnettop-${version}.tar.gz"; + url = "http://jnettop.kubs.info/dist/jnettop-${finalAttrs.version}.tar.gz"; sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9"; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "jnettop"; }; -} +}) diff --git a/pkgs/by-name/jo/johnny/package.nix b/pkgs/by-name/jo/johnny/package.nix index 7d04afef0ded..e70c774e2152 100644 --- a/pkgs/by-name/jo/johnny/package.nix +++ b/pkgs/by-name/jo/johnny/package.nix @@ -9,14 +9,14 @@ copyDesktopItems, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "johnny"; version = "2.2"; src = fetchFromGitHub { owner = "openwall"; repo = "johnny"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-fwRvyQbRO63iVt9AHlfl+Cv4NRFQmyVsZUQLxmzGjAY="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ Misaka13514 ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/jo/jonquil/package.nix b/pkgs/by-name/jo/jonquil/package.nix index e9b40d20f3aa..5434e3fa091f 100644 --- a/pkgs/by-name/jo/jonquil/package.nix +++ b/pkgs/by-name/jo/jonquil/package.nix @@ -19,14 +19,14 @@ assert ( ] ); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jonquil"; version = "0.3.0"; src = fetchFromGitHub { owner = "toml-f"; repo = "jonquil"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-2JCTHA0nyA7xE0IA+LNrEAulHU2eIbNRvFGQ7YSQMRE="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/jo/jose/package.nix b/pkgs/by-name/jo/jose/package.nix index 000bcba502b1..1414d2fcbf2e 100644 --- a/pkgs/by-name/jo/jose/package.nix +++ b/pkgs/by-name/jo/jose/package.nix @@ -11,14 +11,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jose"; version = "14"; src = fetchFromGitHub { owner = "latchset"; repo = "jose"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rMNPJaCtVpbwIkMQzBNpmRct6S/NelTwjmsuB0RP6R8="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { # The last successful Darwin Hydra build was in 2024 broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/jo/joypixels/package.nix b/pkgs/by-name/jo/joypixels/package.nix index b8c15b6675d6..0dcd10dc8f47 100644 --- a/pkgs/by-name/jo/joypixels/package.nix +++ b/pkgs/by-name/jo/joypixels/package.nix @@ -47,14 +47,13 @@ let unfree licenses. configuration.nix: - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "joypixels" - ]; + nixpkgs.config.allowUnfreePackages = [ + "joypixels" + ]; nixpkgs.config.joypixels.acceptLicense = true; config.nix: - allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + allowUnfreePackages = [ "joypixels" ]; joypixels.acceptLicense = true; diff --git a/pkgs/by-name/jp/jpcre2/package.nix b/pkgs/by-name/jp/jpcre2/package.nix index a39a02ca3dec..6f2ab424f059 100644 --- a/pkgs/by-name/jp/jpcre2/package.nix +++ b/pkgs/by-name/jp/jpcre2/package.nix @@ -5,15 +5,15 @@ pcre2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jpcre2"; version = "10.32.01"; - rev = version; + rev = finalAttrs.version; src = fetchFromGitHub { owner = "jpcre2"; repo = "jpcre2"; - tag = version; + tag = finalAttrs.version; hash = "sha256-CizjxAiajDLqajZKizMRAk5UEZA+jDeBSldPyIb6Ic8="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/jp/jpegoptim/package.nix b/pkgs/by-name/jp/jpegoptim/package.nix index 53674c35cdc2..4d457153574d 100644 --- a/pkgs/by-name/jp/jpegoptim/package.nix +++ b/pkgs/by-name/jp/jpegoptim/package.nix @@ -5,14 +5,14 @@ libjpeg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.5.6"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = "jpegoptim"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Nw9mz5zefkRwqkTIyBQyDlANHEx4dztiIiTuXUnuCKM="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "jpegoptim"; }; -} +}) diff --git a/pkgs/by-name/jp/jpilot/package.nix b/pkgs/by-name/jp/jpilot/package.nix index 430b6fd094b8..84cf5b287410 100644 --- a/pkgs/by-name/jp/jpilot/package.nix +++ b/pkgs/by-name/jp/jpilot/package.nix @@ -12,14 +12,14 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jpilot"; version = "2.0.2"; src = fetchFromGitHub { owner = "juddmon"; repo = "jpilot"; - rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "v${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-ja/P6kq53C7drEPWemGMV5fB4BktHrbrxL39jLEGhRI="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { mainProgram = "jpilot"; maintainers = with lib.maintainers; [ PapayaJackal ]; }; -} +}) diff --git a/pkgs/by-name/jq/jq-zsh-plugin/package.nix b/pkgs/by-name/jq/jq-zsh-plugin/package.nix index b0566ed6403f..88c6b869d84e 100644 --- a/pkgs/by-name/jq/jq-zsh-plugin/package.nix +++ b/pkgs/by-name/jq/jq-zsh-plugin/package.nix @@ -7,14 +7,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jq-zsh-plugin"; version = "0.6.1"; src = fetchFromGitHub { owner = "reegnz"; repo = "jq-zsh-plugin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-q/xQZ850kifmd8rCMW+aAEhuA43vB9ZAW22sss9e4SE="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.vinnymeller ]; }; -} +}) diff --git a/pkgs/by-name/js/json-fortran/package.nix b/pkgs/by-name/js/json-fortran/package.nix index c92f24d2ce4e..c98b40431d00 100644 --- a/pkgs/by-name/js/json-fortran/package.nix +++ b/pkgs/by-name/js/json-fortran/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "json-fortran"; version = "9.2.0"; src = fetchFromGitHub { owner = "jacobwilliams"; repo = "json-fortran"; - rev = version; + rev = finalAttrs.version; hash = "sha256-DjNBB1qYXZcUSvjcWqunFeI275F3YojRDCRf61pIkYs="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/js/json2tsv/package.nix b/pkgs/by-name/js/json2tsv/package.nix index 83d2e4d44eeb..7a377dbd29ec 100644 --- a/pkgs/by-name/js/json2tsv/package.nix +++ b/pkgs/by-name/js/json2tsv/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "json2tsv"; version = "1.2"; src = fetchurl { - url = "https://codemadness.org/releases/json2tsv/json2tsv-${version}.tar.gz"; + url = "https://codemadness.org/releases/json2tsv/json2tsv-${finalAttrs.version}.tar.gz"; hash = "sha256-ET5aeuspXn+BNfIxytkACR+Zrr1smDFvdh03fptQ/YQ="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sikmir ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/js/jsvc/package.nix b/pkgs/by-name/js/jsvc/package.nix index 38cdcb1833f7..dbc1127ca201 100644 --- a/pkgs/by-name/js/jsvc/package.nix +++ b/pkgs/by-name/js/jsvc/package.nix @@ -8,12 +8,12 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jsvc"; version = "1.4.1"; src = fetchurl { - url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; + url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${finalAttrs.version}-src.tar.gz"; sha256 = "sha256-yPsiNFbqbfDGHzxlr7So8sZt395BABYEJ7jOmLEhUTE="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix; mainProgram = "jsvc"; }; -} +}) diff --git a/pkgs/by-name/jt/jtag-remote-server/package.nix b/pkgs/by-name/jt/jtag-remote-server/package.nix index 287099ff04fe..9ed393911a6e 100644 --- a/pkgs/by-name/jt/jtag-remote-server/package.nix +++ b/pkgs/by-name/jt/jtag-remote-server/package.nix @@ -7,14 +7,14 @@ libftdi1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jtag-remote-server"; version = "1.2"; src = fetchFromGitHub { owner = "jiegec"; repo = "jtag-remote-server"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-qtgO0BO2hvWi/E2RzGTTuQynKbh7/OLeoLcm60dqro8="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nickcao ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/jt/jtc/package.nix b/pkgs/by-name/jt/jtc/package.nix index adb03226f735..b158db148753 100644 --- a/pkgs/by-name/jt/jtc/package.nix +++ b/pkgs/by-name/jt/jtc/package.nix @@ -5,14 +5,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jtc"; version = "1.76"; src = fetchFromGitHub { owner = "ldn-softdev"; repo = "jtc"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-VATRlOOV4wBInLOm9J0Dp2vhtL5mb0Yxdl/ya0JiqEU="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ju/judy/package.nix b/pkgs/by-name/ju/judy/package.nix index 31d024917459..b1387dd6ccff 100644 --- a/pkgs/by-name/ju/judy/package.nix +++ b/pkgs/by-name/ju/judy/package.nix @@ -6,12 +6,12 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "judy"; version = "1.0.5"; src = fetchurl { - url = "mirror://sourceforge/judy/Judy-${version}.tar.gz"; + url = "mirror://sourceforge/judy/Judy-${finalAttrs.version}.tar.gz"; sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { description = "State-of-the-art C library that implements a sparse dynamic array"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ju/jujuutils/package.nix b/pkgs/by-name/ju/jujuutils/package.nix index 7cfb5340415d..e8bd917d34dc 100644 --- a/pkgs/by-name/ju/jujuutils/package.nix +++ b/pkgs/by-name/ju/jujuutils/package.nix @@ -5,12 +5,12 @@ linuxHeaders, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jujuutils"; version = "0.2"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-${version}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-${finalAttrs.version}.tar.gz"; sha256 = "1r74m7s7rs9d6y7cffi7mdap3jf96qwm1v6jcw53x5cikgmfxn4x"; }; @@ -22,4 +22,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ju/julius/package.nix b/pkgs/by-name/ju/julius/package.nix index 3b8a37720db5..ba4c45d64f8a 100644 --- a/pkgs/by-name/ju/julius/package.nix +++ b/pkgs/by-name/ju/julius/package.nix @@ -10,14 +10,14 @@ libicns, imagemagick, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "julius"; version = "1.8.0"; src = fetchFromGitHub { owner = "bvschaik"; repo = "julius"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ppA/lCugFfzcbANuyWUvH3/1STNRdYOhRNR4tlfWEhc="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ju/junction/package.nix b/pkgs/by-name/ju/junction/package.nix index 3381aa33be08..e6184d85a8a4 100644 --- a/pkgs/by-name/ju/junction/package.nix +++ b/pkgs/by-name/ju/junction/package.nix @@ -17,14 +17,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "junction"; version = "1.9"; src = fetchFromGitHub { owner = "sonnyp"; repo = "junction"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gnFig8C46x73gAUl9VVx3Y3hrhEVeP/DvaYHYuv9RTg="; fetchSubmodules = true; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ju/junkie/package.nix b/pkgs/by-name/ju/junkie/package.nix index cd4e0af4de58..dc9b8003aedd 100644 --- a/pkgs/by-name/ju/junkie/package.nix +++ b/pkgs/by-name/ju/junkie/package.nix @@ -10,14 +10,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "junkie"; version = "2.8.0"; src = fetchFromGitHub { owner = "rixed"; repo = "junkie"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0kfdjgch667gfb3qpiadd2dj3fxc7r19nr620gffb1ahca02wq31"; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { - a tool listing TLS certificates... ''; }; -} +}) diff --git a/pkgs/by-name/ju/juno-theme/package.nix b/pkgs/by-name/ju/juno-theme/package.nix index fd6827dc25a9..b78d310c72b0 100644 --- a/pkgs/by-name/ju/juno-theme/package.nix +++ b/pkgs/by-name/ju/juno-theme/package.nix @@ -5,25 +5,25 @@ gtk-engine-murrine, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "juno"; version = "0.0.3"; srcs = [ (fetchurl { - url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno.tar.xz"; + url = "https://github.com/gvolpe/Juno/releases/download/${finalAttrs.version}/Juno.tar.xz"; sha256 = "sha256-G/H5FZ6VSLHwtMtttRafvPFE2sd30FHbep/0i4dGfl8="; }) (fetchurl { - url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno-mirage.tar.xz"; + url = "https://github.com/gvolpe/Juno/releases/download/${finalAttrs.version}/Juno-mirage.tar.xz"; sha256 = "sha256-VU8uNH6T9FyOWgIfsGCCihnX3uHfOy6dXsANWKRPQ1c="; }) (fetchurl { - url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno-ocean.tar.xz"; + url = "https://github.com/gvolpe/Juno/releases/download/${finalAttrs.version}/Juno-ocean.tar.xz"; sha256 = "sha256-OeMXR0nE9aUmwAGfOAfbNP2Rgvv1u/2vj3LKb88mD1s="; }) (fetchurl { - url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno-palenight.tar.xz"; + url = "https://github.com/gvolpe/Juno/releases/download/${finalAttrs.version}/Juno-palenight.tar.xz"; sha256 = "sha256-DP3fKXYxUHpsw0msfPAZB3UtEa6CCOfqsabAmsmWq44="; }) ]; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.gvolpe ]; }; -} +}) diff --git a/pkgs/by-name/jx/jxplorer/package.nix b/pkgs/by-name/jx/jxplorer/package.nix index a8c7a8140c26..960e79584d00 100644 --- a/pkgs/by-name/jx/jxplorer/package.nix +++ b/pkgs/by-name/jx/jxplorer/package.nix @@ -8,12 +8,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jxplorer"; version = "3.3.1.2"; src = fetchurl { - url = "https://github.com/pegacat/jxplorer/releases/download/v${version}/jxplorer-${version}-project.tar.bz2"; + url = "https://github.com/pegacat/jxplorer/releases/download/v${finalAttrs.version}/jxplorer-${finalAttrs.version}-project.tar.bz2"; hash = "sha256-/lWkavH51OqNFSLpgT+4WcQcfW3WvnnOkB03jB7bE/s="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "jxplorer"; }; -} +}) diff --git a/pkgs/by-name/jy/jython/package.nix b/pkgs/by-name/jy/jython/package.nix index d3a6bd32af5d..c0ce9c3b41ef 100644 --- a/pkgs/by-name/jy/jython/package.nix +++ b/pkgs/by-name/jy/jython/package.nix @@ -6,13 +6,13 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jython"; version = "2.7.4"; src = fetchurl { - url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar"; + url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${finalAttrs.version}/jython-standalone-${finalAttrs.version}.jar"; sha256 = "sha256-H7oXae/8yLGfXhBDa8gnShWM6YhVnyV5J8JMc7sTfzw="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { license = lib.licenses.psfl; platforms = jre.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/k4/k40-whisperer/package.nix b/pkgs/by-name/k4/k40-whisperer/package.nix index 9cfb5cbcc02d..8155c61346d9 100644 --- a/pkgs/by-name/k4/k40-whisperer/package.nix +++ b/pkgs/by-name/k4/k40-whisperer/package.nix @@ -26,12 +26,12 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "k40-whisperer"; version = "0.68"; src = fetchzip { - url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${version}_src.zip"; + url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${finalAttrs.version}_src.zip"; stripRoot = true; sha256 = "sha256-Pc6iqBQUoI0dsrf+2dA1ZbxX+4Eks/lVgMGC4SR+oFI="; }; @@ -80,4 +80,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fooker ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ka/kaitai-struct-compiler/package.nix b/pkgs/by-name/ka/kaitai-struct-compiler/package.nix index cf273f2523e5..260694e81f07 100644 --- a/pkgs/by-name/ka/kaitai-struct-compiler/package.nix +++ b/pkgs/by-name/ka/kaitai-struct-compiler/package.nix @@ -6,12 +6,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kaitai-struct-compiler"; version = "0.11"; src = fetchzip { - url = "https://github.com/kaitai-io/kaitai_struct_compiler/releases/download/${version}/kaitai-struct-compiler-${version}.zip"; + url = "https://github.com/kaitai-io/kaitai_struct_compiler/releases/download/${finalAttrs.version}/kaitai-struct-compiler-${finalAttrs.version}.zip"; sha256 = "sha256-j9TEilijqgIiD0GbJfGKkU1FLio9aTopIi1v8QT1b+A="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ qubasa ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ka/kallisto/package.nix b/pkgs/by-name/ka/kallisto/package.nix index cec86f056bf3..63ed552052cb 100644 --- a/pkgs/by-name/ka/kallisto/package.nix +++ b/pkgs/by-name/ka/kallisto/package.nix @@ -10,14 +10,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kallisto"; version = "0.51.1"; src = fetchFromGitHub { repo = "kallisto"; owner = "pachterlab"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-hfdeztEyHvuOnLS71oSv8sPqFe2UCX5KlANqrT/Gfx8="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.arcadio ]; }; -} +}) diff --git a/pkgs/by-name/ka/kamilalisp/package.nix b/pkgs/by-name/ka/kamilalisp/package.nix index efaed71a73e0..9d8c499d82ae 100644 --- a/pkgs/by-name/ka/kamilalisp/package.nix +++ b/pkgs/by-name/ka/kamilalisp/package.nix @@ -6,12 +6,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kamilalisp"; version = "0.3.0.1"; src = fetchurl { - url = "https://github.com/kspalaiologos/kamilalisp/releases/download/v${version}/kamilalisp-${version}.jar"; + url = "https://github.com/kspalaiologos/kamilalisp/releases/download/v${finalAttrs.version}/kamilalisp-${finalAttrs.version}.jar"; hash = "sha256-SW0U483eHptkYw+yJV/2cImfK3uEjkl8ma54yeagF6s="; }; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -pv $out/share/java $out/bin - cp ${src} $out/share/java/kamilalisp-${version}.jar + cp ${finalAttrs.src} $out/share/java/kamilalisp-${finalAttrs.version}.jar makeWrapper ${jre}/bin/java $out/bin/kamilalisp \ - --add-flags "-jar $out/share/java/kamilalisp-${version}.jar" \ + --add-flags "-jar $out/share/java/kamilalisp-${finalAttrs.version}.jar" \ --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp" \ --set _JAVA_AWT_WM_NONREPARENTING 1 ''; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ cafkafk ]; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; }; -} +}) diff --git a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix index e82f304c7dc2..e8ce78821b61 100644 --- a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix +++ b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix @@ -18,14 +18,14 @@ zita-resampler, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kapitonov-plugins-pack"; version = "1.2.1"; src = fetchFromGitHub { owner = "olegkapitonov"; repo = "kapitonov-plugins-pack"; - rev = version; + rev = finalAttrs.version; sha256 = "1mxi7b1vrzg25x85lqk8c77iziqrqyz18mqkfjlz09sxp5wfs9w4"; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ magnetophon ]; }; -} +}) diff --git a/pkgs/by-name/ka/kapow/package.nix b/pkgs/by-name/ka/kapow/package.nix index 6dc4f20ae7ed..6e6405a9106a 100644 --- a/pkgs/by-name/ka/kapow/package.nix +++ b/pkgs/by-name/ka/kapow/package.nix @@ -5,14 +5,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kapow"; version = "1.5.10"; src = fetchFromGitHub { owner = "gottcode"; repo = "kapow"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1fz9fb4w21ax8hjs6dwfn2410ig4lqvzdlijq0jcj3jbgxd4i1gw"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix index fc9f04f29589..bc9ffab51974 100644 --- a/pkgs/by-name/ka/karakeep/package.nix +++ b/pkgs/by-name/ka/karakeep/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "karakeep"; - version = "0.29.3"; + version = "0.30.0"; src = fetchFromGitHub { owner = "karakeep-app"; repo = "karakeep"; tag = "v${finalAttrs.version}"; - hash = "sha256-MmurmQ/z8ME7Y6lpEWGaf7sFRSYhwd8flM4f0GBbUIM="; + hash = "sha256-ZYAjbinVMT0iiqojRxcKwQbvDqYteoExm1Ocppka0Ps="; }; patches = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { }; fetcherVersion = 3; - hash = "sha256-LEdI9chVuOli4XiA0VRV9h8L3ho0IRbPsXtAyQM6Du8="; + hash = "sha256-ZCsG+Zjiy3hmROgBKnqxGlJjvIYqAeQMlfXUnNQIsiI="; }; buildPhase = '' runHook preBuild @@ -150,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: { package = finalAttrs.finalPackage; # remove hardcoded version if upstream syncs general version with cli # version - version = "0.27.1"; + version = "0.29.1"; }; }; updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ka/kazumi/git-hashes.json b/pkgs/by-name/ka/kazumi/git-hashes.json index 025e0bb3141c..4c30eaaf5a27 100644 --- a/pkgs/by-name/ka/kazumi/git-hashes.json +++ b/pkgs/by-name/ka/kazumi/git-hashes.json @@ -1,12 +1,12 @@ { "desktop_webview_window": "sha256-kkBPJvPVAChzk9eDL5xwZvonWobChW0C5dGQYTlQ8qA=", - "media_kit": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=", - "media_kit_libs_android_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=", - "media_kit_libs_ios_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=", - "media_kit_libs_linux": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=", - "media_kit_libs_macos_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=", - "media_kit_libs_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=", - "media_kit_libs_windows_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=", - "media_kit_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=", + "media_kit": "sha256-Az58j17UwEKYrxpJGlswhxMTEkO573xFsEijH0Od3v4=", + "media_kit_libs_android_video": "sha256-Az58j17UwEKYrxpJGlswhxMTEkO573xFsEijH0Od3v4=", + "media_kit_libs_ios_video": "sha256-Az58j17UwEKYrxpJGlswhxMTEkO573xFsEijH0Od3v4=", + "media_kit_libs_linux": "sha256-Az58j17UwEKYrxpJGlswhxMTEkO573xFsEijH0Od3v4=", + "media_kit_libs_macos_video": "sha256-Az58j17UwEKYrxpJGlswhxMTEkO573xFsEijH0Od3v4=", + "media_kit_libs_video": "sha256-Az58j17UwEKYrxpJGlswhxMTEkO573xFsEijH0Od3v4=", + "media_kit_libs_windows_video": "sha256-Az58j17UwEKYrxpJGlswhxMTEkO573xFsEijH0Od3v4=", + "media_kit_video": "sha256-Az58j17UwEKYrxpJGlswhxMTEkO573xFsEijH0Od3v4=", "webview_windows": "sha256-pDnCv8tkeeaodMcNggHOyvPPkoCfd0hvopTg1Uvx0sM=" } diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 9f857e55512c..4acbd37484ec 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -18,13 +18,13 @@ }: let - version = "1.9.4"; + version = "1.9.6"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; tag = version; - hash = "sha256-xWbk81y+cA/iJCttZAKR1EfSkA7u9+aLFnty548Bv0g="; + hash = "sha256-SNPG+k03RhNuveNaDSscPQeaqh0QXkpqZ2D1JvMtAYM="; }; in flutter338.buildFlutterApplication { diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index 2de2076b8004..235c135f9b47 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -909,8 +909,8 @@ "dependency": "direct main", "description": { "path": "media_kit", - "ref": "7b248251fc274f986635876946130f2afc78c959", - "resolved-ref": "7b248251fc274f986635876946130f2afc78c959", + "ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", + "resolved-ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -920,8 +920,8 @@ "dependency": "direct overridden", "description": { "path": "libs/android/media_kit_libs_android_video", - "ref": "7b248251fc274f986635876946130f2afc78c959", - "resolved-ref": "7b248251fc274f986635876946130f2afc78c959", + "ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", + "resolved-ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -931,8 +931,8 @@ "dependency": "direct overridden", "description": { "path": "libs/ios/media_kit_libs_ios_video", - "ref": "7b248251fc274f986635876946130f2afc78c959", - "resolved-ref": "7b248251fc274f986635876946130f2afc78c959", + "ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", + "resolved-ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -942,8 +942,8 @@ "dependency": "direct overridden", "description": { "path": "libs/linux/media_kit_libs_linux", - "ref": "7b248251fc274f986635876946130f2afc78c959", - "resolved-ref": "7b248251fc274f986635876946130f2afc78c959", + "ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", + "resolved-ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -953,8 +953,8 @@ "dependency": "direct overridden", "description": { "path": "libs/macos/media_kit_libs_macos_video", - "ref": "7b248251fc274f986635876946130f2afc78c959", - "resolved-ref": "7b248251fc274f986635876946130f2afc78c959", + "ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", + "resolved-ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -964,8 +964,8 @@ "dependency": "direct main", "description": { "path": "libs/universal/media_kit_libs_video", - "ref": "7b248251fc274f986635876946130f2afc78c959", - "resolved-ref": "7b248251fc274f986635876946130f2afc78c959", + "ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", + "resolved-ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -975,8 +975,8 @@ "dependency": "direct overridden", "description": { "path": "libs/windows/media_kit_libs_windows_video", - "ref": "7b248251fc274f986635876946130f2afc78c959", - "resolved-ref": "7b248251fc274f986635876946130f2afc78c959", + "ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", + "resolved-ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -986,8 +986,8 @@ "dependency": "direct main", "description": { "path": "media_kit_video", - "ref": "7b248251fc274f986635876946130f2afc78c959", - "resolved-ref": "7b248251fc274f986635876946130f2afc78c959", + "ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", + "resolved-ref": "c04ddeead9ab468a3b5ddab0ee3789c77635841e", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -2133,6 +2133,6 @@ }, "sdks": { "dart": ">=3.9.0 <4.0.0", - "flutter": ">=3.38.6" + "flutter": ">=3.38.9" } } diff --git a/pkgs/by-name/kb/kbdlight/package.nix b/pkgs/by-name/kb/kbdlight/package.nix index 4db6a2d50e0b..fae1720b1be1 100644 --- a/pkgs/by-name/kb/kbdlight/package.nix +++ b/pkgs/by-name/kb/kbdlight/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kbdlight"; version = "1.3"; src = fetchFromGitHub { owner = "hobarrera"; repo = "kbdlight"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1f08aid1xrbl4sb5447gkip9lnvkia1c4ap0v8zih5s9w8v72bny"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.womfoo ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/kc/kcat/package.nix b/pkgs/by-name/kc/kcat/package.nix index b01def6c0f97..068c57d2ecf9 100644 --- a/pkgs/by-name/kc/kcat/package.nix +++ b/pkgs/by-name/kc/kcat/package.nix @@ -11,7 +11,7 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kcat"; version = "1.7.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "edenhill"; repo = "kcat"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-pCIYNx0GYPGDYzTLq9h/LbOrJjhKWLAV4gq07Ikl5O4="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ nyarly ]; }; -} +}) diff --git a/pkgs/by-name/kc/kcp/package.nix b/pkgs/by-name/kc/kcp/package.nix index 6d46f2275a12..f1a5cdbb3d6d 100644 --- a/pkgs/by-name/kc/kcp/package.nix +++ b/pkgs/by-name/kc/kcp/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kcp"; version = "1.7"; src = fetchFromGitHub { owner = "skywind3000"; repo = "kcp"; - rev = version; + rev = finalAttrs.version; hash = "sha256-yW40x4T++4rB7hoabGN8qiSN7octyoUYEfE9oDlLxjU="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/kd/kdbg/package.nix b/pkgs/by-name/kd/kdbg/package.nix index 917139a42651..488f90fc2692 100644 --- a/pkgs/by-name/kd/kdbg/package.nix +++ b/pkgs/by-name/kd/kdbg/package.nix @@ -7,11 +7,11 @@ kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kdbg"; version = "3.2.0"; src = fetchurl { - url = "mirror://sourceforge/kdbg/${version}/kdbg-${version}.tar.gz"; + url = "mirror://sourceforge/kdbg/${finalAttrs.version}/kdbg-${finalAttrs.version}.tar.gz"; hash = "sha256-GoWLKWD/nWXBTiTbDLxeNArDMyPI/gSzADqyOgxrNHE="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { mainProgram = "kdbg"; license = lib.licenses.gpl2; }; -} +}) diff --git a/pkgs/by-name/kd/kddockwidgets/package.nix b/pkgs/by-name/kd/kddockwidgets/package.nix index 213dca33129c..4efc159da341 100644 --- a/pkgs/by-name/kd/kddockwidgets/package.nix +++ b/pkgs/by-name/kd/kddockwidgets/package.nix @@ -9,14 +9,14 @@ nlohmann_json, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "KDDockWidgets"; version = "2.4.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "KDDockWidgets"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/ioCX/Txqr84uJJYPhVLrZKug6VdWQDVirmsTg42PXs="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { tmarkus ]; }; -} +}) diff --git a/pkgs/by-name/kd/kde-rounded-corners/package.nix b/pkgs/by-name/kd/kde-rounded-corners/package.nix index 4c11e4b18669..e85d10b882d1 100644 --- a/pkgs/by-name/kd/kde-rounded-corners/package.nix +++ b/pkgs/by-name/kd/kde-rounded-corners/package.nix @@ -8,14 +8,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kde-rounded-corners"; version = "0.8.6"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-v/kobtUoWBbYP4iMiUqWNnpIYyu5CBmYHnwxfN4eoQ0="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ devusb ]; }; -} +}) diff --git a/pkgs/by-name/kd/kdiskmark/package.nix b/pkgs/by-name/kd/kdiskmark/package.nix index 9e4a4b065e5f..9b8b42fb21b3 100644 --- a/pkgs/by-name/kd/kdiskmark/package.nix +++ b/pkgs/by-name/kd/kdiskmark/package.nix @@ -6,14 +6,14 @@ fetchFromGitHub, kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kdiskmark"; version = "3.2.0"; src = fetchFromGitHub { owner = "jonmagon"; repo = "kdiskmark"; - rev = version; + rev = finalAttrs.version; hash = "sha256-b42PNUrG10RyGct6dPtdT89oO222tEovkSPoRcROfaQ="; fetchSubmodules = true; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "kdiskmark"; }; -} +}) diff --git a/pkgs/by-name/kd/kdsingleapplication/package.nix b/pkgs/by-name/kd/kdsingleapplication/package.nix index 41eb66cbe351..a1be57ca0823 100644 --- a/pkgs/by-name/kd/kdsingleapplication/package.nix +++ b/pkgs/by-name/kd/kdsingleapplication/package.nix @@ -6,14 +6,14 @@ qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "KDSingleApplication"; version = "1.2.0"; src = fetchFromGitHub { owner = "KDAB"; repo = "KDSingleApplication"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rglt89Gw6OHXXVOEwf0TxezDzyHEvWepeGeup7fBlLs="; }; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ hellwolf ]; platforms = lib.platforms.unix; license = lib.licenses.mit; - changelog = "https://github.com/KDAB/KDSingleApplication/releases/tag/v${version}"; + changelog = "https://github.com/KDAB/KDSingleApplication/releases/tag/v${finalAttrs.version}"; }; -} +}) diff --git a/pkgs/by-name/ke/keama/package.nix b/pkgs/by-name/ke/keama/package.nix index 89621fbd6b07..76456ef05e98 100644 --- a/pkgs/by-name/ke/keama/package.nix +++ b/pkgs/by-name/ke/keama/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "keama"; version = "4.4.3-P1"; src = fetchurl { - url = "https://ftp.isc.org/isc/dhcp/${version}/dhcp-${version}.tar.gz"; + url = "https://ftp.isc.org/isc/dhcp/${finalAttrs.version}/dhcp-${finalAttrs.version}.tar.gz"; sha256 = "sha256-CsQWu1WZfKhjIXT9EHN/1hzbjbonUhYKM1d1vCHcc8c="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ blitz ]; mainProgram = "keama"; }; -} +}) diff --git a/pkgs/by-name/ke/keepalived/package.nix b/pkgs/by-name/ke/keepalived/package.nix index d52f632dd211..d08c856293f9 100644 --- a/pkgs/by-name/ke/keepalived/package.nix +++ b/pkgs/by-name/ke/keepalived/package.nix @@ -14,14 +14,14 @@ withNetSnmp ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "keepalived"; version = "2.3.4"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Xv/UGIeZhRHQO5lxkaWgHDUW+3qBi3wFU4+Us1A2uE0="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.raitobezarius ]; mainProgram = "keepalived"; }; -} +}) diff --git a/pkgs/by-name/ke/keybinder/package.nix b/pkgs/by-name/ke/keybinder/package.nix index 958d32612857..0e7ed8ec4ea7 100644 --- a/pkgs/by-name/ke/keybinder/package.nix +++ b/pkgs/by-name/ke/keybinder/package.nix @@ -15,14 +15,14 @@ let lua = lua5_1; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "keybinder"; version = "0.3.1"; src = fetchFromGitHub { owner = "engla"; repo = "keybinder"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-elL6DZtzCwAtoyGZYP0jAma6tHPks2KAtrziWtBENGU="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/ke/keybinder3/package.nix b/pkgs/by-name/ke/keybinder3/package.nix index 7399f3dc0568..085e678931cf 100644 --- a/pkgs/by-name/ke/keybinder3/package.nix +++ b/pkgs/by-name/ke/keybinder3/package.nix @@ -17,14 +17,14 @@ gobject-introspection, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "keybinder3"; version = "0.3.2"; src = fetchFromGitHub { owner = "kupferlauncher"; repo = "keybinder"; - rev = "keybinder-3.0-v${version}"; + rev = "keybinder-3.0-v${finalAttrs.version}"; sha256 = "196ibn86j54fywfwwgyh89i9wygm4vh7ls19fn20vrnm6ijlzh9r"; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ke/keychain/package.nix b/pkgs/by-name/ke/keychain/package.nix index 1582c06144b5..2583d183f81f 100644 --- a/pkgs/by-name/ke/keychain/package.nix +++ b/pkgs/by-name/ke/keychain/package.nix @@ -15,14 +15,14 @@ gnused, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "keychain"; version = "2.9.8"; src = fetchFromGitHub { owner = "funtoo"; repo = "keychain"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-xk3ooFhBkgv93Po5oC4TZRmMhJJXDv7yekoE102FQd8="; }; @@ -71,4 +71,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sigma ]; mainProgram = "keychain"; }; -} +}) diff --git a/pkgs/by-name/ke/keylight-cli/package.nix b/pkgs/by-name/ke/keylight-cli/package.nix index d8535dc68be2..757f4e3203fa 100644 --- a/pkgs/by-name/ke/keylight-cli/package.nix +++ b/pkgs/by-name/ke/keylight-cli/package.nix @@ -5,14 +5,14 @@ babashka, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "keylight-cli"; version = "1.0.0"; src = fetchFromGitHub { owner = "versality"; repo = "keylight-cli"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-boL6Sg+C9OxMEcr5tAFCn8NxCDrJ6I2nMn9/2yMOYRI="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { mainProgram = "keylight"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ke/keystone/package.nix b/pkgs/by-name/ke/keystone/package.nix index 0fc9ccd6045a..11b8ff7da8c4 100644 --- a/pkgs/by-name/ke/keystone/package.nix +++ b/pkgs/by-name/ke/keystone/package.nix @@ -8,14 +8,14 @@ fixDarwinDylibNames, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "keystone"; version = "0.9.2"; src = fetchFromGitHub { owner = "keystone-engine"; repo = "keystone"; - rev = version; + rev = finalAttrs.version; sha256 = "020d1l1aqb82g36l8lyfn2j8c660mm6sh1nl4haiykwgdl9xnxfa"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { mainProgram = "kstool"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix index 48c5ddb88987..ebd9e4b077f3 100644 --- a/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix +++ b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix @@ -7,14 +7,14 @@ withTracing ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencl-icd-loader"; version = "2025.07.22"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-jwviNwX7C7b9lqIS4oZ4YLEFBfBdmQfXHxW3FPPYxYs="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/kh/khronos/package.nix b/pkgs/by-name/kh/khronos/package.nix index 17eb91974ccf..c7b58843a699 100644 --- a/pkgs/by-name/kh/khronos/package.nix +++ b/pkgs/by-name/kh/khronos/package.nix @@ -16,14 +16,14 @@ wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "khronos"; version = "4.0.1"; src = fetchFromGitHub { owner = "lainsce"; repo = "khronos"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-2mO2ZMDxZ7sx2EVTN0tsAv8MisGxlK/1h61N+hOqyGI="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; mainProgram = "io.github.lainsce.Khronos"; }; -} +}) diff --git a/pkgs/by-name/ki/kile/package.nix b/pkgs/by-name/ki/kile/package.nix index a1219e2ab8bd..83df113af79b 100644 --- a/pkgs/by-name/ki/kile/package.nix +++ b/pkgs/by-name/ki/kile/package.nix @@ -7,12 +7,12 @@ qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kile"; version = "2.9.94"; src = fetchurl { - url = "mirror://sourceforge/kile/kile-${version}.tar.bz2"; + url = "mirror://sourceforge/kile/kile-${finalAttrs.version}.tar.bz2"; sha256 = "U8Z0K9g/sJXL3ImLA/344Vq2gKgWk8yvnFB2uTrRo8o="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "kile"; }; -} +}) diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index a9e734ac226f..37b31020872a 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -7,13 +7,13 @@ php.buildComposerProject2 (finalAttrs: { pname = "kimai"; - version = "2.46.0"; + version = "2.47.0"; src = fetchFromGitHub { owner = "kimai"; repo = "kimai"; tag = finalAttrs.version; - hash = "sha256-sZjDl3nQ4i5KVnM2fLVvaQxMlE225q7EBkgFmTn+ugc="; + hash = "sha256-aMvgioXuKZWstkslfX8bFuxBpTo9F3VHl9aqyNPDMFQ="; }; php = php.buildEnv { @@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: { ''; }; - vendorHash = "sha256-FJaWNlzOIm4hJexgKI8fEmRvBfaa8nxxkg8zJeCz3SU="; + vendorHash = "sha256-HOpl+cfQgh/I/Od8o6/hRlJvuMsaEouwn3w4M9FmR7Q="; composerNoPlugins = false; postInstall = '' diff --git a/pkgs/by-name/ki/kirc/package.nix b/pkgs/by-name/ki/kirc/package.nix index 197ae8768bde..b5830bc07871 100644 --- a/pkgs/by-name/ki/kirc/package.nix +++ b/pkgs/by-name/ki/kirc/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kirc"; version = "1.0.7"; src = fetchFromGitHub { owner = "mcpcpc"; repo = "kirc"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ModcUryLJTbf19ZKZDQ05Wqqac5vBsCN7SaT0/TD4Ro="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix index 70a2c7a40e7e..5dbe1106eee9 100644 --- a/pkgs/by-name/ki/kitsas/package.nix +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kitsas"; version = "5.9"; src = fetchFromGitHub { owner = "artoh"; repo = "kitupiikki"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-4FCfpUFfi+N207SEAKz8nLpVS8MxfmDwM6r6i5pyqEM="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/kl/klick/package.nix b/pkgs/by-name/kl/klick/package.nix index 2326a26acf8c..ef84e4401967 100644 --- a/pkgs/by-name/kl/klick/package.nix +++ b/pkgs/by-name/kl/klick/package.nix @@ -12,14 +12,14 @@ libsndfile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "klick"; version = "0.14.2"; src = fetchFromGitHub { owner = "Allfifthstuning"; repo = "klick"; - rev = version; + rev = finalAttrs.version; hash = "sha256-jHyeVCmyy9ipbVaF7GSW19DOVpU9EQJoLcGq9uos+eY="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "klick"; }; -} +}) diff --git a/pkgs/by-name/kl/klong/package.nix b/pkgs/by-name/kl/klong/package.nix index e5ffb916dfd8..a2bfc7acfa8d 100644 --- a/pkgs/by-name/kl/klong/package.nix +++ b/pkgs/by-name/kl/klong/package.nix @@ -8,12 +8,12 @@ gv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "klong"; version = "20221212"; src = fetchurl { - url = "https://t3x.org/klong/klong${version}.tgz"; + url = "https://t3x.org/klong/klong${finalAttrs.version}.tgz"; hash = "sha256-XhpIdyKKPGQ6mdv9LXPmC8P6hW4mFawv54yANw5/lrQ="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { cc0 ]; }; -} +}) diff --git a/pkgs/by-name/km/kmod-debian-aliases/package.nix b/pkgs/by-name/km/kmod-debian-aliases/package.nix index 4cfe90a4499c..ce83fb2c42bc 100644 --- a/pkgs/by-name/km/kmod-debian-aliases/package.nix +++ b/pkgs/by-name/km/kmod-debian-aliases/package.nix @@ -4,12 +4,12 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kmod-debian-aliases.conf"; version = "30+20230601-2"; src = fetchurl { - url = "https://snapshot.debian.org/archive/debian/20231117T085632Z/pool/main/k/kmod/kmod_${version}.debian.tar.xz"; + url = "https://snapshot.debian.org/archive/debian/20231117T085632Z/pool/main/k/kmod/kmod_${finalAttrs.version}.debian.tar.xz"; hash = "sha256-xJMGKht8hu0aQjN9TER87Rv5EYkVMeDfX/jJ8+UjAqM="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { lgpl21Plus ]; }; -} +}) diff --git a/pkgs/by-name/km/kmsvnc/package.nix b/pkgs/by-name/km/kmsvnc/package.nix index 629e3bf929e0..6d50d5f0ab84 100644 --- a/pkgs/by-name/km/kmsvnc/package.nix +++ b/pkgs/by-name/km/kmsvnc/package.nix @@ -10,14 +10,14 @@ libva, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kmsvnc"; version = "0.0.6"; src = fetchFromGitHub { owner = "isjerryxiao"; repo = "kmsvnc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-fOryY9pkeRXjfOq4ZcUKBrBDMWEljLChwXSAbeMNXhw="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { mainProgram = "kmsvnc"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/kn/knightos-genkfs/package.nix b/pkgs/by-name/kn/knightos-genkfs/package.nix index a3d13d63d580..eead12805dbb 100644 --- a/pkgs/by-name/kn/knightos-genkfs/package.nix +++ b/pkgs/by-name/kn/knightos-genkfs/package.nix @@ -7,14 +7,14 @@ libxslt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "genkfs"; version = "1.3.2"; src = fetchFromGitHub { owner = "KnightOS"; repo = "genkfs"; - rev = version; + rev = finalAttrs.version; sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/kn/knightos-kcc/package.nix b/pkgs/by-name/kn/knightos-kcc/package.nix index 3cefa6d5ca58..19d592e04048 100644 --- a/pkgs/by-name/kn/knightos-kcc/package.nix +++ b/pkgs/by-name/kn/knightos-kcc/package.nix @@ -8,7 +8,7 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kcc"; version = "4.0.4"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KnightOS"; repo = "kcc"; - rev = version; + rev = finalAttrs.version; sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/kn/knightos-kimg/package.nix b/pkgs/by-name/kn/knightos-kimg/package.nix index b8b262f32745..7ca72e3f1f4c 100644 --- a/pkgs/by-name/kn/knightos-kimg/package.nix +++ b/pkgs/by-name/kn/knightos-kimg/package.nix @@ -7,14 +7,14 @@ asciidoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kimg"; version = "0.4.0"; src = fetchFromGitHub { owner = "KnightOS"; repo = "kimg"; - rev = version; + rev = finalAttrs.version; sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/kn/knightos-kpack/package.nix b/pkgs/by-name/kn/knightos-kpack/package.nix index 08f3f922ca3e..57a41bce7455 100644 --- a/pkgs/by-name/kn/knightos-kpack/package.nix +++ b/pkgs/by-name/kn/knightos-kpack/package.nix @@ -7,7 +7,7 @@ libxslt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kpack"; version = "1.1.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KnightOS"; repo = "kpack"; - rev = version; + rev = finalAttrs.version; sha256 = "1l6bm2j45946i80qgwhrixg9sckazwb5x4051s76d3mapq9bara8"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/kn/knightos-mkrom/package.nix b/pkgs/by-name/kn/knightos-mkrom/package.nix index ce0b1d57d97f..69c1333dbb04 100644 --- a/pkgs/by-name/kn/knightos-mkrom/package.nix +++ b/pkgs/by-name/kn/knightos-mkrom/package.nix @@ -6,14 +6,14 @@ asciidoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mkrom"; version = "1.0.4"; src = fetchFromGitHub { owner = "KnightOS"; repo = "mkrom"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-YFrh0tOGiM90uvU9ZWopW1+9buHDQtetuOtPDSYYaXw="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/kn/knightos-mktiupgrade/package.nix b/pkgs/by-name/kn/knightos-mktiupgrade/package.nix index cc84a42066ce..dc2b16e653a6 100644 --- a/pkgs/by-name/kn/knightos-mktiupgrade/package.nix +++ b/pkgs/by-name/kn/knightos-mktiupgrade/package.nix @@ -7,14 +7,14 @@ asciidoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mktiupgrade"; version = "1.1.6"; src = fetchFromGitHub { owner = "KnightOS"; repo = "mktiupgrade"; - rev = version; + rev = finalAttrs.version; sha256 = "15y3rxvv7ipgc80wrvrpksxzdyqr21ywysc9hg6s7d3w8lqdq8dm"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/kn/knightos-patchrom/package.nix b/pkgs/by-name/kn/knightos-patchrom/package.nix index e3ab717f1bcb..4fb10e159096 100644 --- a/pkgs/by-name/kn/knightos-patchrom/package.nix +++ b/pkgs/by-name/kn/knightos-patchrom/package.nix @@ -7,7 +7,7 @@ libxslt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "patchrom"; version = "1.1.3"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KnightOS"; repo = "patchrom"; - rev = version; + rev = finalAttrs.version; sha256 = "0yc4q7n3k7k6rx3cxq5ddd5r0la8gw1287a74kql6gwkxjq0jmcv"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/kn/knightos-scas/package.nix b/pkgs/by-name/kn/knightos-scas/package.nix index bd8cc17bed7f..565ab2f3aa82 100644 --- a/pkgs/by-name/kn/knightos-scas/package.nix +++ b/pkgs/by-name/kn/knightos-scas/package.nix @@ -12,14 +12,14 @@ let isCrossCompiling = stdenv.hostPlatform != stdenv.buildPlatform; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scas"; version = "0.5.5"; src = fetchFromGitHub { owner = "KnightOS"; repo = "scas"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-JGQE+orVDKKJsTt8sIjPX+3yhpZkujISroQ6g19+MzU="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/kn/knightos-z80e/package.nix b/pkgs/by-name/kn/knightos-z80e/package.nix index 5f540a065fdd..6dfbc6cf5ec9 100644 --- a/pkgs/by-name/kn/knightos-z80e/package.nix +++ b/pkgs/by-name/kn/knightos-z80e/package.nix @@ -8,14 +8,14 @@ SDL2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "z80e"; version = "0.5.3"; src = fetchFromGitHub { owner = "KnightOS"; repo = "z80e"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-FQMYHxKxHEP+x98JbGyjaM0OL8QK/p3epsAWvQkv6bc="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index b047cd0d7d7e..6919ba9ec52d 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -32,12 +32,12 @@ runCommandLocal, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "knot-dns"; version = "3.5.3"; src = fetchurl { - url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; + url = "https://secure.nic.cz/files/knot-dns/knot-${finalAttrs.version}.tar.xz"; sha256 = "e003ad1eef229c4e65a6cac876ee773e25a06177ecdc83795a26617a6eebe471"; }; @@ -136,10 +136,10 @@ stdenv.mkDerivation rec { meta = { description = "Authoritative-only DNS server from .cz domain registry"; homepage = "https://knot-dns.cz"; - changelog = "https://gitlab.nic.cz/knot/knot-dns/-/releases/v${version}"; + changelog = "https://gitlab.nic.cz/knot/knot-dns/-/releases/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.vcunat ]; mainProgram = "knotd"; }; -} +}) diff --git a/pkgs/by-name/ko/kobodeluxe/package.nix b/pkgs/by-name/ko/kobodeluxe/package.nix index fa8d47a287bd..6be5b8b85cba 100644 --- a/pkgs/by-name/ko/kobodeluxe/package.nix +++ b/pkgs/by-name/ko/kobodeluxe/package.nix @@ -8,11 +8,11 @@ libGL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kobodeluxe"; version = "0.5.1"; src = fetchurl { - url = "https://olofson.net/kobodl/download/KoboDeluxe-${version}.tar.bz2"; + url = "https://olofson.net/kobodl/download/KoboDeluxe-${finalAttrs.version}.tar.bz2"; sha256 = "0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index 34e4905ba760..c3900db56c88 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.100.0"; + version = "1.101.0"; pyproject = false; src = fetchFromGitea { @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; tag = "v${version}"; - hash = "sha256-rHOXRvUm/Wc5oQpp8+rg3szHxuko+R0oap4S/9rmHMk="; + hash = "sha256-sDhnG6d77erHO9HS0fL4Fl5qHbeyuLz2TFeic5zLJIE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/kompute/package.nix b/pkgs/by-name/ko/kompute/package.nix index f7c350c52f16..da8f2cefc385 100644 --- a/pkgs/by-name/ko/kompute/package.nix +++ b/pkgs/by-name/ko/kompute/package.nix @@ -12,14 +12,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kompute"; version = "0.9.0"; src = fetchFromGitHub { owner = "KomputeProject"; repo = "kompute"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-cf9Ef85R+VKao286+WHLgBWUqgwvuRocgeCzVJOGbdc="; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ atila ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ko/kona/package.nix b/pkgs/by-name/ko/kona/package.nix index 68ac5b0c0caf..0be40b37c47f 100644 --- a/pkgs/by-name/ko/kona/package.nix +++ b/pkgs/by-name/ko/kona/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kona"; version = "20211225"; src = fetchFromGitHub { owner = "kevinlawler"; repo = "kona"; - rev = "Win64-${version}"; + rev = "Win64-${finalAttrs.version}"; sha256 = "sha256-m3a9conyKN0qHSSAG8zAb3kx8ir+7dqgxm1XGjCQcfk="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.isc; }; -} +}) diff --git a/pkgs/by-name/ko/kore/package.nix b/pkgs/by-name/ko/kore/package.nix index b931fc4748a2..44fc2aecc4cb 100644 --- a/pkgs/by-name/ko/kore/package.nix +++ b/pkgs/by-name/ko/kore/package.nix @@ -9,14 +9,14 @@ yajl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kore"; version = "4.2.3"; src = fetchFromGitHub { owner = "jorisvink"; repo = "kore"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-p0M2P02xwww5EnT28VnEtj5b+/jkPW3YkJMuK79vp4k="; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ johnmh ]; }; -} +}) diff --git a/pkgs/by-name/ko/kotlin-language-server/package.nix b/pkgs/by-name/ko/kotlin-language-server/package.nix index e1efd4904248..a32c8bd468c3 100644 --- a/pkgs/by-name/ko/kotlin-language-server/package.nix +++ b/pkgs/by-name/ko/kotlin-language-server/package.nix @@ -8,11 +8,11 @@ maven, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kotlin-language-server"; version = "1.3.13"; src = fetchzip { - url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; + url = "https://github.com/fwcd/kotlin-language-server/releases/download/${finalAttrs.version}/server.zip"; hash = "sha256-ypiOeXA+14Js31WPGJAdSjskQJR9sBPVWGecLkKHiN4="; }; @@ -50,10 +50,10 @@ stdenv.mkDerivation rec { using the Language Server Protocol Topics''; maintainers = with lib.maintainers; [ vtuan10 ]; homepage = "https://github.com/fwcd/kotlin-language-server"; - changelog = "https://github.com/fwcd/kotlin-language-server/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/fwcd/kotlin-language-server/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; platforms = lib.platforms.unix; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; mainProgram = "kotlin-language-server"; }; -} +}) diff --git a/pkgs/by-name/kr/kronosnet/package.nix b/pkgs/by-name/kr/kronosnet/package.nix index 8136a95f561e..77fa7eeb79bb 100644 --- a/pkgs/by-name/kr/kronosnet/package.nix +++ b/pkgs/by-name/kr/kronosnet/package.nix @@ -19,14 +19,14 @@ doxygen, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kronosnet"; version = "1.32"; src = fetchFromGitHub { owner = "kronosnet"; repo = "kronosnet"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-g2AgVAFEmRlMaqH7uRabSNJP0ehUQ6Iws4LT2iB8kTA="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ ryantm ]; }; -} +}) diff --git a/pkgs/by-name/kr/krunner-vscodeprojects/package.nix b/pkgs/by-name/kr/krunner-vscodeprojects/package.nix index 07316f77b59e..47d9bd1884f4 100644 --- a/pkgs/by-name/kr/krunner-vscodeprojects/package.nix +++ b/pkgs/by-name/kr/krunner-vscodeprojects/package.nix @@ -6,14 +6,14 @@ kdePackages, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "krunner-vscodeprojects"; version = "2.0.2"; src = fetchFromGitHub { owner = "alex1701c"; repo = "krunner-vscodeprojects"; - rev = version; + rev = finalAttrs.version; hash = "sha256-a24MFSXYFR4VVUVMOAY0n0sKqY0L9lUhnpgSeDFtceI="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ js6pak ]; inherit (kdePackages.krunner.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/kr/krusader/package.nix b/pkgs/by-name/kr/krusader/package.nix index e4c982772ade..f4e98cb2cffe 100644 --- a/pkgs/by-name/kr/krusader/package.nix +++ b/pkgs/by-name/kr/krusader/package.nix @@ -7,12 +7,12 @@ kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "krusader"; version = "2.9.0"; src = fetchurl { - url = "mirror://kde/stable/krusader/${version}/krusader-${version}.tar.xz"; + url = "mirror://kde/stable/krusader/${finalAttrs.version}/krusader-${finalAttrs.version}.tar.xz"; hash = "sha256-ybeb+t5sxp/g40Hs75Mvysiv2f6U6MvPvXKf61Q5TgQ="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; mainProgram = "krusader"; }; -} +}) diff --git a/pkgs/by-name/ks/kseexpr/package.nix b/pkgs/by-name/ks/kseexpr/package.nix index 138b6c2b56e8..2df3ab19c848 100644 --- a/pkgs/by-name/ks/kseexpr/package.nix +++ b/pkgs/by-name/ks/kseexpr/package.nix @@ -11,14 +11,14 @@ llvm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kseexpr"; version = "4.0.4.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "graphics"; repo = "kseexpr"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-XjFGAN7kK2b0bLouYG3OhajhOQk4AgC4EQRzseccGCE="; }; patches = [ @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nek0 ]; license = lib.licenses.lgpl3Plus; }; -} +}) diff --git a/pkgs/by-name/ks/ksmbd-tools/package.nix b/pkgs/by-name/ks/ksmbd-tools/package.nix index d84f22f63724..d37f766e796f 100644 --- a/pkgs/by-name/ks/ksmbd-tools/package.nix +++ b/pkgs/by-name/ks/ksmbd-tools/package.nix @@ -12,14 +12,14 @@ withKerberos ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ksmbd-tools"; version = "3.5.6"; src = fetchFromGitHub { owner = "cifsd-team"; repo = "ksmbd-tools"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-JwfxYFBwrMtP2D7GcDpW44WYbLJyxZy3Jhgi+7HsIng="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ks/ksuperkey/package.nix b/pkgs/by-name/ks/ksuperkey/package.nix index 474aa82f2a18..f5355613147b 100644 --- a/pkgs/by-name/ks/ksuperkey/package.nix +++ b/pkgs/by-name/ks/ksuperkey/package.nix @@ -9,14 +9,14 @@ libXi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ksuperkey"; version = "0.4"; src = fetchFromGitHub { owner = "hanschen"; repo = "ksuperkey"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1dvgf356fihfav8pjzww1q6vgd96c5h18dh8vpv022g9iipiwq8a"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ksuperkey"; }; -} +}) diff --git a/pkgs/by-name/kt/ktlint/package.nix b/pkgs/by-name/kt/ktlint/package.nix index e7c6b10d7875..207452241001 100644 --- a/pkgs/by-name/kt/ktlint/package.nix +++ b/pkgs/by-name/kt/ktlint/package.nix @@ -7,12 +7,12 @@ gnused, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ktlint"; version = "1.8.0"; src = fetchurl { - url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; + url = "https://github.com/pinterest/ktlint/releases/download/${finalAttrs.version}/ktlint"; sha256 = "sha256-o/1iAgfVxA2myniblef4I8VOhUt/ref2E+kQlqNwbXU="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; mainProgram = "ktlint"; }; -} +}) diff --git a/pkgs/by-name/kt/ktls-utils/package.nix b/pkgs/by-name/kt/ktls-utils/package.nix index 170b9126f137..8820b61c3471 100644 --- a/pkgs/by-name/kt/ktls-utils/package.nix +++ b/pkgs/by-name/kt/ktls-utils/package.nix @@ -13,14 +13,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ktls-utils"; version = "1.3.0"; src = fetchFromGitHub { owner = "oracle"; repo = "ktls-utils"; - rev = "ktls-utils-${version}"; + rev = "ktls-utils-${finalAttrs.version}"; hash = "sha256-xBh9iSmTf8YCfahWnJvDx/nvz91NFZ3AiJ2JYs+pMfY="; }; @@ -52,10 +52,10 @@ stdenv.mkDerivation rec { meta = { description = "TLS handshake utilities for in-kernel TLS consumers"; homepage = "https://github.com/oracle/ktls-utils"; - changelog = "https://github.com/oracle/ktls-utils/blob/${src.rev}/NEWS"; + changelog = "https://github.com/oracle/ktls-utils/blob/${finalAttrs.src.rev}/NEWS"; license = lib.licenses.gpl2Only; maintainers = [ ]; mainProgram = "tlshd"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/kt/ktx-tools/package.nix b/pkgs/by-name/kt/ktx-tools/package.nix index c443ce61bafb..c312cc6071cf 100644 --- a/pkgs/by-name/kt/ktx-tools/package.nix +++ b/pkgs/by-name/kt/ktx-tools/package.nix @@ -8,14 +8,14 @@ pkg-config, stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ktx-tools"; version = "4.4.2"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "KTX-Software"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-yBRLKa0h64vDBvaessh2FwP16d8+jvW6udbyZvOMzTQ="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bonsairobo ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ku/kubetail/package.nix b/pkgs/by-name/ku/kubetail/package.nix index 66653a5ccf64..3eb214e0b81b 100644 --- a/pkgs/by-name/ku/kubetail/package.nix +++ b/pkgs/by-name/ku/kubetail/package.nix @@ -7,14 +7,14 @@ kubectl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kubetail"; version = "1.6.22"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-iCZoK9is3Zpew0q61ZpG/OK3RLU4Fb6XCh7eVaVrTEY="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ky/kyotocabinet/package.nix b/pkgs/by-name/ky/kyotocabinet/package.nix index e27d698799af..ff9d8d52cd83 100644 --- a/pkgs/by-name/ky/kyotocabinet/package.nix +++ b/pkgs/by-name/ky/kyotocabinet/package.nix @@ -5,12 +5,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kyotocabinet"; version = "1.2.80"; src = fetchurl { - url = "https://dbmx.net/kyotocabinet/pkg/kyotocabinet-${version}.tar.gz"; + url = "https://dbmx.net/kyotocabinet/pkg/kyotocabinet-${finalAttrs.version}.tar.gz"; sha256 = "sha256-TIXXNmaNgpIL/b25KsPWa32xEI8JWBp2ndkWCgLe80k="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/la/lambda-delta/package.nix b/pkgs/by-name/la/lambda-delta/package.nix index ec00837035b9..0dd6ca6c5bd1 100644 --- a/pkgs/by-name/la/lambda-delta/package.nix +++ b/pkgs/by-name/la/lambda-delta/package.nix @@ -7,14 +7,14 @@ SDL2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lambda-delta"; version = "0.98.3"; src = fetchFromGitHub { owner = "dseagrav"; repo = "ld"; - rev = version; + rev = finalAttrs.version; sha256 = "02m43fj9dzc1i1jl01qwnhjiq1rh03jw1xq59sx2h3bhn7dk941x"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/la/laminar/package.nix b/pkgs/by-name/la/laminar/package.nix index a3d70ca2eb92..85d7be934fd9 100644 --- a/pkgs/by-name/la/laminar/package.nix +++ b/pkgs/by-name/la/laminar/package.nix @@ -25,7 +25,7 @@ let hash = "sha256-+8RZJua0aEWg+QVVKg4LEzEEm/8RFez5Tb4JBNiV5xA="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "laminar"; version = "1.3"; outputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ohwgiles"; repo = "laminar"; - rev = version; + rev = finalAttrs.version; hash = "sha256-eo5WzvmjBEe0LAfZdQ/U0XepEE2kdWKKiyE4HOi3RXk="; }; patches = [ ./patches/no-network.patch ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { zlib rapidjson ]; - cmakeFlags = [ "-DLAMINAR_VERSION=${version}" ]; + cmakeFlags = [ "-DLAMINAR_VERSION=${finalAttrs.version}" ]; preBuild = '' mkdir -p js css @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { maralorn ]; }; -} +}) diff --git a/pkgs/by-name/la/larswm/package.nix b/pkgs/by-name/la/larswm/package.nix index 28d5fe805c5a..dd931bcd187b 100644 --- a/pkgs/by-name/la/larswm/package.nix +++ b/pkgs/by-name/la/larswm/package.nix @@ -9,12 +9,12 @@ libXmu, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "larswm"; version = "7.5.3"; src = fetchurl { - url = "mirror://sourceforge/larswm/larswm-${version}.tar.gz"; + url = "mirror://sourceforge/larswm/larswm-${finalAttrs.version}.tar.gz"; sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = lib.licenses.free; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/la/lasem/package.nix b/pkgs/by-name/la/lasem/package.nix index 17eec751b730..e3c7604a7334 100644 --- a/pkgs/by-name/la/lasem/package.nix +++ b/pkgs/by-name/la/lasem/package.nix @@ -13,7 +13,7 @@ gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lasem"; version = "0.4.4"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/lasem/${lib.versions.majorMinor version}/lasem-${version}.tar.xz"; + url = "mirror://gnome/sources/lasem/${lib.versions.majorMinor finalAttrs.version}/lasem-${finalAttrs.version}.tar.xz"; sha256 = "0fds3fsx84ylsfvf55zp65y8xqjj5n8gbhcsk02vqglivk7izw4v"; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/la/lasso/package.nix b/pkgs/by-name/la/lasso/package.nix index b4aceabd88f0..68792a7ead3c 100644 --- a/pkgs/by-name/la/lasso/package.nix +++ b/pkgs/by-name/la/lasso/package.nix @@ -17,7 +17,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lasso"; version = "2.9.0"; @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { domain = "git.entrouvert.org"; owner = "entrouvert"; repo = "lasso"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-fDMM9DJBzxz6DX4cNK3DEE28FBT8gCF9C9DQfUNNFaY="; }; postPatch = let printVersion = writeShellScript "print-version" '' - echo -n ${lib.escapeShellArg version} + echo -n ${lib.escapeShellArg finalAttrs.version} ''; in '' @@ -67,9 +67,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://lasso.entrouvert.org/"; description = "Liberty Alliance Single Sign-On library"; - changelog = "https://git.entrouvert.org/entrouvert/lasso/raw/tag/v${version}/NEWS"; + changelog = "https://git.entrouvert.org/entrouvert/lasso/raw/tag/v${finalAttrs.version}/NEWS"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ womfoo ]; }; -} +}) diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix index a415e4174df0..eb31bd752453 100644 --- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix +++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix @@ -11,21 +11,21 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-collaboration-server"; version = "4.4.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Cm/Ch7dBKInQYPFGfSlSMLgj8uQR6E3S+6gCFUyvFSU="; }; sourceRoot = "source/src/frontend"; offlineCache = fetchYarnDeps { - yarnLock = "${src}/src/frontend/yarn.lock"; + yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; hash = "sha256-JacPecJvdyATea8o1jQOxY9Gzx4kH+HLqE0eq03dzjg="; }; @@ -57,10 +57,10 @@ stdenv.mkDerivation rec { meta = { description = "Collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline"; homepage = "https://github.com/suitenumerique/docs"; - changelog = "https://github.com/suitenumerique/docs/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/suitenumerique/docs/blob/${finalAttrs.src.tag}/CHANGELOG.md"; mainProgram = "docs-collaboration-server"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ soyouzpanda ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix index 64dbe9867d8a..6d5137df41f0 100644 --- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix @@ -10,21 +10,21 @@ yarnBuildHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-frontend"; version = "4.4.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Cm/Ch7dBKInQYPFGfSlSMLgj8uQR6E3S+6gCFUyvFSU="; }; sourceRoot = "source/src/frontend"; offlineCache = fetchYarnDeps { - yarnLock = "${src}/src/frontend/yarn.lock"; + yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; hash = "sha256-JacPecJvdyATea8o1jQOxY9Gzx4kH+HLqE0eq03dzjg="; }; @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { meta = { description = "Collaborative note taking, wiki and documentation platform that scales. Built with Django and React. Opensource alternative to Notion or Outline"; homepage = "https://github.com/suitenumerique/docs"; - changelog = "https://github.com/suitenumerique/docs/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/suitenumerique/docs/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ soyouzpanda ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/la/latex2html/package.nix b/pkgs/by-name/la/latex2html/package.nix index ab6d0047a531..b2ff5ba4df73 100644 --- a/pkgs/by-name/la/latex2html/package.nix +++ b/pkgs/by-name/la/latex2html/package.nix @@ -9,14 +9,14 @@ }: # TODO: withTex -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "latex2html"; version = "2025"; src = fetchFromGitHub { owner = "latex2html"; repo = "latex2html"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-xylIU2GY/1t9mA8zJzEjHwAIlvVxZmUAUdQ/IXEy+Wg="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ yurrriq ]; }; -} +}) diff --git a/pkgs/by-name/la/layan-gtk-theme/package.nix b/pkgs/by-name/la/layan-gtk-theme/package.nix index 8ea8204d4bf6..4fd104475f92 100644 --- a/pkgs/by-name/la/layan-gtk-theme/package.nix +++ b/pkgs/by-name/la/layan-gtk-theme/package.nix @@ -5,14 +5,14 @@ gtk-engine-murrine, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "layan-gtk-theme"; version = "2023-05-23"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "layan-gtk-theme"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-R8QxDMOXzDIfioAvvescLAu6NjJQ9zhf/niQTXZr+yA="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.vanilla ]; }; -} +}) diff --git a/pkgs/by-name/lb/lbdb/package.nix b/pkgs/by-name/lb/lbdb/package.nix index b04a223950e5..65d2356b2393 100644 --- a/pkgs/by-name/lb/lbdb/package.nix +++ b/pkgs/by-name/lb/lbdb/package.nix @@ -26,12 +26,12 @@ let ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lbdb"; version = "0.57"; src = fetchurl { - url = "https://www.spinnaker.de/lbdb/download/lbdb-${version}.tar.gz"; + url = "https://www.spinnaker.de/lbdb/download/lbdb-${finalAttrs.version}.tar.gz"; sha256 = "sha256-IS/i5A317T5Ulrxegh5LBoOmyVI7iIXn6HtjS8+SOog="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/lb/lbzip2/package.nix b/pkgs/by-name/lb/lbzip2/package.nix index ce3bdc3f8d27..1e2f4b48a58f 100644 --- a/pkgs/by-name/lb/lbzip2/package.nix +++ b/pkgs/by-name/lb/lbzip2/package.nix @@ -9,14 +9,14 @@ automake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lbzip2"; version = "2.5"; src = fetchFromGitHub { owner = "kjn"; repo = "lbzip2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/lc/lcalc/package.nix b/pkgs/by-name/lc/lcalc/package.nix index 60b2b3f5ffe1..dc506ffaca5b 100644 --- a/pkgs/by-name/lc/lcalc/package.nix +++ b/pkgs/by-name/lc/lcalc/package.nix @@ -8,14 +8,14 @@ pari, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.1.1"; pname = "lcalc"; src = fetchFromGitLab { owner = "sagemath"; repo = "lcalc"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0CYrRGn5YQ07BaGu0Q5otnjwyh3sNq21EXp3M/KlRdw="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.sage ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/lc/lcdf-typetools/package.nix b/pkgs/by-name/lc/lcdf-typetools/package.nix index bddf45a1a78b..473a45780408 100644 --- a/pkgs/by-name/lc/lcdf-typetools/package.nix +++ b/pkgs/by-name/lc/lcdf-typetools/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lcdf-typetools"; version = "2.110"; src = fetchFromGitHub { owner = "kohler"; repo = "lcdf-typetools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-hoILYYCef2R1v6aN9V+FoYnXYaKsnGN2jlpb/QFAN/w="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/lc/lcdproc/package.nix b/pkgs/by-name/lc/lcdproc/package.nix index ef1045cfba3d..05b27dca1f42 100644 --- a/pkgs/by-name/lc/lcdproc/package.nix +++ b/pkgs/by-name/lc/lcdproc/package.nix @@ -16,14 +16,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lcdproc"; version = "0.5.9"; src = fetchFromGitHub { owner = "lcdproc"; repo = "lcdproc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1r885zv1gsh88j43x6fvzbdgfkh712a227d369h4fdcbnnfd0kpm"; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; -} +}) diff --git a/pkgs/by-name/lc/lcm/package.nix b/pkgs/by-name/lc/lcm/package.nix index f1ff112f4ee4..56c17c318e1f 100644 --- a/pkgs/by-name/lc/lcm/package.nix +++ b/pkgs/by-name/lc/lcm/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lcm"; version = "1.5.2"; src = fetchFromGitHub { owner = "lcm-proj"; repo = "lcm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-72fytJY+uXEHGdZ7N+0g+JK7ALb2e2ZtJuvhiGIMHiA="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ kjeremy ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ld/ldacbt/package.nix b/pkgs/by-name/ld/ldacbt/package.nix index c4ec8d49980d..72320637739d 100644 --- a/pkgs/by-name/ld/ldacbt/package.nix +++ b/pkgs/by-name/ld/ldacbt/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ldacBT"; version = "2.0.2.3"; src = fetchFromGitHub { repo = "ldacBT"; owner = "ehfive"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "09dalysx4fgrgpfdm9a51x6slnf4iik1sqba4xjgabpvq91bnb63"; fetchSubmodules = true; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.littleEndian; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ld/ldm/package.nix b/pkgs/by-name/ld/ldm/package.nix index d0a850ee2f6d..44ca16f58a81 100644 --- a/pkgs/by-name/ld/ldm/package.nix +++ b/pkgs/by-name/ld/ldm/package.nix @@ -12,7 +12,7 @@ assert mountPath != ""; let version = "0.5"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ldm"; inherit version; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # contains important fixes for LVM setups. src = fetchgit { url = "https://github.com/LemonBoy/ldm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0lxfypnbamfx6p9ar5k9wra20gvwn665l4pp2j4vsx4yi5q7rw2n"; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ld/ldmtool/package.nix b/pkgs/by-name/ld/ldmtool/package.nix index afc7e7d789bf..e72931cbbc9b 100644 --- a/pkgs/by-name/ld/ldmtool/package.nix +++ b/pkgs/by-name/ld/ldmtool/package.nix @@ -17,14 +17,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ldmtool"; version = "0.2.4"; src = fetchFromGitHub { owner = "mdbooth"; repo = "libldm"; - rev = "libldm-${version}"; + rev = "libldm-${finalAttrs.version}"; sha256 = "1fy5wbmk8kwl86lzswq0d1z2j5y023qzfm2ppm8knzv9c47kniqk"; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ldmtool"; }; -} +}) diff --git a/pkgs/by-name/le/leatherman/package.nix b/pkgs/by-name/le/leatherman/package.nix index e7b5117e8332..00498584b6ad 100644 --- a/pkgs/by-name/le/leatherman/package.nix +++ b/pkgs/by-name/le/leatherman/package.nix @@ -8,13 +8,13 @@ ruby, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "leatherman"; version = "1.12.13"; src = fetchFromGitHub { sha256 = "sha256-rfh4JLnLekx9UhyLH6eDJUeItPROmY/Lc6mcWpbGb3s="; - rev = version; + rev = finalAttrs.version; repo = "leatherman"; owner = "puppetlabs"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/le/ledger2beancount/package.nix b/pkgs/by-name/le/ledger2beancount/package.nix index 0b3c9b527887..ce45aebedf5a 100644 --- a/pkgs/by-name/le/ledger2beancount/package.nix +++ b/pkgs/by-name/le/ledger2beancount/package.nix @@ -21,14 +21,14 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ledger2beancount"; version = "2.7"; src = fetchFromGitHub { owner = "beancount"; repo = "ledger2beancount"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-2LIP3ljK1HMAwjk2ueIf9pFL+UUnGDgx9GYNtRztdFY="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ pablovsky ]; }; -} +}) diff --git a/pkgs/by-name/le/ledmon/package.nix b/pkgs/by-name/le/ledmon/package.nix index f7b9bc96c317..c85d19900f6a 100644 --- a/pkgs/by-name/le/ledmon/package.nix +++ b/pkgs/by-name/le/ledmon/package.nix @@ -7,14 +7,14 @@ sg3_utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ledmon"; version = "0.92"; src = fetchFromGitHub { owner = "intel"; repo = "ledmon"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1lz59606vf2sws5xwijxyffm8kxcf8p9qbdpczsq1b5mm3dk6lvp"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ gpl2Only ]; maintainers = with lib.maintainers; [ sorki ]; }; -} +}) diff --git a/pkgs/by-name/le/lemon-graph/package.nix b/pkgs/by-name/le/lemon-graph/package.nix index 35c1e268a125..ca1ea2a627cc 100644 --- a/pkgs/by-name/le/lemon-graph/package.nix +++ b/pkgs/by-name/le/lemon-graph/package.nix @@ -6,12 +6,12 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lemon-graph"; version = "1.3.1"; src = fetchurl { - url = "https://lemon.cs.elte.hu/pub/sources/lemon-${version}.tar.gz"; + url = "https://lemon.cs.elte.hu/pub/sources/lemon-${finalAttrs.version}.tar.gz"; sha256 = "1j6kp9axhgna47cfnmk1m7vnqn01hwh7pf1fp76aid60yhjwgdvi"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ trepetti ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/le/leo3-bin/package.nix b/pkgs/by-name/le/leo3-bin/package.nix index 856cdb526482..dfdd5f0eb22d 100644 --- a/pkgs/by-name/le/leo3-bin/package.nix +++ b/pkgs/by-name/le/leo3-bin/package.nix @@ -5,12 +5,12 @@ openjdk, runtimeShell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "leo3"; version = "1.2"; src = fetchurl { - url = "https://github.com/leoprover/Leo-III/releases/download/v${version}/leo3.jar"; + url = "https://github.com/leoprover/Leo-III/releases/download/v${finalAttrs.version}/leo3.jar"; sha256 = "1lgwxbr1rnk72rnvc8raq5i1q71ckhn998pwd9xk6zf27wlzijk7"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{bin,lib/java/leo3} - cp "${src}" "$out/lib/java/leo3/leo3.jar" + cp "${finalAttrs.src}" "$out/lib/java/leo3/leo3.jar" echo "#!${runtimeShell}" > "$out/bin/leo3" echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" >> "$out/bin/leo3" chmod a+x "$out/bin/leo3" @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; homepage = "https://page.mi.fu-berlin.de/lex/leo3/"; }; -} +}) diff --git a/pkgs/by-name/le/leptonica/package.nix b/pkgs/by-name/le/leptonica/package.nix index c4031c912852..90dd922ca451 100644 --- a/pkgs/by-name/le/leptonica/package.nix +++ b/pkgs/by-name/le/leptonica/package.nix @@ -16,14 +16,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "leptonica"; version = "1.85.0"; src = fetchFromGitHub { owner = "DanBloomBerg"; repo = "leptonica"; - rev = version; + rev = finalAttrs.version; hash = "sha256-meiSi0qL4i/KCMe5wsRK1/mbuRLHUb55DDOnxkrXZSs="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/le/lesspipe/package.nix b/pkgs/by-name/le/lesspipe/package.nix index 419a1a5c3dc1..a31266eddfd6 100644 --- a/pkgs/by-name/le/lesspipe/package.nix +++ b/pkgs/by-name/le/lesspipe/package.nix @@ -19,14 +19,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lesspipe"; version = "2.20"; src = fetchFromGitHub { owner = "wofr06"; repo = "lesspipe"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-yb3IzdaMiv1PwqHOfSyHvmWXyStvK/XXC49saXVAJFU="; }; @@ -242,4 +242,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.martijnvermaat ]; }; -} +}) diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix index a2614074d014..4838a2a229b9 100644 --- a/pkgs/by-name/le/level-zero/package.nix +++ b/pkgs/by-name/le/level-zero/package.nix @@ -9,14 +9,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "level-zero"; version = "1.26.3"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AFdACq4oooxv9XMrFjDwSXO+dIoGETqhuqgc0qENkNI="; }; @@ -41,9 +41,9 @@ stdenv.mkDerivation rec { meta = { description = "oneAPI Level Zero Specification Headers and Loader"; homepage = "https://github.com/oneapi-src/level-zero"; - changelog = "https://github.com/oneapi-src/level-zero/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/oneapi-src/level-zero/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.ziguana ]; }; -} +}) diff --git a/pkgs/by-name/lh/lhapdf/package.nix b/pkgs/by-name/lh/lhapdf/package.nix index c6e424c55ca6..b108443dd603 100644 --- a/pkgs/by-name/lh/lhapdf/package.nix +++ b/pkgs/by-name/lh/lhapdf/package.nix @@ -7,12 +7,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lhapdf"; version = "6.5.5"; src = fetchurl { - url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; + url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${finalAttrs.version}.tar.gz"; sha256 = "sha256-ZB1eoJQreeREfhXlozSR/zxwMtcdYYEZk14UrSf146U="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; }; -} +}) diff --git a/pkgs/by-name/lh/lhasa/package.nix b/pkgs/by-name/lh/lhasa/package.nix index d0c7d777a4c2..652d97098f14 100644 --- a/pkgs/by-name/lh/lhasa/package.nix +++ b/pkgs/by-name/lh/lhasa/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lhasa"; version = "0.5.0"; src = fetchurl { - url = "https://soulsphere.org/projects/lhasa/lhasa-${version}.tar.gz"; + url = "https://soulsphere.org/projects/lhasa/lhasa-${finalAttrs.version}.tar.gz"; sha256 = "sha256-v4eFxwYJ0h62K32ueJTxOIiPiJ086Xho1QL24Tp5Kxw="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { mainProgram = "lha"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/lib3ds/package.nix b/pkgs/by-name/li/lib3ds/package.nix index 67f34436efe3..9120886961e8 100644 --- a/pkgs/by-name/li/lib3ds/package.nix +++ b/pkgs/by-name/li/lib3ds/package.nix @@ -5,12 +5,12 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lib3ds"; version = "1.3.0"; src = fetchurl { - url = "http://lib3ds.googlecode.com/files/lib3ds-${version}.zip"; + url = "http://lib3ds.googlecode.com/files/lib3ds-${finalAttrs.version}.zip"; sha256 = "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m"; }; @@ -22,4 +22,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Only; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libGDSII/package.nix b/pkgs/by-name/li/libGDSII/package.nix index d1226ad50745..8b66a95d3a23 100644 --- a/pkgs/by-name/li/libGDSII/package.nix +++ b/pkgs/by-name/li/libGDSII/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libGDSII"; version = "0.21"; src = fetchFromGitHub { owner = "HomerReid"; repo = "libGDSII"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-EXEt7l69etcBdDdEDlD1ODOdhTBZCVjgY1jhRUDd/W0="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libacars/package.nix b/pkgs/by-name/li/libacars/package.nix index 6137de5240fd..b9863850961a 100644 --- a/pkgs/by-name/li/libacars/package.nix +++ b/pkgs/by-name/li/libacars/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libacars"; version = "2.2.0"; src = fetchFromGitHub { owner = "szpajder"; repo = "libacars"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2n1tuKti8Zn5UzQHmRdvW5Q+x4CXS9QuPHFQ+DFriiE="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.mafo ]; }; -} +}) diff --git a/pkgs/by-name/li/libaccounts-glib/package.nix b/pkgs/by-name/li/libaccounts-glib/package.nix index 72e5b0915f97..02dfa6431f80 100644 --- a/pkgs/by-name/li/libaccounts-glib/package.nix +++ b/pkgs/by-name/li/libaccounts-glib/package.nix @@ -21,7 +21,7 @@ gobject-introspection, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libaccounts-glib"; version = "1.27"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "accounts-sso"; repo = "libaccounts-glib"; - rev = "VERSION_${version}"; + rev = "VERSION_${finalAttrs.version}"; hash = "sha256-mLhcwp8rhCGSB1K6rTWT0tuiINzgwULwXINfCbgPKEg="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.lgpl21; }; -} +}) diff --git a/pkgs/by-name/li/libad9361/package.nix b/pkgs/by-name/li/libad9361/package.nix index 4b05073cabc3..ba273800a142 100644 --- a/pkgs/by-name/li/libad9361/package.nix +++ b/pkgs/by-name/li/libad9361/package.nix @@ -6,14 +6,14 @@ libiio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libad9361"; version = "0.3"; src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libad9361-iio"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-9e66qSrKpczatZY9lPAzi/6f7lHChnl2+Pih53oa28Y="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sikmir ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/li/libaec/package.nix b/pkgs/by-name/li/libaec/package.nix index ebd4fc51c83c..b789c473a649 100644 --- a/pkgs/by-name/li/libaec/package.nix +++ b/pkgs/by-name/li/libaec/package.nix @@ -5,7 +5,7 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libaec"; version = "1.1.4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { domain = "gitlab.dkrz.de"; owner = "k202009"; repo = "libaec"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-MJFx0gErfrSK6EeeGDk8CQWj6j4PVvFPJEI/iys3bI8="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ tbenst ]; }; -} +}) diff --git a/pkgs/by-name/li/libajantv2/package.nix b/pkgs/by-name/li/libajantv2/package.nix index 2044db178b6a..aad9624acc98 100644 --- a/pkgs/by-name/li/libajantv2/package.nix +++ b/pkgs/by-name/li/libajantv2/package.nix @@ -10,14 +10,14 @@ linuxPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libajantv2"; version = "17.5.0"; src = fetchFromGitHub { owner = "aja-video"; repo = "libajantv2"; - rev = "ntv2_${builtins.replaceStrings [ "." ] [ "_" ] version}"; + rev = "ntv2_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-/BfFbBScS75TpUZEeYzAHd1PtnZgnCNfGtjwYPJJjkg="; }; patches = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { Name: libajantv2 Description: Library for controlling AJA NTV2 video devices - Version: ${version} + Version: ${finalAttrs.version} Libs: -L\''${libdir} -lajantv2 Cflags: -I\''${includedir} -I\''${includedir}/ajantv2/includes -I\''${includedir}/ajantv2/src/lin -DAJALinux -DAJA_LINUX -DAJA_USE_CPLUSPLUS11 -DNDEBUG -DNTV2_USE_CPLUSPLUS11 EOF @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.lukegb ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libansilove/package.nix b/pkgs/by-name/li/libansilove/package.nix index 5343ed1b0b0c..bd2e6e52cd60 100644 --- a/pkgs/by-name/li/libansilove/package.nix +++ b/pkgs/by-name/li/libansilove/package.nix @@ -6,14 +6,14 @@ gd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libansilove"; version = "1.4.2"; src = fetchFromGitHub { owner = "ansilove"; repo = "libansilove"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kbQ7tbQbJ8zYhdbfiVZY26woyR4NNzqjCJ/5nrunlWs="; }; @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { meta = { description = "Library for converting ANSI, ASCII, and other formats to PNG"; homepage = "https://github.com/ansilove/libansilove"; - changelog = "https://github.com/ansilove/libansilove/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/ansilove/libansilove/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ jethair ]; mainProgram = "libansilove"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libantlr3c/package.nix b/pkgs/by-name/li/libantlr3c/package.nix index 45919c448c25..cc40666b66b8 100644 --- a/pkgs/by-name/li/libantlr3c/package.nix +++ b/pkgs/by-name/li/libantlr3c/package.nix @@ -4,11 +4,11 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libantlr3c"; version = "3.4"; src = fetchurl { - url = "https://www.antlr3.org/download/C/libantlr3c-${version}.tar.gz"; + url = "https://www.antlr3.org/download/C/libantlr3c-${finalAttrs.version}.tar.gz"; sha256 = "0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) diff --git a/pkgs/by-name/li/libao/package.nix b/pkgs/by-name/li/libao/package.nix index 7e19c4782258..ae7135d649ba 100644 --- a/pkgs/by-name/li/libao/package.nix +++ b/pkgs/by-name/li/libao/package.nix @@ -12,7 +12,7 @@ usePulseAudio ? config.pulseaudio or (lib.meta.availableOn stdenv.hostPlatform libpulseaudio), }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.2.2"; pname = "libao"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "xiph"; repo = "libao"; - rev = version; + rev = finalAttrs.version; sha256 = "0svgk4sc9kdhcsfyvbvgm5vpbg3sfr6z5rliflrw49v3x2i4vxq5"; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/li/libaosd/package.nix b/pkgs/by-name/li/libaosd/package.nix index e0c4b2eaa966..658c9d287dee 100644 --- a/pkgs/by-name/li/libaosd/package.nix +++ b/pkgs/by-name/li/libaosd/package.nix @@ -11,14 +11,14 @@ automake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.2.7-9-g177589f"; pname = "libaosd"; src = fetchFromGitHub { owner = "atheme-legacy"; repo = "libaosd"; - rev = version; + rev = finalAttrs.version; sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a"; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ unode ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/li/libappimage/package.nix b/pkgs/by-name/li/libappimage/package.nix index 3f9e51c465ae..7000e59b4d19 100644 --- a/pkgs/by-name/li/libappimage/package.nix +++ b/pkgs/by-name/li/libappimage/package.nix @@ -19,14 +19,14 @@ xz, # for liblzma zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libappimage"; version = "1.0.4-5"; src = fetchFromGitHub { owner = "AppImageCommunity"; repo = "libappimage"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-V9Ilo0zFo9Urke+jCA4CSQB5tpzLC/S5jmon+bA+TEU="; }; @@ -103,4 +103,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ k900 ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libargs/package.nix b/pkgs/by-name/li/libargs/package.nix index e3f0d1577514..5702f094ed8e 100644 --- a/pkgs/by-name/li/libargs/package.nix +++ b/pkgs/by-name/li/libargs/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "args"; version = "6.4.7"; src = fetchFromGitHub { owner = "Taywee"; repo = "args"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-IQzhbXl1CfEV164EjulKrOUdCTZNZAFgVyzxk4rTNlU="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libaribcaption/package.nix b/pkgs/by-name/li/libaribcaption/package.nix index b2ff119eaa0a..622242e10daa 100644 --- a/pkgs/by-name/li/libaribcaption/package.nix +++ b/pkgs/by-name/li/libaribcaption/package.nix @@ -9,14 +9,14 @@ }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libaribcaption"; version = "1.1.1"; src = fetchFromGitHub { owner = "xqq"; repo = "libaribcaption"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-x6l0ZrTktSsqfDLVRXpQtUOruhfc8RF3yT991UVZiKA="; }; @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { meta = { description = "Portable ARIB STD-B24 Caption Decoder/Renderer"; homepage = "https://github.com/xqq/libaribcaption"; - changelog = "https://github.com/xqq/libaribcaption/releases/tag/${src.rev}"; + changelog = "https://github.com/xqq/libaribcaption/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ chayleaf ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libassuan/package.nix b/pkgs/by-name/li/libassuan/package.nix index 4c6fbea82951..269be1740ef7 100644 --- a/pkgs/by-name/li/libassuan/package.nix +++ b/pkgs/by-name/li/libassuan/package.nix @@ -9,12 +9,12 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libassuan"; version = "3.0.2"; src = fetchurl { - url = "mirror://gnupg/libassuan/libassuan-${version}.tar.bz2"; + url = "mirror://gnupg/libassuan/libassuan-${finalAttrs.version}.tar.bz2"; hash = "sha256-0pMc2tJm5jNRD5lw4aLzRgVeNRuxn5t4kSR1uAdMNvY="; }; @@ -59,9 +59,9 @@ stdenv.mkDerivation rec { provided. ''; homepage = "https://gnupg.org/software/libassuan/"; - changelog = "https://dev.gnupg.org/source/libassuan/browse/master/NEWS;libassuan-${version}"; + changelog = "https://dev.gnupg.org/source/libassuan/browse/master/NEWS;libassuan-${finalAttrs.version}"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libatasmart/package.nix b/pkgs/by-name/li/libatasmart/package.nix index 17f099f12d24..010e177b6be9 100644 --- a/pkgs/by-name/li/libatasmart/package.nix +++ b/pkgs/by-name/li/libatasmart/package.nix @@ -7,12 +7,12 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libatasmart"; version = "0.19"; src = fetchurl { - url = "http://0pointer.de/public/libatasmart-${version}.tar.xz"; + url = "http://0pointer.de/public/libatasmart-${finalAttrs.version}.tar.xz"; sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libatomic_ops/package.nix b/pkgs/by-name/li/libatomic_ops/package.nix index 38dda0f5ce14..b871fa2fdd84 100644 --- a/pkgs/by-name/li/libatomic_ops/package.nix +++ b/pkgs/by-name/li/libatomic_ops/package.nix @@ -7,14 +7,14 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libatomic_ops"; version = "7.10.0"; src = fetchurl { urls = [ - "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz" - "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz" + "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${finalAttrs.version}.tar.gz" + "https://github.com/ivmai/libatomic_ops/releases/download/v${finalAttrs.version}/libatomic_ops-${finalAttrs.version}.tar.gz" ]; sha256 = "sha256-DbPr/3VdsXD2XnSmTsRRGBLp7jGFwjLu/+rNJ0GQ37A="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.raskin ]; platforms = with lib.platforms; unix ++ windows; }; -} +}) diff --git a/pkgs/by-name/li/libaudec/package.nix b/pkgs/by-name/li/libaudec/package.nix index 22b6a4dcd568..1a28980ae637 100644 --- a/pkgs/by-name/li/libaudec/package.nix +++ b/pkgs/by-name/li/libaudec/package.nix @@ -9,14 +9,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libaudec"; version = "0.3.4"; src = fetchFromGitHub { owner = "zrythm"; repo = "libaudec"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-8morbrq8zG+2N3ruMeJa85ci9P0wPQOfZ5H56diFEAo="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { mainProgram = "audec"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libavif/package.nix b/pkgs/by-name/li/libavif/package.nix index f406a9974792..9633dc319cbb 100644 --- a/pkgs/by-name/li/libavif/package.nix +++ b/pkgs/by-name/li/libavif/package.nix @@ -29,7 +29,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libavif"; version = "1.3.0"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "AOMediaCodec"; repo = "libavif"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-0J56wpXa2AVh9JUp5UY2kzWijNE3i253RKhpG5oDFJE="; }; @@ -120,9 +120,9 @@ stdenv.mkDerivation rec { (avifenc/avifdec). ''; homepage = "https://github.com/AOMediaCodec/libavif"; - changelog = "https://github.com/AOMediaCodec/libavif/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/AOMediaCodec/libavif/blob/v${finalAttrs.version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ mkg20001 ]; platforms = lib.platforms.all; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/by-name/li/libayatana-appindicator/package.nix b/pkgs/by-name/li/libayatana-appindicator/package.nix index 7814147dd3b2..c74bd25b26b3 100644 --- a/pkgs/by-name/li/libayatana-appindicator/package.nix +++ b/pkgs/by-name/li/libayatana-appindicator/package.nix @@ -12,7 +12,7 @@ gobject-introspection, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libayatana-appindicator"; version = "0.5.92"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-appindicator"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-NzaWQBb2Ez1ik23wCgW1ZQh1/rY7GcPlLvaSgV7uXrA="; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "Ayatana Application Indicators Shared Library"; homepage = "https://github.com/AyatanaIndicators/libayatana-appindicator"; - changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${version}/ChangeLog"; + changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${finalAttrs.version}/ChangeLog"; license = [ lib.licenses.lgpl3Plus lib.licenses.lgpl21Plus @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.nickhu ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libayatana-indicator/package.nix b/pkgs/by-name/li/libayatana-indicator/package.nix index 4314031deed8..8bf2302721cb 100644 --- a/pkgs/by-name/li/libayatana-indicator/package.nix +++ b/pkgs/by-name/li/libayatana-indicator/package.nix @@ -9,14 +9,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libayatana-indicator"; version = "0.9.4"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-indicator"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-OsguZ+jl274uPSCTFHq/ZwUE3yHR7MlUPHCpfmn1F7A="; }; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { meta = { description = "Ayatana Indicators Shared Library"; homepage = "https://github.com/AyatanaIndicators/libayatana-indicator"; - changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${version}/ChangeLog"; + changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.nickhu ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libb64/package.nix b/pkgs/by-name/li/libb64/package.nix index 398c430cc623..c35204a820a5 100644 --- a/pkgs/by-name/li/libb64/package.nix +++ b/pkgs/by-name/li/libb64/package.nix @@ -5,14 +5,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libb64"; version = "2.0.0.1"; src = fetchFromGitHub { owner = "libb64"; repo = "libb64"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-9loDftr769qnIi00MueO86kjha2EiG9pnCLogp0Iq3c="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { mainProgram = "base64"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libbase58/package.nix b/pkgs/by-name/li/libbase58/package.nix index 94f7c4ec8bc7..b8bcd9f4c3a5 100644 --- a/pkgs/by-name/li/libbase58/package.nix +++ b/pkgs/by-name/li/libbase58/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libbase58"; version = "0.1.4"; src = fetchFromGitHub { owner = "bitcoin"; repo = "libbase58"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-CU55V89GbcYnrhwTPFMd13EGeCk/x9nQswUZ2JsYsUU="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { mainProgram = "base58"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libbladeRF/package.nix b/pkgs/by-name/li/libbladeRF/package.nix index 65775419c7a1..cb340b8bad73 100644 --- a/pkgs/by-name/li/libbladeRF/package.nix +++ b/pkgs/by-name/li/libbladeRF/package.nix @@ -14,14 +14,14 @@ udev, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libbladeRF"; version = "2025.10"; src = fetchFromGitHub { owner = "Nuand"; repo = "bladeRF"; - tag = version; + tag = finalAttrs.version; hash = "sha256-gp+OnAlECGZs4+JEWNX5Gt7LYdTFJUItpmDdJgeoJO4="; fetchSubmodules = true; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ markuskowa ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libbtbb/package.nix b/pkgs/by-name/li/libbtbb/package.nix index db06ab2b0569..c2bb0427e626 100644 --- a/pkgs/by-name/li/libbtbb/package.nix +++ b/pkgs/by-name/li/libbtbb/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libbtbb"; version = "2020-12-R1"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "libbtbb"; - rev = version; + rev = finalAttrs.version; sha256 = "1byv8174xam7siakr1p0523x97wkh0fmwmq341sd3g70qr2g767d"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ oxzi ]; }; -} +}) diff --git a/pkgs/by-name/li/libcaca/package.nix b/pkgs/by-name/li/libcaca/package.nix index d79906f49a86..689257d7ff8e 100644 --- a/pkgs/by-name/li/libcaca/package.nix +++ b/pkgs/by-name/li/libcaca/package.nix @@ -12,14 +12,14 @@ x11Support ? !stdenv.hostPlatform.isDarwin, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcaca"; version = "0.99.beta20"; src = fetchFromGitHub { owner = "cacalabs"; repo = "libcaca"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-N0Lfi0d4kjxirEbIjdeearYWvStkKMyV6lgeyNKXcVw="; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcangjie/package.nix b/pkgs/by-name/li/libcangjie/package.nix index c2f09fa46fe3..8773b880ad15 100644 --- a/pkgs/by-name/li/libcangjie/package.nix +++ b/pkgs/by-name/li/libcangjie/package.nix @@ -9,7 +9,7 @@ cppcheck, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcangjie"; version = "1.4.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "cangjie"; repo = "libcangjie"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-LZRU2hbAC8xftPAIHDKCa2SfFLuH/PVqvjZmOSoUQwc="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "libcangjie-cli"; }; -} +}) diff --git a/pkgs/by-name/li/libccd/package.nix b/pkgs/by-name/li/libccd/package.nix index 202635f62b98..fb2dbdbf9246 100644 --- a/pkgs/by-name/li/libccd/package.nix +++ b/pkgs/by-name/li/libccd/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libccd"; version = "2.1"; src = fetchFromGitHub { owner = "danfis"; repo = "libccd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0sfmn5pd7k5kyhbxnd689xmsa5v843r7sska96dlysqpljd691jc"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lopsided98 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcdada/package.nix b/pkgs/by-name/li/libcdada/package.nix index 318d96159263..4031d35844c5 100644 --- a/pkgs/by-name/li/libcdada/package.nix +++ b/pkgs/by-name/li/libcdada/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcdada"; version = "0.6.1"; src = fetchFromGitHub { owner = "msune"; repo = "libcdada"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-x//22FvgxIGL9H2whMAVCTyI9gAjlMWkEmpOAcoeOgE="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ _0x4A6F ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcdaudio/package.nix b/pkgs/by-name/li/libcdaudio/package.nix index eb21424d349c..1683e1f4b373 100644 --- a/pkgs/by-name/li/libcdaudio/package.nix +++ b/pkgs/by-name/li/libcdaudio/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcdaudio"; version = "0.99.12p2"; src = fetchurl { - url = "mirror://sourceforge/libcdaudio/libcdaudio-${version}.tar.gz"; + url = "mirror://sourceforge/libcdaudio/libcdaudio-${finalAttrs.version}.tar.gz"; sha256 = "1fsy6dlzxrx177qc877qhajm9l4g28mvh06h2l15rxy4bapzknjz"; }; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.lgpl2; }; -} +}) diff --git a/pkgs/by-name/li/libcdio-paranoia/package.nix b/pkgs/by-name/li/libcdio-paranoia/package.nix index 85016c6354f9..661e3d04e89a 100644 --- a/pkgs/by-name/li/libcdio-paranoia/package.nix +++ b/pkgs/by-name/li/libcdio-paranoia/package.nix @@ -8,14 +8,14 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcdio-paranoia"; version = "2.0.2"; src = fetchFromGitHub { owner = "rocky"; repo = "libcdio-paranoia"; - rev = "release-10.2+${version}"; + rev = "release-10.2+${finalAttrs.version}"; hash = "sha256-n05PSVgh6z7BFPq4CjJa5DqCO7Huj8Bsg0x3HQPsbeI="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { mainProgram = "cd-paranoia"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcec/package.nix b/pkgs/by-name/li/libcec/package.nix index edaf5eb8dd21..b9ae94e68be2 100644 --- a/pkgs/by-name/li/libcec/package.nix +++ b/pkgs/by-name/li/libcec/package.nix @@ -10,14 +10,14 @@ libraspberrypi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcec"; version = "7.1.1"; src = fetchFromGitHub { owner = "Pulse-Eight"; repo = "libcec"; - rev = "libcec-${version}"; + rev = "libcec-${finalAttrs.version}"; sha256 = "sha256-t8GUQKWTcxjyaAlsTP4C+heYiVYowG7x+fmjHPND7As="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; teams = [ lib.teams.kodi ]; }; -} +}) diff --git a/pkgs/by-name/li/libcec_platform/package.nix b/pkgs/by-name/li/libcec_platform/package.nix index c98d9ae63234..5a622a67688e 100644 --- a/pkgs/by-name/li/libcec_platform/package.nix +++ b/pkgs/by-name/li/libcec_platform/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "p8-platform"; version = "2.1.0.1"; src = fetchFromGitHub { owner = "Pulse-Eight"; repo = "platform"; - rev = "p8-platform-${version}"; + rev = "p8-platform-${finalAttrs.version}"; hash = "sha256-zAI/AOLJAunv+cCQ6bOXrgkW+wl5frj3ktzx2cDeCCk="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; teams = [ lib.teams.kodi ]; }; -} +}) diff --git a/pkgs/by-name/li/libcello/package.nix b/pkgs/by-name/li/libcello/package.nix index b71675290309..05cefe320295 100644 --- a/pkgs/by-name/li/libcello/package.nix +++ b/pkgs/by-name/li/libcello/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcello"; version = "2.1.0"; src = fetchurl { - url = "https://libcello.org/static/libCello-${version}.tar.gz"; + url = "https://libcello.org/static/libCello-${finalAttrs.version}.tar.gz"; sha256 = "0a1b2x5ni07vd9ridnl7zv7h2s32070wsphjy94qr066b99gdb29"; }; @@ -22,4 +22,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.MostAwesomeDude ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcerf/package.nix b/pkgs/by-name/li/libcerf/package.nix index b07e8f05046c..76a4426a7b49 100644 --- a/pkgs/by-name/li/libcerf/package.nix +++ b/pkgs/by-name/li/libcerf/package.nix @@ -7,12 +7,12 @@ gnuplot, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcerf"; version = "3.2"; src = fetchurl { - url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz"; + url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${finalAttrs.version}/libcerf-v${finalAttrs.version}.tar.gz"; sha256 = "sha256-6o0RDXPsJKZDBCyjlARhzLsbZUHiExDstwq05NwUSu8="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libcgroup/package.nix b/pkgs/by-name/li/libcgroup/package.nix index a14d24f153da..4cc230a21176 100644 --- a/pkgs/by-name/li/libcgroup/package.nix +++ b/pkgs/by-name/li/libcgroup/package.nix @@ -11,14 +11,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcgroup"; version = "3.2.0"; src = fetchFromGitHub { owner = "libcgroup"; repo = "libcgroup"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-kWW9ID/eYZH0O/Ge8pf3Cso4yu644R5EiQFYfZMcizs="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/li/libchardet/package.nix b/pkgs/by-name/li/libchardet/package.nix index bb673fd2d4d1..7f803ba6a504 100644 --- a/pkgs/by-name/li/libchardet/package.nix +++ b/pkgs/by-name/li/libchardet/package.nix @@ -6,14 +6,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libchardet"; version = "1.0.6"; src = fetchFromGitHub { owner = "Joungkyun"; repo = "libchardet"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-JhEiWM3q8X+eEBHxv8k9yYOaTGoJOzI+/iFYC0gZJJs="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcint/package.nix b/pkgs/by-name/li/libcint/package.nix index ef7c96f88cb9..6eb43b814c2f 100644 --- a/pkgs/by-name/li/libcint/package.nix +++ b/pkgs/by-name/li/libcint/package.nix @@ -8,14 +8,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcint"; version = "6.1.3"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-k9luTarszZAqh33SzPMM3BYj01HT7cfTipt44nSC+2A="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcircle/package.nix b/pkgs/by-name/li/libcircle/package.nix index 82001484a009..b6291c45b070 100644 --- a/pkgs/by-name/li/libcircle/package.nix +++ b/pkgs/by-name/li/libcircle/package.nix @@ -7,14 +7,14 @@ mpi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcircle"; version = "0.3"; src = fetchFromGitHub { owner = "hpc"; repo = "libcircle"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-EfnoNL6wo6qQES6XzMtpTpYcsJ8V2gy32i26wiTldH0="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/li/libck/package.nix b/pkgs/by-name/li/libck/package.nix index 2715c3f38512..7a645825c3f5 100644 --- a/pkgs/by-name/li/libck/package.nix +++ b/pkgs/by-name/li/libck/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ck"; version = "0.7.2"; src = fetchFromGitHub { owner = "concurrencykit"; repo = "ck"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-lxJ8WsZ3pBGf4sFYj5+tR37EYDZqpksaoohiIKA4pRI="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/li/libcli/package.nix b/pkgs/by-name/li/libcli/package.nix index afc41038077a..8a3765468910 100644 --- a/pkgs/by-name/li/libcli/package.nix +++ b/pkgs/by-name/li/libcli/package.nix @@ -6,14 +6,14 @@ libxcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcli"; version = "1.10.7"; src = fetchFromGitHub { owner = "dparrish"; repo = "libcli"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-ItmZfclx2mprKUOk/MwlS2w4f0ukiiPA5/QaRdGfEO8="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libcloudproviders/package.nix b/pkgs/by-name/li/libcloudproviders/package.nix index 057acdc377a1..ff18b38d237a 100644 --- a/pkgs/by-name/li/libcloudproviders/package.nix +++ b/pkgs/by-name/li/libcloudproviders/package.nix @@ -16,12 +16,12 @@ # TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcloudproviders"; version = "0.3.6"; src = fetchurl { - url = "mirror://gnome/sources/libcloudproviders/${lib.versions.majorMinor version}/libcloudproviders-${version}.tar.xz"; + url = "mirror://gnome/sources/libcloudproviders/${lib.versions.majorMinor finalAttrs.version}/libcloudproviders-${finalAttrs.version}.tar.xz"; hash = "sha256-O3URCzpP3vTFxaRA5IcB/gVNKuBh0VbIkTa7W6BedLc="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jtojnar ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libclthreads/package.nix b/pkgs/by-name/li/libclthreads/package.nix index ecf506310f4e..d4f021f5511e 100644 --- a/pkgs/by-name/li/libclthreads/package.nix +++ b/pkgs/by-name/li/libclthreads/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libclthreads"; version = "2.4.2"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${finalAttrs.version}.tar.bz2"; sha256 = "0cbs1w89q8wfjrrhvxf6xk0y02nkjl5hd0yb692c8ma01i6b2nf6"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libclxclient/package.nix b/pkgs/by-name/li/libclxclient/package.nix index 6c1175caab5e..8c904f4cf5c9 100644 --- a/pkgs/by-name/li/libclxclient/package.nix +++ b/pkgs/by-name/li/libclxclient/package.nix @@ -9,12 +9,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libclxclient"; version = "3.9.2"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${finalAttrs.version}.tar.bz2"; sha256 = "10bq6fy8d3pr1x2x3xx9qhf2hdxrwdgvg843a2y6lx70y1jfj0c5"; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libcmis/package.nix b/pkgs/by-name/li/libcmis/package.nix index 2d318efb1075..cf1408c4e1a5 100644 --- a/pkgs/by-name/li/libcmis/package.nix +++ b/pkgs/by-name/li/libcmis/package.nix @@ -12,14 +12,14 @@ cppunit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcmis"; version = "0.6.2"; src = fetchFromGitHub { owner = "tdf"; repo = "libcmis"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-HXiyQKjOlQXWABY10XrOiYxPqfpmUJC3a6xD98LIHDw="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { mainProgram = "cmis-client"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcoap/package.nix b/pkgs/by-name/li/libcoap/package.nix index b7fc45841354..42f6f9aa811e 100644 --- a/pkgs/by-name/li/libcoap/package.nix +++ b/pkgs/by-name/li/libcoap/package.nix @@ -13,13 +13,13 @@ withTLS ? true, withDocs ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcoap"; version = "4.3.5a"; src = fetchFromGitHub { repo = "libcoap"; owner = "obgm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-mLVGIG2JkWMlnZOlLxFTZVGM0nF6q2PKJoEo0s4Vq54="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.kmein ]; }; -} +}) diff --git a/pkgs/by-name/li/libcomps/package.nix b/pkgs/by-name/li/libcomps/package.nix index 12a6f3c0bce7..ff5c0ebe3af1 100644 --- a/pkgs/by-name/li/libcomps/package.nix +++ b/pkgs/by-name/li/libcomps/package.nix @@ -12,7 +12,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcomps"; version = "0.1.23"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rpm-software-management"; repo = "libcomps"; - rev = version; + rev = finalAttrs.version; hash = "sha256-6nX6Oa2ACVALOtXDxjowIGKaziZkGZbtkgZzDfuP4PE="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ katexochen ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcork/package.nix b/pkgs/by-name/li/libcork/package.nix index 7c59221f52d5..8d0afc371a73 100644 --- a/pkgs/by-name/li/libcork/package.nix +++ b/pkgs/by-name/li/libcork/package.nix @@ -6,22 +6,22 @@ pkg-config, check, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcork"; version = "1.0.0--rc3"; src = fetchFromGitHub { owner = "dcreager"; repo = "libcork"; - rev = version; + rev = finalAttrs.version; sha256 = "152gqnmr6wfmflf5l6447am4clmg3p69pvy3iw7yhaawjqa797sk"; }; postPatch = '' # N.B. We need to create this file, otherwise it tries to use git to # determine the package version, which we do not want. - echo "${version}" > .version-stamp - echo "${version}" > .commit-stamp + echo "${finalAttrs.version}" > .version-stamp + echo "${finalAttrs.version}" > .commit-stamp # N.B. We disable tests by force, since their build is broken. sed -i '/add_subdirectory(tests)/d' ./CMakeLists.txt @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ lovesegfault ]; }; -} +}) diff --git a/pkgs/by-name/li/libcotp/package.nix b/pkgs/by-name/li/libcotp/package.nix index 5fdd68034c80..3fe41d69cd33 100644 --- a/pkgs/by-name/li/libcotp/package.nix +++ b/pkgs/by-name/li/libcotp/package.nix @@ -7,14 +7,14 @@ libgcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcotp"; version = "3.1.1"; src = fetchFromGitHub { owner = "paolostivanin"; repo = "libcotp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-5Jjk8uby1QjvU7TraTTTp+29Yh5lzbCvlorfPbGvciM="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ alexbakker ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libcouchbase/package.nix b/pkgs/by-name/li/libcouchbase/package.nix index c7aa9158d92d..05a608e8c96b 100644 --- a/pkgs/by-name/li/libcouchbase/package.nix +++ b/pkgs/by-name/li/libcouchbase/package.nix @@ -8,14 +8,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcouchbase"; version = "3.3.18"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-+6RrApyml/FPv8pRjmwY1yuZIX1YXNKqdeNjP1y4cbU="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcpuid/package.nix b/pkgs/by-name/li/libcpuid/package.nix index 68402de9a104..fc6be2e81b14 100644 --- a/pkgs/by-name/li/libcpuid/package.nix +++ b/pkgs/by-name/li/libcpuid/package.nix @@ -5,19 +5,24 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcpuid"; version = "0.8.1"; src = fetchFromGitHub { owner = "anrieff"; repo = "libcpuid"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-+/TTlGk1ePPTHrSTSZmPHT2h3gKs9ouCF4ElvLWHF/g="; }; nativeBuildInputs = [ autoreconfHook ]; + outputs = [ + "out" + "dev" + ]; + meta = { homepage = "https://libcpuid.sourceforge.net/"; description = "Small C library for x86 CPU detection and feature extraction"; @@ -28,4 +33,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.x86; }; -} +}) diff --git a/pkgs/by-name/li/libcrafter/package.nix b/pkgs/by-name/li/libcrafter/package.nix index d53e5e3c917c..807099dff9c5 100644 --- a/pkgs/by-name/li/libcrafter/package.nix +++ b/pkgs/by-name/li/libcrafter/package.nix @@ -8,14 +8,14 @@ libpcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcrafter"; version = "1.0"; src = fetchFromGitHub { owner = "pellegre"; repo = "libcrafter"; - rev = "version-${version}"; + rev = "version-${finalAttrs.version}"; sha256 = "sha256-tCdN3+EzISVl+wp5umOFD+bgV+uUdabH+2LyxlV/W7Q="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcredis/package.nix b/pkgs/by-name/li/libcredis/package.nix index 9059754b679a..000a35d40492 100644 --- a/pkgs/by-name/li/libcredis/package.nix +++ b/pkgs/by-name/li/libcredis/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcredis"; version = "0.2.3"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/credis/credis-${version}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/credis/credis-${finalAttrs.version}.tar.gz"; sha256 = "1l3hlw9rrc11qggbg9a2303p3bhxxx2vqkmlk8avsrbqw15r1ayr"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/li/libcryptui/package.nix b/pkgs/by-name/li/libcryptui/package.nix index 5ce3f093ead0..d8d591e76237 100644 --- a/pkgs/by-name/li/libcryptui/package.nix +++ b/pkgs/by-name/li/libcryptui/package.nix @@ -19,12 +19,12 @@ gcr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcryptui"; version = "3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/libcryptui/${lib.versions.majorMinor version}/libcryptui-${version}.tar.xz"; + url = "mirror://gnome/sources/libcryptui/${lib.versions.majorMinor finalAttrs.version}/libcryptui-${finalAttrs.version}.tar.xz"; sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski"; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { # cannot open shared object file: No such file or directory broken = stdenv.buildPlatform != stdenv.hostPlatform; }; -} +}) diff --git a/pkgs/by-name/li/libcsptr/package.nix b/pkgs/by-name/li/libcsptr/package.nix index 3eb1cb52fb3d..b27c4992eeff 100644 --- a/pkgs/by-name/li/libcsptr/package.nix +++ b/pkgs/by-name/li/libcsptr/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcsptr"; version = "2.0.4"; src = fetchFromGitHub { owner = "Snaipe"; repo = "libcsptr"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0i1498h2i6zq3fn3zf3iw7glv6brn597165hnibgwccqa8sh3ich"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.fragamus ]; }; -} +}) diff --git a/pkgs/by-name/li/libctemplate/package.nix b/pkgs/by-name/li/libctemplate/package.nix index 11c2323806d5..1c1f14e22cc3 100644 --- a/pkgs/by-name/li/libctemplate/package.nix +++ b/pkgs/by-name/li/libctemplate/package.nix @@ -8,14 +8,14 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ctemplate"; version = "2.4"; src = fetchFromGitHub { owner = "OlafvdSpek"; repo = "ctemplate"; - rev = "ctemplate-${version}"; + rev = "ctemplate-${finalAttrs.version}"; sha256 = "1x0p5yym6vvcx70pm8ihnbxxrl2wnblfp72ih5vjyg8mzkc8cxrr"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/OlafvdSpek/ctemplate"; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/li/libctl/package.nix b/pkgs/by-name/li/libctl/package.nix index 4cd3482c2ddb..ca62a719dd93 100644 --- a/pkgs/by-name/li/libctl/package.nix +++ b/pkgs/by-name/li/libctl/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libctl"; version = "4.5.1"; src = fetchFromGitHub { owner = "NanoComp"; repo = "libctl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "uOydBWYPXSBUi+4MM6FNx6B5l2to7Ny9Uc1MMTV9bGA="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libcue/package.nix b/pkgs/by-name/li/libcue/package.nix index ffca99114c85..3f0c93133a66 100644 --- a/pkgs/by-name/li/libcue/package.nix +++ b/pkgs/by-name/li/libcue/package.nix @@ -7,14 +7,14 @@ flex, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcue"; version = "2.3.0"; src = fetchFromGitHub { owner = "lipnitsk"; repo = "libcue"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ZMUUa8CmpFNparPsM/P2yvRto9E85EdTxpID5sKQbNI="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libcyaml/package.nix b/pkgs/by-name/li/libcyaml/package.nix index 89f0525be200..04ab5c967bfb 100644 --- a/pkgs/by-name/li/libcyaml/package.nix +++ b/pkgs/by-name/li/libcyaml/package.nix @@ -5,14 +5,14 @@ libyaml, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libcyaml"; version = "1.4.2"; src = fetchFromGitHub { owner = "tlsa"; repo = "libcyaml"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-JIN/cvh9PRl4/K0Z3WZtSCA3casBxyaxNxjXZZdQRWQ="; }; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/tlsa/libcyaml"; description = "C library for reading and writing YAML"; - changelog = "https://github.com/tlsa/libcyaml/raw/v${version}/CHANGES.md"; + changelog = "https://github.com/tlsa/libcyaml/raw/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix index cc9b2b5f06ae..734852b1b749 100644 --- a/pkgs/by-name/li/libdatachannel/package.nix +++ b/pkgs/by-name/li/libdatachannel/package.nix @@ -12,14 +12,14 @@ usrsctp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdatachannel"; version = "0.23.2"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = "libdatachannel"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-76rlnO0wr7xQAGCc0GmpHQldzHKnZ8NZWpHmrE70h/c="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ erdnaxe ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/li/libdatovka/package.nix b/pkgs/by-name/li/libdatovka/package.nix index 999fbd7bc608..cb23eb4626af 100644 --- a/pkgs/by-name/li/libdatovka/package.nix +++ b/pkgs/by-name/li/libdatovka/package.nix @@ -14,12 +14,12 @@ docbook_xsl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdatovka"; version = "0.7.2"; src = fetchurl { - url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz"; + url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${finalAttrs.version}/libdatovka-v${finalAttrs.version}.tar.gz"; sha256 = "sha256-pct+COy7ibyNtwB8l/vDnEHBUEihlo5OaoXWXVRJBrQ="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.ovlach ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libdbiDrivers/package.nix b/pkgs/by-name/li/libdbiDrivers/package.nix index dd8e2b3cdd70..a1211dfce3e3 100644 --- a/pkgs/by-name/li/libdbiDrivers/package.nix +++ b/pkgs/by-name/li/libdbiDrivers/package.nix @@ -9,12 +9,12 @@ libpq ? null, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdbi-drivers"; version = "0.9.0"; src = fetchurl { - url = "mirror://sourceforge/libdbi-drivers/libdbi-drivers-${version}.tar.gz"; + url = "mirror://sourceforge/libdbi-drivers/libdbi-drivers-${finalAttrs.version}.tar.gz"; hash = "sha256-Q9LqzVc6T6/ylvqSXdl/vyrtvxrjXGJjR4IQxhAEyFQ="; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libdecor/package.nix b/pkgs/by-name/li/libdecor/package.nix index 2954748ce73f..b93d58b2992b 100644 --- a/pkgs/by-name/li/libdecor/package.nix +++ b/pkgs/by-name/li/libdecor/package.nix @@ -14,7 +14,7 @@ gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdecor"; version = "0.2.5"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "libdecor"; repo = "libdecor"; - rev = version; + rev = finalAttrs.version; hash = "sha256-sUktv/k+4IdJ55uH3F6z8XqaAOTic6miuyZ9U+NhtQQ="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ artturin ]; }; -} +}) diff --git a/pkgs/by-name/li/libdigidocpp/package.nix b/pkgs/by-name/li/libdigidocpp/package.nix index 7e0795ce9aa6..d4bffda33301 100644 --- a/pkgs/by-name/li/libdigidocpp/package.nix +++ b/pkgs/by-name/li/libdigidocpp/package.nix @@ -15,14 +15,14 @@ xxd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "4.3.0"; pname = "libdigidocpp"; src = fetchFromGitHub { owner = "open-eid"; repo = "libdigidocpp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-f5wU3C6NC4op+9Wy+khwNJ6slFyPhq7hZl1Tj5hnYc8="; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { lib.maintainers.flokli ]; }; -} +}) diff --git a/pkgs/by-name/li/libdivsufsort/package.nix b/pkgs/by-name/li/libdivsufsort/package.nix index 05f3f629fa8d..dce05f07d522 100644 --- a/pkgs/by-name/li/libdivsufsort/package.nix +++ b/pkgs/by-name/li/libdivsufsort/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdivsufsort"; version = "2.0.1"; src = fetchFromGitHub { owner = "y-256"; repo = "libdivsufsort"; - rev = "${version}"; + rev = "${finalAttrs.version}"; hash = "sha256-4p+L1bq9SBgWSHXx+WYWAe60V2g1AN+zlJvC+F367Tk="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { description = "Library to construct the suffix array and the BW transformed string"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libdmtx/package.nix b/pkgs/by-name/li/libdmtx/package.nix index 56d21de31eb5..b4087dc9bae5 100644 --- a/pkgs/by-name/li/libdmtx/package.nix +++ b/pkgs/by-name/li/libdmtx/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdmtx"; version = "0.7.8"; src = fetchFromGitHub { owner = "dmtx"; repo = "libdmtx"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/sV+t7RAr5dTwfUsGz0KEZYgm0DzQWRdiwrbbEbC1OY="; }; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { meta = { description = "Open source software for reading and writing Data Matrix barcodes"; homepage = "https://github.com/dmtx/libdmtx"; - changelog = "https://github.com/dmtx/libdmtx/blob/v${version}/ChangeLog"; + changelog = "https://github.com/dmtx/libdmtx/blob/v${finalAttrs.version}/ChangeLog"; platforms = lib.platforms.all; maintainers = [ ]; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/by-name/li/libdnf/package.nix b/pkgs/by-name/li/libdnf/package.nix index ab7827cfa43f..5f29d2c8aba6 100644 --- a/pkgs/by-name/li/libdnf/package.nix +++ b/pkgs/by-name/li/libdnf/package.nix @@ -23,7 +23,7 @@ sphinx, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdnf"; version = "0.75.0"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rpm-software-management"; repo = "libdnf"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ujkJVeI6wgapTW1DBIhj4F/rXJFBb+KdREpc5jfU124="; }; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { meta = { description = "Package management library"; homepage = "https://github.com/rpm-software-management/libdnf"; - changelog = "https://github.com/rpm-software-management/libdnf/releases/tag/${version}"; + changelog = "https://github.com/rpm-software-management/libdnf/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ @@ -108,4 +108,4 @@ stdenv.mkDerivation rec { katexochen ]; }; -} +}) diff --git a/pkgs/by-name/li/libdv/package.nix b/pkgs/by-name/li/libdv/package.nix index 4b5d8921aeb1..1bf20a19a0dd 100644 --- a/pkgs/by-name/li/libdv/package.nix +++ b/pkgs/by-name/li/libdv/package.nix @@ -5,12 +5,12 @@ popt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdv"; version = "1.0.0"; src = fetchurl { - url = "mirror://sourceforge/libdv/libdv-${version}.tar.gz"; + url = "mirror://sourceforge/libdv/libdv-${finalAttrs.version}.tar.gz"; sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libdvdnav/package.nix b/pkgs/by-name/li/libdvdnav/package.nix index 5c6e4913ac68..283ac0f322b5 100644 --- a/pkgs/by-name/li/libdvdnav/package.nix +++ b/pkgs/by-name/li/libdvdnav/package.nix @@ -6,12 +6,12 @@ libdvdread, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdvdnav"; version = "6.1.1"; src = fetchurl { - url = "http://get.videolan.org/libdvdnav/${version}/libdvdnav-${version}.tar.bz2"; + url = "http://get.videolan.org/libdvdnav/${finalAttrs.version}/libdvdnav-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-wZGnR1lH0yP/doDPksD7G+gjdwGIXzdlbGTQTpjRjUg="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { }; passthru = { inherit libdvdread; }; -} +}) diff --git a/pkgs/by-name/li/libdvdnav_4_2_1/package.nix b/pkgs/by-name/li/libdvdnav_4_2_1/package.nix index 2af5f90057a8..26582ae8e7ce 100644 --- a/pkgs/by-name/li/libdvdnav_4_2_1/package.nix +++ b/pkgs/by-name/li/libdvdnav_4_2_1/package.nix @@ -8,12 +8,12 @@ let libdvdread = libdvdread_4_9_9; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdvdnav"; version = "4.2.1"; src = fetchurl { - url = "http://dvdnav.mplayerhq.hu/releases/libdvdnav-${version}.tar.xz"; + url = "http://dvdnav.mplayerhq.hu/releases/libdvdnav-${finalAttrs.version}.tar.xz"; sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { }; passthru = { inherit libdvdread; }; -} +}) diff --git a/pkgs/by-name/li/libdvdread_4_9_9/package.nix b/pkgs/by-name/li/libdvdread_4_9_9/package.nix index c1b1e9b3f967..d7b0ec7b2b9f 100644 --- a/pkgs/by-name/li/libdvdread_4_9_9/package.nix +++ b/pkgs/by-name/li/libdvdread_4_9_9/package.nix @@ -5,12 +5,12 @@ libdvdcss, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdvdread"; version = "4.9.9"; src = fetchurl { - url = "http://dvdnav.mplayerhq.hu/releases/libdvdread-${version}.tar.xz"; + url = "http://dvdnav.mplayerhq.hu/releases/libdvdread-${finalAttrs.version}.tar.xz"; sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.wmertens ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libdynd/package.nix b/pkgs/by-name/li/libdynd/package.nix index e9ff379b3431..204b1fc3f956 100644 --- a/pkgs/by-name/li/libdynd/package.nix +++ b/pkgs/by-name/li/libdynd/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdynd"; version = "0.7.2"; src = fetchFromGitHub { owner = "libdynd"; repo = "libdynd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0fkd5rawqni1cq51fmr76iw7ll4fmbahfwv4rglnsabbkylf73pr"; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libeatmydata/package.nix b/pkgs/by-name/li/libeatmydata/package.nix index 8d53048ee18f..7fff9e4ec895 100644 --- a/pkgs/by-name/li/libeatmydata/package.nix +++ b/pkgs/by-name/li/libeatmydata/package.nix @@ -7,14 +7,14 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libeatmydata"; version = "131"; src = fetchFromGitHub { owner = "stewartsmith"; repo = "libeatmydata"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-0lrYDW51/KSr809whGwg9FYhzcLRfmoxipIgrK1zFCc="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { mainProgram = "eatmydata"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libeb/package.nix b/pkgs/by-name/li/libeb/package.nix index fc1528f811a4..06d257c35eda 100644 --- a/pkgs/by-name/li/libeb/package.nix +++ b/pkgs/by-name/li/libeb/package.nix @@ -6,12 +6,12 @@ zlib, fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libeb"; version = "4.4.3"; src = fetchurl { - url = "ftp://ftp.sra.co.jp/pub/misc/eb/eb-${version}.tar.bz2"; + url = "ftp://ftp.sra.co.jp/pub/misc/eb/eb-${finalAttrs.version}.tar.bz2"; sha256 = "0psbdzirazfnn02hp3gsx7xxss9f1brv4ywp6a15ihvggjki1rxb"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/li/libebml/package.nix b/pkgs/by-name/li/libebml/package.nix index 18b548dfddb9..9bf2b689cea7 100644 --- a/pkgs/by-name/li/libebml/package.nix +++ b/pkgs/by-name/li/libebml/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libebml"; version = "1.4.5"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libebml"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "sha256-PIVBePTWceMgiENdaL9lvXIL/RQIrtg7l0OG2tO0SU8="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libebur128/package.nix b/pkgs/by-name/li/libebur128/package.nix index 5f4d2b68c6ac..335b4ac1f053 100644 --- a/pkgs/by-name/li/libebur128/package.nix +++ b/pkgs/by-name/li/libebur128/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.2.6"; pname = "libebur128"; src = fetchFromGitHub { owner = "jiixyj"; repo = "libebur128"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.andrewrk ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libee/package.nix b/pkgs/by-name/li/libee/package.nix index d3bdd2c69bdb..347774dbd8b3 100644 --- a/pkgs/by-name/li/libee/package.nix +++ b/pkgs/by-name/li/libee/package.nix @@ -5,12 +5,12 @@ pkg-config, libestr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libee"; version = "0.4.1"; src = fetchurl { - url = "http://www.libee.org/download/files/download/libee-${version}.tar.gz"; + url = "http://www.libee.org/download/files/download/libee-${finalAttrs.version}.tar.gz"; sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0"; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { mainProgram = "libee-convert"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libei/package.nix b/pkgs/by-name/li/libei/package.nix index 4fea44d697d7..6a47e6bc0f54 100644 --- a/pkgs/by-name/li/libei/package.nix +++ b/pkgs/by-name/li/libei/package.nix @@ -21,7 +21,7 @@ let hash = "sha256-qm30C++rpLtxBhOABBzo+6WILSpKz2ibvUvoe8ku4ow="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libei"; version = "1.5.0"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "libinput"; repo = "libei"; - rev = version; + rev = finalAttrs.version; hash = "sha256-PqQpJz88tDzjwsBuwxpWcGAWz6Gp6A/oAOS87uxGOGs="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.pedrohlc ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libemf2svg/package.nix b/pkgs/by-name/li/libemf2svg/package.nix index f373db811a87..7e0bd86b7028 100644 --- a/pkgs/by-name/li/libemf2svg/package.nix +++ b/pkgs/by-name/li/libemf2svg/package.nix @@ -8,14 +8,14 @@ libpng, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libemf2svg"; version = "1.1.0"; src = fetchFromGitHub { owner = "kakwa"; repo = "libemf2svg"; - rev = version; + rev = finalAttrs.version; sha256 = "04g6dp5xadszqjyjl162x26mfhhwinia65hbkl3mv70bs4an9898"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/li/libepubgen/package.nix b/pkgs/by-name/li/libepubgen/package.nix index e75de3af9e9f..3deb919a43ba 100644 --- a/pkgs/by-name/li/libepubgen/package.nix +++ b/pkgs/by-name/li/libepubgen/package.nix @@ -10,13 +10,13 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libepubgen"; version = "0.1.1"; src = fetchgit { url = "https://git.code.sf.net/p/libepubgen/code"; - rev = "libepubgen-${version}"; + rev = "libepubgen-${finalAttrs.version}"; hash = "sha256-wPpU8Sfhx9GIgDmT/otT5yV4iQKm9QPZqgSBTfFcbbg="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/liberfa/package.nix b/pkgs/by-name/li/liberfa/package.nix index c87f6ed3c8e1..70fcb92b6cea 100644 --- a/pkgs/by-name/li/liberfa/package.nix +++ b/pkgs/by-name/li/liberfa/package.nix @@ -5,7 +5,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "erfa"; version = "2.0.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "liberfa"; repo = "erfa"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-NtHYgiN5mo3kWC2H+5TUDbU1nFrwuhNyOIhg2jZbssM="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { free = true; }; }; -} +}) diff --git a/pkgs/by-name/li/libesmtp/package.nix b/pkgs/by-name/li/libesmtp/package.nix index c704e11e2045..6f1e287fa312 100644 --- a/pkgs/by-name/li/libesmtp/package.nix +++ b/pkgs/by-name/li/libesmtp/package.nix @@ -8,7 +8,7 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libESMTP"; version = "1.1.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "libesmtp"; repo = "libESMTP"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1bhh8hlsl9597x0bnfl563k2c09b61qnkb9mfyqcmzlq63m1zw5y"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { homepage = "https://libesmtp.github.io/"; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/pkgs/by-name/li/libetpan/package.nix b/pkgs/by-name/li/libetpan/package.nix index 285358683767..4ce6ea58d849 100644 --- a/pkgs/by-name/li/libetpan/package.nix +++ b/pkgs/by-name/li/libetpan/package.nix @@ -10,14 +10,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libetpan"; version = "1.9.4"; src = fetchFromGitHub { owner = "dinhviethoa"; repo = "libetpan"; - rev = version; + rev = finalAttrs.version; hash = "sha256-lukeWURNsRPTuFk2q2XVnwkKz5Y+PRiPba5GPQCw6jw="; }; @@ -113,4 +113,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ oxzi ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libeufin/deps.json b/pkgs/by-name/li/libeufin/deps.json index d4055e8af5a9..46686cd95ed4 100644 --- a/pkgs/by-name/li/libeufin/deps.json +++ b/pkgs/by-name/li/libeufin/deps.json @@ -11,8 +11,14 @@ "com/fasterxml#oss-parent/50": { "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" }, - "com/fasterxml#oss-parent/58": { - "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + "com/fasterxml#oss-parent/55": { + "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" + }, + "com/fasterxml#oss-parent/61": { + "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" + }, + "com/fasterxml#oss-parent/68": { + "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc=" }, "com/fasterxml/jackson#jackson-base/2.12.7": { "pom": "sha256-F55U/ibI1N/pJf7jHUqH0cwl+LfgCUik5laxIp4rdq4=" @@ -20,14 +26,14 @@ "com/fasterxml/jackson#jackson-bom/2.12.7": { "pom": "sha256-GVVDL22K8ygG2C2CGP7f5L47s+I9WadNgUSf/HS/e9E=" }, - "com/fasterxml/jackson#jackson-bom/2.17.2": { - "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + "com/fasterxml/jackson#jackson-bom/2.19.1": { + "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4=" }, "com/fasterxml/jackson#jackson-parent/2.12": { "pom": "sha256-YqocFnmt4J8XPb8bbDLTXFXnWAAjj9XkjxOqQzfAh1s=" }, - "com/fasterxml/jackson#jackson-parent/2.17": { - "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + "com/fasterxml/jackson#jackson-parent/2.19.2": { + "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U=" }, "com/fasterxml/jackson/core#jackson-annotations/2.12.7": { "jar": "sha256-PKzvcUqJ89aLafoRJjr6VaaqL97x//k97SLKoWtUaHw=", @@ -70,6 +76,10 @@ "jar": "sha256-ySjWBmXGQV+xw5d1z5XPxE9/RYDPWrAbHDgOv/12iH8=", "pom": "sha256-SDllThaxcU509Rq8s3jYNWgUq49NUnPR3S8c6KOQrdw=" }, + "com/fasterxml/woodstox#woodstox-core/7.1.0": { + "jar": "sha256-gSZpIKHNxHMGqKK0cmyZ7Imz+/McJHDk9eR32dhXyp8=", + "pom": "sha256-+ZXFCx0gl18KjW8OUyK8jRPHiuPcGCcXdoQUlypmzIU=" + }, "com/github/ajalt/clikt#clikt-core-jvm/5.0.3": { "jar": "sha256-acupSiKR90t4yII5zYtn6vPwjg2tKXdJq+ZHez6bgbE=", "module": "sha256-dFtZmw9KoAz3AVYz429KVvJdGLy292htyrOxoRQZ3PE=", @@ -194,6 +204,11 @@ "module": "sha256-1JvlTnf/S5YQ3C8ij4HcBlaqklvHJYj2JFjbWZiVCVE=", "pom": "sha256-5cbZkBgl3gKJ5J0tt1A+A546FmCq2sY3Oyp2zd9eZRM=" }, + "com/github/ben-manes/caffeine#caffeine/2.9.3": { + "jar": "sha256-Hgp7vvHdeRZTFD8/BdDkiZNL9UgeWKh8nmGc1Gtocps=", + "module": "sha256-J9/TStZlaZDTxzF2NEsJkfLIJwn6swcJs93qj6MAMHA=", + "pom": "sha256-b6TxwQGSgG+O8FtdS+e9n1zli4dvZDZNTpDD/AkjI9w=" + }, "com/google/code/gson#gson-parent/2.11.0": { "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" }, @@ -205,78 +220,85 @@ "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" }, + "com/google/errorprone#error_prone_annotations/2.28.0": { + "jar": "sha256-8/yKOgpAIHBqNzsA5/V8JRLdJtH4PSjH04do+GgrIx4=", + "pom": "sha256-DOkJ8TpWgUhHbl7iAPOA+Yx1ugiXGq8V2ylet3WY7zo=" + }, "com/google/errorprone#error_prone_parent/2.27.0": { "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" }, - "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/8.3.6": { - "pom": "sha256-vI+Lii1Izey8uwCD39qhI2EVvzDYzJ3foE1W6T7J3e4=" + "com/google/errorprone#error_prone_parent/2.28.0": { + "pom": "sha256-rM79u1QWzvX80t3DfbTx/LNKIZPMGlXf5ZcKExs+doM=" }, - "com/gradleup/shadow#shadow-gradle-plugin/8.3.6": { - "jar": "sha256-fOIOvwHuKe7FJFY70UK6wpHXUTXtedDZUamP0skmXDs=", - "module": "sha256-+8pm1Bwrz9HiUE9uzIIf4BqbAIx27qnJQM+Ay1aaI/8=", - "pom": "sha256-lRJfSJrSuJ5gJXMmnK9h9tSF26gvHcuNCYDODfK2stA=" + "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.2.2": { + "pom": "sha256-ZLCuyyPFfukfzPJXx4F8uyxpXQT565nM+9pth/TFlOk=" }, - "com/itextpdf#barcodes/8.0.5": { - "jar": "sha256-JxLhfu2Mxizw7c7ZfZI+WBSo9Py3PiiZmBfy7ePTNUI=", - "pom": "sha256-dV3DovvZRqf/5Y0xu2VldhdYPQrQQJzVVKv/jdX6FVo=" + "com/gradleup/shadow#shadow-gradle-plugin/9.2.2": { + "jar": "sha256-rqYDnab2KTcMEKFxcOjz2o1nPhS++FgL0aZc3kSQc9A=", + "module": "sha256-4tXqtRULxjBI6WcI6t6/0XbmOfIsgFFoBVszcQdo3YI=", + "pom": "sha256-bO3IWZV0n5H/XNb8Z3H6PfZ4qlZSIl5uoFjNnXmVjGo=" }, - "com/itextpdf#bouncy-castle-connector/8.0.5": { - "jar": "sha256-0MT4RPSbUGKzPiBWiC92dr/UQ6J5ThchjmEvvmUdQD8=", - "pom": "sha256-6LQh/7hqJkLMpPTG+/P9fkajoFgTA74NtkEhDMxqTwI=" + "com/itextpdf#barcodes/9.3.0": { + "jar": "sha256-YVJM0wSLkIh1Rhz/MjbelydHhb1ykdWVxBuvlCqN1i8=", + "pom": "sha256-qxLCNC5kRcu8VQaULGIhnfpAV/N57Fwn3dvcpjE3mrg=" }, - "com/itextpdf#commons/8.0.5": { - "jar": "sha256-1t1r+kuzlCX6dzF4krg8mL4rkqmB2A3gM/ZbjdrRtxQ=", - "pom": "sha256-6PNV2C/nt/XFpTj9z2T4Es43s7/tV9uf6Szi3uIwQmQ=" + "com/itextpdf#bouncy-castle-connector/9.3.0": { + "jar": "sha256-E3miKl2ctgR4DGWCrQ9yS9iaPvAJ4XzevkcAJRKi/dA=", + "pom": "sha256-wgY5ENrrccm07GKeHx9bWS9+R6Ajo5tClNjUaGtc3fg=" }, - "com/itextpdf#font-asian/8.0.5": { - "jar": "sha256-sugz7zzgkE9m8VCFcC6lMQyRP9rJEGSXH/FxSfRLp7I=", - "pom": "sha256-6xNuoW0+4NSC4HrYMeNw7sK6mBYDPBjQLkUmBiJzk5o=" + "com/itextpdf#commons/9.3.0": { + "jar": "sha256-gIo6Rk/mb6Qvvyh9/q1JqustycqFcgEdmKeuxbTvWoU=", + "pom": "sha256-WDT++TmOSfpcEGAO1Xku9KSPQDE9VhfpQrt8GRZNylM=" }, - "com/itextpdf#forms/8.0.5": { - "jar": "sha256-4jVgN9+9WY3sspbehpiMc8vrsacIVAIzRpjjcVGmIcE=", - "pom": "sha256-tAI0lgxgvxjO5ZQiEKV2Ln71K9az1x9mxX4W6jm8pYg=" + "com/itextpdf#font-asian/9.3.0": { + "jar": "sha256-BGCzs3KRUjqMjUgVrrYaBzps06/y0LLfxSMosfqoOE4=", + "pom": "sha256-Cey1j1gO0ap4QmcbqTzR3qHUX/dtA0UmfFRHYveXLKY=" }, - "com/itextpdf#hyph/8.0.5": { - "jar": "sha256-odACrUGK5MksEuZ04hma501lI0mqDJIramQg23e1AF4=", - "pom": "sha256-zUjk+IM1QOasxIf4tsEmhKycFqszB6t2OIYONTmhLiQ=" + "com/itextpdf#forms/9.3.0": { + "jar": "sha256-8ZUJi8fvRc2+I0Xa7NNm0axIjQusn7uRw5tPy/FiZ+Q=", + "pom": "sha256-/H4ptnC0MAwmugusVUVjfHPvxyoeSuXtKWk1l7d34cI=" }, - "com/itextpdf#io/8.0.5": { - "jar": "sha256-v3f/mTx/yb3kPbUExylCuIU7oqXGw0I2wZdJfUZSqsg=", - "pom": "sha256-n+SFi3+dTykLQ1lLDPn3pQTj6atVydNgVXHPuUYu3so=" + "com/itextpdf#hyph/9.3.0": { + "jar": "sha256-Ds0UrOIIM1Dxfj+RcQvzdzBDSJgPXZRvMvkDLwW6XOQ=", + "pom": "sha256-okNuRLaYnqDRHtrcwpgOF36zf9vIJN5Rzy0NQ9aU/QI=" }, - "com/itextpdf#itext-core/8.0.5": { - "pom": "sha256-pTfMOsGOW3iUy5vQXD371UmhKDQ0Bm+gNPTBY3Yp4T8=" + "com/itextpdf#io/9.3.0": { + "jar": "sha256-9FVYYAt+syPY/9JWG/dAxN4CAgt9fxvYbZyTHDkei4I=", + "pom": "sha256-+WXwcDEFrA0ZYd5KE8W08Exy5GulKtaaSnD1UPn19sM=" }, - "com/itextpdf#kernel/8.0.5": { - "jar": "sha256-RFWOysn0+Nnm2GJx01yb4x3DJdPdp1WAiO6ZG9CMH0g=", - "pom": "sha256-ttY1sI6VnG67f7d8E11sCQ/wmyQxvHetGE3OEs9EW6c=" + "com/itextpdf#itext-core/9.3.0": { + "pom": "sha256-2UeQDGbHx0OOZ7TRxoQFScKtM885psBL5UkUML+UwMw=" }, - "com/itextpdf#layout/8.0.5": { - "jar": "sha256-l8QdV2mtUWUA6n7pjvkodk8QcLSO9ORuvBZlklPY7hU=", - "pom": "sha256-L8rwWrNaQIx87BPGWkgaV0BhKRA8Z7eS4RH6xitArL4=" + "com/itextpdf#kernel/9.3.0": { + "jar": "sha256-P64m5ft4BNypE7Wl+16Hs4aYSVj99dWcYNW4TiqF3EE=", + "pom": "sha256-WX/wsvz4zQId7gm/K3rC61AwCV4ixZbKeFopOO8YE6Y=" }, - "com/itextpdf#pdfa/8.0.5": { - "jar": "sha256-zSTIgUjonvYRRHE04583gaf/+K7VxhO4zxzhgee6TkY=", - "pom": "sha256-xS3rP6rseGc4b813BkBFQJ+tVJLVfPYydW6e7PpeXx8=" + "com/itextpdf#layout/9.3.0": { + "jar": "sha256-18ZDzN6wOApgkGa9oPmo+lApNHFM88kvSf3ucPyD8qU=", + "pom": "sha256-2AExhomAFeGgUTDNmje7SH31Bc1yY2DymxIuUTvPaOE=" }, - "com/itextpdf#pdfua/8.0.5": { - "jar": "sha256-VU+L0O2xFcB9N3ek+GvzNzbIaxvnDm5tMdbEufSBBeA=", - "pom": "sha256-p5mIqCo4mpAfXORVNFasqQkHAF7WDFd6D3NOL8BjRfc=" + "com/itextpdf#pdfa/9.3.0": { + "jar": "sha256-oePCIW1ClzBBrMTOa4d1zYLxqRJE0T9XWYxzWLBNk8E=", + "pom": "sha256-k6jILtff8bkHqFdduLzstJI83cAs5PAkuRq+7hpnGQc=" }, - "com/itextpdf#root/8.0.5": { - "pom": "sha256-73FcJOWH2D5/EmQe8GasDBNMGcrkaPbg8nTodaVZLOA=" + "com/itextpdf#pdfua/9.3.0": { + "jar": "sha256-EtDaKWMmaxDRikReGwb9RXE2Y33DkNuD6OCwnC2zGRs=", + "pom": "sha256-ZL+IRxqOrHK1y2EwQ1KhNL7vGXvyf7ieRBDz5YJt+7Q=" }, - "com/itextpdf#sign/8.0.5": { - "jar": "sha256-u8W77EReI/a0WMUtV8GKyoM7VM9vO4gw9UzeEptkdhA=", - "pom": "sha256-xJ10X2YI6uK65oNJ0F1RhyKPrqVEJ67aMSOFNldaYTQ=" + "com/itextpdf#root/9.3.0": { + "pom": "sha256-wAajTZcYqhPQdW5Z7HUGj5uqxp5DUWcSgXOTWwQMX0o=" }, - "com/itextpdf#styled-xml-parser/8.0.5": { - "jar": "sha256-hyGESBZFgHg6q5v4c+erRpryUxp02nZYudy2eK5SO1c=", - "pom": "sha256-zGoKA7HTlzRMuuOcYEW07dfZGY0ZiLsGoGVlWRmUKBk=" + "com/itextpdf#sign/9.3.0": { + "jar": "sha256-BUvxyphtzjFN59aUYi9Ui1zoCtd2sYYl8eeUB2ejdYY=", + "pom": "sha256-+sHdOKE4aHhGmEOD51K//T0YuN91xvjB6GOKLLu04rw=" }, - "com/itextpdf#svg/8.0.5": { - "jar": "sha256-P3XR7KqtP/nBoCRE5Te6xasxgcuU6tPLotFY+QkIOGo=", - "pom": "sha256-ZyRMu8oNwyJ6H+w75zWKHRM2i5biTzgz8TQzztgGt78=" + "com/itextpdf#styled-xml-parser/9.3.0": { + "jar": "sha256-dvygFilJwkmWVHRtVD38b67aI4Z2ueR90wPaov/vnv4=", + "pom": "sha256-2ylPxpjEQsFBp+jYah4fYZ7z1FiUeWZ7omFAzgexgoU=" + }, + "com/itextpdf#svg/9.3.0": { + "jar": "sha256-ZnQ6ldBs1aptMw8GRjQutj+wTVeBUHmX6tWJbYOMArQ=", + "pom": "sha256-kPshPJ47ACFpnlO+jQEuD4eHiHMtvYd7vreEft8Kxho=" }, "com/kohlschutter#kohlschutter-parent-multirelease/1.7.4": { "pom": "sha256-D4WGWIXlDWSBYqF+qhLiTeZ4j6yg4mwiYfPoS5WF8Zw=" @@ -301,332 +323,408 @@ "com/sun/activation#all/1.2.1": { "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U=" }, - "com/typesafe#config/1.4.3": { - "jar": "sha256-itpMGFznJBZxLWPgta/cXwCcDN9AXl8m7+zfFWql37Y=", - "pom": "sha256-tn6vqd0iD/h9ANumiACDpSlqXgxsAxA/XUuOHaEDD/M=" + "com/typesafe#config/1.4.5": { + "jar": "sha256-SksK/7IqlXJAnTpr3pnOPyBFxVHK3Byn/glpCJLFJsM=", + "pom": "sha256-/zJV7sDsi9XwZTc47BtINCpqkOPU6selb5BMauLhLtU=" }, - "com/zaxxer#HikariCP/6.3.0": { - "jar": "sha256-B8Y0QFmvMKE1FEIJx8i9ZmuIIxJEIuyFmGTSCdSrfKE=", - "pom": "sha256-F8+ZOdJTM0af1/Yok6f37tnqDIm5UWsEmfQO6xzATfQ=" + "com/zaxxer#HikariCP/7.0.2": { + "jar": "sha256-8eYS+ic0W+MQeoVDHoqK6yBcFTZKsvLUEeQKnXuwgJU=", + "pom": "sha256-ZiqH+ASHvom9dyliE+kRCP+fAe0NmpD5pOISY8xJ5z4=" }, "commons-codec#commons-codec/1.11": { "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" }, - "commons-io#commons-io/2.17.0": { - "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=", - "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek=" + "commons-codec#commons-codec/1.18.0": { + "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=", + "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4=" + }, + "commons-io#commons-io/2.20.0": { + "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=", + "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio=" }, "commons-logging#commons-logging/1.2": { "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" }, - "io/ktor#ktor-call-id-jvm/3.1.3": { - "jar": "sha256-gLZ42qyYTS/sXE5ZZ2MYItK8G57qk1pizj9uo8anZw8=", - "module": "sha256-x1DCb6DCDZfz9ZMtEUiqBhhT4+7ej2KtjALiG17O68Q=", - "pom": "sha256-ka+Cj0xtAN7gSn0+YRZLB8krWryTrGB1MD5+3MxyppI=" + "io/github/java-diff-utils#java-diff-utils-parent/4.12": { + "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk=" }, - "io/ktor#ktor-call-id/3.1.3": { - "jar": "sha256-I6z4l6bILYmSlPRmZ0YCAPHknNTKp7uH5Dg/LiRzbVA=", - "module": "sha256-57YM1/WIqRGu7fHccypNxe+LaWbSmzkUG8xuRPKIxgI=", - "pom": "sha256-CgAC7FJxqPycekNdN8JEQIotoDFKuE8Qb4OHl77pZ9A=" + "io/github/java-diff-utils#java-diff-utils/4.12": { + "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=", + "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw=" }, - "io/ktor#ktor-client-apache-jvm/3.1.3": { - "jar": "sha256-YfIjXuxkDJZ6Nip/hhJIUDrF/GywbfvQiakx4g8ztxU=", - "module": "sha256-9ECUrA4wO1Oy9SdU4GD5V+LHYPV0Rl3/sz7bodK4JQU=", - "pom": "sha256-ELzo+wTaUJxN41YoopyNtnzHOSwH8w7vCGaN5LnAUi4=" + "io/ktor#ktor-call-id-jvm/3.3.3": { + "jar": "sha256-gClrV5FJ2vpIqH8iNuxM25KSzPZDEvG6W2Cj4tolLNY=", + "module": "sha256-bu4J/O6d0g5xufdThUBcgR+ZFBxiSCZYzfrghRipsRc=", + "pom": "sha256-yhf9CErM/1H9uGb8B3xIxr7Cl8fNDvdqOwoZ7RlDyJI=" }, - "io/ktor#ktor-client-apache/3.1.3": { - "module": "sha256-Aa7X/CR5yCi70v80Hpkl0dWpD5SoJthrFsbzPta6JXQ=", - "pom": "sha256-r64In4zSRg5gqAHfXNCVJ1ARK+HqQsVp4vMS2SVv134=" + "io/ktor#ktor-call-id/3.3.3": { + "jar": "sha256-lc6fCMCry5aa6RYfwim74jpQLTW6dWVY9AzzCQUCZ6Q=", + "module": "sha256-d3Xp4uQAgrzicY/zyUokOZglcFuYYLgtwxH79IVpMNA=", + "pom": "sha256-Y4hsqpLcdTo96SpnTDW+BwcpyqmXvA2bAXYy4/Tsf0I=" }, - "io/ktor#ktor-client-cio-jvm/3.1.3": { - "jar": "sha256-moY0FYgFeiPTukVi/civzvb6zQcWeKDCCzsooZ7DXIg=", - "module": "sha256-Gf3FXgMKwvEjvNH/Ln9y5kMptpOp6liaI+6ScJrB2ow=", - "pom": "sha256-W5X6Bt5nhVLN/vkqmdzS6oaZSitRolVGfk3Arnq6chc=" + "io/ktor#ktor-client-apache-jvm/3.3.3": { + "jar": "sha256-h2TGm/I2nk8Cr9V4fZ7Ln09rpVDytXB/vX2594VJXB0=", + "module": "sha256-R1EB/+OvSLmHjjhW3Lcgc55NJJezojBxSTvDP8/ROYY=", + "pom": "sha256-pvNBIgQShK1VPvV9zS2s+LG9q7L6kZt0KrpVTNovVcU=" }, - "io/ktor#ktor-client-cio/3.1.3": { - "jar": "sha256-64zDd1PgQKDhC1ZkrqzHic0hPDZJBG9wYrjbmKOxaQI=", - "module": "sha256-A8RHfiHmBpt1S5eqX8z4MJXGsK2XfBBo0Zyt2BlkL58=", - "pom": "sha256-w8t9kA77xuTM6nvxrJSb1jjJ2CyIQ6bUjq/OInMx/+M=" + "io/ktor#ktor-client-apache/3.3.3": { + "module": "sha256-9nArLXQ/WBU154wJPqpYFjM+0qKKOuxtLkeyhzmvQ8o=", + "pom": "sha256-I9WcNNi3GVZYnpz2c3zQdgSN0mA4Z+qJWBpQrxvMc1w=" }, - "io/ktor#ktor-client-core-jvm/3.1.3": { - "jar": "sha256-dG4qPezoc3nWTECZlAGWkAHTc94UWP6FHA0uD4gLQu8=", - "module": "sha256-5oB4ORvBuH88HMIDRRt9L5uAhHbtptx2RKhYVIkA07Q=", - "pom": "sha256-vlfjAdm/W8CML/w7hstr+TRX4ubqpXtWQYb/KnjKTkM=" + "io/ktor#ktor-client-cio-jvm/3.3.3": { + "jar": "sha256-8H3BszD9iQC1hNIQHEGuWoZS2ooTwKJnVCA+8w74EcA=", + "module": "sha256-bVoHakvI2a4TrVCVNgh07RQQuUeKEycVNnUhYB4HAvU=", + "pom": "sha256-D/UIhxRg+ocGUy3ZuVQ54vcjO+8ShpeSxklgysuFQW0=" }, - "io/ktor#ktor-client-core/3.1.3": { - "jar": "sha256-7n7a34hBaAPCwgDunledhgDxDkFTIbWOGwto5dn8FVA=", - "module": "sha256-EvDAELJfjLyCEWrqFFw6Hw8RAJXPgJE/Ori2ZTij9o8=", - "pom": "sha256-x2jprwXTbd2mJ6sk5p2TvM1Zv9MICg9ejvxzSxAPGA4=" + "io/ktor#ktor-client-cio/3.3.3": { + "jar": "sha256-U69nA+rdfvieBzOs8WDWn7REAzPZRBL6oKyrOD1bATw=", + "module": "sha256-a7vE1ZikVVE6mDhcSqiZTJ/58nWZAUMS9liAmLlkdwg=", + "pom": "sha256-g3z9pYaOdg9OTgGzE8Z9GBhZs2GCJB/7ALxXHePZ9UE=" }, - "io/ktor#ktor-client-mock-jvm/3.1.3": { - "jar": "sha256-KuDVe7n8647irtplNqzG8+HeNVmEtMnacgVmuF8VJeg=", - "module": "sha256-fJuLPraloY+Zk+w1jIJ+FtN9aLSrFywUpn5n7N+QZOQ=", - "pom": "sha256-OjT7OR5B1MOvM1f15/tiXg5Z3x6OuCpZTZ/q9tYXffM=" + "io/ktor#ktor-client-core-jvm/3.3.3": { + "jar": "sha256-bEA7OcrDQokoOcJRJ1zEQbJ8fxlJg7kibLRrw6RCWfk=", + "module": "sha256-7YnI9YaCl/LEOw8+1ftB1vqtMwZG4toK1ufd+pWpOpk=", + "pom": "sha256-6GBII5tykJSOuKP26pFvOpwWjNMfs3wz4P9A7Jq44DI=" }, - "io/ktor#ktor-client-mock/3.1.3": { - "jar": "sha256-6zATgJE94DdNhmgvsKGWB6pkNhx5YiCsNGiEVgWyfPY=", - "module": "sha256-6E6gbXazYkCKePaK9DRO4ICc0U7JNelanWHjfRnXIfo=", - "pom": "sha256-gTytx93jygnLRrYSzaCR/urkneZaqg1EBZOI+CC7DVo=" + "io/ktor#ktor-client-core/3.3.3": { + "jar": "sha256-WYXzj1vHlrj4IwDhUhfIXqpzN2SarED3LrDVH9sUeCA=", + "module": "sha256-6ivkA49Bx+2rEEQLPLXZjEA12vMYTi6gAgjZ5D8nI/w=", + "pom": "sha256-tbMflnK3Oj4B+04DPpIjDGAQau5yzGH+xKo0EAh7n9U=" }, - "io/ktor#ktor-client-websockets-jvm/3.1.3": { - "jar": "sha256-mOkOy8uxp7GT2eh59D5wVBBIytE63gIsbWRRj12AJws=", - "module": "sha256-9xxqB84CHjXUL6/+6A6VpGalUGcIj5zvc/aUz+p6R7w=", - "pom": "sha256-v8mwTaPMfpA87i2PrhHPOiUBkQGA8oKGLtJ7kMysMao=" + "io/ktor#ktor-client-mock-jvm/3.3.3": { + "jar": "sha256-GfUuZN7D9wnwhn90a36smajja0ZKVkhXpz9SGnaEAEc=", + "module": "sha256-O9opEj8W5TE1sx1x21YbjYJZuoCAkyUyEddkB1csRh0=", + "pom": "sha256-Qg/KYV7PjI3pclTXXi3gpmFBd8vlEvirqya78rLy69A=" }, - "io/ktor#ktor-client-websockets/3.1.3": { - "jar": "sha256-kaedTZSKg5V+8gireip6nPeO0vzfkuI5vMij6Z5ipXk=", - "module": "sha256-4IIc0qsvldXIRdWHAn51dVMGzQvAtdjTc+e80p/R3Ck=", - "pom": "sha256-OBV5JptMkfEFPcbwChQuiVsXbKzCZh8cNI4tUDaVSbo=" + "io/ktor#ktor-client-mock/3.3.3": { + "jar": "sha256-wgTkxo/Te1Vj+hS5S791P+Uckngnd8zqFPm7jdadk6M=", + "module": "sha256-+Ckbdn9ebu6wkpb/LJ/SZAvPPKG0hGCskBNZhT3JOX8=", + "pom": "sha256-Q2WHQLSntpB/Bf7authFJvG5gJe1zJXC3lFSqUcTgXM=" }, - "io/ktor#ktor-events-jvm/3.1.3": { - "jar": "sha256-2nBpxueICdfDfRBOQVYTy9TNXOwe1UozLLZO9qhkoGA=", - "module": "sha256-OOQgRWP3P5t/373byAHAmMawHYfTECKQ8sajYuoTUdY=", - "pom": "sha256-93csYlM0BJC0293doSvci7K6B+jFvLjAtxvy9rbVgVY=" + "io/ktor#ktor-client-websockets-jvm/3.3.3": { + "jar": "sha256-qgc7ikj15XrxdZoS/WXrnSd/I/WXymAUs8KudTMtf04=", + "module": "sha256-DCTt2l7rNxAc94H8a5FukxNmjJCxJFtxmmY29slMCyA=", + "pom": "sha256-53cFsQ1cWGDEKqz4WgyBg86I9O+Dsr9pvNqmS9b51uI=" }, - "io/ktor#ktor-events/3.1.3": { - "jar": "sha256-EOdojQWik+k9467ZuxEfmpV00K0IQ9QIzfE0DHncx1c=", - "module": "sha256-SrtBkdOeN5QGiSqErN705lqyJiG+hBE5cFn01GIa/vk=", - "pom": "sha256-XestkhWtgPoJtSCKhitHo2ydHL0Yo/lM+jgOPUp3GDY=" + "io/ktor#ktor-client-websockets/3.3.3": { + "jar": "sha256-nH501fk17i9WWE5JoPN8ZmQ8hlfq0Wmk2B8YWMoeQ1o=", + "module": "sha256-M9UxFWaiHqc4Ty4iyKTmzzF7DQVWP6jL3sEMxw8VfCM=", + "pom": "sha256-i39nGYUmgAERK+4c7UO1Z6HojrdoWLx1n1VDqKHlg3g=" }, - "io/ktor#ktor-http-cio-jvm/3.1.3": { - "jar": "sha256-sErt4Y6cAIFoCW3FOj/AFhd7YaXsMCSvv4ysoM1dv0I=", - "module": "sha256-IX4QLGEQ/ocl/6oSUKN+f0t1teTeERcrnPKzOp+wfAg=", - "pom": "sha256-gOmz2o6VeGObSyn/TBTP6/IOzNW5xHEz0U+CV5L+CDk=" + "io/ktor#ktor-events-jvm/3.3.3": { + "jar": "sha256-DXhqEldjCd7cFvmi/0ZAFtUc/B/iDXiQkSIA/yq84Oo=", + "module": "sha256-g9uz7bhbFTumhN8MxphgMVadWKHmUKJePF2sMRvFdc0=", + "pom": "sha256-Mow3sDUkrznzn8ryU6cxzapzqYFHYbSEjteHCh/W9oE=" }, - "io/ktor#ktor-http-cio/3.1.3": { - "jar": "sha256-IzLwt1DKuYqOi/YqikkohFAp8Ai79EzF2wgk7qOU3uo=", - "module": "sha256-iHbg5qXpx8u3jesES57d9zrGdhAvd86GrXIcm3TtOo0=", - "pom": "sha256-GI7a2ilETzpIPqUM1yUDesrifyZuP2+dGycMW/pfWMY=" + "io/ktor#ktor-events/3.3.3": { + "jar": "sha256-YO0KMZz9cTEQEwhB4anbyWg+EwJ3nH9Jump1GfOf8EU=", + "module": "sha256-zWi3ngAW8YJo7TYkxuMirV+YVqQivnvyoTIauoovHYo=", + "pom": "sha256-MMqkkcgciOPeioHfV+GTv8DN71al0mquIy1s/onfZ4Y=" }, - "io/ktor#ktor-http-jvm/3.1.3": { - "jar": "sha256-ilDZS0b5G9VlgLkWknLWzWNvRCAyugeKFB2nBBNGWUY=", - "module": "sha256-TspOEQpq9l7faaAXoJJLizyO01cuHvboyhnSp+jOsdI=", - "pom": "sha256-+NbU7DyYNRpjYjfuqGVLjC6l2ME9YZR+fbjo+WaOjKo=" + "io/ktor#ktor-http-cio-jvm/3.3.3": { + "jar": "sha256-/0NQi/j8wXm/ZyrG5eBY+AEKYq35RKHgzwmCtmV+Bk8=", + "module": "sha256-DUY9Bu960i6mXb9FDcEo54Z4ChcT0FXWcI568JMWfA0=", + "pom": "sha256-zLvpBAqhkvzAIw+z2gbsDmyTXnsVI4XSbW1CY+Fmc1U=" }, - "io/ktor#ktor-http/3.1.3": { - "jar": "sha256-rUgmpsG5/IZUZ+5jGRCpP7WnGX9wJflqNkwRVcPJRSk=", - "module": "sha256-bBO1SCiBE6ubWCOidWV2CulpkWOJ04GgZXyjn7vTim4=", - "pom": "sha256-7idNqX1di1SNU4b3fULG67fKrD79rWPRwstbHLDkfqs=" + "io/ktor#ktor-http-cio/3.3.3": { + "jar": "sha256-B/rtApVjj3gVe0plG5XYdPxbGlJvCDiibhfqlcqAI8U=", + "module": "sha256-CpupYqJkqAsnmqzGNY16vr7IoytmxQxrR8VkSvLffvg=", + "pom": "sha256-rwgAqRmBZcxUzWw6TWogdRraygAT8CyqHsgKBIW1kMM=" }, - "io/ktor#ktor-io-jvm/3.1.3": { - "jar": "sha256-uy+2wAr6o0tTnLMOdYTTe/y6Fxwma725mQ4ANXncJME=", - "module": "sha256-pUnfJeuyazKSWYP9oC41YPP++voCniJGncBpPNq7clE=", - "pom": "sha256-mNkD8tAjCib7DVxoK61A2MlUq+e5d6FdyMFtENx0tcI=" + "io/ktor#ktor-http-jvm/3.3.3": { + "jar": "sha256-f3DPUBHZy6/AosyNxRlD5HrqWyXW+yCy37i13G1ZEIU=", + "module": "sha256-TTHHnsKEyxRGEcAmpbsy1w7VLj8rmsYGktYqTWMzIHY=", + "pom": "sha256-mfjMkrtyBPbJcRvh7p0L+Ev6ppJWS5JORuXMXbwcLIc=" }, - "io/ktor#ktor-io/3.1.3": { - "jar": "sha256-1mdwNHtTpmLFy263VW23Ra0C/yaPZeBYL/SWg41gO5A=", - "module": "sha256-YZ/tWS8/2Z8/x/U99YZuJSenDRzUitwSVxJqYxJ/nC8=", - "pom": "sha256-7ktgsFmUplhPYYkmL7F/hTXWSW/IlKM16S7UiJogUk0=" + "io/ktor#ktor-http/3.3.3": { + "jar": "sha256-zUDZHxtTUFItPgWh2MT5/BeGUkK96rKZ9zZmOEDKrMw=", + "module": "sha256-B90G/RZEiw+OXuoUpzOiV8hAvLbZ2gTaZLHAfP7LE/c=", + "pom": "sha256-mwCHegSEMIYiXM460UMPHxLLls+1RyXg2mFmfgJKt6Y=" }, - "io/ktor#ktor-network-jvm/3.1.3": { - "jar": "sha256-+k5hZbWtS/XbM369Xxb5tZbcXkAfvqNDud6sthOCQK8=", - "module": "sha256-Si6Qj4EHpZBwIUVoR9cHuGxQzp5tOaFrRO/WzPgvEAI=", - "pom": "sha256-TFAXZfbtxft4UvcmvYFXJw2lCfKl58xWlR02Muwro9Y=" + "io/ktor#ktor-io-jvm/3.3.3": { + "jar": "sha256-wb6tjAoiGEVqO3wr3+p5rBOVrVsg8sUCp/OeNZEbJxA=", + "module": "sha256-0NdJho5fTEOOeGGtAcT3XFbuhbl1P/ILnEGTY3MA1Rk=", + "pom": "sha256-MAxJK+RTKKpgaAqyBWY0njlGeVNo/S2tsBX64XylYwI=" }, - "io/ktor#ktor-network-tls-certificates-jvm/3.1.3": { - "jar": "sha256-BkwhltwxGzPP+aqaVmTr7dbuiz67IA60jZtfRZQSrlM=", - "module": "sha256-gcQGERjUAa6kl6qgylndfhpGJjh5OdRx5JWstsm+OJY=", - "pom": "sha256-y7AvvPCe0qrTls3EEiXtE0+t1pEQATHleZ3Y+s0qCxs=" + "io/ktor#ktor-io/3.3.3": { + "jar": "sha256-EKPKrHWbHnplcx4NlvpLZLzKwQKtZvZpQVkhYFN6AOg=", + "module": "sha256-UrAaGnTyorOWzVjTj+BcncPHJ1DGdUgjptvPoxS04Rs=", + "pom": "sha256-b8E6tQCqJCxb12/pUi6VEWDtBCNP5nQaeDJqC6776oU=" }, - "io/ktor#ktor-network-tls-certificates/3.1.3": { - "module": "sha256-/kfhj/9BW9Y/QbJDgAJCbWos1nu2bU3l6fMxWG0puL8=", - "pom": "sha256-u91KdHx2L7qlIfadR+KYYEoGqN4xD2L1ub7LB1mcXbk=" + "io/ktor#ktor-network-jvm/3.3.3": { + "jar": "sha256-9Qw4mCicK/t2quhitPobGd4y4R7V49gJC0nutX3fZiY=", + "module": "sha256-lvcZqcjm0oMPjOCoOnbiPyXZS9uJtRClwosVZPC0Cv0=", + "pom": "sha256-sKt4lH4+I/Hzdg2kM/fPVdvtn5MqiJWdGNKqUlzSUjw=" }, - "io/ktor#ktor-network-tls-jvm/3.1.3": { - "jar": "sha256-9nUHo+i/UqoI11NoLmzdoBlOOr51ARi5nJM2lT5Zi+k=", - "module": "sha256-R6w5Z4HWgpnnykgITN4N1ZNrh2FHNAH8wftced8TG7o=", - "pom": "sha256-x3zaqx/JtbTUdUvvzgAIbfXxCOn03cL2J4IqACeiFVU=" + "io/ktor#ktor-network-tls-certificates-jvm/3.3.3": { + "jar": "sha256-XXj8zmccPHBN4NYm3Vzc95a/DNsS5S3xET9v25lEaGo=", + "module": "sha256-xRezIhqBsyTjZkint06MVgys3E1IhtsV05ZhdyYoySQ=", + "pom": "sha256-oItEk0WgFf2ghIfmnL2FiijzdMXn/fpRbym5b7hvhNQ=" }, - "io/ktor#ktor-network-tls/3.1.3": { - "jar": "sha256-vLgy2Hr+70QUDBlg9ey228QQ9wTzrbL9oi2deO/N3LA=", - "module": "sha256-WfzehlGXLzN8L5kJEfakcCxaMcgsRVLnBQH0cFKq9Ok=", - "pom": "sha256-YCA6aPexaUd84QS42Y0YGf6p5yPYUSR419IdMcp/FUU=" + "io/ktor#ktor-network-tls-certificates/3.3.3": { + "module": "sha256-DCAP3lBxmOhXQr4H1mfGnPcHH9locHyrQj1sFc8uInk=", + "pom": "sha256-eF0ocXL6SIiQSm83RlzxGe2Z7D7e3IsuJKTtaIfgRgQ=" }, - "io/ktor#ktor-network/3.1.3": { - "jar": "sha256-jqkqtUms54rXMCOgdDhnzhDEvH6HuJS8TdPd9EWmh3o=", - "module": "sha256-3TRbPopwzopilO5mDnAmO1v2Tkiz5hrJ50dlKpeeZxw=", - "pom": "sha256-ilEKTIUHv+XJw7qLFA7eGPWCrBF1+mx46Siiv2XjyrI=" + "io/ktor#ktor-network-tls-jvm/3.3.3": { + "jar": "sha256-3V33pEHc4G8/W1Z7VZBZi8TSz1d5PYX7mgCyDnmrgwI=", + "module": "sha256-5q/rIHgkIqsE8mA4PBZC0wJxWPKtFGXTM8jBold0zkE=", + "pom": "sha256-dLcoobny5lGY6jdNRiutWr2CbIpUItVnXViA9X7je5E=" }, - "io/ktor#ktor-serialization-jvm/3.1.3": { - "jar": "sha256-DXBLwRSKj9mh8gBeC1GJza7TAw7+JLgjZFnEHDVvViA=", - "module": "sha256-hrLAT4uo4LfDEL2gGGd1ra0iQbfx5Dru5CH6aHtD0bs=", - "pom": "sha256-4ZshuXOBpTTKtMJCDaZBdTzYYMffWMvEgfrxfgw+LL0=" + "io/ktor#ktor-network-tls/3.3.3": { + "jar": "sha256-3EfyvxKdPz9GZtWov0uud8XNXwy2L1qB3jeXanT3QHg=", + "module": "sha256-zBIBfTDHDVP6CMITQUbR4T7ZaEBiiFo+6KuERaWXxRU=", + "pom": "sha256-wSmN0m+myQIFtNGodHy5yoomSTN4voe/EsVrNVXh3vo=" }, - "io/ktor#ktor-serialization-kotlinx-json-jvm/3.1.3": { - "jar": "sha256-m4EPAcqm4/J+Atccq6hZXitLBAcduhbg5CbiARW+01Q=", - "module": "sha256-Q8ZICBvOetLCv9HVLiJif/Ctu2WXvR0qBW8kuJfFUBI=", - "pom": "sha256-H+t05IxocuBJhVDaoUm51ezRGz8/0rWw16WJ2wJvU4M=" + "io/ktor#ktor-network/3.3.3": { + "jar": "sha256-p27WdCOUVow7w8AzAmU6d5A4ICKlkGPGxwHtZU1jwBY=", + "module": "sha256-lLlDusqgT9MM7RD6M/jqbixiYFEh+LqtFFk9IFFaksw=", + "pom": "sha256-3OSi4D1J7jez6iuEUikvgaD+V25IyDMdezfgFmIasxg=" }, - "io/ktor#ktor-serialization-kotlinx-json/3.1.3": { - "jar": "sha256-CYtkKozmGWKJ0BsgMOQxfI3hyflxL3tb/dgKyAvoCyE=", - "module": "sha256-00l9qrTzDFIDWmtaIxCS6OfTwRkh0kqCQPtW0WO08jc=", - "pom": "sha256-GKfcV/J/1w2yrVxQ6NqhQueryuuC1w9XC2K5JekScuo=" + "io/ktor#ktor-serialization-jvm/3.3.3": { + "jar": "sha256-WncQbJc39avjoTxB5WcUjrnz1yI/sryWE+woF1kg/fc=", + "module": "sha256-ErkNs0MtSgHLAXHZA71Oqu8m2wCRkD4/+dsHXv39Qxs=", + "pom": "sha256-ccqfti49wqaaLLTp0u3B/kA+RMaFQA35rmTHisYWVAA=" }, - "io/ktor#ktor-serialization-kotlinx-jvm/3.1.3": { - "jar": "sha256-tNwvnU0d2o1IGgVNf4M7oZXwZPURX946sN/bi0L2H9o=", - "module": "sha256-TQfjPiAej7Dz4Au8iPU6czUrNAARd3K6U8b1T03chLI=", - "pom": "sha256-MgXGnrCSBOC1v1UiWvKWtqRfWtFfitvdbs9nU8M5CKs=" + "io/ktor#ktor-serialization-kotlinx-json-jvm/3.3.3": { + "jar": "sha256-8pwLK+fsfepWDBnr5aBEL6JzbZDFB4sknWx7yoAkW5Q=", + "module": "sha256-v3+y0YYZw8XygZugohd1DpnTYoL2YB9iTd4CzFRMEoc=", + "pom": "sha256-DOx8ZoQyUuS//NDRtdaUteFQozB0+jgYsl2willP6Vs=" }, - "io/ktor#ktor-serialization-kotlinx/3.1.3": { - "jar": "sha256-AHj3k3AFwnibzWyNaFwBm/7y74WcHrXgsSzCKg7T56o=", - "module": "sha256-yc+GGYze19bUrMkH9CRmMEMaKlPCOvJbAkmulngmeBI=", - "pom": "sha256-Apcaj2Ndohz/xUbuS2TLhUzxVSPNKO/Jax9BQOsEQ+o=" + "io/ktor#ktor-serialization-kotlinx-json/3.3.3": { + "jar": "sha256-9J+zqVMHC25TwpmPzvdDD0s7LYBejoQoSYJfuZwjKUg=", + "module": "sha256-Bc+fdqSx8pKOhRAqgb+8vot3lZ7ACi4WZs9QUhj1J9A=", + "pom": "sha256-OPHFhb0hhPWNI8nOpn4HCwX5Ejo703AZpU7Ric4lo54=" }, - "io/ktor#ktor-serialization/3.1.3": { - "jar": "sha256-1usUAlHKWspctpxK1+8Yk1OiutpxL4Nog4RXCrJCzRA=", - "module": "sha256-cEzCV/1TL86ynz3JxpmKhXw8JVuR5sAtlzXCi29Ywr4=", - "pom": "sha256-hn199YlXfKzLAkrZuhD9YFZ8CfpoqsAU6QOZzuSEuck=" + "io/ktor#ktor-serialization-kotlinx-jvm/3.3.3": { + "jar": "sha256-bVNmwZuHpoGo/u/sc1jpH7xwVZBVE37EdKmyqLuEvhc=", + "module": "sha256-UElFGAo5tHpKzaFmKu8X684OdIyarndQtXHTCU762M0=", + "pom": "sha256-DhGR0AnQ6GpnlgURgOyFl1qDdSjabysiAcneRHn/Etc=" }, - "io/ktor#ktor-server-call-id-jvm/3.1.3": { - "jar": "sha256-rTrEYCx7HiMyWkH2G2lnMJriNcR0yc/Y+3mYSC2vesY=", - "module": "sha256-E0rhT6hN6dZmQESVL/Nt5OsgmfaL/GPS+tOFc3W9gGM=", - "pom": "sha256-VQUyPQQ9649tC75IijPH75yS5L3Y3wdga8MrzM9GsEI=" + "io/ktor#ktor-serialization-kotlinx/3.3.3": { + "jar": "sha256-HULchHs3T8uMK6exCsiHF+PpotJa9/l+P72Qt7J5FRg=", + "module": "sha256-KK7jf/K9Rb3TRREg2dsbFrI5NLhIvOBD4713QyuSfd0=", + "pom": "sha256-y8BQybp11ACjZwHgIxFc7S57RRcoE0kX8q2wrE6dKJU=" }, - "io/ktor#ktor-server-call-id/3.1.3": { - "jar": "sha256-QPsVJH80qfHY9NbU6zeNb+Q7GGJ7QU4Ig5MqG8YZDrE=", - "module": "sha256-wsauzHFW6QEiqgBvbUBJzA+r4SJnT/vpEMgGKEYDgfQ=", - "pom": "sha256-M8us44N1Lsp1fVURdydRZwvuXgCWUeimR+CG7PFqcXc=" + "io/ktor#ktor-serialization/3.3.3": { + "jar": "sha256-Eqp3ylHQ/ek1AuVuE3pje0lUcUxQWexJo57P/X23QbI=", + "module": "sha256-Zxdl05iaR+SLPB4qYMbsaOEU1HkDICoCdVu+7hWrXrM=", + "pom": "sha256-CWj2QFGKA1esC23ufLR785z7lJe+agxCklzweZWtlXI=" }, - "io/ktor#ktor-server-call-logging-jvm/3.1.3": { - "jar": "sha256-7X31L642IGDIZyuUMrt7kJl5z7pWqktIZbDvLNglxRM=", - "module": "sha256-VCBc70vbjMgJX4lU3JpcfvU8ImYLT5qd5F36JXIuDtc=", - "pom": "sha256-t3DDhM7ut6pisXLree6nWqKX1aYcJA94Pg3otS/NJQ8=" + "io/ktor#ktor-server-call-id-jvm/3.3.3": { + "jar": "sha256-QZ/sLJH11GECEhufXPkAsJKlsqvuMFrKxQT8cRxdXSQ=", + "module": "sha256-arZLasY1M3fC4tlj29ivnwh05XyL9Dfzkk9/Sfz1CS8=", + "pom": "sha256-h+1EO6IFH/BVbi9WyYyzy8ZpOu9cY3F5oaBC6jKr8Q8=" }, - "io/ktor#ktor-server-call-logging/3.1.3": { + "io/ktor#ktor-server-call-id/3.3.3": { + "jar": "sha256-r3C/eKiXcPdWl25tnDqzUvfB9+fjQEudMzd/Li2Ag/U=", + "module": "sha256-2lZ7hZUMULGJSoBFdlUrk4JUwIzIOu96OTiLPYCT1ss=", + "pom": "sha256-9tkDTooVwnqxDXRILbUOlSpLJQV2Z0icemOT7JnFOKM=" + }, + "io/ktor#ktor-server-call-logging-jvm/3.3.3": { + "jar": "sha256-qq+Af1ktWjHLls3935VyV8P7tS30ocSb6Ms2+FvtoOo=", + "module": "sha256-/w/U714E/I7Btu0o20Y0/YTdIC4ll5FiTbE2fl0FUe8=", + "pom": "sha256-DNQqQmuEgu+b+/Mp6/mMgOe6Xi8qf9nTzr5bS5fqDZA=" + }, + "io/ktor#ktor-server-call-logging/3.3.3": { "jar": "sha256-CJ4kQXv59sNO7Fcg7rssvMguooVezvkBM+sX4QedWGg=", - "module": "sha256-CgT5aT2q2oRyRQfMrJDFsbhdwOQd4z0Cy9V+c9LmGtg=", - "pom": "sha256-TXkBTRr1UUpsDc0mRobP6RZcIUxAwYmVtq3BMdjU0Y8=" + "module": "sha256-MuIl5/Kx3/Qc+ykxsVgIWVuLNNjM3NtpRabkHw+KjwE=", + "pom": "sha256-+22ghPJ/gCwIR/9lL9GyHRgt9L82Ih8mKvjMz/YmeaI=" }, - "io/ktor#ktor-server-cio-jvm/3.1.3": { - "jar": "sha256-8VJv6U6NdsUlG1ol5LS7chmaJdPh9gReS55CeJKT8Gk=", - "module": "sha256-jF0I8BCfdzqJxxGy+6UZpxN+s20aNdqsBxlOhHT/cno=", - "pom": "sha256-jYVlFWQAUM8hwbsJGwySg+AxA5jq7NF08IDxvMZxDfw=" + "io/ktor#ktor-server-cio-jvm/3.3.3": { + "jar": "sha256-bvfD35foLWO8XrPrylWpwR2so5GKxMtDUjWyvjH77Lc=", + "module": "sha256-vZFPghyTjQcwSgvY4b9GyhpakAT05fZdgCN1zAT+D7I=", + "pom": "sha256-DfeqmirYdbsuEDfidvWzWTg2sO982v7waThgF3Uemf4=" }, - "io/ktor#ktor-server-cio/3.1.3": { - "jar": "sha256-KC7iPoPNM7ETWgb5cKPnFJ1yQAEO1SVPUS9QDgID0l4=", - "module": "sha256-/2Sq4LOGKM/ZmC6Oaulpm58Wul9KZEyYVeikTEQfwBk=", - "pom": "sha256-Is28uQDeec36fV1VUc81PvreC8sst8ra0XMFY5fNhLg=" + "io/ktor#ktor-server-cio/3.3.3": { + "jar": "sha256-nUIICmUpzuvcsOVGa58muU0XIhCOdLGeo2Xsg5kbrGk=", + "module": "sha256-/71LL4HT+ehRqRKXOtRbtnymRGsHJ2lfR/CzS5CJfJ4=", + "pom": "sha256-onbUOtNnyp2pYr30Np31zpyAEwxnmGHpIuTBVOxKQkY=" }, - "io/ktor#ktor-server-content-negotiation-jvm/3.1.3": { - "jar": "sha256-w1b9Wlr7+4tDGOHXcppI9vDsYL4Dxx6cTOajBOTFJ2o=", - "module": "sha256-bd72oiTHCSObzfd90inqxNHPzmfuwfu/f088kavQYSU=", - "pom": "sha256-K44R9mNdl/LmTNAB6A4l3w5zCQzdiIP9GZJzZk3Jtuc=" + "io/ktor#ktor-server-content-negotiation-jvm/3.3.3": { + "jar": "sha256-u+aZgQNyfgNpNvSdKLrTiOtkrO+MEDG3IaKxDrHUJvs=", + "module": "sha256-xnFXYW9ypo+TjUvwqokmJgsGZrCRqCKx9VFhOmJ4H+U=", + "pom": "sha256-M+013GY8sk1eJVh+2HEkpiYcwo/WJE8S6eSzpK4aVVw=" }, - "io/ktor#ktor-server-content-negotiation/3.1.3": { - "jar": "sha256-zp/Y6sVgtfvD9fUdCT6aqAA86sA/GZo4NhqwtcLsy/A=", - "module": "sha256-SvkMyeuDjpzCSjoInox442aX7hEuZU9u2KlrBTC4EBc=", - "pom": "sha256-prlMX89HukRZm7b3nD9FtNpzYe2LwgLsaqn8bLkP0h8=" + "io/ktor#ktor-server-content-negotiation/3.3.3": { + "jar": "sha256-H/49KOxzEhXfYIaluXY+tp9Xm+Uybh77rTkIxsVRZmg=", + "module": "sha256-7j8Wv/bfnaY/MD/26EMK4VDQipWMb9uDzNx0OfBBXCo=", + "pom": "sha256-Lop3fraqW7MfSePzQ7xxTCD+HM5azTq19xUqeFjqN1c=" }, - "io/ktor#ktor-server-core-jvm/3.1.3": { - "jar": "sha256-v1groARjTQ00O7Lfoe3Q6N4YzcLGB6QInbi3nTCF0Qo=", - "module": "sha256-ZHlHr1JToWRVDLpNSDySwdYaQ6OH1vyh+i1KTufmgxI=", - "pom": "sha256-0/zeJwXJ3zLhKLLao7ieLEyXWs8WX0yY46ySWbz9k2E=" + "io/ktor#ktor-server-core-jvm/3.3.3": { + "jar": "sha256-mdKYvwIkbNh/9z1cp4CFNfTMdasUVyeczYDHKYu9pjE=", + "module": "sha256-DvAldCDYf2XCb3Z3yU1NV20G0xzeSJGdeAnqBH5AwjI=", + "pom": "sha256-LtvG/M3aMJ8Ek9aPBUUqbIesfsQPombLsfMweWbyolA=" }, - "io/ktor#ktor-server-core/3.1.3": { - "jar": "sha256-n+YeO2DxvKhHcxl/pdkEkpQpM6wNGoxhMBYIjk/HVKA=", - "module": "sha256-BxQ9OzY9g3H2iABYcT5McpJNs8K/WLAPka8DdDt8L9E=", - "pom": "sha256-VMbKa2gSQD4SxOHzputA+R9bAjjHe7dOz9q4vjx0eJo=" + "io/ktor#ktor-server-core/3.3.3": { + "jar": "sha256-kkyJOfZvTm3736+doZM1ZqEAOZi20zcqTFpXKd5ZVY0=", + "module": "sha256-01cfk3mlI7BsyRLi3tdU8auU1VA22CBsMtp2gbY8BK0=", + "pom": "sha256-FtkzBWdPHZXD+Z0BtBCSZLGVBrzVjaMGVmt3ea1+YYw=" }, - "io/ktor#ktor-server-cors-jvm/3.1.3": { - "jar": "sha256-2ugPxtOsO/+i/DPKu+d3b7HihnVxRktUrgkO49qxoOE=", - "module": "sha256-YeolK4tzm148tUP51u077wIAj5RtbkuZbOl3miCU6Ro=", - "pom": "sha256-MpdTjWVFj9O0xXMDir8A1GK6rjv5Lq6sG21uNEtH5e0=" + "io/ktor#ktor-server-forwarded-header-jvm/3.3.3": { + "jar": "sha256-o9X2Ojv1KspWfGZ5gm8oYrUIi2214hmTB7sGyAcp1tU=", + "module": "sha256-Vzn2JwWnXsuFo9ur+mWqly6jfwuvrCLDC/DCRMTw+oo=", + "pom": "sha256-z8n6GYOsO3j6JM+YpbesdBFFwG46gNzogNK2y6jktEo=" }, - "io/ktor#ktor-server-cors/3.1.3": { - "jar": "sha256-XLfoUSjIQ88lTsNnH9d1KY2ePRwLyQtj0zolzAKTxHc=", - "module": "sha256-Gq3OQioAWKS7LRr4J9CB415u/5lpsLVzaUD2W6WYwhw=", - "pom": "sha256-j1OZffe+XGR1zXmGO054OWNlXaS0GVVG0LDqWZshWBo=" + "io/ktor#ktor-server-forwarded-header/3.3.3": { + "jar": "sha256-PuM12Np2pje4Eg7NI4Gr8YYUq04/gncgoPSxE1mpSTM=", + "module": "sha256-H1RAnvo0oxf5vDtXQ9rPj7j3cLCRnp8Zm+El+SB8fh4=", + "pom": "sha256-MV6htbPN4ysU6l06Qntl5V9Ez4vcWrMRfrRo7ICc2kU=" }, - "io/ktor#ktor-server-forwarded-header-jvm/3.1.3": { - "jar": "sha256-s/5ie75S2mX7QNjEerdsRPupljs8nDEjhwQ0GoEHfcI=", - "module": "sha256-w4fnLNPOdjpBBijHIZT45HN1vSkG+jTf+7iN8VC7KAE=", - "pom": "sha256-OpaLxwNHvyWzUAoOs6+IpHjS4muXFdvd6l8/2mxNG4Y=" + "io/ktor#ktor-server-status-pages-jvm/3.3.3": { + "jar": "sha256-bt28ggd/z1XLM0jZSzXjRT1lpmUe86QXoSFKVnGyObE=", + "module": "sha256-h8XDadCZwuGD/Jed57b7QmWTTI0j1+Hr59XpLK3qsyM=", + "pom": "sha256-SKXKkFwnpNrz4GoGtNcP4Gev7sROrcnfiKIihoUZnZQ=" }, - "io/ktor#ktor-server-forwarded-header/3.1.3": { - "jar": "sha256-HulEGAyI4tFlLm1QeCY5sRLVcdvoukuIFjRPTEoKM3w=", - "module": "sha256-Pxd4X7nqMuMkxCaOlPnt/rDHC/8r5Tp0ThbZKlsMDkk=", - "pom": "sha256-vMhQMKQcIBuT9G2tPO76XF+QU9Yx0P/9Z+t26Dk13D0=" + "io/ktor#ktor-server-status-pages/3.3.3": { + "jar": "sha256-3s1N8YJq/jYRT+myBoHxfKEnP/KTtlfW+9Qu69b02eo=", + "module": "sha256-XLpW3cV2pk6O8B5Zw64sARwqqQVRyzj0yX7i44+g75k=", + "pom": "sha256-uTV/b+DZLKvlhpb/HLSFsn8L0jsPd0wh3DG+Yd9kghY=" }, - "io/ktor#ktor-server-status-pages-jvm/3.1.3": { - "jar": "sha256-3yRhBJ//jUfWekNSRNN8yxpYB6s09e0Msz9KdN3ylW8=", - "module": "sha256-JW6mNpHvN35LumZDQuM77iT4QCuGbDXQd9V9qdjbfS4=", - "pom": "sha256-muGktnWGux/LNpQkW0buokeYGdS0p85UefOFZGtbg14=" + "io/ktor#ktor-server-test-host-jvm/3.3.3": { + "jar": "sha256-F7wGOwZ58w+ZG7f0bpfzFfgENsEIacEZaigsdBVeqTo=", + "module": "sha256-bZX93dSUi/bIWJEW/TiUYMeLTOCOHv+/9p7nTs0zh1Q=", + "pom": "sha256-WFn/smQQzk7nSxH7seSwCMyaSfo8Whqg42xg2+ErbTM=" }, - "io/ktor#ktor-server-status-pages/3.1.3": { - "jar": "sha256-emBe4975jEOApk7fge0C0SZ352mLxjmplrkexsRL0MY=", - "module": "sha256-ld6F0TrWQOAzu+LYFWptmoHhDcdk5A3+dPCUWwKcsNw=", - "pom": "sha256-tNjWQzwDYT3UOISqZT6DVPfWoHs50lz0+b34OzO5hWo=" + "io/ktor#ktor-server-test-host/3.3.3": { + "jar": "sha256-Hc3jGhljwu6AGwAtvBQagQzTN1H1f7U60oa0adxwVWU=", + "module": "sha256-d2i3eHBm6947UH1ejEtiogZ6458VNTdbzycndfPep20=", + "pom": "sha256-lFBidzJH8eCuVoR4fkO2sKAR4R0uCQ82lc0w5Fwq9Ug=" }, - "io/ktor#ktor-server-test-host-jvm/3.1.3": { - "jar": "sha256-JBz8iHfwdYLZ4aPV9kKlMXUbpV1qPPy03UANS+Jl/bI=", - "module": "sha256-VS79ptC5+EvuLPMdrM7SNgJbCtDUXmUP7lvB+4DmLAg=", - "pom": "sha256-4GSEOaK5jw+2l5Py3HxdOjWS1AcAJGryry0SEYb/Sag=" + "io/ktor#ktor-server-websockets-jvm/3.3.3": { + "jar": "sha256-68UTHdoG/7TQaA48o43FSZErsP5p9is99sjieo//89s=", + "module": "sha256-ndSEYbbJ42kpVzrbhc0gyZ1Tw4/L1k+tuhUbCOSf+hA=", + "pom": "sha256-KfnMqO0T00KcBNRiRztRzeXlF1bWWT4QvLx9gpDP5Kk=" }, - "io/ktor#ktor-server-test-host/3.1.3": { - "jar": "sha256-N3BXI3qHirkZ3VN2ZM7Pal/SpLUZ1fc6FWVBaqOmOB4=", - "module": "sha256-YaPbsgWq0MkdHPEpfYYYbZwVcp8KOpr8tmRjwIWjmRM=", - "pom": "sha256-KWsnR/usc2YKH/tcAs7EL5qAAKQakM/XZm6LQF8EdV8=" + "io/ktor#ktor-server-websockets/3.3.3": { + "module": "sha256-BZIxvEle40BeNJhZ3xmQcgLqlrsZUdoNWNKu076Gsy4=", + "pom": "sha256-i2Zzp2SvOZoMfSHCF+r2Zfw8lcvGaKKfbRRLGtDsx6s=" }, - "io/ktor#ktor-server-websockets-jvm/3.1.3": { - "jar": "sha256-XX+QXUiqiNepjf/sOU4aUMSKcDqUDUN0tTeYJdYCWzI=", - "module": "sha256-bO13M/ikp+IL53YKlFG4YHzB7OI2YRO130BXx3zJgdQ=", - "pom": "sha256-Wl34pRgEfol295ye1/2DAryMaMMvboujUHJ7JCNLlhg=" + "io/ktor#ktor-sse-jvm/3.3.3": { + "jar": "sha256-qHqKAWhnGvRr3HYtnzRdrKHqgTOpydNnM0zB6bLEriw=", + "module": "sha256-lZeNEK063rmbzqOitEjxlHEE6V1rbz1PeNvb1biLSYc=", + "pom": "sha256-F9Jq7VaBXrNQ5aXhPGHwXr19huMzneJeRmq5qo4fNmY=" }, - "io/ktor#ktor-server-websockets/3.1.3": { - "module": "sha256-H0FP3DbRwIXwMnX4jjMrlHPo0aeaz6GaMYfCj/s5EW8=", - "pom": "sha256-QG/cwxgyVWWv34Z1hSFMd3u1Ry6rBljVPole9jRqF4o=" + "io/ktor#ktor-sse/3.3.3": { + "jar": "sha256-eQoWq0Rx6iv5flDDBv8c8+AlYbsdEJHiZzc+3Vvca8g=", + "module": "sha256-mU17Z8q5Hh6hV0m/H0omPsisypEtvRMDgMGI+Ywndik=", + "pom": "sha256-zo8eyIpWldjsSNxthM1JMDFIdwHefHa6wwDDefrl1DU=" }, - "io/ktor#ktor-sse-jvm/3.1.3": { - "jar": "sha256-oq6KM4ux1EbRbc/qIYnvWlvjGogSOzh5Vit5VWZ6Vjk=", - "module": "sha256-rdg6VuF2nwNnQhRnvrsHfPywrKIG5GKlJ9xYePU2K1M=", - "pom": "sha256-QOpyqdXTF9TMFZl3/HvSlQED4m5/3C3sRKgxWNyzmxE=" + "io/ktor#ktor-test-dispatcher-jvm/3.3.3": { + "jar": "sha256-Um2OtflCvBmLIv71M2QFIrHlx09n15cfKvhKcfOrH0o=", + "module": "sha256-BmFixEjaGEsK/qQ5iXJ6I3wvCPC/QPpZlP/2I9vzPm0=", + "pom": "sha256-RRHD1+iTegtsOayIpL0mAVUS7qD+EcMeyfvgptSZzUw=" }, - "io/ktor#ktor-sse/3.1.3": { - "jar": "sha256-CZgN7Mg5zmR1e5ziCOTFcdyH/Iqx1JBq0bVWBfp5s8Q=", - "module": "sha256-y6bUpfymP+8fbYEujnoYIC37tlUfFsrjPjM9aJ3xmmo=", - "pom": "sha256-zm3mJKVfOZ/FzYOKH1e4NjEp6x5j851TbCQnpe2AZYw=" + "io/ktor#ktor-test-dispatcher/3.3.3": { + "jar": "sha256-TwjLPQaBNoq7M1+jWAK6OCQEmvmHnZadFeTbnCRK6E4=", + "module": "sha256-NMoPopiJ6x+9awX66r/y8zNlnydWcbFesJUxKwaktG0=", + "pom": "sha256-SZUtsoksu7FGlNMzxH/viCIpGzqhIOwPHdlEzrLMJug=" }, - "io/ktor#ktor-test-dispatcher-jvm/3.1.3": { - "jar": "sha256-NrzzX5TEWzqMBQ38UuiJfwnh4IGiSnWjio+nsCk1flc=", - "module": "sha256-/tR5MXA2RYzSqhlb5RDEKIIZY8sC73wTPoeI4nYYgF4=", - "pom": "sha256-SyL11I6e6FgTtCAeZlxLnn1pHKbhxAaW8TSnhJoV4HE=" + "io/ktor#ktor-utils-jvm/3.3.3": { + "jar": "sha256-rQIL2c1crg9fXXQ/yHht+/+53B2O+3amsZcrNXjIHXo=", + "module": "sha256-v0gUuOlqxXAf1yRhgE6Z3WD8ygsMZMihIyYCtfucPug=", + "pom": "sha256-TnRXGtSkRuuuZw26vdnZIY6mK+pq1RULvb/kw1thFLk=" }, - "io/ktor#ktor-test-dispatcher/3.1.3": { - "jar": "sha256-AN3bYYjb/HGfe6upeVoizfw3YeOaWT6Pf0XkMgco2sc=", - "module": "sha256-gHxquj5arC0GbU2CwiN2mimNFyAcwWqSjrR+7sqQ7+A=", - "pom": "sha256-B62EIIeEymYaKPwyH+pDmqrMTmxmMqnnJHh0TMKOGFM=" + "io/ktor#ktor-utils/3.3.3": { + "jar": "sha256-EhfbVhWaziZD4t8TBgPAt32+7yISDTk7Lv19Ac2cUmk=", + "module": "sha256-BDYXx8JRc0T3eYhmmeZWmc2pk2jy6AYH7v9AepwBjME=", + "pom": "sha256-cm4/9eM0xol6fMJqMxxrqtjx1j4ur2IowaxJjFfq48E=" }, - "io/ktor#ktor-utils-jvm/3.1.3": { - "jar": "sha256-MzM5N7mPwMjpQ+5LELPqZrSXgt+1acRMFC2k8y2F3/w=", - "module": "sha256-lWS9gapHoNIfgfAhNx2KfzP42nJXb42E5YTPe8KCZ7g=", - "pom": "sha256-nkoVp9atlvtmX5kPM/TJDIUmPLkxUlDUmzEw3Bxx3Rs=" + "io/ktor#ktor-websocket-serialization-jvm/3.3.3": { + "jar": "sha256-P8kEfHnKPxdNhsN4VeqEYCXVY0H3d0rd0dNpZo/LT4I=", + "module": "sha256-Zio4MWZaHP4EQF/CU7RiDJqZ74Ntf11nlcQWeJdmQWw=", + "pom": "sha256-Mkfm3Af/IVAjPLSGlAYvo3Hx5s0xzZFZ359u/gPIi88=" }, - "io/ktor#ktor-utils/3.1.3": { - "jar": "sha256-8x9wURdB2HuriPQcJIu/q8Kokg/CsWr7iWvSkSQDyhk=", - "module": "sha256-JZJhaENGuzO48fd5tY0RafZYNLa8SwOxzI6QOaVNFgw=", - "pom": "sha256-i3GcmWpfQAiH+9aZyYfyQ59q3DGyS+I8UaOR+Yfinu0=" + "io/ktor#ktor-websocket-serialization/3.3.3": { + "jar": "sha256-oB4GdlzDtdMy5U6vTsnKFpa6KZZYi0yHY4Me/pgovR8=", + "module": "sha256-rvJscdqY+3EgR+0hPx9UHdp24TQdH/F4a27Ui6OuqAI=", + "pom": "sha256-WziPxVHw0vgwcfEpyqDzKt0iv8aGE13dWEoRVCrNsOE=" }, - "io/ktor#ktor-websocket-serialization-jvm/3.1.3": { - "jar": "sha256-Z/D1ZuLtUXF/btVfbStN7hyEvk6izZb8Y20L3w/UMGc=", - "module": "sha256-u1PzbCOOIEp3AojhuUkEpyDqjMmCpBnr0NlthP/2Dpg=", - "pom": "sha256-GE/EIEOdOTZc2yOAp9iqWCRQmuJ2WGYLrdUgiLTtRaY=" + "io/ktor#ktor-websockets-jvm/3.3.3": { + "jar": "sha256-Epz23j7k7xKtKiZay5MgVurJJDq25fBT6OsC6csU2JQ=", + "module": "sha256-CbEklDkCAF0EzmOPbmEtPZccJ4IL1Efvz/qiUXEuAjA=", + "pom": "sha256-wGfz4QXGC7F9ZMihP2h0XJ1RQvIef0rboXC5Seq/vLY=" }, - "io/ktor#ktor-websocket-serialization/3.1.3": { - "jar": "sha256-H4Kdk+9uqBnvMbwuO81vRj8f2/Zgrg6MngFGGSs1khE=", - "module": "sha256-49SsMoW7+o4lNURzq9eVpX2Z28k5wL0+1ZjDH1JHSRs=", - "pom": "sha256-ZrLLfZtUa9iXxCSSwsFvresrRhtWEK1tQbLwX9MAEeA=" + "io/ktor#ktor-websockets/3.3.3": { + "jar": "sha256-pCt1zV1lhSNMyPvm7eM9HDd7HElPm5hZ3LUIRgQMOO0=", + "module": "sha256-2RvXlQc/oulRCjeVkhB/7sK09CKw6iQgQbJXu1dQ/bs=", + "pom": "sha256-XOyiYitqms3IlzWlLQ1HKn7z/+FWKKPrfe8s9UGSbz8=" }, - "io/ktor#ktor-websockets-jvm/3.1.3": { - "jar": "sha256-7yi08SBU7hJXZbcv4yMOIVpgtzsv8gcqXCgPzwkykHc=", - "module": "sha256-0TNZF+t77kMTTSYVARydRRUdDN3+036GsoZN9N959ck=", - "pom": "sha256-wpP8Ln5PBBczeWfnK4iFVsDICmv2vjSdzi9WBAVFl78=" + "io/opentelemetry#opentelemetry-api/1.41.0": { + "jar": "sha256-kzZmjziN5ooKLD4RQVT+vSnbGadkTyfE66VI9d6FIlg=", + "module": "sha256-JhRoWJyZO4j3zK2TOP/YFmud9Mw03jCAZpMrKlyd6VY=", + "pom": "sha256-vB7w93s71tsLem8WUv20IWmKDlQ3RQSnQZ+xvrRWKZM=" }, - "io/ktor#ktor-websockets/3.1.3": { - "jar": "sha256-+haBQSo9iI+FM+XkJwLzOOTgUmpr3dKhxOxk0WdTlMk=", - "module": "sha256-la4yLJcPwcxRMttyqbkXOYd7eYEaHHAW4P02P4fTTlg=", - "pom": "sha256-nfZPKimVknp58bfTOSkwi/8WWJ36VdYix6hSVIZMDWA=" + "io/opentelemetry#opentelemetry-bom-alpha/1.50.0-alpha": { + "module": "sha256-motyKjX+LhSR/JEgCdMdXZ0XyRe/gYq2eumOKXyfxmg=", + "pom": "sha256-gkb0AxHagYEEX+g3T0Vxm693rCteW2iYa6ljEQi2WIQ=" + }, + "io/opentelemetry#opentelemetry-bom/1.50.0": { + "module": "sha256-X81epaY2CatVv2JSmXVRpxed13JsKI5WgFLb4MZiy5A=", + "pom": "sha256-TIVFAMtOZbbuHdYb1OKsBkaPsYvoifvx3qVqXP/UNBM=" + }, + "io/opentelemetry#opentelemetry-context/1.41.0": { + "jar": "sha256-XjQypEZKQyq/2rc75xQuUW0lqEqoQm/OEZL/sFMvqjU=", + "module": "sha256-F03No+hAImE4rbjOkENXbdxDwoa2EtPb9kUx9nvY2Yc=", + "pom": "sha256-yzs5YlmYNClZTWLkdmdcwAuyUskNMU1keptW3sI+VSY=" + }, + "io/opentelemetry/instrumentation#opentelemetry-instrumentation-bom-alpha/2.16.0-alpha": { + "module": "sha256-+v1OLPpRPsQoEin6l5DT4MOXC+7ywjDno2EcgNSTVgc=", + "pom": "sha256-hv9xK5DrDj9FGhDIla3coyJn7v/7E4/xmthCnOZI8sM=" + }, + "io/opentelemetry/instrumentation#opentelemetry-instrumentation-bom/2.16.0": { + "module": "sha256-2+z7AbAY8c98jV0i6F2OQ7P2M4z1CtUCUzk830Bxr1g=", + "pom": "sha256-kBWbjAVIrFa3HxGhlIFuENkhVwfTFSJFmCZJej0mqjo=" + }, + "io/prometheus#client_java/1.4.3": { + "pom": "sha256-dmdgOlsaUgKU2Lnb9yRlgAlrENWQ2JcFboXMrDWVDQE=" + }, + "io/prometheus#client_java_parent/1.4.3": { + "pom": "sha256-g97t7BwPTOZ/khf3dJpwU/ym+q3O70AY4Rx38f/uqQ4=" + }, + "io/prometheus#prometheus-metrics-config/1.4.3": { + "jar": "sha256-PaLV8BI6+eMTvPJvBMEkiv6s0bDVw6NfIgA0YErA7Ec=", + "pom": "sha256-eVXWqygRZJQnLkk97u4qDh01SSSCaic+P7G4rq48jW8=" + }, + "io/prometheus#prometheus-metrics-core/1.4.3": { + "jar": "sha256-fs1UbVI449P18xL1gOqqsQywXRR1l5eKuQt4CAzFglU=", + "pom": "sha256-YXaNXAHMTmA2ska+d0s4QDp9lnSzUrwZM8aDQWLfS3U=" + }, + "io/prometheus#prometheus-metrics-exposition-formats/1.4.3": { + "jar": "sha256-UCrWs3xEsaYxH2BwoY/JIf+i4mq7Q+qq92Jqobl5hLY=", + "pom": "sha256-A3yGiGquq6Cryi040ee/xO7b7Qan+hMqHSMog+Gl/HQ=" + }, + "io/prometheus#prometheus-metrics-exposition-textformats/1.4.3": { + "jar": "sha256-Su7jDZN65brzTKnaztD4RADsDwNOe+qoMx2cUZ2E49c=", + "pom": "sha256-haTuBQr6iQYZmda8Ho1s5YZPDsFnf8y4UIFcobenWRk=" + }, + "io/prometheus#prometheus-metrics-instrumentation-jvm/1.4.3": { + "jar": "sha256-CuAPaRoLkFb61jwcCLEGVKMyCWm1k9IDenuV3PS/0qM=", + "pom": "sha256-oTwtL3z2Zzt1VNvrfOCwDnCk+kVCBOhXsbdHKhi9YBE=" + }, + "io/prometheus#prometheus-metrics-model/1.4.3": { + "jar": "sha256-vD8YJQFKFABmJghup3m2KJPmR+cdHqsHXAu2UFfCRfg=", + "pom": "sha256-TN+BCldpWM6XNVueuv2DPTGJAR5wHENnvm7Af8NnjGE=" + }, + "io/prometheus#prometheus-metrics-tracer-common/1.4.3": { + "jar": "sha256-uBaq+E5F1ZHl9mxblMenid7fLXBeW/Puwq6HMPdsaM0=", + "pom": "sha256-iDraZDyYxzKUfdhBtg6ak6rdS0Vc7Mk/UYyyCsXfy70=" + }, + "io/prometheus#prometheus-metrics-tracer-initializer/1.4.3": { + "jar": "sha256-gltR0cdMUb53mmcnexlQUUHWu5SwBi9RkYNu+OgcbG4=", + "pom": "sha256-n/8FgKQVUiyhrmA/DUr9KUOdjaf43osNC7dTwcHDrwU=" + }, + "io/prometheus#prometheus-metrics-tracer-otel-agent/1.4.3": { + "jar": "sha256-9n62+sA1sXWLPh4yFr/e73DF2xE3zMJqyttUFHVtdms=", + "pom": "sha256-qOdqNQC7WlxXB0yoMVsUqk9nx421TTWL7rntEZDELSU=" + }, + "io/prometheus#prometheus-metrics-tracer-otel/1.4.3": { + "jar": "sha256-W2wp3tUzgQwDZhjYq7d1tU/oUqlixXgPYQE2FKdSVl0=", + "pom": "sha256-8CpTz3UAn4N/GNaOhoGvolh/+L5nVWrj1zncJDUSFug=" + }, + "io/prometheus#prometheus-metrics-tracer/1.4.3": { + "pom": "sha256-y8jJNLV7c2Vl7YPL2pBJ5e7hgzhCxcqpSupSi3TO/Wo=" }, "jakarta/activation#jakarta.activation-api/1.2.1": { "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=", @@ -641,10 +739,17 @@ "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.2": { "pom": "sha256-FaVbfVN8n5lwrq0o0q+XwFn2X/YQL3a70p8SR92Kbfs=" }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": { + "pom": "sha256-nx+11KAun4/dYu876rlLj+p7gWQ3SMhvaKMfQPd0rVY=" + }, "jakarta/xml/bind#jakarta.xml.bind-api/2.3.2": { "jar": "sha256-aRVjBAeb3u2fwK47OTifGbPMS6REO8gFCJlTlOrXQuo=", "pom": "sha256-tTeziNurTMBpC50vsMdBJNZyUxc0VnrPblMTDqsTGtY=" }, + "jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": { + "jar": "sha256-uPtL7j/1tcHvdxRNhBExYBjXu9Qfzx7eBkb3l4VGuGc=", + "pom": "sha256-onPayXQUEv2dzM6ZESmHBteJ5YLcs1GXB19v0qWw6+o=" + }, "junit#junit/4.13.2": { "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" @@ -694,12 +799,15 @@ "org/apache#apache/21": { "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" }, - "org/apache#apache/31": { - "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" - }, "org/apache#apache/33": { "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" }, + "org/apache#apache/34": { + "pom": "sha256-NnGunU0GKuO7mFcxx2CIuy9vfXJU4tME7p9pC5dlEyg=" + }, + "org/apache#apache/35": { + "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" + }, "org/apache/ant#ant-launcher/1.10.15": { "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" @@ -717,12 +825,15 @@ "org/apache/commons#commons-parent/42": { "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" }, - "org/apache/commons#commons-parent/74": { - "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss=" + "org/apache/commons#commons-parent/79": { + "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo=" }, - "org/apache/groovy#groovy-bom/4.0.22": { - "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", - "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + "org/apache/commons#commons-parent/85": { + "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U=" + }, + "org/apache/groovy#groovy-bom/4.0.27": { + "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=", + "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs=" }, "org/apache/httpcomponents#httpasyncclient/4.1.5": { "jar": "sha256-DBh3SJqdG6T6UPbPyrEdESNhiFjLMdVq+qta/dUGTZk=", @@ -752,97 +863,123 @@ "jar": "sha256-PLrtCIxJmhD5bd5Y853A55hRcavYgTjKFlWocgEbsUI=", "pom": "sha256-Kaz+qoqIu2IPw0Nxows9QDKNxaecx0kCz0RsCUPBvms=" }, - "org/apache/logging#logging-parent/11.3.0": { - "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + "org/apache/logging/log4j#log4j-api/2.25.2": { + "jar": "sha256-n9Zsn+C+oG+pZmwUeYmkbK+qkrSoh1NpfTlFzEMzjLs=", + "module": "sha256-WPeF66u6zDA/Ow5aSF91X9qzKQ9p5JsDT4lj0ngjZV4=", + "pom": "sha256-CVYJaiUCQIyVioMXTytqV9yy5bB7uRTISHMrRLirvcM=" }, - "org/apache/logging/log4j#log4j-api/2.24.1": { - "jar": "sha256-bne7Ip/I3K8JA4vutekDCyLp4BtRtFiwGDzmaevMku8=", - "pom": "sha256-IzAaISnUEAiZJfSvQa7LUlhKPcxFJoI+EyNOyst+c+M=" + "org/apache/logging/log4j#log4j-bom/2.25.2": { + "pom": "sha256-Tym32cLZcP0qZpcXa/fd3EFQifYNaW0ov98xsk6S8Rw=" }, - "org/apache/logging/log4j#log4j-bom/2.24.1": { - "pom": "sha256-vGPPsrS5bbS9cwyWLoJPtpKMuEkCwUFuR3q1y3KwsNM=" + "org/apache/logging/log4j#log4j-core/2.25.2": { + "jar": "sha256-5Q23cBQw/5B5gYUO9SekHVGlPdABf1Oghgr8urhXAnc=", + "module": "sha256-JRQSc3eFDwR83jJbc7efriEzKSK+tkmiUzr9CEIlihE=", + "pom": "sha256-L/9GPTmclAgtmCLCG/v0cOEFHbt9S0XyWw54G8Xg9BI=" }, - "org/apache/logging/log4j#log4j-core/2.24.1": { - "jar": "sha256-ALzziEcsqApocBQYF2O2bXdxd/Isu/F5/WDhsaybybA=", - "pom": "sha256-JyQstBek3xl47t/GlYtFyJgg+WzH9NFtH0gr/CN24M0=" + "org/apache/logging/log4j#log4j/2.25.2": { + "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w=" }, - "org/apache/logging/log4j#log4j/2.24.1": { - "pom": "sha256-+NcAm1Rl2KhT0QuEG8Bve3JnXwza71OoDprNFDMkfto=" + "org/apache/maven#maven-api-annotations/4.0.0-rc-3": { + "jar": "sha256-XTSQ9yrTp+gr6IsnYp83xZ/SUxuuURw7E4ZkINXYYr0=", + "pom": "sha256-83HUqkRgxMwP4x0W20WC2+eGHvzS5nqvGEPimR8Xx0I=" }, - "org/apache/maven#maven-api-meta/4.0.0-alpha-9": { - "jar": "sha256-MsT1yturaAw0lS+ctXBFehODzOxMmlewOSYH1xkcaUk=", - "pom": "sha256-2ePDXW/aysuNGLn2QoYJDH/65yjWbLJq9aJmgZUNvnk=" + "org/apache/maven#maven-api-xml/4.0.0-rc-3": { + "jar": "sha256-8+OzZCNzxp1MdEHUDroHZeHXROmStiGURS9epUUd/bo=", + "pom": "sha256-XxSOOelo08K3a4426hN3mJ8KeetDpqWa5yPZElzLXGE=" }, - "org/apache/maven#maven-api-xml/4.0.0-alpha-9": { - "jar": "sha256-KbJijQ8CgRlxWRaEnBnu1FsyzcZ+sTVReYxzr6SqI9Y=", - "pom": "sha256-N2bjAzOTTJIvUlj6M0uHXyi7ABJ/8D3vANl/KlOnrps=" + "org/apache/maven#maven-xml/4.0.0-rc-3": { + "jar": "sha256-BjxCTLR/dRZBJdXuolFnuTHdaU40Jo1QJHN050IR3Rk=", + "pom": "sha256-nZZekiyqwDYkl9J7v6UaRI+UydcTYjZnnGhSNwb3KYI=" }, - "org/apache/maven#maven-api/4.0.0-alpha-9": { - "pom": "sha256-ZYvglXcymzX5TemWdb8O/HI26ZYbXHhfMyqkfyKUcfA=" - }, - "org/apache/maven#maven-bom/4.0.0-alpha-9": { - "pom": "sha256-4EfSnTUI/yd6Wsk1u5J/NUkQLMbTec5a4p4pYzeE0Rw=" - }, - "org/apache/maven#maven-parent/41": { - "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM=" - }, - "org/apache/maven#maven-xml-impl/4.0.0-alpha-9": { - "jar": "sha256-JucCuIHVeuTuiNAsAJQLpkBjcF7mkgWuiVi/g5qLBrE=", - "pom": "sha256-us0USYVzbUMmuuRChHM78eMTKX3NolNGTkYpsddoGPc=" - }, - "org/apache/maven#maven/4.0.0-alpha-9": { - "pom": "sha256-5QzZ/zefQ3H3/ywsrFF5YfPS9n7fgJCHU8e9UGuRPX4=" + "org/apache/santuario#xmlsec/3.0.6": { + "jar": "sha256-OV7Mw0lgY6x7HWryQioRZw7l3tgH9RVCgY7M1fu14gw=", + "pom": "sha256-U7h5IkxipFUFuy3C9Mk+MJQ6C837DOGhj0PTjbOzWMA=" }, "org/apiguardian#apiguardian-api/1.1.2": { "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" }, + "org/bouncycastle#bcpg-jdk18on/1.80": { + "jar": "sha256-N5mg1TURuGB4CvQ8RK6OBRmvq7JjGVr0AXT0YxLNWL0=", + "pom": "sha256-B6JGwq2vtih4OhroSsGNTfQCXfBq42NN/pOHq5T56nQ=" + }, "org/bouncycastle#bcpkix-jdk18on/1.80": { "jar": "sha256-T0umqSYX6hncGD8PpdtJLu5Cb93ioKLWyUd3/9GvZBM=", "pom": "sha256-pKEiETRntyjhjyb7DP1X8LGg18SlO4Zxis5wv4uG7Uc=" }, + "org/bouncycastle#bcpkix-jdk18on/1.82": { + "jar": "sha256-vccj4gg0gyrGrxNstbX/BeQ7cdT6FRzGUQ2SEu4IbmM=", + "pom": "sha256-9ZxFA6pO73U+GBOvaX5XtEbzNZMCXlUOuudLDz3+kK8=" + }, "org/bouncycastle#bcprov-jdk18on/1.80": { "jar": "sha256-6K0gn4xY0pGjfKl1Dp6frGBZaVbJg+Sd2Cgjgd2LMkk=", "pom": "sha256-oKdcdtkcQh7qVtD2Bi+49j7ff6x+xyT9QgzNytcYHUM=" }, + "org/bouncycastle#bcprov-jdk18on/1.82": { + "jar": "sha256-FM3i/fqoiQSAqOW2es7vDJD5ZoLB4jwTO6/cngsyVc4=", + "pom": "sha256-IIFtWAs+mNGQCnGsqBnsns7HimpKN+ejwMbCeTkDlD8=" + }, "org/bouncycastle#bcutil-jdk18on/1.80": { "jar": "sha256-Iuymh/eVVBH0Vq8z5uqOaPxzzYDLizKqX3qLGCfXxng=", "pom": "sha256-Qhp95L/rnFs4sfxHxCagh9kIeJVdQQf1t6gusde3R7Y=" }, + "org/bouncycastle#bcutil-jdk18on/1.82": { + "jar": "sha256-RCBpGVitHAuidabW2KYxetvb3JJ3BVtqcqqJyIzajH0=", + "pom": "sha256-pel6j6ALh5IPPwsFA7ri1GGx4mEsVviGirV554QqHEI=" + }, + "org/bouncycastle/bcprov-jdk18on/maven-metadata": { + "xml": { + "groupId": "org.bouncycastle", + "lastUpdated": "20251126065922", + "release": "1.83" + } + }, "org/bouncycastle/bcutil-jdk18on/maven-metadata": { "xml": { "groupId": "org.bouncycastle", - "lastUpdated": "20250604080934", - "release": "1.81" + "lastUpdated": "20251126070121", + "release": "1.83" } }, - "org/checkerframework#checker-qual/3.48.3": { - "jar": "sha256-RDaFsbIygDuq+APBXW9aQlRzxve4HF8nbfz5MojjiaU=", - "module": "sha256-Enu8VRPkHM/ms8tvqngBQjNJqVQUNnrLfPdil2dUnlk=", - "pom": "sha256-te+ROQIjzafQKelrKwwcZPVVu0Ad9lfqLLm7fElrqbE=" + "org/checkerframework#checker-qual/3.43.0": { + "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=", + "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=", + "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM=" + }, + "org/checkerframework#checker-qual/3.49.5": { + "jar": "sha256-UIyDxiw0T29+4o9HuIqHl9YRbQQ7/RygV2yCjdHfKIA=", + "module": "sha256-+zeot4Ic/rPYxSoh7WCqZwPgx0MnW5SWbvLNh6Jnibo=", + "pom": "sha256-V+9aHvxp0UcORdDRIwiAtt718X3MVVl+xD43REwUkmI=" }, "org/codehaus/plexus#plexus-utils/4.0.2": { "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=", "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8=" }, - "org/codehaus/plexus#plexus-xml/4.0.4": { - "jar": "sha256-Bp54tTcQjcYSSmcHP8mYJkeR9rZJnpVaOOcrs+T+Gt8=", - "pom": "sha256-Ohb3yn7CRzFFtGHgpylREI1H4SThjIRMCFsaY3jGEVE=" + "org/codehaus/plexus#plexus-xml/4.1.0": { + "jar": "sha256-huan8HSE6LH3r2bZfTujyz1pKlRhtLHQordnDPV0jok=", + "pom": "sha256-uKO6h7WsMXVJUEngIXiIDKJczJ6rGkR9OKGbU3xXgk4=" }, - "org/codehaus/plexus#plexus/18": { - "pom": "sha256-tD7onIiQueW8SNB5/LTETwgrUTklM1bcRVgGozw92P0=" + "org/codehaus/plexus#plexus/20": { + "pom": "sha256-p7WUsAL8eRczyOlEcNCQRfT9aak61cN1dS8gV/hGM7Q=" }, "org/codehaus/woodstox#stax2-api/4.2.1": { "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" }, + "org/codehaus/woodstox#stax2-api/4.2.2": { + "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=", + "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI=" + }, "org/eclipse/ee4j#project/1.0.2": { "pom": "sha256-dJWgenl+iOQ8O8GodCG9ix/FXjIpH6GOTjLYAx3chz8=" }, "org/eclipse/ee4j#project/1.0.5": { "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, "org/eclipse/ee4j#project/1.0.7": { "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" }, @@ -853,9 +990,9 @@ "org/fusesource#fusesource-pom/1.12": { "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" }, - "org/fusesource/jansi#jansi/2.4.1": { - "jar": "sha256-Ll53Wp3Fj/prvWqm8JnWL4ti3N60w8O7vlzyMBvC3ME=", - "pom": "sha256-P5jZeaTTVZ+HefuwBLNK51Fq+t9RDhHffMPNBz6xuzs=" + "org/fusesource/jansi#jansi/2.4.2": { + "jar": "sha256-C3uLADqQ6kkVebYvURiCjkURKRTGVYmwD6pJ1ux4WDk=", + "pom": "sha256-Lory+B0MmVUIvWfJid4ewhbrakdgk/WY9CFOz2ESjfA=" }, "org/hamcrest#hamcrest-core/1.3": { "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", @@ -914,26 +1051,6 @@ "module": "sha256-AukU6HnChqCQGPsrif7JV0M3zDOTbk5lZQLxcao/2/k=", "pom": "sha256-h963mcSbDJo92nmwCLjyM56iBKWbaY4dsCFhboxAqlQ=" }, - "org/jetbrains/dokka#gfm-plugin/2.0.0": { - "jar": "sha256-hxTAhA5WUog28yrrSwQVnwbwusy9IZdmgQlz22z1528=", - "module": "sha256-b7RU/rlsO7nK6tj3YG5mTKZbAUQBJkon0l1zE6AClJQ=", - "pom": "sha256-UNSVocw91I8Z0Zw6bBpbNvXHKNAtHcntzvyV4egFuPc=" - }, - "org/jetbrains/dokka#gfm-template-processing-plugin/2.0.0": { - "jar": "sha256-gT8k5SHnIPZNkZy/iURLT4jgcpXiCczh7VMgDqYo0Kg=", - "module": "sha256-gyXcecQGFajlN8LXiVPnym1F/e/coMrCHZFSsuXFX+Q=", - "pom": "sha256-4BMmXKjl/J9rKued/DJxxQfr1WwQnZPRQsl8zxWvZOo=" - }, - "org/jetbrains/dokka#jekyll-plugin/2.0.0": { - "jar": "sha256-mXX12/1XgWWQquhV4VXb7EYffDwYzMcZJaUFKwyG2/M=", - "module": "sha256-73ceMvAQZCkSDGxUI4G8OEcJS3Tm/w2LZ6kSoFD5uow=", - "pom": "sha256-pFiMSooMuHuNE/ASaJN8TXHigvgNzDyKrjVCMsHxxYQ=" - }, - "org/jetbrains/dokka#jekyll-template-processing-plugin/2.0.0": { - "jar": "sha256-9fKVXJeP9R86N4tlWbCS2DrV6MRGQIJbMSlbRndOFKk=", - "module": "sha256-LPL9uY4DSHo5DF8sUtw8iXOejxuMnvgvDanWoqInoOs=", - "pom": "sha256-njK1/mOrlDIJrD6wyjZzLEV1cA4Z60WGTUwd08N1m3I=" - }, "org/jetbrains/dokka#org.jetbrains.dokka.gradle.plugin/2.0.0": { "pom": "sha256-4fxoagGDfn6GKRGFkBUH/+r3lLip7JR7XQQ2j6cOAMo=" }, @@ -942,93 +1059,105 @@ "module": "sha256-YIna696ws1DZHuCxqxarB5j63II7Eo3UNDmWOxdkmsQ=", "pom": "sha256-rqDS7WCgzoRhO3nxh8It7eTbBPIfV/mRPhapC/0ONdk=" }, - "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { - "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", - "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + "org/jetbrains/kotlin#abi-tools-api/2.2.21": { + "jar": "sha256-I5kB8xfBibS0zIvF6WaUPcGeOSWVOeZouqXX7xjrkWo=", + "pom": "sha256-kkkKzKD0UFgdVs4FeWHY/6mDVYfmn2bpbQpxdbrOzYU=" }, - "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20": { - "module": "sha256-6NVkojvCA3s++xxbAP+3SuRPmXJFd+L8jYf/u8nLn7U=", - "pom": "sha256-oRA6cKb4/8EITdwIGyS6smpWRJcvnM0UG4mU2fUFRHg=" + "org/jetbrains/kotlin#abi-tools/2.2.21": { + "jar": "sha256-JLrPeVAp0oMWCNmzH6jQ0p/hw/unqbLHYw0Vk/I4mIQ=", + "pom": "sha256-lT1nNEcrmYiUAnBFZxRfbNnQFB4SckQ1yQLDRWloLNw=" }, - "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20/gradle85": { - "jar": "sha256-ZnTyl1XTJq3cdWov3Kvyu2AvAABKDtLbZp2j306EgAY=" + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.2.21": { + "module": "sha256-SVZZs54wVUHstxLmm2IuE+OK2SQPmoJ8oFhDS9mfIR0=", + "pom": "sha256-JQzsmn5XTCwRF+7PBCHjIAHqDzSwqQHH+k6tb+jd7aQ=" }, - "org/jetbrains/kotlin#kotlin-build-statistics/2.1.20": { - "jar": "sha256-TSjxg6dsMKjKwg56P6hwVMLdHbiGSzyc04nhjdmX0x4=", - "pom": "sha256-OR9tc0uDTJG3qAHiI638c2tYDb3ODxOafkvUdknATKM=" + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.2.21/gradle813": { + "jar": "sha256-J9z0rqpbu2TYYb0p7WDUgvD/2WJEyB4kJrnaxef9xj8=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": { - "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=", - "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo=" + "org/jetbrains/kotlin#kotlin-build-statistics/2.2.21": { + "jar": "sha256-jf37K49n/NzEzuPvkKJa9GfKKVhTsOoBnQAQrOvW8Yo=", + "pom": "sha256-yL9i9tym159DbECxrwnbQvRuv0vNcrMHnfjHJbXAY1g=" }, - "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.20": { - "jar": "sha256-bpSJbjIWA+O/6J/vAkeORNHWSj0l1J0GlIkv/AHGCs8=", - "pom": "sha256-EPseNeDocGdH6Og+ro+LQ0BrpmTkIB7J38ua99prQro=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.2.21": { + "jar": "sha256-MWRcpSI5siHr0GCgD/+NhRb/3Ii72fTkzX3bQacGjHA=", + "pom": "sha256-Y/3PHe0qtFrXfASZefqkTxkPe7jurE+B+Yd+nfqf2fk=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.20": { - "jar": "sha256-xUoAcYyMDj7oWL9Cdxx/QBxePBc4hh4Y6VNjcQQvobM=", - "pom": "sha256-InQE6sbYCbwNlN74kzbf332afVOHkqI01Svbr8Kuha8=" + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.2.21": { + "jar": "sha256-RYtj74/FCgoxgP5ojsG5lXRZkqBcSV2sYeWNEIiSeoA=", + "pom": "sha256-Ln/cogFlzxDnO2L4NfZ+7PQnyCPtYPGdXwButnQ0Wv4=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.20": { - "jar": "sha256-3jtUI9j7+G6ivRM01AG8SqhOKOxIlFlS0RwAsQsUArY=", - "pom": "sha256-xgNdI3KARTSALDfOVU6MjLqq6EUUp7rWzAlkJNjySUU=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.2.21": { + "jar": "sha256-lYj6aWrFUHr3ZP1WYN9olBheEnBOwbw/XLdyr0mH8pU=", + "pom": "sha256-CzPGTyYiujvIKDN4vbdQXyvjMKInWAcDitVDWbM935s=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/2.1.20": { - "jar": "sha256-NjCjAYLGNXDrUZrmWqqUGSF9utCBT+3kLI3ecERlpMY=", - "pom": "sha256-+qpgvkJw6RSbWUOSZjlhkr60f/XjpAmF3u3FTlkXItI=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.2.21": { + "jar": "sha256-o6Qi4GvNNaMqeY0ZHvbrs16ms5w1U+lB05wB5jH8XHc=", + "pom": "sha256-HxA9i94I3dYUvZg6vfy3lJE5xgasYM2KaJQf0Pse4SQ=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.20": { - "jar": "sha256-2eg98dhHogG6PAFqeGztCRvpUDmX0J9qnPF5buSJ83Q=", - "pom": "sha256-sdOMCv1uHRXEjBxdFWzmBXj0MxNr7FI/TrGZ968/gik=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.2.21": { + "jar": "sha256-POLKPF17x8h8QUmsLFk9IaeR1ndiKa4SPbZFowF96BQ=", + "pom": "sha256-T2/dvBDZshZ4meNPoRP8mtdcxNbOWKuE+WFLY8BfjaM=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.20": { - "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=", - "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.2.21": { + "jar": "sha256-kcBnPCLkSwVK4DFNMjhg6+Hzr/Pw68dP/4LEcz3eCb4=", + "pom": "sha256-Fwvb7LpX/wCiuNF+8seeCLhfZ99p2FO6CiWaQYO/uSM=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20": { - "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=", - "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=", - "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.2.21": { + "jar": "sha256-NZTEDHAF0ESVL4D3BBcrtv0YRCQQJRlPsWvubUXaLls=", + "pom": "sha256-VErpKrN3QI/B7TBOxBou7EKT4PLhObPS9v0nIF8UY38=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20/gradle85": { - "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.2.21": { + "jar": "sha256-t7/Qf18eCkSvYS60hHTfYyjuD286anNkLORz8wZF4aU=", + "module": "sha256-HnS0hvlEq54Rb5pKriDFL8L5rFI6VS25fdZYFID+lAs=", + "pom": "sha256-m9RXg5guF17un6rUX1/3QVyWrrau8ufPjjUIr7Y51hc=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.1.20": { - "jar": "sha256-6vELILujkjoH+PsYL7jNVlaZ4Vfuc9Elma8fXKuiUEA=", - "pom": "sha256-PdYeaTbcUQBs5MN+/+Q+/hQAuEHgnsSx7kqU9rkZOCo=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.2.21/gradle813": { + "jar": "sha256-t7/Qf18eCkSvYS60hHTfYyjuD286anNkLORz8wZF4aU=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.20": { - "jar": "sha256-APb4Q6vJMNDGGrtOPjAsjRd2EpH5srwlhv4SsMuXXq0=", - "module": "sha256-td7wBfIpohsq1pJt9wjPhLqe+8TsGcY16/5baTcx2wg=", - "pom": "sha256-CjCxRdSY1H2yVdDUzWp3hMXx+QyL+YgsupWCKjvzMHA=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.2.21": { + "jar": "sha256-S0vndO+5WFrw/aGA0zkD2CcuSX33uBuwkfqTOezaRb0=", + "pom": "sha256-uhvOJI5HRY7tRmheuiEreT/7fTfkKd/2cKIT3dEC0MA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.20": { - "jar": "sha256-1jf7pHCzv3E7CmXmcXrV3QOocl/MlFMCiUc6smtC6Cs=", - "module": "sha256-WJm5fnqbFx5sBeVJziqbo8ddJZMVnUsrAVZkFLVoUWo=", - "pom": "sha256-18CRV8ehutuNrk6Jv54N9FRbBM0DqqQJZqJm87hG0sM=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.2.21": { + "jar": "sha256-7JacXwsJn4I4RiMiOPm9ZPPTdB5i6pBQrS5DL6150KA=", + "module": "sha256-kVGuIjeH8cILcLJKEXeJtNFNDMSE5GJzLLIwp5f3W88=", + "pom": "sha256-KKWiq7pbWCk+JKngbmqskmJr4YLGXfyLLbaUlE5wraU=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20": { - "module": "sha256-6Ue1RPTNCcFQr9h5G70yoxN92uMEWn1TlL6lCaq5bFc=", - "pom": "sha256-H2OowlwTZmlled2VLz639CoKSns/avaRpIIjEwb82sk=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.2.21": { + "jar": "sha256-kI5uXIkLtJ28kmbczyi9sMJYxIZHA5rtcC/p1YZkAYY=", + "module": "sha256-/kRucdWLn1verY7wW2i0mGFzF+G5LUe5qztnTWTydmQ=", + "pom": "sha256-IIRTo2pr5JsHGhwQ6bRAQQZjbJO65b8wxtrFdMQM9bE=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20/gradle85": { - "jar": "sha256-+wFuZDtY4Koq7IkRDq8U54s3aMFX8lQ0V5X9aqEEk+s=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.2.21": { + "module": "sha256-TiOAKj1TACSsRlrNJkh9ajpwLugEzWEzScUQjeq/S6I=", + "pom": "sha256-5bWdPJpGu38Pe0nPyI1pjaVBpL0JClwX2aAKtHIQc4w=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": { - "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=", - "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.2.21/gradle813": { + "jar": "sha256-t6UoZcal4WDSz2Hk1CPORKaiDeCmsj0DQEttAaKBFzc=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.1.20": { - "jar": "sha256-EyGYEVmGCVkEsMsB76rh2BJJZB75FJ4Fs0T4ZKrpdfQ=", - "pom": "sha256-LZayVvD8kesSvOtuR2HhPXAf8TU/BZL8VymI2uai0Zs=" + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.2.21": { + "module": "sha256-3E/A81pVMqU6Qy7k/iJDEyVIVV8nX2PuaZDVAzP4zio=", + "pom": "sha256-JfRGZjOd7uAQanbqXvzPqzSvz9uWCnZy+4h/cboNqL0=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.1.20": { - "jar": "sha256-TRP+4Fu7RxlCw7Xt4PKKui4BGWDmQSZ0uCh7rYZuLfo=", - "pom": "sha256-xAVqvU8vDg7JUBdZ2H1aRLlQ5/IquAc+dG7OPrc2HII=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.2.21": { + "jar": "sha256-WLxFHOYu1r79B3rBB+pfEzRD503XjPOkpI+GjmGDfos=", + "pom": "sha256-yJkqd6ltK5+NgTdMQL1x0y4h2f8c23mdFdSXGLEqEuE=" }, - "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": { - "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=", - "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.2.21": { + "jar": "sha256-//lbm1mVeYEWQHp8DKLaKPfTME7uZRkcf+ebQE9fcwg=", + "pom": "sha256-vrwNaWyR3BXR5/k38QogdN+Xp2wlZxoaeqRTSpw5g2U=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.2.20": { + "jar": "sha256-hSTqyQ9+jg8TZog/LGyCDJO/ph3z12hXyNPoA89nMV0=", + "pom": "sha256-e2qAtqLSZ2oEIvaWg4EyMVQlUfYbMgxochz7nh9ZCdA=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.2.21": { + "jar": "sha256-4YHzKiGjzfGV+XQASkLwBnwr2d6qKog2NnSNg/3v2Z0=", + "pom": "sha256-TLa9Xeiu1yk6i++uepAMPDasknxAlMxwJ/SrWM1rPJ0=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.2.21": { + "jar": "sha256-50sUQG2uCgI4gYfGLBcxGDun0NjmBnVoLeURqQr6bFY=", + "pom": "sha256-1SJqfIYGn6mnIavJeuTaFaQO0WicirVQXhoa0tsg3F8=" }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", @@ -1038,40 +1167,40 @@ "jar": "sha256-GPRR5rS3vR0fnWCEnDy/Fg4RUwL5eiAIwZDVBcQ5xnA=", "pom": "sha256-Y+Y4sFbdRJ5vUtcenCxdxdsNFkRDI5cOFtf8DWWDk9s=" }, - "org/jetbrains/kotlin#kotlin-reflect/2.1.20": { - "jar": "sha256-QZd48reoJrrW7iyh5L3r5jmrMG0pBPo+8qMI7PqrOBE=", - "pom": "sha256-XgIIh67A2JqcFo79ka7WKGVVOHf5MD8UXby50jumDcc=" + "org/jetbrains/kotlin#kotlin-reflect/2.2.21": { + "jar": "sha256-RDgKvzfSRc5cDylPQ1EtHDmllkK/pGOSLHTpaHfPSfg=", + "pom": "sha256-5atrEFYKWlJWLDXNvnHdvkJ9Uetb/HAdzU9rlJvZ4D8=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/2.1.20": { - "jar": "sha256-rkOX+7OqKhraCSkOdTu6maQRRUiXfDEVUmuZWPTLGgQ=", - "pom": "sha256-D4O1qQFWxhpv8QlVey2YjicQ7j++n0pCV6bqDYdIw9Y=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.2.21": { + "jar": "sha256-KxUZtCe1FNFTbBtCVnSwP+kUr2N5JAKOmVnGYlRC31E=", + "pom": "sha256-h2elQPxdviC34Sg6lfUQKX5sDJiy6sLtxNBhKi0PLq8=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/2.1.20": { - "jar": "sha256-X9v2rnIjfOM11gPrEsSbCbycGjPAwB8dYud/8zZjzvs=", - "pom": "sha256-H3dwkEXdkF63UFqUKA037HV/CHCc/p86dKunO7+Z95s=" + "org/jetbrains/kotlin#kotlin-scripting-common/2.2.21": { + "jar": "sha256-QU7ZHD9eRJKyPLlTeEK0ZRA44l2thBB5OfQ0wiA/KpI=", + "pom": "sha256-7CWpeZRRdbrSFlRqSEsLj0SoZwVZGV4kCzR/H9oXcN8=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.20": { - "jar": "sha256-PU93KyOEFGUAF+l0YiVrfE1e36EBPL9Ud1c+sawuKIQ=", - "pom": "sha256-D/9/8dO/qczj77tNs4mJwmilHrZ/ge/QMRuKZGGLhak=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.2.21": { + "jar": "sha256-2TS50MJGvAliS3Bor1itV87xHb4q3bx7GdJQzOQt4ck=", + "pom": "sha256-EUhmLJXzbgCYEXj7LYldBrLs59BX7YRTLdNTu9bDVlA=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.20": { - "jar": "sha256-9mXXCxoIN/86Dve+xPxdn+1n6nXkaX3hWOtR8epQHD8=", - "pom": "sha256-tjmuINh6gV4wTd0goOTEk34Ttfx6Qme14VwOWQIphmU=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.2.21": { + "jar": "sha256-eIowYMjnmX+K4WulwCgNBQBa8KQgKfGMsQxWJbl5+sM=", + "pom": "sha256-DKT5XDLUrpVOF06kHlutYseNvJOmTEUHb96czISrNgk=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.20": { - "jar": "sha256-afRXrKuYNkwOtXjEl+DDypMLjPuCvndASdoEzeOAh/c=", - "pom": "sha256-PERTORE37EVcdL5Jb3HZpJhpbSVJvmT1mmBkfO7iVT0=" + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.2.21": { + "jar": "sha256-g4IMX8xdKPBF+RTs1ZALu8+BFbDXAHM03gaf5scGaeY=", + "pom": "sha256-nR1Dsi27irmp3yJ6bVRYNB2v/sFQ73WV12XMXsvxeQg=" }, - "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.1.20": { - "jar": "sha256-5pZQZxDSxI0BfMiczB6kkQF5lXcJK3Ah/q2pX/Yv1X8=", - "pom": "sha256-Al1rBx59fPPsennw0/5He9Ydveir9ZbYn41DL3wBmCU=" + "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.2.21": { + "jar": "sha256-xeclwTzLnw0tl4yxCZeyly19Rr70paqlAmN+wwdHj0Y=", + "pom": "sha256-75hpd8HcaVQ1Gmqm2iss2XZ+iupnwpNy5DdRJj4sBRg=" }, - "org/jetbrains/kotlin#kotlin-serialization/2.1.20": { - "module": "sha256-OMZPybedsk2Y415NutDvDjOxdsKXSTE8c7k6D5bCIgs=", - "pom": "sha256-Ffv0qiQBTCr6vmXjwzrY39LYocR8z5dsBbqKNqGou0I=" + "org/jetbrains/kotlin#kotlin-serialization/2.2.21": { + "module": "sha256-sc5+1XMJJKt7vj7YYxg9wLV1z5s8r5ceQ75VPhkvP7k=", + "pom": "sha256-r1G8pHCVJ3AskFJFuP5nbkAl+lgHIgh9ACHU/2OxE3Y=" }, - "org/jetbrains/kotlin#kotlin-serialization/2.1.20/gradle85": { - "jar": "sha256-rNawwcN18ocop1LMbI0itREnbFT1DZcb7UM957K9qjI=" + "org/jetbrains/kotlin#kotlin-serialization/2.2.21/gradle813": { + "jar": "sha256-vJEHe1gSynn9uJQK6dznkhvE4JFs35hK2kZ/EipVqOI=" }, "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.20": { "pom": "sha256-YFWRuJs3ISfmspxpMl+i9qjEb0aMRdCUEOeOtZ/IChc=" @@ -1084,9 +1213,9 @@ "module": "sha256-tZe3Be/U4tgnFCCQw2BUJlVI7VG09SN38r+JxFlNU28=", "pom": "sha256-o11/wINw+TE6S5U7zu7d2F4OHnLTEGLTe/jHeBs/b18=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.20": { - "module": "sha256-lNCtKyMZuFxANRz57nB32hLdOFA5LmzxCj/oFZ+8c/c=", - "pom": "sha256-1iLjAAVmBil0Qmj6iRKPt97U1C4XTOsIH2f3BWrJqLs=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.2.21": { + "module": "sha256-P/20UaotMU/nJjeC036r3c+LlBvLlA/jGSrAGmK1f3s=", + "pom": "sha256-YY3DrMdzRaytwwwN7viloOYD+O7zr0LldvBYoXVMLHw=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.20": { "jar": "sha256-rx7EDDuVGv3MDCoBc8e4F2PFKBwtW6+/CoVEokxdzAw=", @@ -1105,48 +1234,57 @@ "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=", "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.1.20": { - "jar": "sha256-G8x06M6E4sJeqv3hDxJINJzOMGK242l4y+7GENsekwo=", - "module": "sha256-VdKW5FRF9siGmbCJZwbqlVCvh62Uhz3BO2W+u9VmCm8=", - "pom": "sha256-Z1DheZ7lAgd9rlw9WZeW9mdgb2DTXpXLeQRI3HkStAs=" + "org/jetbrains/kotlin#kotlin-stdlib/2.2.20": { + "jar": "sha256-iDbM/9NYX63amQEkSyDUKQHS881YEFjYQ04v+rzzo+c=", + "module": "sha256-yRj1IU0CGnLjdn8nVul9EDpSbgTxQj2jZj79+1hH25U=", + "pom": "sha256-SosIbmQxvPYjY39Ssv8ZLhrbkTg4dC5cDupwqN7kKcQ=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.1.20/all": { - "jar": "sha256-geB9406Esp4U8/3vkC9LxM8dXalZuGffaD++HMVM4eE=" + "org/jetbrains/kotlin#kotlin-stdlib/2.2.21": { + "jar": "sha256-ZVij0jPaVqIJNLMhWfnbX4btWBbvCY94osIj3Gq7ed0=", + "module": "sha256-v7xlfd06jjfkyK1BeWjV6wsLFxyfzkj5YsKtMu5DTCE=", + "pom": "sha256-zzH5IxlsY67ezQpXwkJpvTcCpOR8C/C9ZLWtpd5SInI=" }, - "org/jetbrains/kotlin#kotlin-test-junit/2.1.20": { - "jar": "sha256-/JyFRHUR3oPiEPfenSA67HLvRT9yXETXvP/H6Qed+tw=", - "module": "sha256-NnictkXfB/pR3tuXVy871W//MsXrk8oI1dgx1upBqBo=", - "pom": "sha256-WYfnDG7E65vAb8Ao8saDKTteNgH5YjtwfuX2YbqrsGw=" + "org/jetbrains/kotlin#kotlin-stdlib/2.2.21/all": { + "jar": "sha256-VVzbTIhKWEwbXVn2lvt2zWYJF/qza4roAyvNYsdQ7+U=" }, - "org/jetbrains/kotlin#kotlin-test/2.1.20": { - "jar": "sha256-ACi1x0GRGEUZ9g5yfFqk5dfjrAT8C+1Vn0nTcWXeyWE=", - "module": "sha256-3M5BCYnVErxDug/4sgYkU0DJ86An36Fl9y6BQy3ssVY=", - "pom": "sha256-2SCpd6AcRqNwv3Npji1BcJE8afDeRoXURWTtUW9BtMo=" + "org/jetbrains/kotlin#kotlin-test-junit/2.2.21": { + "jar": "sha256-XYj8+aVu5QH7+HTuZegjdeoSIUI4Z8WY/ymxHgrUkxc=", + "module": "sha256-0kVTxsx9Gu4OinOXUrKkkLKXtHuKuP8cwbVMWDJK+IE=", + "pom": "sha256-fPxKDJQidRmNuLsFtGeiVJFUEw8tmFovNfVQ8WRM8jw=" }, - "org/jetbrains/kotlin#kotlin-test/2.1.20/all": { - "jar": "sha256-07fPliK3To6kwNNvS9X/nR0xsy/jUORuCCBHxb48alc=" + "org/jetbrains/kotlin#kotlin-test/2.2.21": { + "jar": "sha256-YSlm3e5NPQSGFW8Qx3pXxcR9rmXrmKK93zTPKu64lMQ=", + "module": "sha256-DsG6Qs7vWe/c0Vjk6q+JpinozazBGpQACJ1r2q32/bM=", + "pom": "sha256-vZ18di4pTTpc/z7zyIeNkyXaBbfjEwRo0n+REYiNb00=" }, - "org/jetbrains/kotlin#kotlin-tooling-core/2.1.20": { - "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=", - "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY=" + "org/jetbrains/kotlin#kotlin-test/2.2.21/all": { + "jar": "sha256-toH6GStsYrA8abCnP4HesdryGRz8DOiSVESTL1SNOLQ=" }, - "org/jetbrains/kotlin#kotlin-util-io/2.1.20": { - "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=", - "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM=" + "org/jetbrains/kotlin#kotlin-tooling-core/2.2.21": { + "jar": "sha256-dAFOxPPveM59p+Pmlk8sUmoxIdXFj++MopeeXzRFgvQ=", + "pom": "sha256-3TPmGTLBut893oXyBPY0yABL6WQnw6HKiGbMAR1xHfo=" }, - "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.20": { - "jar": "sha256-8tXmhHFbkgtghJaObDPIuwWwtrl5GYAOLyIdlBgkDH0=", - "pom": "sha256-hCdVuVwx20vbks9tQshUGhcB+ivc8lIahwa8sDKgoZc=" + "org/jetbrains/kotlin#kotlin-util-io/2.2.21": { + "jar": "sha256-JmqkAmoQb1n878PxUXaIcK+RzvFeQBH6wKofH1Z9SfQ=", + "pom": "sha256-67UM9Bx0RJdvAsL5FbQXMlcsXzmUplgciOZN4LmY970=" }, - "org/jetbrains/kotlin#kotlin-util-klib/2.1.20": { - "jar": "sha256-/3nFsObkLZIOuxx2uhDMLdvyJOgFZFqO6sreSRbiqs4=", - "pom": "sha256-ps3TjXdd/QfQe9FZ00LPegqWg4qH50guIgxjrtluEoA=" + "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.2.21": { + "jar": "sha256-AiuVo9/tlJ18LkeCC82YNu4Fe3IVE/dzNh5DM/bHb4w=", + "pom": "sha256-87Mj0f6eM9x+nF7XfzBSg//WN4FdiMUHlFQRvXqiow8=" }, - "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.1.20": { - "pom": "sha256-q8TDh14/l1U6F2qQ9ReI7A9ero4dJkI+qOvb+KpqF4Y=" + "org/jetbrains/kotlin#kotlin-util-klib/2.2.21": { + "jar": "sha256-VUAKkX5rmEphl+rni1tS7b3yzW4KfDhD95VEgbr7JD8=", + "pom": "sha256-o1Lf02Uns67w98DsZJDeydX8m+xPM02ETK6U+BdD3zA=" }, - "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.1.20": { - "pom": "sha256-YjXePQABYjdcj3IvCO2hU/CQ4RoDW0qbi+fqxO8UX+Y=" + "org/jetbrains/kotlin#swift-export-embeddable/2.2.21": { + "jar": "sha256-x6F2ROmfqKsHOT6Ja7SaowE7losTnoEHrJUMsEsutwE=", + "pom": "sha256-rum0xjRU8MsUFdllt3bBdHZWeDKyQyD0zjxfp49r2a4=" + }, + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.2.21": { + "pom": "sha256-XDvebn8dwPpE4UyFobpqA6r/hsq7GXAIMPTS3R3hPcQ=" + }, + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.2.21": { + "pom": "sha256-u40UTr2DH+9CbaYqQ3KOfFtkmPuZGzcYPpm+6+CcjVM=" }, "org/jetbrains/kotlinx#atomicfu/0.23.1": { "jar": "sha256-fbhmDr5LkbtHjts2FsTjpQulnAfcpRfR4ShMA/6GrFc=", @@ -1215,152 +1353,165 @@ "module": "sha256-yic/19Bs3g8yr4MjBwCr2bD1c7mErohHzpDj3F0NE1M=", "pom": "sha256-CwfOpOggKjkGxUbxfi5akjR2rKhZ01TnnocfKehL0pc=" }, - "org/jetbrains/kotlinx#kotlinx-io-bytestring-jvm/0.7.0": { - "jar": "sha256-6jimaw/0btgt3tnoHS3OcOX74DvWzFK0/IhpOB3qe30=", - "module": "sha256-D852CxW6wLkL7xvZDJfi0V+sQ6ZtwSCbSq7Jadk0Nv8=", - "pom": "sha256-mhfWfOIxynIhqWkS1WVtjRZ1gJ5FI/LDmupvs+o6bV8=" + "org/jetbrains/kotlinx#kotlinx-io-bytestring-jvm/0.8.0": { + "jar": "sha256-PagF6dov88sRn3RNzRHeahjjKluTNRjxdBi6V5XPp3U=", + "module": "sha256-LQKSG80vxBFFHMHvS8M46niUgzhq9D0fY7KYzpFP6aY=", + "pom": "sha256-HOhkNWaxjNIWBwGyYa5DIJoyoqsOmAcQJm+RQPJW8iI=" }, "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.6.0": { "module": "sha256-aO+bxmrpVPRzxZ9R679Ywdewb9b/9zNd0/s9JPipOQA=", "pom": "sha256-I1NofPyzbJCaW8T08LUj0wv2WuXI34CsxW6enFJb528=" }, - "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.7.0": { - "jar": "sha256-01Y1Kw5VW+Emqtypvjm7d0kx4ypQCO3QYAmNu0fVfp4=", - "module": "sha256-3NfGKkJ9279ezgt5jcEqD41VcSN/UScFEKUHIotjM3k=", - "pom": "sha256-b+eWaxTo7fC/rO+FfIiUpr9EtmFsbwK/7UoJMU7+0Zw=" + "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.8.0": { + "jar": "sha256-g0mATPWbsOhVOZ0C972+oRBKQo4zd36XG/MdG70lDT8=", + "module": "sha256-Nw3ClkvQ6ajt1xFYBBEJ07c4e9hqtoTEXsR+a+iYDxY=", + "pom": "sha256-tQDMgM5ypof7aYWm2Z0ahw3ikW7SoAgpUl5PtWBmOkE=" }, "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.6.0": { "module": "sha256-tZuXjCxEJJpnRkGmlONaKs7LqBLah9NlpRZzQqjKU0c=", "pom": "sha256-3DNkYsj1BEkGHNRdXLHI9oC+VEGqgQ6UQR/4GQmdT2s=" }, - "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.7.0": { - "jar": "sha256-bt7cm+TYeK6oDH3WCfkb/Ef809NsyR/Q8/Mo+9ZlbI8=", - "module": "sha256-dDDspoloWorXVm2MgIIUpylQsdbwNjQd+MTYKah3Bsg=", - "pom": "sha256-I4nhfLeFp854BZ7v7yv5fpGCbCe4PMzhkbTkLtlfiBo=" + "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.8.0": { + "jar": "sha256-YQdwzIVe3xxX2fzXxp/QQK9Xra+INFBfkYBd5oB4PRM=", + "module": "sha256-iwARgP4DhhHnx8R3y+psA1vod1U68IC8nXcXvtx8clg=", + "pom": "sha256-lxbMNmw5CB2vEU/KHNLzkUzhB4mgG2rK8Hrb//YTbC8=" }, "org/jetbrains/kotlinx#kotlinx-io-core/0.6.0": { "module": "sha256-FIX7aljyQWnRr3PEFDAiUKx4u0axpD4Csa4hILKhJPA=", "pom": "sha256-QIZ+EY9KW7uz291WZ3DY8Yu07w02MtyE+WyZ+2vD6oE=" }, - "org/jetbrains/kotlinx#kotlinx-io-core/0.7.0": { - "jar": "sha256-4QKwiGCeeovbzCd6VH5GhOwER+QIk9coWDH769Gyfug=", - "module": "sha256-gTKXY+sZquO3OGcb7DFrkESEkcO/Unj24Q6kxwKS4iQ=", - "pom": "sha256-fu4E9DS9OmrRjhQFT0SH9DvKyQwDabBFA7FltzG+3Mo=" + "org/jetbrains/kotlinx#kotlinx-io-core/0.8.0": { + "jar": "sha256-KAA+vl98bQrGW53+o0RziH498p991fkEpF2WxCELZ8I=", + "module": "sha256-m5KKLT5wpVBAcOFrHgW9wkdDdEyzxtXBegfOMS/R6q0=", + "pom": "sha256-Kan8XPxgjhJBdvbJmzLL5HhBj3ypws2SRgFNLDKaql0=" }, "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.0": { "pom": "sha256-bKZIdTuB5O4L9/N2wGNreMr6o7BxbBykXM0AzZSXdHc=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.1": { - "pom": "sha256-APNVWudiSFHGfbEsMIvJziauMnzw1yR2akAeW6AGCMc=" + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.7.3": { + "pom": "sha256-QiakkcW1nOkJ9ztlqpiUQZHI3Kw4JWN8a+EGnmtYmkY=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.9.0": { + "pom": "sha256-bX/zZcDvHNN2+1SxoWyAoh7Vj+tGwz80ULbPIuKxNT0=" }, "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.6.0": { "jar": "sha256-7DUSjE+5BE6Zu88H8F7yVDv6bUIDDXqtq66s/7FucsU=", "module": "sha256-uVDCZfLD4WO/1kdETbSsGqrAXX56jSrbBoRHs0wxxsg=", "pom": "sha256-0VZ6zJLhdIK8ATwZA1EbtbG/36GUKWLXAia+3FK3xII=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.8.1": { - "jar": "sha256-NWW21NeJv3BoPEVWaUQof8HY3HXCPZi9h9AQWcx28rM=", - "module": "sha256-++GdWIrX1fZGZmaCA0/0Tglo0iBx/mzPn5ngPHpe+lc=", - "pom": "sha256-RGZV6NQ4KL+7OHzp0VGpNxowkrSLkJ6AYGtT/FiXnig=" + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.7.3": { + "jar": "sha256-8K3eRYZBREdThc9Kp+C3/rJ/Yfz5RyZl7ZjMlxsGses=", + "module": "sha256-c7tMAnk/h8Ke9kvqS6AlgHb01Mlj/NpjPRJI7yS0tO8=", + "pom": "sha256-c09fdJII3QvvPZjKpZTPkiKv3w/uW2hDNHqP5k4kBCc=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.9.0": { + "jar": "sha256-Hwr6FyEQ5FpyMe8bRK6P2Eweuv+W8/w61o74xIEgtZw=", + "module": "sha256-cMh+MWGSq3cpqmOZIgKQ98jZ/dTZNC3J+cDkKFarNG0=", + "pom": "sha256-hxkNQ05icv7WBa8PztFfa8CC2KVQQMUZjm1LLWovysI=" }, "org/jetbrains/kotlinx#kotlinx-serialization-core/1.6.0": { "module": "sha256-0lw7Wm4k3nKasF1JmDxg7CmY290q5O/iS2JV2MqC+nc=", "pom": "sha256-O0Ni9LSZwS3/XUzOriTCaLBFe1Scha56Dyetslzgs3M=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.1": { - "jar": "sha256-2ZhZ/4zEmudp+Uivgj9GlHs+Vhf+wmg/3pUdTQ4Kd0k=", - "module": "sha256-eL3oMFSUrxs445ZrUleskINAFkk/i60hm4iGx/vbJdU=", - "pom": "sha256-Rz8Ko+Sheqt4YNykkNxC6rthJPHSlT5qmVoIcX5QxxQ=" + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.7.3": { + "module": "sha256-OdCabgLfKzJVhECmTGKPnGBfroxPYJAyF5gzTIIXfmQ=", + "pom": "sha256-MdERd2ua93fKFnED8tYfvuqjLa5t1mNZBrdtgni6VzA=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-json-io-jvm/1.8.1": { - "jar": "sha256-q17I6kiBUZfEan359BimJ5H+kc2lAjuUHOTehy2BDME=", - "module": "sha256-vz47hoSxN/py0pZVZ1/c4xRGewh5JikYMm2vedE+Afo=", - "pom": "sha256-27ETuPvVUEVZjiTmATIGrrzKkSr+Vjnr2VJjC579kjw=" + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.9.0": { + "jar": "sha256-ecpZ3uVj+c/AXmZzvUDDyUAgn8awUAZ+9+bZ2j7rslY=", + "module": "sha256-jNEYEwvyIIAgKeI5l0oz0nL00COlYQ9Vfs5rD4mV+J8=", + "pom": "sha256-lTt2Dcs2Ooqgz+X5GMPd0SRmh4XZGKw/QAsZGZasrJ0=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-json-io/1.8.1": { - "jar": "sha256-v2dav1Fi3Xc9TltbbSQ9Lpg2GtQRl1SRmQSXA+qnzN0=", - "module": "sha256-WTtZ8otvvbjsNRD4+ZQksTTlv8Qe2GS82LAiDv4APnM=", - "pom": "sha256-2e2KSEKd687/Z05u1OdgPR1K5Ao3lWT9BlPQ3V9gJb8=" + "org/jetbrains/kotlinx#kotlinx-serialization-json-io-jvm/1.9.0": { + "jar": "sha256-mKuxMrA+EbgDGNRTUOyeu7VFPSZQXoEzG/LupxQ7b74=", + "module": "sha256-Ulyljv7R1umPyqpU1SVREZDtF7uOVnP4TSiZnwi8Zbc=", + "pom": "sha256-s3U1BAhN78b0c6JYIz1gPtoTPEe40oYs/olDHNKcxfM=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-io/1.9.0": { + "jar": "sha256-kEoapTbuZE5j8xlXsWRZE3ueFQawQOmZplKY6GQefK0=", + "module": "sha256-vcVd2t2bARaFIanBk+KDkkGLOdZKalVdDbw163Jpltk=", + "pom": "sha256-qLTanfNROjgysRYUhPrwPiKCN05MsOWvy1LLqX1RhOE=" }, "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.6.0": { "jar": "sha256-H3K8q5I1ZCWR+1qrqG4UMXAe8A7/pfQFTTWEPceVEXY=", "module": "sha256-OG9a4BhhX0cAIEcQ0c8Jh4MncnzrATBDjg9WTwit1MI=", "pom": "sha256-CKbxhALfOeKfAj/f1VrfaHHpXLJkcpv3ikkciSUavDw=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.1": { - "jar": "sha256-h2nlZHVX43AJGcMtUI9cXa1TxdgjTNEIRjVPvP8UqiQ=", - "module": "sha256-uZHLSTQAwdlgut+oYhcVjGN+XsqIgbIM0BJbtOz8+DE=", - "pom": "sha256-1mXWtB/gWPZmpvOGrS5JzBAe+P0u7+/vy8ER6R7oJDY=" + "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.9.0": { + "jar": "sha256-2UzDTK45JGoa90/aY/nEgSzhIhbvZB1fo7u7U5ppItg=", + "module": "sha256-u634x2urP82I/ORbO7tj37FIfzgCHhvdg7+5MQ735po=", + "pom": "sha256-azQzwqqesmYo26vxbJYzTKqzD24HcQ0Q7n+HkGznMN0=" }, "org/jetbrains/kotlinx#kotlinx-serialization-json/1.6.0": { "module": "sha256-IagQNSE8nNiADHbXYFfPRaqJxp2jsSkqn4zQf+DaLQc=", "pom": "sha256-6hSUk17ZJHsWf8DXD/i/xJurjzLNLMahWnpXPNTXBgU=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.1": { - "jar": "sha256-WK3zNYoPmd2NZqVQ++GQZNOV4NX38eRlFc00cKVvu7A=", - "module": "sha256-f33wBUM932BPUqq9avsh65YJMZfLS90Hk8SEydPEtnU=", - "pom": "sha256-x3AMmcg94CtGVBo9fktps4h0m3wPV9zrRU0UPyzYens=" + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.9.0": { + "jar": "sha256-8NRkNgU2KrFYwRsg9si+FyYCO7kxuerV/6WhTiM4394=", + "module": "sha256-T8E+xBK3uaIToX39qjNkV4Ab4W/BZa2GsLcxT9CW5ww=", + "pom": "sha256-mUGX39Wqub9VhVbCFW/eIoK6b8OtR/RmoIznk1zPR2Q=" }, - "org/jline#jline-parent/3.29.0": { - "pom": "sha256-eSLv09hwp9euA7GWwwDjXF3gIo5ZpbASrqZB4215ko4=" - }, - "org/jline#jline/3.29.0": { - "jar": "sha256-mcIqlmg4ukKR5ppd1Wia/QSVAOuTYrI7qs5zH5ycl90=", - "pom": "sha256-3kA5CpgAeh+lw1PW1PYTKA4JXTA4VY7LXnwjHb0SanA=" + "org/jline#jline/3.30.5": { + "jar": "sha256-WnMoHNfNIeL3AgXxVJlY/RZYSizY0XjPNjta8vbul2U=", + "pom": "sha256-0mVMOldr75gEtBrgQze5cNe8wJzWs5f9/k7MOe0IYsM=" }, "org/jsoup#jsoup/1.16.1": { "jar": "sha256-HxFXJlQN33GVjBS8UX6/xJz0gekc2Rew+s6E8BJy6QE=", "pom": "sha256-bMUH9jBTbyBb3iwbOMPFkHUR3i17GkRL6dY41GFPJDw=" }, - "org/junit#junit-bom/5.10.1": { - "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", - "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" - }, - "org/junit#junit-bom/5.10.2": { - "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", - "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" - }, - "org/junit#junit-bom/5.10.3": { - "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", - "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" - }, "org/junit#junit-bom/5.11.0": { "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" }, - "org/junit#junit-bom/5.12.1": { - "module": "sha256-TdKqnplFecYwRX35lbkZsDVFYzZGNy6q3R0WXQv1jBo=", - "pom": "sha256-fIJrxyvt3IF9rZJjAn+QEqD1Wjd9ON+JxCkyolAcK/A=" + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" }, - "org/junit/jupiter#junit-jupiter-api/5.12.1": { - "jar": "sha256-pAHgtgNz7fffCWLCXrMhPkUaR3h5LTOnaHbDuKW7IJs=", - "module": "sha256-iv9r5FYIFhBl7mO4QDyfKTE6HdnzkfP5eIVlpiMxGXY=", - "pom": "sha256-zqRvFdpTNT8vtSYZyvbcAH7CqE8O2vQMwSV/jjzvd9w=" + "org/junit#junit-bom/5.13.1": { + "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=", + "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM=" }, - "org/junit/jupiter#junit-jupiter-engine/5.12.1": { - "jar": "sha256-Dn8tvrkb+usNTLM6SHNRuvDlpu1ykGFU2P2ZddMpxZI=", - "module": "sha256-tvSQZ/FmJdFN7gmT8weKTGYeF8kOV0yf0SoWRur98tA=", - "pom": "sha256-GCeXDlNI10sY6757guDLGdxOj5np1NmEyyZJTVcTPao=" + "org/junit#junit-bom/5.13.2": { + "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=", + "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k=" }, - "org/junit/jupiter#junit-jupiter-params/5.12.1": { - "jar": "sha256-WVFwaZnjWVHU3w7KbgkdNhn2WanBCFjy9aPOGRy1dnM=", - "module": "sha256-KYwQtU+G3dtCeclfSYnRW+DV5QDEU+yTXv1Wd8v6Guk=", - "pom": "sha256-dHNtHnFnHQDeQFyxnD2GhOHFl9BwfeJmH7gHGyeEJ8M=" + "org/junit#junit-bom/5.14.0": { + "module": "sha256-etPdstdOanfWWuiaykXUaMl7+ZFba8UvRJ1nXk5vmzU=", + "pom": "sha256-9apHs2ZIPo0fm+8Q5noMZvZq/A8zHJ+WaxMQutYND28=" }, - "org/junit/jupiter#junit-jupiter/5.12.1": { - "jar": "sha256-IoqUye50PVW/6gm1djBoHqeyCmYaR3RH9cH2DcEtnjo=", - "module": "sha256-OY71Q1eCyqfceKDRVRBpP6Xt7w/HP5PFVOZ3FxtCIj4=", - "pom": "sha256-m42YgPjFl2/JUEKEnzsSwRWdom5UUkMSY3edCx54yKQ=" + "org/junit#junit-bom/6.0.1": { + "module": "sha256-xI2Y9e3P2cVeefrLugEB98G6CIY0ib6EqRYrmaGG0cI=", + "pom": "sha256-4xXFzLsIchbc4ErnDDK/F2K+KguKQ++B47p4MXpM1cg=" }, - "org/junit/platform#junit-platform-commons/1.12.1": { - "jar": "sha256-wxYWNYGqpWSSgBIrEuo2/k6cICoaImd1P+p8nh3wVes=", - "module": "sha256-ypN54aC/xbLOQ8dOh0SxT7fEkhPiISv1pH7QIv3bMM4=", - "pom": "sha256-tzKBEektR47QlWxjCgwkZm52gbUTgWj6FchbUJRqcAM=" + "org/junit/jupiter#junit-jupiter-api/5.14.0": { + "jar": "sha256-00MaAEuDgjvN2VtnOBMAh+wysvsopaXetPvBY1e6uPk=", + "module": "sha256-V86ZtxkZ0eDbZV6tULSICJBLKO5qv3xUWBB/mEjVw1o=", + "pom": "sha256-BB5HJeF9zQfpo65wj6aHHXEq3dsLXTbqy0D1xC4nE7s=" }, - "org/junit/platform#junit-platform-engine/1.12.1": { - "jar": "sha256-f+3/k/2SrsfSn8YNwB+gJyRrNrgIhCOl78SUnl9q/6Q=", - "module": "sha256-Vb3CX4rhKh3yQQisSArgiAKMiOMV+ou01HbU4RXyrGE=", - "pom": "sha256-TANohTegh/d9NLNNjczZO5NhcWu5u/S0ucbYMXkBS5w=" + "org/junit/jupiter#junit-jupiter-engine/5.14.0": { + "jar": "sha256-IDt6JAsVcW+LiB4t+rDFgPHaWydKGW/zYPjK2i0XUuo=", + "module": "sha256-KGfhYWM1n7KIfHUvqy8A0Z2Pyj8NzO2dHV8BiM32rgY=", + "pom": "sha256-KPX4YI+V7PYg3qXcJg2BTF6RFZuKrayxa5QrcVBmXZI=" + }, + "org/junit/jupiter#junit-jupiter-params/5.14.0": { + "jar": "sha256-f7tRg3khwylgS6EZ3BrwVz02Iw6oD3hqo9T9jB27ihs=", + "module": "sha256-V/+2UZyCd8xdhK7GB1hLfcPgA/Dtjc4sJYBHBWHELGY=", + "pom": "sha256-RkOJ7Dv6ZGLKy944a9Ba0f9/3iCY24vQXD73fC5Omdg=" + }, + "org/junit/jupiter#junit-jupiter/5.14.0": { + "jar": "sha256-qJUBx26Rq/3AggGs2qrmgdXI1Zti83XVkptmgaARj0M=", + "module": "sha256-cbSt8Ak6UM6YuGLTp1eIinVug+X58LsfU0guaQ4zWQo=", + "pom": "sha256-lKGuTY5jmp+gt0JTGMQjwf3U8tJlFoDnxjNvRlUwl5M=" + }, + "org/junit/platform#junit-platform-commons/1.14.0": { + "jar": "sha256-5UOjqEIvHf5gR/U1MFtwx3fg20MfHvP1XvXIasC7y5s=", + "module": "sha256-Kwq1YmEUumwASZEJ6MOJoXy6XhP7+BEExBjoY3UNSLw=", + "pom": "sha256-Ed3u4UN656ybNGhLDophehZaIKobIjyk0YM3ZMxwZJI=" + }, + "org/junit/platform#junit-platform-engine/1.14.0": { + "jar": "sha256-V80p3oNEaa7mVuXevaHwn3xZYw/Ve5DMDLqjFyb8TUo=", + "module": "sha256-panr9kOUz5HYW/InO6g+K3f5V2dAYYiEV+4nzr00gOQ=", + "pom": "sha256-dAumF9c4ITX+Ekf3H3Umh0ljeYj9OdEq5Qn9Rl+v3QY=" }, "org/mockito#mockito-bom/4.11.0": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" @@ -1368,9 +1519,6 @@ "org/mockito#mockito-bom/5.13.0": { "pom": "sha256-M7Wzq5+zSPUKHI9BRG1NKpn46wqk88Og13Vifqp/aNE=" }, - "org/mockito#mockito-bom/5.7.0": { - "pom": "sha256-dlcAW89JAw1nzF1S3rxm3xj0jVTbs+1GZ/1yWwZ5+6A=" - }, "org/opentest4j#opentest4j/1.3.0": { "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", @@ -1379,25 +1527,21 @@ "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "org/ow2/asm#asm-commons/9.7.1": { - "jar": "sha256-mlebVNKSrZvhcdQxP9RznGNVksK1rDpFm70QSc3exqA=", - "pom": "sha256-C/HTHaDJ+djtwvJ9u/279z8acVtyzS+ijz8ZWZTXStE=" + "org/ow2/asm#asm-commons/9.8": { + "jar": "sha256-MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=", + "pom": "sha256-95PnjwH3A3F9CUcuVs3yEv4piXDIguIRbo5Un7bRQMI=" }, - "org/ow2/asm#asm-tree/9.7.1": { - "jar": "sha256-mSmIH1nra4QOhtVFcMd7Wc5yHRBObf16QJeJkcLTtB8=", - "pom": "sha256-E7kF9l5/1DynZ09Azao3Z5ukhYxsnZ+48Xp6/ZuqvJ4=" + "org/ow2/asm#asm-tree/9.8": { + "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=", + "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c=" }, - "org/ow2/asm#asm/9.7.1": { - "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=", - "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg=" + "org/ow2/asm#asm/9.8": { + "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", + "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" }, - "org/postgresql#postgresql/42.7.5": { - "jar": "sha256-aQILO9IJhFQ+gXOT8ubAGokO8uN6d90R1thQgYHQeas=", - "pom": "sha256-FB6pP8GF3rFdKPz+P+qAivQBic9pEtaPMW6GjXzq/kg=" - }, - "org/slf4j#slf4j-api/1.7.36": { - "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", - "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + "org/postgresql#postgresql/42.7.8": { + "jar": "sha256-KjKp3LxC1npQrToN5e/RAsjSvkZyAEXyy9ZonxYKt8c=", + "pom": "sha256-gSWAq7t1dry37do8TLITXVleqFcIOstggFeYNRhUr5M=" }, "org/slf4j#slf4j-api/2.0.16": { "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", @@ -1413,9 +1557,6 @@ "org/slf4j#slf4j-bom/2.0.17": { "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" }, - "org/slf4j#slf4j-parent/1.7.36": { - "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" - }, "org/slf4j#slf4j-parent/2.0.16": { "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" }, @@ -1426,9 +1567,9 @@ "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" }, - "org/vafer#jdependency/2.12": { - "jar": "sha256-xuxNA/nwT7ZEjTavQ6HMBpoh7LXocBM90Y/tT02x3mg=", - "pom": "sha256-LY6Zq9RS9eZCxtK74xACuSh5naw6CeA+PknyE3ozt+s=" + "org/vafer#jdependency/2.13": { + "jar": "sha256-FFxghksjansSllUNMaSap1rWEpWBOO4NRxufywu+3T4=", + "pom": "sha256-3Ip1HRudXz2imiihDmKF62+3Q/TW46MleRsZX9B4eXs=" }, "uk/org/webcompere#system-stubs-core/2.1.8": { "jar": "sha256-nCcyLPxwQ8dThK1EQAewiAyhj+cjHWm/ppYWvHc8r+E=", diff --git a/pkgs/by-name/li/libeufin/package.nix b/pkgs/by-name/li/libeufin/package.nix index b0ef18dea909..d8e8a691615d 100644 --- a/pkgs/by-name/li/libeufin/package.nix +++ b/pkgs/by-name/li/libeufin/package.nix @@ -16,19 +16,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libeufin"; - version = "1.0.2"; + version = "1.3.0"; src = fetchgit { url = "https://git.taler.net/libeufin.git/"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZjZo0oCsrnc413OY7ElU95Vto9Smp6fuPI3RzJzC3Zk="; + hash = "sha256-bt1NBoiN52CX2Itg8lQ/b0V/MZulBTaD8luNlH4Mwss="; fetchSubmodules = true; leaveDotGit = true; # required for correct submodule fetching # Save the HEAD short commit hash in a file so it can be retrieved later for versioning. # Delete .git folder for reproducibility (otherwise, the hash changes unexpectedly after fetching submodules) postFetch = '' pushd $out - git rev-parse HEAD > ./common/src/main/resources/HEAD.txt + git rev-parse HEAD > ./libeufin-common/src/main/resources/HEAD.txt rm -rf .git popd ''; @@ -37,9 +37,12 @@ stdenv.mkDerivation (finalAttrs: { patchPhase = '' runHook prePatch + substituteInPlace Makefile \ + --replace-fail "install: build install-nobuild-files" "install: install-nobuild-files" + # The .git folder had to be deleted. Read hash from file instead of using the git command. substituteInPlace build.gradle \ - --replace-fail "commandLine 'git', 'rev-parse', '--short', 'HEAD'" 'commandLine "cat", "$projectDir/common/src/main/resources/HEAD.txt"' + --replace-fail "git rev-parse --short HEAD" "cat $projectDir/libeufin-common/src/main/resources/HEAD.txt" # Use gradle repo to download dependencies substituteInPlace build.gradle \ @@ -62,8 +65,9 @@ stdenv.mkDerivation (finalAttrs: { gradleFlags = [ "-Dorg.gradle.java.home=${jdk17_headless}" ]; gradleBuildTask = [ - "bank:installShadowDist" - "nexus:installShadowDist" + "libeufin-bank:installShadowDist" + "libeufin-nexus:installShadowDist" + "libeufin-ebisync:installShadowDist" ]; nativeBuildInputs = [ @@ -76,9 +80,9 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - make install-nobuild + make install - for exe in libeufin-nexus libeufin-bank ; do + for exe in libeufin-bank libeufin-nexus libeufin-ebisync ; do wrapProgram $out/bin/$exe \ --set JAVA_HOME ${jdk17_headless.home} \ --prefix PATH : $out/bin \ diff --git a/pkgs/by-name/li/libevdevc/package.nix b/pkgs/by-name/li/libevdevc/package.nix index eea628fb9330..5c1309ef356a 100644 --- a/pkgs/by-name/li/libevdevc/package.nix +++ b/pkgs/by-name/li/libevdevc/package.nix @@ -5,13 +5,13 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libevdevc"; version = "2.0.1"; src = fetchFromGitHub { owner = "hugegreenbug"; repo = "libevdevc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0ry30krfizh87yckmmv8n082ad91mqhhbbynx1lfidqzb6gdy2dd"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { homepage = "https://chromium.googlesource.com/chromiumos/platform/libevdev/"; maintainers = with lib.maintainers; [ kcalvinalvin ]; }; -} +}) diff --git a/pkgs/by-name/li/libewf/package.nix b/pkgs/by-name/li/libewf/package.nix index b950831600d2..179bbd1da2d3 100644 --- a/pkgs/by-name/li/libewf/package.nix +++ b/pkgs/by-name/li/libewf/package.nix @@ -9,12 +9,12 @@ bzip2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "20231119"; pname = "libewf"; src = fetchurl { - url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz"; + url = "https://github.com/libyal/libewf/releases/download/${finalAttrs.version}/libewf-experimental-${finalAttrs.version}.tar.gz"; hash = "sha256-7AjUEaXasOzJV9ErZK2a4HMTaqhcBbLKd8M+A5SbKrc="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libexif/package.nix b/pkgs/by-name/li/libexif/package.nix index e828aeb8ac23..37b3a92f762d 100644 --- a/pkgs/by-name/li/libexif/package.nix +++ b/pkgs/by-name/li/libexif/package.nix @@ -6,14 +6,14 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libexif"; version = "0.6.25"; src = fetchFromGitHub { owner = "libexif"; repo = "libexif"; - rev = "libexif-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; + rev = "libexif-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}-release"; sha256 = "sha256-H8YzfNO2FCrYAwEA4bkOpRdxISK9RXaHVuK8zz70TlM="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libexsid/package.nix b/pkgs/by-name/li/libexsid/package.nix index c9c59508ca0b..9b6b768b1d52 100644 --- a/pkgs/by-name/li/libexsid/package.nix +++ b/pkgs/by-name/li/libexsid/package.nix @@ -10,14 +10,14 @@ libftdi1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libexsid"; version = "2.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "exsid-driver"; - rev = version; + rev = finalAttrs.version; sha256 = "1qbiri549fma8c72nmj3cpz3sn1vc256kfafnygkmkzg7wdmgi7r"; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libf2c/package.nix b/pkgs/by-name/li/libf2c/package.nix index 5c45409c2cd0..8d7c9585d86f 100644 --- a/pkgs/by-name/li/libf2c/package.nix +++ b/pkgs/by-name/li/libf2c/package.nix @@ -5,7 +5,7 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libf2c"; version = "20160102"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { unpackPhase = '' mkdir build cd build - unzip ${src} + unzip ${finalAttrs.src} ''; postPatch = '' @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "glibc"); }; -} +}) diff --git a/pkgs/by-name/li/libfabric/package.nix b/pkgs/by-name/li/libfabric/package.nix index 125cc98968f7..4e8f961f5934 100644 --- a/pkgs/by-name/li/libfabric/package.nix +++ b/pkgs/by-name/li/libfabric/package.nix @@ -11,7 +11,7 @@ numactl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfabric"; version = "2.4.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ofiwg"; repo = "libfabric"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-C8k1caArVPBTtSggvAM7S660HpP99y9vac7oyf+HW2c="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.bzizou ]; }; -} +}) diff --git a/pkgs/by-name/li/libfakekey/package.nix b/pkgs/by-name/li/libfakekey/package.nix index d075ce7f25a6..fc7e30f5c145 100644 --- a/pkgs/by-name/li/libfakekey/package.nix +++ b/pkgs/by-name/li/libfakekey/package.nix @@ -12,13 +12,13 @@ xorgproto, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfakekey"; version = "0.3"; src = fetchgit { url = "https://git.yoctoproject.org/libfakekey"; - tag = version; + tag = finalAttrs.version; hash = "sha256-QNJlxZ9uNwNgFWm9qRJdPfusx7dXHZajjFH7wDhpgcs="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libffcall/package.nix b/pkgs/by-name/li/libffcall/package.nix index a1ee28558af2..308b8691d04d 100644 --- a/pkgs/by-name/li/libffcall/package.nix +++ b/pkgs/by-name/li/libffcall/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libffcall"; version = "2.5"; src = fetchurl { - url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz"; + url = "mirror://gnu/libffcall/libffcall-${finalAttrs.version}.tar.gz"; sha256 = "sha256-f0IglrQEmLE4kJOVWCXxQbtn7WAUJJ2IQAlGPceEaHk="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libfixposix/package.nix b/pkgs/by-name/li/libfixposix/package.nix index 25878860746f..b74840db88ce 100644 --- a/pkgs/by-name/li/libfixposix/package.nix +++ b/pkgs/by-name/li/libfixposix/package.nix @@ -7,14 +7,14 @@ getconf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfixposix"; version = "0.5.1"; src = fetchFromGitHub { owner = "sionescu"; repo = "libfixposix"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-5qA6ytbqE+/05XQGxP9/4vEs9gFcuI3k7eJJYucW7fM="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/li/libfreeaptx/package.nix b/pkgs/by-name/li/libfreeaptx/package.nix index a0c7f549c9bd..524c92b9d0df 100644 --- a/pkgs/by-name/li/libfreeaptx/package.nix +++ b/pkgs/by-name/li/libfreeaptx/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfreeaptx"; version = "0.2.2"; src = fetchFromGitHub { owner = "iamthehorker"; repo = "libfreeaptx"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ntbF0jz/ilOk45xMQxx00WJtJq4Wb7VyKE0eKvghYnY="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libgbinder/package.nix b/pkgs/by-name/li/libgbinder/package.nix index a7f97cd3bc15..0736a50e1048 100644 --- a/pkgs/by-name/li/libgbinder/package.nix +++ b/pkgs/by-name/li/libgbinder/package.nix @@ -7,14 +7,14 @@ libglibutil, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgbinder"; version = "1.1.43"; src = fetchFromGitHub { owner = "mer-hybris"; repo = "libgbinder"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-a4lQzWOVdlXQeoJzvNaELiVXLvXsx4reigKrhsrcafM="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libgda5/package.nix b/pkgs/by-name/li/libgda5/package.nix index ea59cdbeb500..9fa9e43d8acd 100644 --- a/pkgs/by-name/li/libgda5/package.nix +++ b/pkgs/by-name/li/libgda5/package.nix @@ -24,12 +24,12 @@ libpq, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgda"; version = "5.2.10"; src = fetchurl { - url = "mirror://gnome/sources/libgda/${lib.versions.majorMinor version}/libgda-${version}.tar.xz"; + url = "mirror://gnome/sources/libgda/${lib.versions.majorMinor finalAttrs.version}/libgda-${finalAttrs.version}.tar.xz"; hash = "sha256-b2zfe4BT9VO5B+DIimBk60jPJ1GFLrJDI9zwJ3kjNMg="; }; @@ -129,4 +129,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bot-wxt1221 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libgda6/package.nix b/pkgs/by-name/li/libgda6/package.nix index f91b264d177a..4d13317c8111 100644 --- a/pkgs/by-name/li/libgda6/package.nix +++ b/pkgs/by-name/li/libgda6/package.nix @@ -30,12 +30,12 @@ assert mysqlSupport -> libmysqlclient != null; assert postgresSupport -> libpq != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgda"; version = "6.0.0"; src = fetchurl { - url = "mirror://gnome/sources/libgda/${lib.versions.majorMinor version}/libgda-${version}.tar.xz"; + url = "mirror://gnome/sources/libgda/${lib.versions.majorMinor finalAttrs.version}/libgda-${finalAttrs.version}.tar.xz"; sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr"; }; @@ -116,4 +116,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libgedit-amtk/package.nix b/pkgs/by-name/li/libgedit-amtk/package.nix index 80838b14f74b..4301fb3f186d 100644 --- a/pkgs/by-name/li/libgedit-amtk/package.nix +++ b/pkgs/by-name/li/libgedit-amtk/package.nix @@ -16,7 +16,7 @@ xvfb-run, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgedit-amtk"; version = "5.9.2"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { group = "World"; owner = "gedit"; repo = "libgedit-amtk"; - rev = version; + rev = finalAttrs.version; hash = "sha256-TpPiVIsHIBrRzDG2oBwtrIYB3CYEW6SRRVow9pe2XFs="; }; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/World/gedit/libgedit-amtk"; - changelog = "https://gitlab.gnome.org/World/gedit/libgedit-amtk/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/World/gedit/libgedit-amtk/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Actions, Menus and Toolbars Kit for GTK applications"; maintainers = with lib.maintainers; [ bobby285271 @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libgedit-tepl/package.nix b/pkgs/by-name/li/libgedit-tepl/package.nix index ab6b99865d92..498bb615e15c 100644 --- a/pkgs/by-name/li/libgedit-tepl/package.nix +++ b/pkgs/by-name/li/libgedit-tepl/package.nix @@ -18,7 +18,7 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgedit-tepl"; version = "6.14.0"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { group = "World"; owner = "gedit"; repo = "libgedit-tepl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KtmExJCEfa4c6alrtWOLNSKZUs65tZ7p9zcT9f8ZC+k="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libgeotiff/package.nix b/pkgs/by-name/li/libgeotiff/package.nix index de629da0e1ec..6ae5462a4bce 100644 --- a/pkgs/by-name/li/libgeotiff/package.nix +++ b/pkgs/by-name/li/libgeotiff/package.nix @@ -10,14 +10,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.7.4"; pname = "libgeotiff"; src = fetchFromGitHub { owner = "OSGeo"; repo = "libgeotiff"; - rev = version; + rev = finalAttrs.version; hash = "sha256-oiuooLejCRI1DFTjhgYoePtKS+OAGnW6OBzgITcY500="; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "dev" ]; - sourceRoot = "${src.name}/libgeotiff"; + sourceRoot = "${finalAttrs.src.name}/libgeotiff"; configureFlags = [ "--with-jpeg=${libjpeg.dev}" @@ -49,10 +49,10 @@ stdenv.mkDerivation rec { meta = { description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; homepage = "https://github.com/OSGeo/libgeotiff"; - changelog = "https://github.com/OSGeo/libgeotiff/blob/${src.rev}/libgeotiff/NEWS"; + changelog = "https://github.com/OSGeo/libgeotiff/blob/${finalAttrs.src.rev}/libgeotiff/NEWS"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ marcweber ]; teams = [ lib.teams.geospatial ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/li/libgestures/package.nix b/pkgs/by-name/li/libgestures/package.nix index f8a532c6e519..8d76910e4b7b 100644 --- a/pkgs/by-name/li/libgestures/package.nix +++ b/pkgs/by-name/li/libgestures/package.nix @@ -7,13 +7,13 @@ jsoncpp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgestures"; version = "2.0.1"; src = fetchFromGitHub { owner = "hugegreenbug"; repo = "libgestures"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0dfvads2adzx4k8cqc1rbwrk1jm2wn9wl2jk51m26xxpmh1g0zab"; }; patches = [ ./include-fix.patch ]; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { homepage = "https://chromium.googlesource.com/chromiumos/platform/gestures"; maintainers = with lib.maintainers; [ kcalvinalvin ]; }; -} +}) diff --git a/pkgs/by-name/li/libgflow/package.nix b/pkgs/by-name/li/libgflow/package.nix index 47a603a06a1b..7e5794c3b486 100644 --- a/pkgs/by-name/li/libgflow/package.nix +++ b/pkgs/by-name/li/libgflow/package.nix @@ -11,7 +11,7 @@ gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgflow"; version = "1.0.4"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { domain = "notabug.org"; owner = "grindhold"; repo = "libgtkflow"; - rev = "gflow_${version}"; + rev = "gflow_${finalAttrs.version}"; hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libglibutil/package.nix b/pkgs/by-name/li/libglibutil/package.nix index 97216255c6d4..d05ea175750b 100644 --- a/pkgs/by-name/li/libglibutil/package.nix +++ b/pkgs/by-name/li/libglibutil/package.nix @@ -6,14 +6,14 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libglibutil"; version = "1.0.80"; src = fetchFromGitHub { owner = "sailfishos"; repo = "libglibutil"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-wp87cStOuQILSKFPFlFDL2vGvTQ4Cg5kuSlwnM4kc64="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libgnome-games-support/package.nix b/pkgs/by-name/li/libgnome-games-support/package.nix index 72e1bb3e4513..fb6614258a58 100644 --- a/pkgs/by-name/li/libgnome-games-support/package.nix +++ b/pkgs/by-name/li/libgnome-games-support/package.nix @@ -14,12 +14,12 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgnome-games-support"; version = "1.8.2"; src = fetchurl { - url = "mirror://gnome/sources/libgnome-games-support/${lib.versions.majorMinor version}/libgnome-games-support-${version}.tar.xz"; + url = "mirror://gnome/sources/libgnome-games-support/${lib.versions.majorMinor finalAttrs.version}/libgnome-games-support-${finalAttrs.version}.tar.xz"; sha256 = "KENGBKewOHMawCMXMTiP8QT1ZbsjMMwk54zaBM/T730="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libgnunetchat/package.nix b/pkgs/by-name/li/libgnunetchat/package.nix index b95abd3d415a..87d51bb9ac44 100644 --- a/pkgs/by-name/li/libgnunetchat/package.nix +++ b/pkgs/by-name/li/libgnunetchat/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchgit, + fetchpatch, meson, ninja, pkg-config, @@ -16,14 +17,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgnunetchat"; - version = "0.6.0"; + version = "0.6.1"; src = fetchgit { url = "https://git.gnunet.org/libgnunetchat.git"; tag = "v${finalAttrs.version}"; - hash = "sha256-pRO8i7tHynCqm97RLMBOiWKCl2CAYBE6RXfyIljIiQ0="; + hash = "sha256-FKFoIuGGPcYVRBrsqn1rnodRVCLAjLKlgZOs9v4H+8w="; }; + patches = [ + (fetchpatch { + url = "https://build.opensuse.org/public/source/openSUSE:Factory/libgnunetchat/libgnunetchat-0.6.1-gnunet-0.26.2.patch?rev=6"; + hash = "sha256-Q0FvZUXSnYwK+LsN9MoW7v+gPYmD7w4E+bXNDluhxfI="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libgnurl/package.nix b/pkgs/by-name/li/libgnurl/package.nix index 8e72d0f5d657..e48762704d64 100644 --- a/pkgs/by-name/li/libgnurl/package.nix +++ b/pkgs/by-name/li/libgnurl/package.nix @@ -12,12 +12,12 @@ libunistring, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgnurl"; version = "7.72.0"; src = fetchurl { - url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; + url = "mirror://gnu/gnunet/gnurl-${finalAttrs.version}.tar.gz"; sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi"; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.curl; }; -} +}) diff --git a/pkgs/by-name/li/libgpiod/package.nix b/pkgs/by-name/li/libgpiod/package.nix index 9d3a6dc374d3..f4547d8b7ac0 100644 --- a/pkgs/by-name/li/libgpiod/package.nix +++ b/pkgs/by-name/li/libgpiod/package.nix @@ -9,13 +9,13 @@ enable-tools ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgpiod"; version = "2.2.2"; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MePv6LsK+8zCxG8l4vyiiZPSVqv9F4H4KQB0gHjm0YM="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libgpiod_1/package.nix b/pkgs/by-name/li/libgpiod_1/package.nix index ece00227400a..0d4dd8f33f76 100644 --- a/pkgs/by-name/li/libgpiod_1/package.nix +++ b/pkgs/by-name/li/libgpiod_1/package.nix @@ -12,12 +12,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgpiod"; version = "1.6.4"; src = fetchurl { - url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; + url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${finalAttrs.version}.tar.gz"; hash = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libgpod/package.nix b/pkgs/by-name/li/libgpod/package.nix index 0222cc37c406..86d1dded32f0 100644 --- a/pkgs/by-name/li/libgpod/package.nix +++ b/pkgs/by-name/li/libgpod/package.nix @@ -21,12 +21,12 @@ gtk-sharp-2_0, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgpod"; version = "0.8.3"; src = fetchurl { - url = "mirror://sourceforge/gtkpod/libgpod-${version}.tar.bz2"; + url = "mirror://sourceforge/gtkpod/libgpod-${finalAttrs.version}.tar.bz2"; hash = "sha256-Y4p5WdBOlfHmKrrQK9M3AuTo3++YSFrH2dUDlcN+lV0="; }; @@ -106,4 +106,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libgrapheme/package.nix b/pkgs/by-name/li/libgrapheme/package.nix index cc7f662b8a35..c145a4f2fdfb 100644 --- a/pkgs/by-name/li/libgrapheme/package.nix +++ b/pkgs/by-name/li/libgrapheme/package.nix @@ -5,12 +5,12 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgrapheme"; version = "3.0.0"; src = fetchurl { - url = "https://dl.suckless.org/libgrapheme/libgrapheme-${version}.tar.gz"; + url = "https://dl.suckless.org/libgrapheme/libgrapheme-${finalAttrs.version}.tar.gz"; hash = "sha256-Mlha9z3aYvvMD+0U8ZmqG8mIrQHa0L+9Bs8XXZzz1ow="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ sikmir ]; }; -} +}) diff --git a/pkgs/by-name/li/libgtkflow3/package.nix b/pkgs/by-name/li/libgtkflow3/package.nix index a825f7ab67ec..cfbef278ae9e 100644 --- a/pkgs/by-name/li/libgtkflow3/package.nix +++ b/pkgs/by-name/li/libgtkflow3/package.nix @@ -12,7 +12,7 @@ libgflow, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgtkflow3"; version = "1.0.6"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { domain = "notabug.org"; owner = "grindhold"; repo = "libgtkflow"; - rev = "gtkflow3_${version}"; + rev = "gtkflow3_${finalAttrs.version}"; hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libgtkflow4/package.nix b/pkgs/by-name/li/libgtkflow4/package.nix index 82c04e72cce4..32824b8ee92f 100644 --- a/pkgs/by-name/li/libgtkflow4/package.nix +++ b/pkgs/by-name/li/libgtkflow4/package.nix @@ -12,7 +12,7 @@ libgflow, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgtkflow4"; version = "0.2.6"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { domain = "notabug.org"; owner = "grindhold"; repo = "libgtkflow"; - rev = "gtkflow4_${version}"; + rev = "gtkflow4_${finalAttrs.version}"; hash = "sha256-JoVq7U5JQ3pRxptR7igWFw7lcBTsgr3aVXxayLqhyFo="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libhandy/package.nix b/pkgs/by-name/li/libhandy/package.nix index 283e598d6a17..94800313273f 100644 --- a/pkgs/by-name/li/libhandy/package.nix +++ b/pkgs/by-name/li/libhandy/package.nix @@ -25,7 +25,7 @@ runCommand, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libhandy"; version = "1.8.3"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/libhandy/${lib.versions.majorMinor version}/libhandy-${version}.tar.xz"; + url = "mirror://gnome/sources/libhandy/${lib.versions.majorMinor finalAttrs.version}/libhandy-${finalAttrs.version}.tar.xz"; hash = "sha256-BbSXIpBz/1V/ELMm4HTFBm+HQ6MC1IIKuXvLXNLasIc="; }; @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { }; meta = { - changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}"; + changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${finalAttrs.version}"; description = "Building blocks for modern adaptive GNOME apps"; mainProgram = "handy-1-demo"; homepage = "https://gitlab.gnome.org/GNOME/libhandy"; @@ -148,4 +148,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.gnome ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libhandy_0/package.nix b/pkgs/by-name/li/libhandy_0/package.nix index d1ef1ede527f..563ca1e9cd18 100644 --- a/pkgs/by-name/li/libhandy_0/package.nix +++ b/pkgs/by-name/li/libhandy_0/package.nix @@ -19,7 +19,7 @@ hicolor-icon-theme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libhandy"; version = "0.0.13"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { domain = "source.puri.sm"; owner = "Librem5"; repo = "libhandy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5"; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libhangul/package.nix b/pkgs/by-name/li/libhangul/package.nix index 5bb008a3d111..e7630d33b024 100644 --- a/pkgs/by-name/li/libhangul/package.nix +++ b/pkgs/by-name/li/libhangul/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libhangul"; version = "0.1.0"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-${version}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-${finalAttrs.version}.tar.gz"; sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.ianwookim ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libharu/package.nix b/pkgs/by-name/li/libharu/package.nix index 78402032198a..9e962062410f 100644 --- a/pkgs/by-name/li/libharu/package.nix +++ b/pkgs/by-name/li/libharu/package.nix @@ -7,14 +7,14 @@ libpng, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libharu"; version = "2.4.5"; src = fetchFromGitHub { owner = "libharu"; repo = "libharu"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-v2vudB95OdYPiLxS9Al5lsAInsvmharhPWdnUmCl+Bs="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libhdhomerun/package.nix b/pkgs/by-name/li/libhdhomerun/package.nix index 1ad5b0466e15..412c7332e805 100644 --- a/pkgs/by-name/li/libhdhomerun/package.nix +++ b/pkgs/by-name/li/libhdhomerun/package.nix @@ -8,12 +8,12 @@ # If your firewall is enabled, make sure to have something like: # networking.firewall.allowedUDPPorts = [ 65001 ]; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libhdhomerun"; version = "20250506"; src = fetchurl { - url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; + url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${finalAttrs.version}.tgz"; hash = "sha256-h5sbxHbJuT537igKhPwRV+fMR9Q+2cg5jYiorF81wDQ="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sielicki ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libheif/package.nix b/pkgs/by-name/li/libheif/package.nix index 8b40a9c1fc62..14168a25b284 100644 --- a/pkgs/by-name/li/libheif/package.nix +++ b/pkgs/by-name/li/libheif/package.nix @@ -22,7 +22,7 @@ vips, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libheif"; version = "1.20.2"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "strukturag"; repo = "libheif"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-PVfdX3/Oe3DXpYU5WMnCSi2p9X4fPszq2X3uuyh8RVU="; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ kuflierl ]; }; -} +}) diff --git a/pkgs/by-name/li/libhomfly/package.nix b/pkgs/by-name/li/libhomfly/package.nix index ff919d6b5449..866c65d8b648 100644 --- a/pkgs/by-name/li/libhomfly/package.nix +++ b/pkgs/by-name/li/libhomfly/package.nix @@ -7,14 +7,14 @@ boehmgc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.03"; pname = "libhomfly"; src = fetchFromGitHub { owner = "miguelmarco"; repo = "libhomfly"; - rev = version; + rev = finalAttrs.version; hash = "sha256-lav/c5i4TXiQSp4r376sy7s+xLO85GutTb/UZJ70gh8="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.sage ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libhttpserver/package.nix b/pkgs/by-name/li/libhttpserver/package.nix index c2117e97b843..87aec6bf9b2a 100644 --- a/pkgs/by-name/li/libhttpserver/package.nix +++ b/pkgs/by-name/li/libhttpserver/package.nix @@ -9,14 +9,14 @@ libmicrohttpd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libhttpserver"; version = "0.19.0"; src = fetchFromGitHub { owner = "etr"; repo = "libhttpserver"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Pc3Fvd8D4Ymp7dG9YgU58mDceOqNfhWE1JtnpVaNx/Y="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; # configure: error: cannot find required auxiliary files: ltmain.sh }; -} +}) diff --git a/pkgs/by-name/li/libid3tag/package.nix b/pkgs/by-name/li/libid3tag/package.nix index 18b8779ad7d3..c0402216d408 100644 --- a/pkgs/by-name/li/libid3tag/package.nix +++ b/pkgs/by-name/li/libid3tag/package.nix @@ -8,7 +8,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libid3tag"; version = "0.16.3"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "tenacityteam"; repo = "libid3tag"; - rev = version; + rev = finalAttrs.version; hash = "sha256-6/49rk7pmIpJRj32WmxC171NtdIOaMNhX8RD7o6Jbzs="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libiec61883/package.nix b/pkgs/by-name/li/libiec61883/package.nix index 45711fd939d6..46a58b9960e5 100644 --- a/pkgs/by-name/li/libiec61883/package.nix +++ b/pkgs/by-name/li/libiec61883/package.nix @@ -6,13 +6,13 @@ libraw1394, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.2.0"; pname = "libiec61883"; src = fetchurl { - url = "mirror://debian/pool/main/libi/libiec61883/libiec61883_${version}.orig.tar.gz"; - name = "libiec61883-${version}.tar.gz"; + url = "mirror://debian/pool/main/libi/libiec61883/libiec61883_${finalAttrs.version}.orig.tar.gz"; + name = "libiec61883-${finalAttrs.version}.tar.gz"; sha256 = "7c7879c6b9add3148baea697dfbfdcefffbc8ac74e8e6bcf46125ec1d21b373a"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libieee1284/package.nix b/pkgs/by-name/li/libieee1284/package.nix index 70db42c998d9..c741a1953059 100644 --- a/pkgs/by-name/li/libieee1284/package.nix +++ b/pkgs/by-name/li/libieee1284/package.nix @@ -11,14 +11,14 @@ docbook_xsl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libieee1284"; version = "0.2.11"; src = fetchFromGitHub { owner = "twaugh"; repo = "libieee1284"; - rev = "V${builtins.replaceStrings [ "." ] [ "_" ] version}"; + rev = "V${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; sha256 = "0wfv1prmhhpyll9l4g1ij3im7hk9mm96ydw3l9fvhjp3993cdn2x"; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ romildo ]; }; -} +}) diff --git a/pkgs/by-name/li/libime/package.nix b/pkgs/by-name/li/libime/package.nix index 8fb616d1797e..b48a8570a40b 100644 --- a/pkgs/by-name/li/libime/package.nix +++ b/pkgs/by-name/li/libime/package.nix @@ -28,14 +28,14 @@ let hash = "sha256-fKa+R1TA1MJ7p3AsDc5lFlm9LKH6pcvyhI2BoAU8jBM="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libime"; version = "1.1.12"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LqbwXpmqUCbaKHaaE9pOrHb1Qdp20/S3QEf9F4/3oiE="; fetchSubmodules = true; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ poscat ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libimobiledevice-glue/package.nix b/pkgs/by-name/li/libimobiledevice-glue/package.nix index 7e1466e43b4f..6738747244ce 100644 --- a/pkgs/by-name/li/libimobiledevice-glue/package.nix +++ b/pkgs/by-name/li/libimobiledevice-glue/package.nix @@ -8,19 +8,19 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libimobiledevice-glue"; version = "1.3.2"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = "libimobiledevice-glue"; - rev = version; + rev = finalAttrs.version; hash = "sha256-cUcJARbZV9Yaqd9TP3NVmF9p8Pjz88a3GmAh4c4sEHo="; }; preAutoreconf = '' - export RELEASE_VERSION=${version} + export RELEASE_VERSION=${finalAttrs.version} ''; nativeBuildInputs = [ @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libindicator/package.nix b/pkgs/by-name/li/libindicator/package.nix index 2fa1a94cbd1c..f24418f297c0 100644 --- a/pkgs/by-name/li/libindicator/package.nix +++ b/pkgs/by-name/li/libindicator/package.nix @@ -10,12 +10,12 @@ gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libindicator-gtk${gtkVersion}"; version = "12.10.1"; src = fetchurl { - url = "https://launchpad.net/libindicator/${lib.versions.majorMinor version}/${version}/+download/libindicator-${version}.tar.gz"; + url = "https://launchpad.net/libindicator/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.version}/+download/libindicator-${finalAttrs.version}.tar.gz"; sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f"; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.msteen ]; }; -} +}) diff --git a/pkgs/by-name/li/libinjection/package.nix b/pkgs/by-name/li/libinjection/package.nix index a3c3bdf6cfd7..e64a6a70b251 100644 --- a/pkgs/by-name/li/libinjection/package.nix +++ b/pkgs/by-name/li/libinjection/package.nix @@ -6,14 +6,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libinjection"; version = "3.10.0"; src = fetchFromGitHub { owner = "client9"; repo = "libinjection"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/li/libinsane/package.nix b/pkgs/by-name/li/libinsane/package.nix index c91d4b271132..68663010e738 100644 --- a/pkgs/by-name/li/libinsane/package.nix +++ b/pkgs/by-name/li/libinsane/package.nix @@ -16,7 +16,7 @@ cunit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libinsane"; version = "1.0.10"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { repo = "libinsane"; group = "World"; owner = "OpenPaperwork"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-2BLg8zB0InPJqK9JypQIMVXIJndo9ZuNB4OeOAo/Hsc="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.symphorien ]; }; -} +}) diff --git a/pkgs/by-name/li/libinstpatch/package.nix b/pkgs/by-name/li/libinstpatch/package.nix index 5bce976df79c..47366123c669 100644 --- a/pkgs/by-name/li/libinstpatch/package.nix +++ b/pkgs/by-name/li/libinstpatch/package.nix @@ -8,14 +8,14 @@ libsndfile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libinstpatch"; version = "1.1.7"; src = fetchFromGitHub { owner = "swami"; repo = "libinstpatch"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-y3rmCQk3homgnWT/i/qhKJ6gRO8opMFnaC0T8d5UN48="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libipt/package.nix b/pkgs/by-name/li/libipt/package.nix index b14a14f01eff..4e14d1e306e2 100644 --- a/pkgs/by-name/li/libipt/package.nix +++ b/pkgs/by-name/li/libipt/package.nix @@ -7,14 +7,14 @@ freebsd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libipt"; version = "2.1.2"; src = fetchFromGitHub { owner = "intel"; repo = "libipt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-rO2Mf2/BfKlPh1wHe0qTuyQAyqpSB/j3Q+JWpNDyNm0="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libiptcdata/package.nix b/pkgs/by-name/li/libiptcdata/package.nix index b38ea1b5365b..321374e37c28 100644 --- a/pkgs/by-name/li/libiptcdata/package.nix +++ b/pkgs/by-name/li/libiptcdata/package.nix @@ -7,14 +7,14 @@ libintl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libiptcdata"; version = "1.0.5"; src = fetchFromGitHub { owner = "ianw"; repo = "libiptcdata"; - rev = "release_${builtins.replaceStrings [ "." ] [ "_" ] version}"; + rev = "release_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; sha256 = "sha256-ZjokepDAHiSEwXrkvM9qUAPcpIiRQoOsv7REle7roPU="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ wegank ]; }; -} +}) diff --git a/pkgs/by-name/li/libirecovery/package.nix b/pkgs/by-name/li/libirecovery/package.nix index 22ef42ebe424..ff82099b8e3e 100644 --- a/pkgs/by-name/li/libirecovery/package.nix +++ b/pkgs/by-name/li/libirecovery/package.nix @@ -9,7 +9,7 @@ libimobiledevice-glue, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libirecovery"; version = "1.3.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "libimobiledevice"; repo = "libirecovery"; - rev = version; + rev = finalAttrs.version; hash = "sha256-CSDG8mOLvKAIpxmZnNLMKY1HvQIqk66/rkjmzq7F8vY="; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; preAutoreconf = '' - export RELEASE_VERSION=${version} + export RELEASE_VERSION=${finalAttrs.version} ''; # Packager note: Not clear whether this needs a NixOS configuration, @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { mainProgram = "irecovery"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libiscsi/package.nix b/pkgs/by-name/li/libiscsi/package.nix index 69f88454c405..7b8f5d74aea0 100644 --- a/pkgs/by-name/li/libiscsi/package.nix +++ b/pkgs/by-name/li/libiscsi/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libiscsi"; version = "1.20.0"; src = fetchFromGitHub { owner = "sahlberg"; repo = "libiscsi"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-idiK9JowKhGAk5F5qJ57X14Q2Y0TbIKRI02onzLPkas="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ misuzu ]; }; -} +}) diff --git a/pkgs/by-name/li/libite/package.nix b/pkgs/by-name/li/libite/package.nix index 3eaa036be22e..f5b9d2a2d5a4 100644 --- a/pkgs/by-name/li/libite/package.nix +++ b/pkgs/by-name/li/libite/package.nix @@ -7,14 +7,14 @@ libconfuse, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libite"; version = "2.6.2"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-hm3cd7UnskfwEvcMRGHei8KLt0k+WlCzB1LMnZdYo+g="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { bsd3 ]; }; -} +}) diff --git a/pkgs/by-name/li/libivykis/package.nix b/pkgs/by-name/li/libivykis/package.nix index e6232dd1daed..c9fb9cec72ab 100644 --- a/pkgs/by-name/li/libivykis/package.nix +++ b/pkgs/by-name/li/libivykis/package.nix @@ -8,13 +8,13 @@ protobufc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libivykis"; version = "0.43.2"; src = fetchurl { - url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz"; + url = "mirror://sourceforge/libivykis/${finalAttrs.version}/ivykis-${finalAttrs.version}.tar.gz"; sha256 = "sha256-k+PpsjdpVDfNY9SqSKjZ39izm8KKGSpXcNETxP6Qme8="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libixion/package.nix b/pkgs/by-name/li/libixion/package.nix index 3c64585b3475..3a525d8400b5 100644 --- a/pkgs/by-name/li/libixion/package.nix +++ b/pkgs/by-name/li/libixion/package.nix @@ -9,14 +9,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libixion"; version = "0.19.0"; src = fetchFromGitLab { owner = "ixion"; repo = "ixion"; - rev = version; + rev = finalAttrs.version; hash = "sha256-BrexWRaxrLTWuoU62kqws3tlSqVOHecSV5MXc4ZezFs="; }; @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { meta = { description = "General purpose formula parser, interpreter, formula cell dependency tracker and spreadsheet document model backend all in one package"; homepage = "https://gitlab.com/ixion/ixion"; - changelog = "https://gitlab.com/ixion/ixion/-/blob/${src.rev}/CHANGELOG"; + changelog = "https://gitlab.com/ixion/ixion/-/blob/${finalAttrs.src.rev}/CHANGELOG"; license = lib.licenses.mpl20; maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libjcat/package.nix b/pkgs/by-name/li/libjcat/package.nix index b94ea6e87361..dd13204711aa 100644 --- a/pkgs/by-name/li/libjcat/package.nix +++ b/pkgs/by-name/li/libjcat/package.nix @@ -18,7 +18,7 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libjcat"; version = "0.2.3"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hughsie"; repo = "libjcat"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-3Ttk5nwVLB/Ll4Xz25JODOKHsGrOxKeSF2f+6QhDI2Q="; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libjson-rpc-cpp/package.nix b/pkgs/by-name/li/libjson-rpc-cpp/package.nix index a898b6ffee29..b522c1a08cf1 100644 --- a/pkgs/by-name/li/libjson-rpc-cpp/package.nix +++ b/pkgs/by-name/li/libjson-rpc-cpp/package.nix @@ -13,7 +13,7 @@ libmicrohttpd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libjson-rpc-cpp"; version = "1.4.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "cinemast"; repo = "libjson-rpc-cpp"; sha256 = "sha256-YCCZN4y88AixQeo24pk6YHfSCsJz8jJ97Dg40KM08cQ="; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; }; env.NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2"; @@ -110,4 +110,4 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ robertrichter ]; }; -} +}) diff --git a/pkgs/by-name/li/libjson/package.nix b/pkgs/by-name/li/libjson/package.nix index 5bb93c8ad95b..663d29743c61 100644 --- a/pkgs/by-name/li/libjson/package.nix +++ b/pkgs/by-name/li/libjson/package.nix @@ -5,11 +5,11 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libjson"; version = "7.6.1"; src = fetchurl { - url = "mirror://sourceforge/libjson/libjson_${version}.zip"; + url = "mirror://sourceforge/libjson/libjson_${finalAttrs.version}.zip"; sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7"; }; patches = [ ./install-fix.patch ]; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/by-name/li/libjwt/package.nix b/pkgs/by-name/li/libjwt/package.nix index bec9e3ad97ee..df33c4c12703 100644 --- a/pkgs/by-name/li/libjwt/package.nix +++ b/pkgs/by-name/li/libjwt/package.nix @@ -8,14 +8,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libjwt"; version = "1.18.1"; src = fetchFromGitHub { owner = "benmcollins"; repo = "libjwt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-0gFMeSW4gfbI6MUctcN8UuKhMDswaT8BzHTV2VuwZzc="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pnotequalnp ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libkeyfinder/package.nix b/pkgs/by-name/li/libkeyfinder/package.nix index 7346f3793e0b..b22fd208fc37 100644 --- a/pkgs/by-name/li/libkeyfinder/package.nix +++ b/pkgs/by-name/li/libkeyfinder/package.nix @@ -7,14 +7,14 @@ catch2_3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libkeyfinder"; version = "2.2.8"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "libkeyfinder"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Et8u5j/ke9u2bwHFriPCCBiXkPel37gwx+kwuViAr4o="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libkqueue/package.nix b/pkgs/by-name/li/libkqueue/package.nix index e52e7436b585..f0ca9be4f270 100644 --- a/pkgs/by-name/li/libkqueue/package.nix +++ b/pkgs/by-name/li/libkqueue/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libkqueue"; version = "2.6.3"; src = fetchFromGitHub { owner = "mheily"; repo = "libkqueue"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-q9ycYeo8BriD9bZEozjkdHUg2xntQUZwbYX7d1IZPzk="; }; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { description = "kqueue(2) compatibility library"; homepage = "https://github.com/mheily/libkqueue"; - changelog = "https://github.com/mheily/libkqueue/raw/v${version}/ChangeLog"; + changelog = "https://github.com/mheily/libkqueue/raw/v${finalAttrs.version}/ChangeLog"; license = lib.licenses.bsd2; maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix index 11c96a659b8d..4630a6fb1926 100644 --- a/pkgs/by-name/li/libkrun/package.nix +++ b/pkgs/by-name/li/libkrun/package.nix @@ -17,6 +17,7 @@ withNet ? false, withGpu ? false, withSound ? false, + withInput ? false, withTimesync ? false, variant ? null, }: @@ -32,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libkrun" + lib.optionalString (variant != null) "-${variant}"; - version = "1.15.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; tag = "v${finalAttrs.version}"; - hash = "sha256-VhlFyYJ/TH12I3dUq0JTus60rQEJq5H4Pm1puCnJV5A="; + hash = "sha256-6HBSL5Zu29sDoEbZeQ6AsNIXUcqXVVGMk0AR2X6v1yU="; }; outputs = [ @@ -48,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-dK3V7HCCvTqmQhB5Op2zmBPa9FO3h9gednU9tpQk+1U="; + hash = "sha256-UIzbtBJH6aivoIxko1Wxdod/jUN44pERX9Hd+v7TC3Q="; }; # Make sure libkrunfw can be found by dlopen() @@ -88,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withNet "NET=1" ++ lib.optional withGpu "GPU=1" ++ lib.optional withSound "SND=1" + ++ lib.optional withInput "INPUT=1" ++ lib.optional withTimesync "TIMESYNC=1" ++ lib.optional (variant == "sev") "SEV=1" ++ lib.optional (variant == "tdx") "TDX=1"; diff --git a/pkgs/by-name/li/libkrunfw/package.nix b/pkgs/by-name/li/libkrunfw/package.nix index 2977487ee116..a9b55cec19d4 100644 --- a/pkgs/by-name/li/libkrunfw/package.nix +++ b/pkgs/by-name/li/libkrunfw/package.nix @@ -21,18 +21,18 @@ assert lib.elem variant [ stdenv.mkDerivation (finalAttrs: { pname = "libkrunfw" + lib.optionalString (variant != null) "-${variant}"; - version = "4.10.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "containers"; repo = "libkrunfw"; tag = "v${finalAttrs.version}"; - hash = "sha256-mq2gw0+xL6qUZE/fk0vLT3PEpzPV8p+iwRFJHXVOMnk="; + hash = "sha256-x9HQP+EqCteoCq2Sl/TQcfdzQC5iuE4gaSKe7tN5dAA="; }; kernelSrc = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.34.tar.xz"; - hash = "sha256-p/P+OB9n7KQXLptj77YaFL1/nhJ44DYD0P9ak/Jwwk0="; + url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.62.tar.xz"; + hash = "sha256-E+LGhayPq13Zkt0QVzJVTa5RSu81DCqMdBjnt062LBM="; }; postPatch = '' @@ -81,6 +81,12 @@ stdenv.mkDerivation (finalAttrs: { RossComputerGuy nrabulinski ]; - platforms = [ "x86_64-linux" ] ++ lib.optionals (variant == null) [ "aarch64-linux" ]; + platforms = [ + "x86_64-linux" + ] + ++ lib.optionals (variant == null) [ + "aarch64-linux" + "riscv64-linux" + ]; }; }) diff --git a/pkgs/by-name/li/libksba/package.nix b/pkgs/by-name/li/libksba/package.nix index ddb350d70042..97736060a1ac 100644 --- a/pkgs/by-name/li/libksba/package.nix +++ b/pkgs/by-name/li/libksba/package.nix @@ -7,12 +7,12 @@ libgpg-error, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libksba"; version = "1.6.7"; src = fetchurl { - url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2"; + url = "mirror://gnupg/libksba/libksba-${finalAttrs.version}.tar.bz2"; hash = "sha256-z3JRC467TrZpPu92V0nYNnegPHkpGjEQQKW/15uqt2M="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; license = lib.licenses.lgpl3; }; -} +}) diff --git a/pkgs/by-name/li/libksi/package.nix b/pkgs/by-name/li/libksi/package.nix index 4d5606444c36..ddf7396f70b8 100644 --- a/pkgs/by-name/li/libksi/package.nix +++ b/pkgs/by-name/li/libksi/package.nix @@ -7,14 +7,14 @@ curl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libksi"; version = "3.21.3087"; src = fetchFromGitHub { owner = "Guardtime"; repo = "libksi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-zEWxJpv0MeGUq/xkM26tDoauFyw53enGyWVhlX0jlYI="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/liblastfmSF/package.nix b/pkgs/by-name/li/liblastfmSF/package.nix index 8c7af49f4be0..9a5cd7e77f63 100644 --- a/pkgs/by-name/li/liblastfmSF/package.nix +++ b/pkgs/by-name/li/liblastfmSF/package.nix @@ -7,7 +7,7 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblastfm-SF"; version = "0.5"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://sourceforge/liblastfm/libclastfm-${version}.tar.gz"; + url = "mirror://sourceforge/liblastfm/libclastfm-${finalAttrs.version}.tar.gz"; sha256 = "0hpfflvfx6r4vvsbvdc564gkby8kr07p8ma7hgpxiy2pnlbpian9"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { description = "Unofficial C lastfm library"; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/li/liblaxjson/package.nix b/pkgs/by-name/li/liblaxjson/package.nix index 56658b5ff35c..088349952e3a 100644 --- a/pkgs/by-name/li/liblaxjson/package.nix +++ b/pkgs/by-name/li/liblaxjson/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.0.5"; pname = "liblaxjson"; src = fetchFromGitHub { owner = "andrewrk"; repo = "liblaxjson"; - rev = version; + rev = finalAttrs.version; sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { broken = stdenv.hostPlatform.isDarwin; maintainers = [ lib.maintainers.andrewrk ]; }; -} +}) diff --git a/pkgs/by-name/li/liblbfgs/package.nix b/pkgs/by-name/li/liblbfgs/package.nix index 2b85c561f88a..d4c1a065d958 100644 --- a/pkgs/by-name/li/liblbfgs/package.nix +++ b/pkgs/by-name/li/liblbfgs/package.nix @@ -3,13 +3,13 @@ stdenv, fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblbfgs"; version = "1.10"; configureFlags = [ "--enable-sse2" ]; src = fetchurl { - url = "https://github.com/downloads/chokkan/liblbfgs/liblbfgs-${version}.tar.gz"; + url = "https://github.com/downloads/chokkan/liblbfgs/liblbfgs-${finalAttrs.version}.tar.gz"; sha256 = "1kv8d289rbz38wrpswx5dkhr2yh4fg4h6sszkp3fawxm09sann21"; }; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/liblcf/package.nix b/pkgs/by-name/li/liblcf/package.nix index 615e95de225b..1edcbd599d81 100644 --- a/pkgs/by-name/li/liblcf/package.nix +++ b/pkgs/by-name/li/liblcf/package.nix @@ -10,7 +10,7 @@ inih, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblcf"; # When updating this package, you should probably also update # easyrpg-player and libretro.easyrpg @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "EasyRPG"; repo = "liblcf"; - rev = version; + rev = finalAttrs.version; hash = "sha256-jIk55+n8wSk3Z3FPR18SE7U3OuWwmp2zJgvSZQBB2l0="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/liblinear/package.nix b/pkgs/by-name/li/liblinear/package.nix index 38fee736dc36..646aa16435a1 100644 --- a/pkgs/by-name/li/liblinear/package.nix +++ b/pkgs/by-name/li/liblinear/package.nix @@ -7,14 +7,14 @@ let soVersion = "5"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblinear"; version = "2.47"; src = fetchFromGitHub { owner = "cjlin1"; repo = "liblinear"; - rev = "v${builtins.replaceStrings [ "." ] [ "" ] version}"; + rev = "v${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; sha256 = "sha256-so7uCc/52NdN0V2Ska8EUdw/wSegaudX5AF+c0xe5jk="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/liblockfile/package.nix b/pkgs/by-name/li/liblockfile/package.nix index 30c18c5d6729..52400d222ac3 100644 --- a/pkgs/by-name/li/liblockfile/package.nix +++ b/pkgs/by-name/li/liblockfile/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblockfile"; version = "1.17"; src = fetchurl { - url = "mirror://debian/pool/main/libl/liblockfile/liblockfile_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/libl/liblockfile/liblockfile_${finalAttrs.version}.orig.tar.gz"; sha256 = "sha256-bpN/NlCvq0qsGY80i4mxykLtzrF/trsJGPZCFDzP0V4="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/liblogging/package.nix b/pkgs/by-name/li/liblogging/package.nix index 0e21cfeb470c..1f87948f0818 100644 --- a/pkgs/by-name/li/liblogging/package.nix +++ b/pkgs/by-name/li/liblogging/package.nix @@ -7,12 +7,12 @@ systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblogging"; version = "1.0.6"; src = fetchurl { - url = "http://download.rsyslog.com/liblogging/liblogging-${version}.tar.gz"; + url = "http://download.rsyslog.com/liblogging/liblogging-${finalAttrs.version}.tar.gz"; sha256 = "14xz00mq07qmcgprlj5b2r21ljgpa4sbwmpr6jm2wrf8wms6331k"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/liblsl/package.nix b/pkgs/by-name/li/liblsl/package.nix index b923bb0b4c22..0a1e5514b0ca 100644 --- a/pkgs/by-name/li/liblsl/package.nix +++ b/pkgs/by-name/li/liblsl/package.nix @@ -6,14 +6,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblsl"; version = "1.16.2"; src = fetchFromGitHub { owner = "sccn"; repo = "liblsl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-nmu7Kxk4U5sGO8Od9JR4id4V4mjeibj4AHjUYhpGPeo="; }; passthru.updateScript = nix-update-script { }; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = { description = "C++ lsl library for multi-modal time-synched data transmission over the local network"; homepage = "https://github.com/sccn/liblsl"; - changelog = "https://github.com/sccn/liblsl/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/sccn/liblsl/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ abcsds ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libltc/package.nix b/pkgs/by-name/li/libltc/package.nix index 438647c3086a..c96bc55e08e7 100644 --- a/pkgs/by-name/li/libltc/package.nix +++ b/pkgs/by-name/li/libltc/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libltc"; version = "1.3.2"; src = fetchurl { - url = "https://github.com/x42/libltc/releases/download/v${version}/libltc-${version}.tar.gz"; + url = "https://github.com/x42/libltc/releases/download/v${finalAttrs.version}/libltc-${finalAttrs.version}.tar.gz"; sha256 = "sha256-Cm1CzWwh6SWif6Vg3EWsgAV9J18jNCECglkJwC07Ekk="; }; @@ -19,4 +19,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3Plus; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libmatchbox/package.nix b/pkgs/by-name/li/libmatchbox/package.nix index 2faa140afea7..70ec8514213b 100644 --- a/pkgs/by-name/li/libmatchbox/package.nix +++ b/pkgs/by-name/li/libmatchbox/package.nix @@ -13,7 +13,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmatchbox"; version = "1.14"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://git.yoctoproject.org/libmatchbox/snapshot/libmatchbox-${version}.tar.gz"; + url = "https://git.yoctoproject.org/libmatchbox/snapshot/libmatchbox-${finalAttrs.version}.tar.gz"; sha256 = "1b66jl178pkwmswf1gqcyrpy15rll1znz38n07l9b3ybga13w31d"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libmatroska/package.nix b/pkgs/by-name/li/libmatroska/package.nix index 70d8eff99a4d..e37c23943ba0 100644 --- a/pkgs/by-name/li/libmatroska/package.nix +++ b/pkgs/by-name/li/libmatroska/package.nix @@ -12,7 +12,7 @@ libmatroska, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmatroska"; version = "1.7.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libmatroska"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; hash = "sha256-hfu3Q1lIyMlWFWUM2Pu70Hie0rlQmua7Kq8kSIWnfHE="; }; @@ -59,10 +59,10 @@ stdenv.mkDerivation rec { meta = { description = "Library to parse Matroska files"; homepage = "https://matroska.org/"; - changelog = "https://github.com/Matroska-Org/libmatroska/blob/${src.rev}/NEWS.md"; + changelog = "https://github.com/Matroska-Org/libmatroska/blob/${finalAttrs.src.rev}/NEWS.md"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ getchoo ]; platforms = lib.platforms.unix; pkgConfigModules = [ "libmatroska" ]; }; -} +}) diff --git a/pkgs/by-name/li/libmatthew_java/package.nix b/pkgs/by-name/li/libmatthew_java/package.nix index 297e7ba6908f..c11ae7a4a681 100644 --- a/pkgs/by-name/li/libmatthew_java/package.nix +++ b/pkgs/by-name/li/libmatthew_java/package.nix @@ -7,12 +7,12 @@ let jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmatthew-java"; version = "0.8"; src = fetchurl { - url = "https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-${version}.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-${version}.tar.gz"; + url = "https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-${finalAttrs.version}.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-${finalAttrs.version}.tar.gz"; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME = jdk; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/li/libmbd/package.nix b/pkgs/by-name/li/libmbd/package.nix index fdba444b8f24..6c2200c25339 100644 --- a/pkgs/by-name/li/libmbd/package.nix +++ b/pkgs/by-name/li/libmbd/package.nix @@ -13,20 +13,20 @@ assert !blas.isILP64; assert !lapack.isILP64; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libMBD"; version = "0.13.0"; src = fetchFromGitHub { owner = "libmbd"; repo = "libMBD"; - rev = version; + rev = finalAttrs.version; hash = "sha256-mSKD/pNluumKP3SCubD68uak2Vya/1tyIh42UxRgSXY="; }; preConfigure = '' cat > cmake/libMBDVersionTag.cmake << EOF - set(VERSION_TAG "${version}") + set(VERSION_TAG "${finalAttrs.version}") EOF ''; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/li/libmbim/package.nix b/pkgs/by-name/li/libmbim/package.nix index b5c9160de6d4..c81226a8c509 100644 --- a/pkgs/by-name/li/libmbim/package.nix +++ b/pkgs/by-name/li/libmbim/package.nix @@ -18,7 +18,7 @@ gobject-introspection, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmbim"; version = "1.32.0"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "mobile-broadband"; repo = "libmbim"; - rev = version; + rev = finalAttrs.version; hash = "sha256-+4INXuH2kbKs9C6t4bOJye7yyfYH/BLukmgDVvXo+u0="; }; @@ -73,9 +73,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.freedesktop.org/wiki/Software/libmbim/"; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; - changelog = "https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/raw/${version}/NEWS"; + changelog = "https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/raw/${finalAttrs.version}/NEWS"; teams = [ lib.teams.freedesktop ]; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix index 729621a793ba..41d2852f60b7 100644 --- a/pkgs/by-name/li/libmediainfo/package.nix +++ b/pkgs/by-name/li/libmediainfo/package.nix @@ -12,12 +12,12 @@ curl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmediainfo"; version = "25.10"; src = fetchurl { - url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; + url = "https://mediaarea.net/download/source/libmediainfo/${finalAttrs.version}/libmediainfo_${finalAttrs.version}.tar.xz"; hash = "sha256-rRPZeXsEbOOdDGWm+B0q7yQpc0whhlpqTFksfAHySd0="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.devhell ]; }; -} +}) diff --git a/pkgs/by-name/li/libmemcached/package.nix b/pkgs/by-name/li/libmemcached/package.nix index 507816afab6b..dfcd86d022de 100644 --- a/pkgs/by-name/li/libmemcached/package.nix +++ b/pkgs/by-name/li/libmemcached/package.nix @@ -7,12 +7,12 @@ libevent, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmemcached"; version = "1.0.18"; src = fetchurl { - url = "https://launchpad.net/libmemcached/${lib.versions.majorMinor version}/${version}/+download/libmemcached-${version}.tar.gz"; + url = "https://launchpad.net/libmemcached/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.version}/+download/libmemcached-${finalAttrs.version}.tar.gz"; sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/li/libmicrodns/package.nix b/pkgs/by-name/li/libmicrodns/package.nix index a2cf4ef48c85..9283fc7a2bed 100644 --- a/pkgs/by-name/li/libmicrodns/package.nix +++ b/pkgs/by-name/li/libmicrodns/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.2.0"; pname = "libmicrodns"; src = fetchFromGitHub { owner = "videolabs"; repo = "libmicrodns"; - rev = version; + rev = finalAttrs.version; sha256 = "05vgka45c1frnv4q7pbz0bggsn5xaykh4xpklh9yb6d6qj7dbx0b"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.shazow ]; }; -} +}) diff --git a/pkgs/by-name/li/libmikmod/package.nix b/pkgs/by-name/li/libmikmod/package.nix index c6e0f62f0804..2a5e44304f46 100644 --- a/pkgs/by-name/li/libmikmod/package.nix +++ b/pkgs/by-name/li/libmikmod/package.nix @@ -11,12 +11,12 @@ let inherit (lib) optional optionalString; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmikmod"; version = "3.3.13"; src = fetchurl { - url = "mirror://sourceforge/mikmod/libmikmod-${version}.tar.gz"; + url = "mirror://sourceforge/mikmod/libmikmod-${finalAttrs.version}.tar.gz"; sha256 = "sha256-n8F5n36mqVx8WILemL6F/H0gugpKb8rK4RyMazgrsgc="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { including MOD, S3M, IT and XM. ''; }; -} +}) diff --git a/pkgs/by-name/li/libmilter/package.nix b/pkgs/by-name/li/libmilter/package.nix index 6a9addcb8e24..13cb982f65e0 100644 --- a/pkgs/by-name/li/libmilter/package.nix +++ b/pkgs/by-name/li/libmilter/package.nix @@ -6,12 +6,12 @@ fixDarwinDylibNames, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmilter"; version = "8.18.2"; src = fetchurl { - url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz"; + url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${finalAttrs.version}.tar.gz"; sha256 = "sha256-GghfqorOUs/94vXpvGEb21+BSByqq/RvBDe3GcoInS8="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fpletz ]; license = lib.licenses.sendmail; }; -} +}) diff --git a/pkgs/by-name/li/libmkv/package.nix b/pkgs/by-name/li/libmkv/package.nix index 5bbf2e44c110..6cb196ab2995 100644 --- a/pkgs/by-name/li/libmkv/package.nix +++ b/pkgs/by-name/li/libmkv/package.nix @@ -7,14 +7,14 @@ automake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmkv"; version = "0.6.5.1"; src = fetchFromGitHub { owner = "saintdev"; repo = "libmkv"; - tag = version; + tag = finalAttrs.version; sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.wmertens ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libmms/package.nix b/pkgs/by-name/li/libmms/package.nix index e304e654e723..88347e69ad5a 100644 --- a/pkgs/by-name/li/libmms/package.nix +++ b/pkgs/by-name/li/libmms/package.nix @@ -6,12 +6,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmms"; version = "0.6.4"; src = fetchurl { - url = "mirror://sourceforge/libmms/libmms-${version}.tar.gz"; + url = "mirror://sourceforge/libmms/libmms-${finalAttrs.version}.tar.gz"; sha256 = "0kvhxr5hkabj9v7ah2rzkbirndfqdijd9hp8v52c1z6bxddf019w"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.lgpl21; }; -} +}) diff --git a/pkgs/by-name/li/libmodbus/package.nix b/pkgs/by-name/li/libmodbus/package.nix index 71e688eb259c..2e1f1c851fe3 100644 --- a/pkgs/by-name/li/libmodbus/package.nix +++ b/pkgs/by-name/li/libmodbus/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmodbus"; version = "3.1.11"; src = fetchFromGitHub { owner = "stephane"; repo = "libmodbus"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-d/diR9yeV0WY0C6wqxYZfOjEKFeWTvN73MxcWtXPOJc="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix ++ windows; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/li/libmodsecurity/package.nix b/pkgs/by-name/li/libmodsecurity/package.nix index 144b64651851..123a55756e8f 100644 --- a/pkgs/by-name/li/libmodsecurity/package.nix +++ b/pkgs/by-name/li/libmodsecurity/package.nix @@ -19,14 +19,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmodsecurity"; version = "3.0.14"; src = fetchFromGitHub { owner = "owasp-modsecurity"; repo = "ModSecurity"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-SaeBO3+WvPhHiJoiOmijB0G3/QYxjAdxgeCVqESS+4U="; fetchSubmodules = true; }; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/modsecurity - cp ${src}/{AUTHORS,CHANGES,LICENSE,README.md,modsecurity.conf-recommended,unicode.mapping} $out/share/modsecurity + cp ${finalAttrs.src}/{AUTHORS,CHANGES,LICENSE,README.md,modsecurity.conf-recommended,unicode.mapping} $out/share/modsecurity ''; enableParallelBuilding = true; @@ -112,4 +112,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ izorkin ]; mainProgram = "modsec-rules-check"; }; -} +}) diff --git a/pkgs/by-name/li/libmodule/package.nix b/pkgs/by-name/li/libmodule/package.nix index 435b6a47c8a8..f2345de72eb3 100644 --- a/pkgs/by-name/li/libmodule/package.nix +++ b/pkgs/by-name/li/libmodule/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmodule"; version = "5.0.2"; src = fetchFromGitHub { owner = "FedeDP"; repo = "libmodule"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-93ItLKThtT9JRc+X/bRm06pugsN31HAF3qTUqqCu6nE="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { eadwu ]; }; -} +}) diff --git a/pkgs/by-name/li/libmodulemd/package.nix b/pkgs/by-name/li/libmodulemd/package.nix index bb1b7e430f3d..fd5c78db1990 100644 --- a/pkgs/by-name/li/libmodulemd/package.nix +++ b/pkgs/by-name/li/libmodulemd/package.nix @@ -17,7 +17,7 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmodulemd"; version = "2.15.0"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fedora-modularity"; repo = "libmodulemd"; - rev = "libmodulemd-${version}"; + rev = "libmodulemd-${finalAttrs.version}"; sha256 = "sha256-mIyrdksyEk1AKV+vw4g8LUwlQRzwwMkPDuCbw2IiNcA="; }; @@ -96,4 +96,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/li/libmongocrypt/package.nix b/pkgs/by-name/li/libmongocrypt/package.nix index 0c59816d8fc8..98efd633bdee 100644 --- a/pkgs/by-name/li/libmongocrypt/package.nix +++ b/pkgs/by-name/li/libmongocrypt/package.nix @@ -9,14 +9,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmongocrypt"; version = "1.7.4"; src = fetchFromGitHub { owner = "mongodb"; repo = "libmongocrypt"; - rev = version; + rev = finalAttrs.version; hash = "sha256-I4KG2BHAovin9EaF8lNzJzucARvi0Qptz5Y9gTt3WkE="; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "-DMONGOCRYPT_ENABLE_DECIMAL128=OFF" # this avoids a dependency on Python - "-DBUILD_VERSION=${version}" + "-DBUILD_VERSION=${finalAttrs.version}" ]; meta = { @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libmowgli/package.nix b/pkgs/by-name/li/libmowgli/package.nix index d744dfbf9146..75a4bf2476d2 100644 --- a/pkgs/by-name/li/libmowgli/package.nix +++ b/pkgs/by-name/li/libmowgli/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmowgli"; version = "2.1.3"; src = fetchFromGitHub { owner = "atheme"; repo = "libmowgli-2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-jlw6ixMoIdIjmQ86N+KN+Gez218sw894POkcCYnT0s0="; }; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { license = lib.licenses.isc; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libmpack/package.nix b/pkgs/by-name/li/libmpack/package.nix index c852ac0736a9..8a64dd0e3f7e 100644 --- a/pkgs/by-name/li/libmpack/package.nix +++ b/pkgs/by-name/li/libmpack/package.nix @@ -5,13 +5,13 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmpack"; version = "1.0.5"; src = fetchFromGitHub { owner = "libmpack"; repo = "libmpack"; - rev = version; + rev = finalAttrs.version; sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lovek323 ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/li/libmpc/package.nix b/pkgs/by-name/li/libmpc/package.nix index 3ff1220deb12..cbfc47befa40 100644 --- a/pkgs/by-name/li/libmpc/package.nix +++ b/pkgs/by-name/li/libmpc/package.nix @@ -12,12 +12,12 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmpc"; version = "1.3.1"; # to avoid clash with the MPD client src = fetchurl { - url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; + url = "mirror://gnu/mpc/mpc-${finalAttrs.version}.tar.gz"; sha256 = "sha256-q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libmpcdec/package.nix b/pkgs/by-name/li/libmpcdec/package.nix index 55d33a2327f9..ef59f3b9c292 100644 --- a/pkgs/by-name/li/libmpcdec/package.nix +++ b/pkgs/by-name/li/libmpcdec/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmpcdec"; version = "1.2.6"; src = fetchurl { - url = "https://files.musepack.net/source/libmpcdec-${version}.tar.bz2"; + url = "https://files.musepack.net/source/libmpcdec-${finalAttrs.version}.tar.bz2"; sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab"; }; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/li/libmtp/package.nix b/pkgs/by-name/li/libmtp/package.nix index 3e990343bbfd..41848990378f 100644 --- a/pkgs/by-name/li/libmtp/package.nix +++ b/pkgs/by-name/li/libmtp/package.nix @@ -13,14 +13,14 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmtp"; version = "1.1.22"; src = fetchFromGitHub { owner = "libmtp"; repo = "libmtp"; - rev = "libmtp-${builtins.replaceStrings [ "." ] [ "-" ] version}"; + rev = "libmtp-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; sha256 = "sha256-hIH6W8qQ6DB4ST7SlFz6CCnLsEGOWgmUb9HoHMNA3wY="; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ lovesegfault ]; }; -} +}) diff --git a/pkgs/by-name/li/libmwaw/package.nix b/pkgs/by-name/li/libmwaw/package.nix index 3fdb31a44bc1..ed8cbd789a33 100644 --- a/pkgs/by-name/li/libmwaw/package.nix +++ b/pkgs/by-name/li/libmwaw/package.nix @@ -11,12 +11,12 @@ librevenge, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmwaw"; version = "0.3.22"; src = fetchurl { - url = "mirror://sourceforge/libmwaw/libmwaw/libmwaw-${version}/libmwaw-${version}.tar.xz"; + url = "mirror://sourceforge/libmwaw/libmwaw/libmwaw-${finalAttrs.version}/libmwaw-${finalAttrs.version}.tar.xz"; sha256 = "sha256-oaOf/Oo/8qenquDCOHfd9JGLVUv4Kw3l186Of2HqjjI="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libmypaint/package.nix b/pkgs/by-name/li/libmypaint/package.nix index 39b3e6d5508e..c5478e2f106e 100644 --- a/pkgs/by-name/li/libmypaint/package.nix +++ b/pkgs/by-name/li/libmypaint/package.nix @@ -12,7 +12,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmypaint"; version = "1.6.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mypaint"; repo = "libmypaint"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1ppgpmnhph9h8ayx9776f79a0bxbdszfw9c6bw7c3ffy2yk40178"; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jtojnar ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libmysofa/package.nix b/pkgs/by-name/li/libmysofa/package.nix index e5dac672f46f..b32265cc07a7 100644 --- a/pkgs/by-name/li/libmysofa/package.nix +++ b/pkgs/by-name/li/libmysofa/package.nix @@ -6,14 +6,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmysofa"; version = "1.3.3"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-jvib1hGPJEY2w/KjlD7iTtRy1s8LFG+Qhb2d6xdpUyc="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix index 20b43867566d..5638f55440c1 100644 --- a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix +++ b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix @@ -8,12 +8,12 @@ mysql80, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmysqlconnectorcpp"; version = "9.4.0"; src = fetchurl { - url = "mirror://mysql/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; + url = "mirror://mysql/Connector-C++/mysql-connector-c++-${finalAttrs.version}-src.tar.gz"; hash = "sha256-NqfJPUoQ0doqLmY2dVnZF0GqDwNivArpQxcc8XcfZhU="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libnats-c/package.nix b/pkgs/by-name/li/libnats-c/package.nix index 4fc6f8938002..2a3ba0cb318e 100644 --- a/pkgs/by-name/li/libnats-c/package.nix +++ b/pkgs/by-name/li/libnats-c/package.nix @@ -9,14 +9,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnats"; version = "3.11.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-W1WxaQ33K+N3AHCK3sQWTQo4sN57qW2ZuAGrj6JpgCU="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/li/libndp/package.nix b/pkgs/by-name/li/libndp/package.nix index 8d99227d1df4..28b2407b1ff4 100644 --- a/pkgs/by-name/li/libndp/package.nix +++ b/pkgs/by-name/li/libndp/package.nix @@ -6,12 +6,12 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libndp"; version = "1.9"; src = fetchurl { - url = "http://libndp.org/files/libndp-${version}.tar.gz"; + url = "http://libndp.org/files/libndp-${finalAttrs.version}.tar.gz"; hash = "sha256-qKshTgHcOpthUnaQU5VjfzkSmMhNd2UfDL8LEILdLdQ="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; }; -} +}) diff --git a/pkgs/by-name/li/libnet/package.nix b/pkgs/by-name/li/libnet/package.nix index be9a0600baf8..298c0ecf7e2b 100644 --- a/pkgs/by-name/li/libnet/package.nix +++ b/pkgs/by-name/li/libnet/package.nix @@ -8,14 +8,14 @@ bash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnet"; version = "1.3"; src = fetchFromGitHub { owner = "sam-github"; repo = "libnet"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-P3LaDMMNPyEnA8nO1Bm7H0mW/hVBr0cFdg+p2JmWcGI="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libnfc/package.nix b/pkgs/by-name/li/libnfc/package.nix index 75aa3663d192..087bb6ed31d3 100644 --- a/pkgs/by-name/li/libnfc/package.nix +++ b/pkgs/by-name/li/libnfc/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnfc"; version = "1.8.0"; src = fetchFromGitHub { owner = "nfc-tools"; repo = "libnfc"; - rev = "libnfc-${version}"; + rev = "libnfc-${finalAttrs.version}"; sha256 = "5gMv/HajPrUL/vkegEqHgN2d6Yzf01dTMrx4l34KMrQ="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ offline ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libnfnetlink/package.nix b/pkgs/by-name/li/libnfnetlink/package.nix index 897b257ab3ef..f9267390dbb4 100644 --- a/pkgs/by-name/li/libnfnetlink/package.nix +++ b/pkgs/by-name/li/libnfnetlink/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnfnetlink"; version = "1.0.2"; src = fetchurl { - url = "https://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${version}.tar.bz2"; + url = "https://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${finalAttrs.version}.tar.bz2"; sha256 = "0xn3rcrzxr6g82kfxzs9bqn2zvl2kf2yda30drwb9vr6sk1wfr5h"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libnfs/package.nix b/pkgs/by-name/li/libnfs/package.nix index c902507761c8..305b95a852f1 100644 --- a/pkgs/by-name/li/libnfs/package.nix +++ b/pkgs/by-name/li/libnfs/package.nix @@ -6,14 +6,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnfs"; version = "5.0.2"; src = fetchFromGitHub { owner = "sahlberg"; repo = "libnfs"; - rev = "libnfs-${version}"; + rev = "libnfs-${finalAttrs.version}"; sha256 = "sha256-rdxi5bPXHTICZQIj/CmHgZ/V70svnITJj/OSF4mmC3o="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ peterhoeg ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libngspice/package.nix b/pkgs/by-name/li/libngspice/package.nix index dfb1e6244a40..88a053851a55 100644 --- a/pkgs/by-name/li/libngspice/package.nix +++ b/pkgs/by-name/li/libngspice/package.nix @@ -12,12 +12,12 @@ readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "${lib.optionalString withNgshared "lib"}ngspice"; version = "45"; src = fetchurl { - url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; + url = "mirror://sourceforge/ngspice/ngspice-${finalAttrs.version}.tar.gz"; hash = "sha256-8arYq6woKKe3HaZkEd6OQGUk518wZuRnVUOcSQRC1zQ="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bgamari ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libnl/package.nix b/pkgs/by-name/li/libnl/package.nix index 21e441960d15..f4f2761ea3c3 100644 --- a/pkgs/by-name/li/libnl/package.nix +++ b/pkgs/by-name/li/libnl/package.nix @@ -17,14 +17,14 @@ python ? null, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnl"; version = "3.12.0"; src = fetchFromGitHub { repo = "libnl"; owner = "thom311"; - rev = "libnl${lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "libnl${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-K77WamOf+/3PNXe/hI+OYg0EBgBqvDfNDamXYXcK7P8="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fpletz ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libnsl/package.nix b/pkgs/by-name/li/libnsl/package.nix index a031474c6a71..30e91035a7d8 100644 --- a/pkgs/by-name/li/libnsl/package.nix +++ b/pkgs/by-name/li/libnsl/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnsl"; version = "2.0.1"; src = fetchFromGitHub { owner = "thkukuk"; repo = "libnsl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-bCToqXVE4RZcoZ2eTNZcVHyzKlWyIpSAssQCOZcfmEA="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.dezgeg ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libnss-mysql/package.nix b/pkgs/by-name/li/libnss-mysql/package.nix index ed921c924969..125c6a8c0f39 100644 --- a/pkgs/by-name/li/libnss-mysql/package.nix +++ b/pkgs/by-name/li/libnss-mysql/package.nix @@ -8,14 +8,14 @@ libmysqlclient, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnss-mysql"; version = "1.7.1"; src = fetchFromGitHub { owner = "saknopper"; repo = "libnss-mysql"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1fhsswa3h2nkhjkyjxxqnj07rlx6bmfvd8j521snimx2jba8h0d6"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ netali ]; }; -} +}) diff --git a/pkgs/by-name/li/libnss_nis/package.nix b/pkgs/by-name/li/libnss_nis/package.nix index 8bf05cdabad0..f16f5bf133bf 100644 --- a/pkgs/by-name/li/libnss_nis/package.nix +++ b/pkgs/by-name/li/libnss_nis/package.nix @@ -9,7 +9,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnss_nis"; version = "3.4"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "thkukuk"; repo = "libnss_nis"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-FWAyf4soSUpNrYzSefNWthEMfQEopfYX9pMDf1rNK6c="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ BarrOff ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libnut/package.nix b/pkgs/by-name/li/libnut/package.nix index f62fb86d0703..38684e540dad 100644 --- a/pkgs/by-name/li/libnut/package.nix +++ b/pkgs/by-name/li/libnut/package.nix @@ -3,7 +3,7 @@ lib, fetchgit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnut"; version = "unstable-2020-11-06"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1wgl2mb9482c1j3yac0v2ilfjs7gb9mhw9kjnrmlj9kp0whm4l1j"; }; - sourceRoot = "${src.name}/src/trunk"; + sourceRoot = "${finalAttrs.src.name}/src/trunk"; makeFlags = [ "prefix=$(out)" ]; installTargets = [ "install-libnut" @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ quag ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libodfgen/package.nix b/pkgs/by-name/li/libodfgen/package.nix index cd5f492fdc91..5a6b9ddc2978 100644 --- a/pkgs/by-name/li/libodfgen/package.nix +++ b/pkgs/by-name/li/libodfgen/package.nix @@ -11,12 +11,12 @@ librevenge, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libodfgen"; version = "0.1.7"; src = fetchurl { - url = "mirror://sourceforge/project/libwpd/libodfgen/libodfgen-${version}/libodfgen-${version}.tar.xz"; + url = "mirror://sourceforge/project/libwpd/libodfgen/libodfgen-${finalAttrs.version}/libodfgen-${finalAttrs.version}.tar.xz"; sha256 = "sha256-Mj5JH5VsjKKrsSyZjjUGcJMKMjF7+WYrBhXdSzkiuDE="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libofx/package.nix b/pkgs/by-name/li/libofx/package.nix index a5cbe80e7bf2..d74091756ecd 100644 --- a/pkgs/by-name/li/libofx/package.nix +++ b/pkgs/by-name/li/libofx/package.nix @@ -13,14 +13,14 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libofx"; version = "0.10.9"; src = fetchFromGitHub { owner = "LibOFX"; repo = "libofx"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-KOQrEAt1jHrOpPQ7QbGUADe0i7sQXNH2fblPRzT0EIg="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libomemo-c/package.nix b/pkgs/by-name/li/libomemo-c/package.nix index 1d7c8e442015..a59d258240f2 100644 --- a/pkgs/by-name/li/libomemo-c/package.nix +++ b/pkgs/by-name/li/libomemo-c/package.nix @@ -10,14 +10,14 @@ protobufc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libomemo-c"; version = "0.5.1"; src = fetchFromGitHub { owner = "dino"; repo = "libomemo-c"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-HoZykdGVDsj4L5yN3SHGF5tjMq5exJyC15zTLBlpX/c="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.astro ]; }; -} +}) diff --git a/pkgs/by-name/li/libopenaptx/package.nix b/pkgs/by-name/li/libopenaptx/package.nix index 61c2c092c524..dab5bd782f01 100644 --- a/pkgs/by-name/li/libopenaptx/package.nix +++ b/pkgs/by-name/li/libopenaptx/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libopenaptx"; version = "0.2.1"; src = fetchFromGitHub { owner = "pali"; repo = "libopenaptx"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-4FYKxw1U+efCfzKOPSDJH8a/dG0KV+anJDgxjqzD80k="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libopenmpt-modplug/package.nix b/pkgs/by-name/li/libopenmpt-modplug/package.nix index c3191eb7b0a9..660d585d8d12 100644 --- a/pkgs/by-name/li/libopenmpt-modplug/package.nix +++ b/pkgs/by-name/li/libopenmpt-modplug/package.nix @@ -7,7 +7,7 @@ libopenmpt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libopenmpt-modplug"; version = "0.8.9.0-openmpt1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://lib.openmpt.org/files/libopenmpt-modplug/libopenmpt-modplug-${version}.tar.gz"; + url = "https://lib.openmpt.org/files/libopenmpt-modplug/libopenmpt-modplug-${finalAttrs.version}.tar.gz"; sha256 = "sha256-7M4aDuz9sLWCTKuJwnDc5ZWWKVosF8KwQyFez018T/c="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libopenmpt/package.nix b/pkgs/by-name/li/libopenmpt/package.nix index 59c06637b483..5187644b1710 100644 --- a/pkgs/by-name/li/libopenmpt/package.nix +++ b/pkgs/by-name/li/libopenmpt/package.nix @@ -15,7 +15,7 @@ libpulseaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libopenmpt"; version = "0.8.4"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; + url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${finalAttrs.version}+release.autotools.tar.gz"; hash = "sha256-Yn+b8RqsrmFaHyyYLH6IyyHxGy1vAmeUb3yCxerklDs="; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libopenraw/package.nix b/pkgs/by-name/li/libopenraw/package.nix index 60cf93670cd4..b125fbd3a736 100644 --- a/pkgs/by-name/li/libopenraw/package.nix +++ b/pkgs/by-name/li/libopenraw/package.nix @@ -12,12 +12,12 @@ rustc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libopenraw"; version = "0.3.7"; src = fetchurl { - url = "https://libopenraw.freedesktop.org/download/libopenraw-${version}.tar.bz2"; + url = "https://libopenraw.freedesktop.org/download/libopenraw-${finalAttrs.version}.tar.bz2"; hash = "sha256-VRWyYQNh7zRYC2uXZjURn23ttPCnnVRmL6X+YYakXtU="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.struan ]; }; -} +}) diff --git a/pkgs/by-name/li/libopensmtpd/package.nix b/pkgs/by-name/li/libopensmtpd/package.nix index ff9556304eb1..9a4142174345 100644 --- a/pkgs/by-name/li/libopensmtpd/package.nix +++ b/pkgs/by-name/li/libopensmtpd/package.nix @@ -5,12 +5,12 @@ libevent, mandoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libopensmtpd"; version = "0.7"; src = fetchurl { - url = "https://imperialat.at/releases/libopensmtpd-${version}.tar.gz"; + url = "https://imperialat.at/releases/libopensmtpd-${finalAttrs.version}.tar.gz"; hash = "sha256-zdbV4RpwY/kmXaQ6QjCcZGVUuLaLA5gsqEctvisIphM="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ malte-v ]; }; -} +}) diff --git a/pkgs/by-name/li/libopusenc/package.nix b/pkgs/by-name/li/libopusenc/package.nix index 973ca7000d35..d4d5653efa9c 100644 --- a/pkgs/by-name/li/libopusenc/package.nix +++ b/pkgs/by-name/li/libopusenc/package.nix @@ -6,12 +6,12 @@ libopus, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libopusenc"; version = "0.2.1"; src = fetchurl { - url = "mirror://mozilla/opus/libopusenc-${version}.tar.gz"; + url = "mirror://mozilla/opus/libopusenc-${finalAttrs.version}.tar.gz"; sha256 = "1ffb0vhlymlsq70pxsjj0ksz77yfm2x0a1x8q50kxmnkm1hxp642"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ pmiddend ]; }; -} +}) diff --git a/pkgs/by-name/li/liborcus/package.nix b/pkgs/by-name/li/liborcus/package.nix index f9e5a27b7ddc..a91620301b8a 100644 --- a/pkgs/by-name/li/liborcus/package.nix +++ b/pkgs/by-name/li/liborcus/package.nix @@ -11,14 +11,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liborcus"; version = "0.19.2"; src = fetchFromGitLab { owner = "orcus"; repo = "orcus"; - rev = version; + rev = finalAttrs.version; hash = "sha256-+9C52H99c/kL5DEIoXV+WcLnTftRbicRLQN/FdIXBw8="; }; @@ -62,9 +62,9 @@ stdenv.mkDerivation rec { meta = { description = "Collection of parsers and import filters for spreadsheet documents"; homepage = "https://gitlab.com/orcus/orcus"; - changelog = "https://gitlab.com/orcus/orcus/-/blob/${src.rev}/CHANGELOG"; + changelog = "https://gitlab.com/orcus/orcus/-/blob/${finalAttrs.src.rev}/CHANGELOG"; license = lib.licenses.mpl20; maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libosip/package.nix b/pkgs/by-name/li/libosip/package.nix index a7bf8e5e0a31..b0515180856f 100644 --- a/pkgs/by-name/li/libosip/package.nix +++ b/pkgs/by-name/li/libosip/package.nix @@ -3,10 +3,10 @@ stdenv, fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "5.3.1"; src = fetchurl { - url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; + url = "mirror://gnu/osip/libosip2-${finalAttrs.version}.tar.gz"; sha256 = "sha256-/oL+hBYIJmrBWlwRGCFtoAxVTVAG4odaisN1Kx5q3Hk="; }; pname = "libosip2"; @@ -18,4 +18,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libosmo-netif/package.nix b/pkgs/by-name/li/libosmo-netif/package.nix index cd57f4c0ea68..55a192ed0b5b 100644 --- a/pkgs/by-name/li/libosmo-netif/package.nix +++ b/pkgs/by-name/li/libosmo-netif/package.nix @@ -8,19 +8,19 @@ libosmocore, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libosmo-netif"; version = "1.6.1"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmo-netif"; - rev = version; + rev = finalAttrs.version; hash = "sha256-0INgJV5fS6VdMsJqjlVc3lGMBdLP7cI+Ghc4WEh6AuU="; }; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/li/libosmo-sigtran/package.nix b/pkgs/by-name/li/libosmo-sigtran/package.nix index 1d2555ed4e7b..116ccc5f7211 100644 --- a/pkgs/by-name/li/libosmo-sigtran/package.nix +++ b/pkgs/by-name/li/libosmo-sigtran/package.nix @@ -9,21 +9,21 @@ libosmo-netif, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libosmo-sigtran"; version = "2.1.2"; # fetchFromGitea hangs src = fetchgit { url = "https://gitea.osmocom.org/osmocom/libosmo-sigtran.git"; - rev = version; + rev = finalAttrs.version; hash = "sha256-/TxD7lc/htm1c24rKfnlYxGsVpxawi3nh7m34mRRhUA="; }; configureFlags = [ "--with-systemdsystemunitdir=$out" ]; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/li/libosmoabis/package.nix b/pkgs/by-name/li/libosmoabis/package.nix index 067357f8a895..3e3bfc36174f 100644 --- a/pkgs/by-name/li/libosmoabis/package.nix +++ b/pkgs/by-name/li/libosmoabis/package.nix @@ -9,21 +9,21 @@ linphonePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libosmoabis"; version = "2.0.1"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmo-abis"; - rev = version; + rev = finalAttrs.version; hash = "sha256-OdmegQXdbpwNBepY+7MeUjaEguVo2q9b8lSkRmlXHEc="; }; configureFlags = [ "enable_dahdi=false" ]; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/li/libosmocore/package.nix b/pkgs/by-name/li/libosmocore/package.nix index df8da21d34b4..454ecea1d58d 100644 --- a/pkgs/by-name/li/libosmocore/package.nix +++ b/pkgs/by-name/li/libosmocore/package.nix @@ -14,19 +14,19 @@ talloc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libosmocore"; version = "1.11.3"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; - rev = version; + rev = finalAttrs.version; hash = "sha256-4fb7vmA3iQuQZ+T2Gp0B7bc5+CYE1cTR3IoFwOde7SE="; }; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; propagatedBuildInputs = [ @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { mog ]; }; -} +}) diff --git a/pkgs/by-name/li/libossp_uuid/package.nix b/pkgs/by-name/li/libossp_uuid/package.nix index 058b709ea80e..3d2af7875c5b 100644 --- a/pkgs/by-name/li/libossp_uuid/package.nix +++ b/pkgs/by-name/li/libossp_uuid/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libossp-uuid"; version = "1.6.2"; src = fetchurl { - url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz"; + url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${finalAttrs.version}.tar.gz"; sha256 = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libotr/package.nix b/pkgs/by-name/li/libotr/package.nix index 0e605813e6df..1995494a170f 100644 --- a/pkgs/by-name/li/libotr/package.nix +++ b/pkgs/by-name/li/libotr/package.nix @@ -7,12 +7,12 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libotr"; version = "4.1.1"; src = fetchurl { - url = "https://otr.cypherpunks.ca/libotr-${version}.tar.gz"; + url = "https://otr.cypherpunks.ca/libotr-${finalAttrs.version}.tar.gz"; sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { description = "Library for Off-The-Record Messaging"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libow/package.nix b/pkgs/by-name/li/libow/package.nix index 090733a6480c..f4444263531a 100644 --- a/pkgs/by-name/li/libow/package.nix +++ b/pkgs/by-name/li/libow/package.nix @@ -8,14 +8,14 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.2p4"; pname = "libow"; src = fetchFromGitHub { owner = "owfs"; repo = "owfs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s"; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ disserman ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libpam-wrapper/package.nix b/pkgs/by-name/li/libpam-wrapper/package.nix index 692d86ffa196..2586fdae3a80 100644 --- a/pkgs/by-name/li/libpam-wrapper/package.nix +++ b/pkgs/by-name/li/libpam-wrapper/package.nix @@ -11,13 +11,13 @@ assert enablePython -> python != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libpam-wrapper"; version = "1.1.5"; src = fetchgit { url = "git://git.samba.org/pam_wrapper.git"; - rev = "pam_wrapper-${version}"; + rev = "pam_wrapper-${finalAttrs.version}"; hash = "sha256-AtfkiCUvCxUfll6lOlbMyy5AhS5R2BGF1+ecC1VuwzM="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libpaper/package.nix b/pkgs/by-name/li/libpaper/package.nix index 452d787318ce..d15318f30b06 100644 --- a/pkgs/by-name/li/libpaper/package.nix +++ b/pkgs/by-name/li/libpaper/package.nix @@ -5,12 +5,12 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.1.29"; pname = "libpaper"; src = fetchurl { - url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz"; + url = "mirror://debian/pool/main/libp/libpaper/libpaper_${finalAttrs.version}.tar.gz"; hash = "sha256-JjMOIemjEkZY1RX9hQsM3lRv9C2JsllqUmTF8Wd/BUc="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libpg_query/package.nix b/pkgs/by-name/li/libpg_query/package.nix index c25f12819f2a..94ac3a3d48b8 100644 --- a/pkgs/by-name/li/libpg_query/package.nix +++ b/pkgs/by-name/li/libpg_query/package.nix @@ -7,14 +7,14 @@ protobufc, xxHash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libpg_query"; version = "17-6.1.0"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UXba2WYyIO7RcFcNZeLL+Q9CwlloMZ5oFfHfL7+j4dU="; }; @@ -52,9 +52,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/pganalyze/libpg_query"; description = "C library for accessing the PostgreSQL parser outside of the server environment"; - changelog = "https://github.com/pganalyze/libpg_query/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/pganalyze/libpg_query/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix index 06684e596f7a..e5edf9b3696a 100644 --- a/pkgs/by-name/li/libphonenumber/package.nix +++ b/pkgs/by-name/li/libphonenumber/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "9.0.22"; + version = "9.0.23"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-gQcMpwVf49m/f62ABd7/IluLe8mUjapNtnrPSmaLJJ0="; + hash = "sha256-HqoyICuGVR8qZNmNeHMbgzG77gUvhbQC0sfEA8v2o1c="; }; patches = [ diff --git a/pkgs/by-name/li/libpipeline/package.nix b/pkgs/by-name/li/libpipeline/package.nix index af4d705853fc..9de45b81e919 100644 --- a/pkgs/by-name/li/libpipeline/package.nix +++ b/pkgs/by-name/li/libpipeline/package.nix @@ -5,12 +5,12 @@ updateAutotoolsGnuConfigScriptsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libpipeline"; version = "1.5.8"; src = fetchurl { - url = "mirror://savannah/libpipeline/libpipeline-${version}.tar.gz"; + url = "mirror://savannah/libpipeline/libpipeline-${finalAttrs.version}.tar.gz"; hash = "sha256-GxIDyhUszWOYPD8hEvf+b6Wv1FMhjt5RU9GzHhG7hAU="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/li/libplacebo/package.nix b/pkgs/by-name/li/libplacebo/package.nix index b9f2bc36706a..dee8248139b6 100644 --- a/pkgs/by-name/li/libplacebo/package.nix +++ b/pkgs/by-name/li/libplacebo/package.nix @@ -20,7 +20,7 @@ vulkanSupport ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libplacebo"; version = "7.351.0"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { domain = "code.videolan.org"; owner = "videolan"; repo = "libplacebo"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ccoEFpp6tOFdrfMyE0JNKKMAdN4Q95tP7j7vzUj+lSQ="; }; @@ -90,9 +90,9 @@ stdenv.mkDerivation rec { MoltenVK). ''; homepage = "https://code.videolan.org/videolan/libplacebo"; - changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${version}"; + changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${finalAttrs.version}"; license = lib.licenses.lgpl21Plus; maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libplacebo_5/package.nix b/pkgs/by-name/li/libplacebo_5/package.nix index a792ccde88ad..edf63e277800 100644 --- a/pkgs/by-name/li/libplacebo_5/package.nix +++ b/pkgs/by-name/li/libplacebo_5/package.nix @@ -17,7 +17,7 @@ libdovi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libplacebo"; version = "5.264.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { domain = "code.videolan.org"; owner = "videolan"; repo = "libplacebo"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-YEefuEfJURi5/wswQKskA/J1UGzessQQkBpltJ0Spq8="; }; @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { MoltenVK). ''; homepage = "https://code.videolan.org/videolan/libplacebo"; - changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${version}"; + changelog = "https://code.videolan.org/videolan/libplacebo/-/tags/v${finalAttrs.version}"; license = lib.licenses.lgpl21Plus; maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libplist/package.nix b/pkgs/by-name/li/libplist/package.nix index 78a7d466bade..f8af87ff1ce7 100644 --- a/pkgs/by-name/li/libplist/package.nix +++ b/pkgs/by-name/li/libplist/package.nix @@ -9,7 +9,7 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libplist"; version = "2.7.0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "libimobiledevice"; repo = "libplist"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Rc1KwJR+Pb2lN8019q5ywERrR7WA2LuLRiEvNsZSxXc="; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; preAutoreconf = '' - export RELEASE_VERSION=${version} + export RELEASE_VERSION=${finalAttrs.version} ''; configureFlags = [ @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "plistutil"; }; -} +}) diff --git a/pkgs/by-name/li/libpoly/package.nix b/pkgs/by-name/li/libpoly/package.nix index d953ed54cdfd..7979242fa6a5 100644 --- a/pkgs/by-name/li/libpoly/package.nix +++ b/pkgs/by-name/li/libpoly/package.nix @@ -7,7 +7,7 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libpoly"; version = "0.2.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "SRI-CSL"; repo = "libpoly"; # they've pushed to the release branch, use explicit tag - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-gE2O1YfiVab/aIqheoMP8GhE+N3yho7kb5EP56pzjW8="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix index a26b79f2b48d..13e196e9910d 100644 --- a/pkgs/by-name/li/libportal/package.nix +++ b/pkgs/by-name/li/libportal/package.nix @@ -20,7 +20,7 @@ assert variant == null || variant == "gtk3" || variant == "gtk4" || variant == "qt5" || variant == "qt6"; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libportal" + lib.optionalString (variant != null) "-${variant}"; version = "0.9.1"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "flatpak"; repo = "libportal"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-CXI4rBr9wxLUX537d6SNNf8YFR/J6YdeROlFt3edeOU="; }; @@ -105,4 +105,4 @@ stdenv.mkDerivation rec { # needs memfd_create which is available on some unixes but not darwin badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; }; -} +}) diff --git a/pkgs/by-name/li/libpostal/package.nix b/pkgs/by-name/li/libpostal/package.nix index 0e930a08ba56..4cdafbe4680d 100644 --- a/pkgs/by-name/li/libpostal/package.nix +++ b/pkgs/by-name/li/libpostal/package.nix @@ -25,14 +25,14 @@ let stripRoot = false; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libpostal"; version = "1.1"; src = fetchFromGitHub { owner = "openvenues"; repo = "libpostal"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7G/CjYdVzsrvUFXGODoXgXoRp8txkl5SddcPtgltrjY="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { mainProgram = "libpostal_data"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libppd/package.nix b/pkgs/by-name/li/libppd/package.nix index 5e0b0706d0bd..5c6879fca097 100644 --- a/pkgs/by-name/li/libppd/package.nix +++ b/pkgs/by-name/li/libppd/package.nix @@ -12,14 +12,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libppd"; version = "2.1.1"; src = fetchFromGitHub { owner = "OpenPrinting"; repo = "libppd"; - rev = version; + rev = finalAttrs.version; hash = "sha256-8ofCv+tKgBk9GoGD4lmBPB/S4ABZ6cWGOk/KqDsEzNk="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libpsl/package.nix b/pkgs/by-name/li/libpsl/package.nix index d738a00d7283..d986b47ff5b9 100644 --- a/pkgs/by-name/li/libpsl/package.nix +++ b/pkgs/by-name/li/libpsl/package.nix @@ -16,12 +16,12 @@ publicsuffix-list, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libpsl"; version = "0.21.5"; src = fetchurl { - url = "https://github.com/rockdaboot/libpsl/releases/download/${version}/libpsl-${version}.tar.lz"; + url = "https://github.com/rockdaboot/libpsl/releases/download/${finalAttrs.version}/libpsl-${finalAttrs.version}.tar.lz"; hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0="; }; @@ -93,11 +93,11 @@ stdenv.mkDerivation rec { the domain in a user interface or sorting domain lists by site. ''; homepage = "https://rockdaboot.github.io/libpsl/"; - changelog = "https://raw.githubusercontent.com/rockdaboot/libpsl/libpsl-${version}/NEWS"; + changelog = "https://raw.githubusercontent.com/rockdaboot/libpsl/libpsl-${finalAttrs.version}/NEWS"; license = lib.licenses.mit; maintainers = [ lib.maintainers.c0bw3b ]; mainProgram = "psl"; platforms = lib.platforms.unix ++ lib.platforms.windows; pkgConfigModules = [ "libpsl" ]; }; -} +}) diff --git a/pkgs/by-name/li/libpsm2/package.nix b/pkgs/by-name/li/libpsm2/package.nix index 28ac598c8ff1..0eb5caad1776 100644 --- a/pkgs/by-name/li/libpsm2/package.nix +++ b/pkgs/by-name/li/libpsm2/package.nix @@ -7,7 +7,7 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libpsm2"; version = "12.0.1"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "intel"; repo = "opa-psm2"; - rev = "PSM2_${version}"; + rev = "PSM2_${finalAttrs.version}"; sha256 = "sha256-MzocxY+X2a5rJvTo+gFU0U10YzzazR1IxzgEporJyhI="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { # uses __off64_t, srand48_r, lrand48_r, drand48_r broken = stdenv.hostPlatform.isMusl; }; -} +}) diff --git a/pkgs/by-name/li/libqmi/package.nix b/pkgs/by-name/li/libqmi/package.nix index 6508bbc1f663..2b98864120d4 100644 --- a/pkgs/by-name/li/libqmi/package.nix +++ b/pkgs/by-name/li/libqmi/package.nix @@ -24,7 +24,7 @@ withMan ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libqmi"; version = "1.36.0"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "mobile-broadband"; repo = "libqmi"; - rev = version; + rev = finalAttrs.version; hash = "sha256-cGNnw0vO/Hr9o/eIf6lLTsoGiEkTvZiArgO7tAc208U="; }; @@ -103,6 +103,6 @@ stdenv.mkDerivation rec { # Tools gpl2Plus ]; - changelog = "https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/${version}/NEWS"; + changelog = "https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/${finalAttrs.version}/NEWS"; }; -} +}) diff --git a/pkgs/by-name/li/libqrtr-glib/package.nix b/pkgs/by-name/li/libqrtr-glib/package.nix index c1c98aeca17d..16f5a7cb6301 100644 --- a/pkgs/by-name/li/libqrtr-glib/package.nix +++ b/pkgs/by-name/li/libqrtr-glib/package.nix @@ -13,7 +13,7 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libqrtr-glib"; version = "1.2.2"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "mobile-broadband"; repo = "libqrtr-glib"; - rev = version; + rev = finalAttrs.version; sha256 = "kHLrOXN6wgBrHqipo2KfAM5YejS0/bp7ziBSpt0s1i0="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.lgpl2Plus; }; -} +}) diff --git a/pkgs/by-name/li/libr3/package.nix b/pkgs/by-name/li/libr3/package.nix index 046547fdd053..1145b48362d9 100644 --- a/pkgs/by-name/li/libr3/package.nix +++ b/pkgs/by-name/li/libr3/package.nix @@ -8,14 +8,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "r3"; version = "1.3.4"; src = fetchFromGitHub { owner = "c9s"; repo = "r3"; - rev = version; + rev = finalAttrs.version; sha256 = "09cixbms817p6nb77wz3rxp0znnac8ybycvsrrzgwlbfn58a3zwl"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = [ lib.licenses.mit ]; }; -} +}) diff --git a/pkgs/by-name/li/libraqm/package.nix b/pkgs/by-name/li/libraqm/package.nix index fe394696c04e..7d94d69d7ceb 100644 --- a/pkgs/by-name/li/libraqm/package.nix +++ b/pkgs/by-name/li/libraqm/package.nix @@ -10,14 +10,14 @@ fribidi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libraqm"; version = "0.10.3"; src = fetchFromGitHub { owner = "HOST-Oman"; repo = "libraqm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-URW29aEONbMN/DQ6mkKksnwtbIL+SGm5VvKsC9h5MH4="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sifmelcara ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/librasterlite2/package.nix b/pkgs/by-name/li/librasterlite2/package.nix index ee54ea5c6807..9d7dd7a73785 100644 --- a/pkgs/by-name/li/librasterlite2/package.nix +++ b/pkgs/by-name/li/librasterlite2/package.nix @@ -29,12 +29,12 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librasterlite2"; version = "1.1.0-beta1"; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/librasterlite2-sources/librasterlite2-${version}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/librasterlite2-sources/librasterlite2-${finalAttrs.version}.tar.gz"; hash = "sha256-9yhM38B600OjFOSHjfAwCHSwFF2dMxsGOwlrSC5+RPQ="; }; @@ -93,4 +93,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = [ lib.teams.geospatial ]; }; -} +}) diff --git a/pkgs/by-name/li/libratbag/package.nix b/pkgs/by-name/li/libratbag/package.nix index 8cd47c2fa0e1..c919e6f1c7e1 100644 --- a/pkgs/by-name/li/libratbag/package.nix +++ b/pkgs/by-name/li/libratbag/package.nix @@ -20,14 +20,14 @@ libunistring, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libratbag"; version = "0.18"; src = fetchFromGitHub { owner = "libratbag"; repo = "libratbag"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-dAWKDF5hegvKhUZ4JW2J/P9uSs4xNrZLNinhAff6NSc="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ mvnetbiz ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix index 3bed42f3d324..f8621c45c410 100644 --- a/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix +++ b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix @@ -6,18 +6,18 @@ qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libre-graph-api-cpp-qt-client"; version = "1.0.4"; src = fetchFromGitHub { owner = "owncloud"; repo = "libre-graph-api-cpp-qt-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wbdamPi2XSLWeprrYZtBUDH1A2gdp6/5geFZv+ZqSWk="; }; - sourceRoot = "${src.name}/client"; + sourceRoot = "${finalAttrs.src.name}/client"; # cmake 4 compatibility postPatch = '' @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ hellwolf ]; platforms = lib.platforms.unix; license = lib.licenses.asl20; - changelog = "https://github.com/owncloud/libre-graph-api-cpp-qt-client/releases/tag/v${version}"; + changelog = "https://github.com/owncloud/libre-graph-api-cpp-qt-client/releases/tag/v${finalAttrs.version}"; }; -} +}) diff --git a/pkgs/by-name/li/libre/package.nix b/pkgs/by-name/li/libre/package.nix index 81af959b57df..e7c610b61238 100644 --- a/pkgs/by-name/li/libre/package.nix +++ b/pkgs/by-name/li/libre/package.nix @@ -7,13 +7,13 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "4.4.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-z/rDpjq483f3xFxZmf6neIQTls0xhn70JrWMlQatasw="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/li/libredwg/package.nix b/pkgs/by-name/li/libredwg/package.nix index 121508c79ade..bfde4639426b 100644 --- a/pkgs/by-name/li/libredwg/package.nix +++ b/pkgs/by-name/li/libredwg/package.nix @@ -16,14 +16,14 @@ let isPython3 = enablePython && python.pythonAtLeast "3"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libredwg"; version = "0.13.3"; src = fetchFromGitHub { owner = "LibreDWG"; repo = "libredwg"; - tag = version; + tag = finalAttrs.version; hash = "sha256-FlBHwNsqVSBE8dTDewoKkCbs8Jd/4d69MPpEFzg6Ruc="; fetchSubmodules = true; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { postPatch = let printVersion = writeShellScript "print-version" '' - echo -n ${lib.escapeShellArg version} + echo -n ${lib.escapeShellArg finalAttrs.version} ''; in '' @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/librelp/package.nix b/pkgs/by-name/li/librelp/package.nix index 889e1549bbc5..c8fb20a39c18 100644 --- a/pkgs/by-name/li/librelp/package.nix +++ b/pkgs/by-name/li/librelp/package.nix @@ -9,14 +9,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librelp"; version = "1.12.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "librelp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-VWW5EM1INxBACoQsIN+mxsJjUKDFbfh2mqdvB/3W6Xw="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/librem/package.nix b/pkgs/by-name/li/librem/package.nix index a39f5301cd05..40c54e607420 100644 --- a/pkgs/by-name/li/librem/package.nix +++ b/pkgs/by-name/li/librem/package.nix @@ -8,13 +8,13 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.12.0"; pname = "librem"; src = fetchFromGitHub { owner = "baresip"; repo = "rem"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-MsXSUxFH89EqxMe4285xFV1Tsqmv2l5RnEeli48O3XQ="; }; nativeBuildInputs = [ cmake ]; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/li/librevenge/package.nix b/pkgs/by-name/li/librevenge/package.nix index 2836060d9455..3f023b20b60f 100644 --- a/pkgs/by-name/li/librevenge/package.nix +++ b/pkgs/by-name/li/librevenge/package.nix @@ -8,12 +8,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librevenge"; version = "0.0.5"; src = fetchurl { - url = "mirror://sourceforge/project/libwpd/librevenge/librevenge-${version}/librevenge-${version}.tar.xz"; + url = "mirror://sourceforge/project/libwpd/librevenge/librevenge-${finalAttrs.version}/librevenge-${finalAttrs.version}.tar.xz"; sha256 = "sha256-EG0MRLtkCLE0i54EZWZvqDuBYXdmWiLNAX6IbBqu6zQ="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/librime/package.nix b/pkgs/by-name/li/librime/package.nix index 158d74692d48..c8021d62e438 100644 --- a/pkgs/by-name/li/librime/package.nix +++ b/pkgs/by-name/li/librime/package.nix @@ -28,14 +28,14 @@ let chmod +w -R plugins/* ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librime"; version = "1.16.1"; src = fetchFromGitHub { owner = "rime"; repo = "librime"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-Jbo6Svt/d00ZJwtYkWMKFeKzpFFYhbnm3m2alDxRGvU="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ vonfry ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/li/librist/package.nix b/pkgs/by-name/li/librist/package.nix index 304e80787f50..606b5f6a5acb 100644 --- a/pkgs/by-name/li/librist/package.nix +++ b/pkgs/by-name/li/librist/package.nix @@ -10,7 +10,7 @@ mbedtls, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librist"; version = "0.2.11"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { domain = "code.videolan.org"; owner = "rist"; repo = "librist"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-xWqyQl3peB/ENReMcDHzIdKXXCYOJYbhhG8tcSh36dY="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raphaelr ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libroxml/package.nix b/pkgs/by-name/li/libroxml/package.nix index 6be682e100c2..510568339a04 100644 --- a/pkgs/by-name/li/libroxml/package.nix +++ b/pkgs/by-name/li/libroxml/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libroxml"; version = "2.3.0"; src = fetchurl { - url = "http://download.libroxml.net/pool/v2.x/libroxml-${version}.tar.gz"; + url = "http://download.libroxml.net/pool/v2.x/libroxml-${finalAttrs.version}.tar.gz"; sha256 = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x"; }; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { mainProgram = "roxml"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/librsync/package.nix b/pkgs/by-name/li/librsync/package.nix index 45926e867897..1e620ba82e61 100644 --- a/pkgs/by-name/li/librsync/package.nix +++ b/pkgs/by-name/li/librsync/package.nix @@ -9,14 +9,14 @@ popt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librsync"; version = "2.3.4"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-fiOby8tOhv0KJ+ZwAWfh/ynqHlYC9kNqKfxNl3IhzR8="; }; @@ -40,9 +40,9 @@ stdenv.mkDerivation rec { meta = { description = "Implementation of the rsync remote-delta algorithm"; homepage = "https://librsync.sourceforge.net/"; - changelog = "https://github.com/librsync/librsync/releases/tag/v${version}"; + changelog = "https://github.com/librsync/librsync/releases/tag/v${finalAttrs.version}"; license = lib.licenses.lgpl2Plus; mainProgram = "rdiff"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/librtprocess/package.nix b/pkgs/by-name/li/librtprocess/package.nix index 6283c5f97c44..3ead088fa4fc 100644 --- a/pkgs/by-name/li/librtprocess/package.nix +++ b/pkgs/by-name/li/librtprocess/package.nix @@ -6,14 +6,14 @@ llvmPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librtprocess"; version = "0.12.0"; src = fetchFromGitHub { owner = "CarVac"; repo = "librtprocess"; - rev = version; + rev = finalAttrs.version; hash = "sha256-/1o6SWUor+ZBQ6RsK2PoDRu03jcVRG58PNYFttriH2w="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/librttopo/package.nix b/pkgs/by-name/li/librttopo/package.nix index 4a62d6d9e24e..448dbce6c02a 100644 --- a/pkgs/by-name/li/librttopo/package.nix +++ b/pkgs/by-name/li/librttopo/package.nix @@ -7,7 +7,7 @@ geos, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librttopo"; version = "1.1.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { domain = "git.osgeo.org"; owner = "rttopo"; repo = "librttopo"; - rev = "librttopo-${version}"; + rev = "librttopo-${finalAttrs.version}"; hash = "sha256-VxyQr4nBy4PS2IjabBZHvzejFPDNBgSNn528ZCf99EA="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.geospatial ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/librum/package.nix b/pkgs/by-name/li/librum/package.nix index 1f7028e1f845..e790395327d2 100644 --- a/pkgs/by-name/li/librum/package.nix +++ b/pkgs/by-name/li/librum/package.nix @@ -12,14 +12,14 @@ let mupdf-cxx = mupdf.override { enableCxx = true; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librum"; version = "0.12.2"; src = fetchFromGitHub { owner = "Librum-Reader"; repo = "Librum"; - tag = "v.${version}"; + tag = "v.${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-Iwcbcz8LrznFP8rfW6mg9p7klAtTx4daFxylTeFKrH0="; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { completely open source. ''; homepage = "https://librumreader.com"; - changelog = "https://github.com/Librum-Reader/Librum/releases/tag/${src.rev}"; + changelog = "https://github.com/Librum-Reader/Librum/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; mainProgram = "librum"; maintainers = with lib.maintainers; [ @@ -71,4 +71,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libsamplerate/package.nix b/pkgs/by-name/li/libsamplerate/package.nix index 59b9a27d13aa..2840f7b39beb 100644 --- a/pkgs/by-name/li/libsamplerate/package.nix +++ b/pkgs/by-name/li/libsamplerate/package.nix @@ -6,12 +6,12 @@ libsndfile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsamplerate"; version = "0.2.2"; src = fetchurl { - url = "https://github.com/libsndfile/libsamplerate/releases/download/${version}/libsamplerate-${version}.tar.xz"; + url = "https://github.com/libsndfile/libsamplerate/releases/download/${finalAttrs.version}/libsamplerate-${finalAttrs.version}.tar.xz"; hash = "sha256-MljaKAUR0ktJ1rCGFbvoJNDKzJhCsOTK8RxSzysEOJM="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { # Linker is unhappy with the `.def` file. broken = stdenv.hostPlatform.isMinGW; }; -} +}) diff --git a/pkgs/by-name/li/libscfg/package.nix b/pkgs/by-name/li/libscfg/package.nix index 5ab969b7f2ef..90204a905963 100644 --- a/pkgs/by-name/li/libscfg/package.nix +++ b/pkgs/by-name/li/libscfg/package.nix @@ -9,14 +9,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libscfg"; version = "0.1.1"; src = fetchFromSourcehut { owner = "~emersion"; repo = "libscfg"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-aTcvs7QuDOx17U/yP37LhvIGxmm2WR/6qFYRtfjRN6w="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ michaeladler ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libscrypt/package.nix b/pkgs/by-name/li/libscrypt/package.nix index c9f0aab010d4..420a808128f9 100644 --- a/pkgs/by-name/li/libscrypt/package.nix +++ b/pkgs/by-name/li/libscrypt/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libscrypt"; version = "1.22"; src = fetchFromGitHub { owner = "technion"; repo = "libscrypt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-QWWqC10bENemG5FYEog87tT7IxDaBJUDqu6j/sO3sYE="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ davidak ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix index db9ec4511e80..049304bb00a6 100644 --- a/pkgs/by-name/li/libseccomp/package.nix +++ b/pkgs/by-name/li/libseccomp/package.nix @@ -11,12 +11,12 @@ python3Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libseccomp"; version = "2.6.0"; src = fetchurl { - url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; + url = "https://github.com/seccomp/libseccomp/releases/download/v${finalAttrs.version}/libseccomp-${finalAttrs.version}.tar.gz"; hash = "sha256-g7YIUjLRWIw3ncm5yuR7s3QHzyYubnSZPGG6ctKnhNw="; }; @@ -93,4 +93,4 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/li/libsecret/package.nix b/pkgs/by-name/li/libsecret/package.nix index 92cdc3e13c45..92ab2fa2f8c1 100644 --- a/pkgs/by-name/li/libsecret/package.nix +++ b/pkgs/by-name/li/libsecret/package.nix @@ -69,7 +69,7 @@ let ''; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsecret"; version = "0.21.7"; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { ++ lib.optional withIntrospection "devdoc"; src = fetchurl { - url = "mirror://gnome/sources/libsecret/${lib.versions.majorMinor version}/libsecret-${version}.tar.xz"; + url = "mirror://gnome/sources/libsecret/${lib.versions.majorMinor finalAttrs.version}/libsecret-${finalAttrs.version}.tar.xz"; hash = "sha256-a0UuR1BZCitWF63EACbyjS9JA94V8SUOHRxAv9aO1V4="; }; @@ -221,4 +221,4 @@ stdenv.mkDerivation rec { glib.meta.platforms; inherit (glib.meta) maintainers teams; }; -} +}) diff --git a/pkgs/by-name/li/libserdes/package.nix b/pkgs/by-name/li/libserdes/package.nix index e35c3d7a6a60..03dd4a710fba 100644 --- a/pkgs/by-name/li/libserdes/package.nix +++ b/pkgs/by-name/li/libserdes/package.nix @@ -12,14 +12,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libserdes"; version = "8.1.0"; src = fetchFromGitHub { owner = "confluentinc"; repo = "libserdes"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-zEBJD7DOhpxfkAPypCZhygA6uaXIdK4yXZtDiuGA5Yg="; }; @@ -91,4 +91,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ liff ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libsieve/package.nix b/pkgs/by-name/li/libsieve/package.nix index a38db2316a9f..5b21c3cba574 100644 --- a/pkgs/by-name/li/libsieve/package.nix +++ b/pkgs/by-name/li/libsieve/package.nix @@ -3,12 +3,12 @@ stdenv, fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.3.1"; pname = "libsieve"; src = fetchurl { - url = "https://github.com/downloads/sodabrew/libsieve/libsieve-${version}.tar.gz"; + url = "https://github.com/downloads/sodabrew/libsieve/libsieve-${finalAttrs.version}.tar.gz"; sha256 = "1gllhl9hbmc86dq3k98d4kjs5bwk0p2rlk7ywqj3fjn7jw6mbhcj"; }; @@ -18,4 +18,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libsignal-protocol-c/package.nix b/pkgs/by-name/li/libsignal-protocol-c/package.nix index 861db375c8df..4f70a5ec113d 100644 --- a/pkgs/by-name/li/libsignal-protocol-c/package.nix +++ b/pkgs/by-name/li/libsignal-protocol-c/package.nix @@ -6,14 +6,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsignal-protocol-c"; version = "2.3.3"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal-protocol-c"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0z5p03vk15i6h870azfjgyfgxhv31q2vq6rfhnybrnkxq2wqzwhk"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libsigsegv/package.nix b/pkgs/by-name/li/libsigsegv/package.nix index cd6284d4a549..ff8b5190010a 100644 --- a/pkgs/by-name/li/libsigsegv/package.nix +++ b/pkgs/by-name/li/libsigsegv/package.nix @@ -5,12 +5,12 @@ enableSigbusFix ? false, # required by kernels < 3.18.6 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsigsegv"; version = "2.15"; src = fetchurl { - url = "mirror://gnu/libsigsegv/libsigsegv-${version}.tar.gz"; + url = "mirror://gnu/libsigsegv/libsigsegv-${finalAttrs.version}.tar.gz"; sha256 = "sha256-A2hVZgIlyzgXoZD8AOZ2TOeDYFG6y0jTXiZES4wXKdk="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libskk/package.nix b/pkgs/by-name/li/libskk/package.nix index 236ffc1dc025..938024b676be 100644 --- a/pkgs/by-name/li/libskk/package.nix +++ b/pkgs/by-name/li/libskk/package.nix @@ -15,14 +15,14 @@ libxkbcommon, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libskk"; version = "1.0.5"; src = fetchFromGitHub { owner = "ueno"; repo = "libskk"; - tag = version; + tag = finalAttrs.version; hash = "sha256-xXed7mQqseefIldGjNsQf8n0YTcI9L9T1FkO/dhNR3g="; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ yuriaisaka ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libslirp/package.nix b/pkgs/by-name/li/libslirp/package.nix index 1f59dc7a767c..ed2e91c3e706 100644 --- a/pkgs/by-name/li/libslirp/package.nix +++ b/pkgs/by-name/li/libslirp/package.nix @@ -8,7 +8,7 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libslirp"; version = "4.9.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = "libslirp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-MKP3iBExaPQryiahI1l/4bTgVht5Vu8AxaDyMotqmMo="; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; postPatch = '' - echo ${version} > .tarball-version + echo ${finalAttrs.version} > .tarball-version ''; meta = { @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libsmbios/package.nix b/pkgs/by-name/li/libsmbios/package.nix index b00c451f2c1e..0adc4c364240 100644 --- a/pkgs/by-name/li/libsmbios/package.nix +++ b/pkgs/by-name/li/libsmbios/package.nix @@ -13,14 +13,14 @@ doxygen, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsmbios"; version = "2.4.3"; src = fetchFromGitHub { owner = "dell"; repo = "libsmbios"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/li/libsmf/package.nix b/pkgs/by-name/li/libsmf/package.nix index 3f28cd6b45ef..609030e3ad95 100644 --- a/pkgs/by-name/li/libsmf/package.nix +++ b/pkgs/by-name/li/libsmf/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.3"; pname = "libsmf"; src = fetchFromGitHub { owner = "stump"; repo = "libsmf"; - rev = "libsmf-${version}"; + rev = "libsmf-${finalAttrs.version}"; sha256 = "sha256-OJXJkXvbM2GQNInZXU2ldObquKHhqkdu1zqUDnVZN0Y="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { mainProgram = "smfsh"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libsndfile/package.nix b/pkgs/by-name/li/libsndfile/package.nix index 4884e3480e49..a8e74d8884ac 100644 --- a/pkgs/by-name/li/libsndfile/package.nix +++ b/pkgs/by-name/li/libsndfile/package.nix @@ -25,14 +25,14 @@ pulseaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsndfile"; version = "1.2.2"; src = fetchFromGitHub { owner = "libsndfile"; repo = "libsndfile"; - rev = version; + rev = finalAttrs.version; hash = "sha256-MOOX/O0UaoeMaQPW9PvvE0izVp+6IoE5VbtTx0RvMkI="; }; @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { meta = { description = "C library for reading and writing files containing sampled sound"; homepage = "https://libsndfile.github.io/libsndfile/"; - changelog = "https://github.com/libsndfile/libsndfile/releases/tag/${version}"; + changelog = "https://github.com/libsndfile/libsndfile/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ lovek323 ]; platforms = lib.platforms.all; @@ -133,4 +133,4 @@ stdenv.mkDerivation rec { formats. ''; }; -} +}) diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix index 5424338c08f3..8edd4a0832da 100644 --- a/pkgs/by-name/li/libsolv/package.nix +++ b/pkgs/by-name/li/libsolv/package.nix @@ -17,14 +17,14 @@ withConda ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.7.35"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; - rev = version; + rev = finalAttrs.version; hash = "sha256-DHECjda7s12hSysbaXK2+wM/nXpAOpTn+eSf9XGC3z0="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libsoundio/package.nix b/pkgs/by-name/li/libsoundio/package.nix index 5461a5934c48..0583b930632b 100644 --- a/pkgs/by-name/li/libsoundio/package.nix +++ b/pkgs/by-name/li/libsoundio/package.nix @@ -8,14 +8,14 @@ libpulseaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.0.0"; pname = "libsoundio"; src = fetchFromGitHub { owner = "andrewrk"; repo = "libsoundio"; - rev = version; + rev = finalAttrs.version; sha256 = "12l4rvaypv87vigdrmjz48d4d6sq4gfxf5asvnc4adyabxb73i4x"; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.andrewrk ]; }; -} +}) diff --git a/pkgs/by-name/li/libspecbleach/package.nix b/pkgs/by-name/li/libspecbleach/package.nix index f3b3bb6d9042..fbd1dbe04e4b 100644 --- a/pkgs/by-name/li/libspecbleach/package.nix +++ b/pkgs/by-name/li/libspecbleach/package.nix @@ -8,14 +8,14 @@ fftwFloat, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libspecbleach"; version = "0.2.0"; src = fetchFromGitHub { owner = "lucianodato"; repo = "libspecbleach"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-s8eHryJfLz63m08O7l3r2iXOAgFqiuVTEcD774C3iXE="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libspf2/package.nix b/pkgs/by-name/li/libspf2/package.nix index c87fa3910f70..cd77d8072305 100644 --- a/pkgs/by-name/li/libspf2/package.nix +++ b/pkgs/by-name/li/libspf2/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libspf2"; version = "2.2.13"; src = fetchFromGitHub { owner = "helsinki-systems"; repo = "libspf2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-tkCHP3B1sBb0+scHBjX5lCvaeSrZryfaGKye02LFlYs="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libspiro/package.nix b/pkgs/by-name/li/libspiro/package.nix index 636d85d4b4ee..1d5706ed67c1 100644 --- a/pkgs/by-name/li/libspiro/package.nix +++ b/pkgs/by-name/li/libspiro/package.nix @@ -6,14 +6,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libspiro"; version = "20240903"; src = fetchFromGitHub { owner = "fontforge"; repo = "libspiro"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-psEF1SWkire6ngEUcMU0xnGYaT8ktqDCBlBckToGUMg="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.erictapen ]; }; -} +}) diff --git a/pkgs/by-name/li/libspnav/package.nix b/pkgs/by-name/li/libspnav/package.nix index f7360eadabf2..bd054ce43b9b 100644 --- a/pkgs/by-name/li/libspnav/package.nix +++ b/pkgs/by-name/li/libspnav/package.nix @@ -5,14 +5,14 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libspnav"; version = "1.2"; src = fetchFromGitHub { owner = "FreeSpacenav"; repo = "libspnav"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4ESzH2pMTGoDI/AAX8Iz/MVhxQD8q5cg9I91ryUi5Ys="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ sohalt ]; }; -} +}) diff --git a/pkgs/by-name/li/libspng/package.nix b/pkgs/by-name/li/libspng/package.nix index 6f20acd4c137..eb7b69bcbd27 100644 --- a/pkgs/by-name/li/libspng/package.nix +++ b/pkgs/by-name/li/libspng/package.nix @@ -10,14 +10,14 @@ libpng, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libspng"; version = "0.7.4"; src = fetchFromGitHub { owner = "randy408"; repo = "libspng"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-BiRuPQEKVJYYgfUsglIuxrBoJBFiQ0ygQmAFrVvCz4Q="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ humancalico ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libsrs2/package.nix b/pkgs/by-name/li/libsrs2/package.nix index e1de774e48e8..b498601ab247 100644 --- a/pkgs/by-name/li/libsrs2/package.nix +++ b/pkgs/by-name/li/libsrs2/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsrs2"; version = "1.0.18"; src = fetchurl { - url = "https://www.libsrs2.org/srs/libsrs2-${version}.tar.gz"; + url = "https://www.libsrs2.org/srs/libsrs2-${finalAttrs.version}.tar.gz"; sha256 = "9d1191b705d7587a5886736899001d04168392bbb6ed6345a057ade50943a492"; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { homepage = "https://www.libsrs2.org/"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libssc/package.nix b/pkgs/by-name/li/libssc/package.nix index fd6862d18941..7eba4d22b9d2 100644 --- a/pkgs/by-name/li/libssc/package.nix +++ b/pkgs/by-name/li/libssc/package.nix @@ -11,7 +11,7 @@ protobuf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libssc"; version = "0.2.2"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "DylanVanAssche"; repo = "libssc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vc3phLAURKXAVD/o4uiGkBtJ3wsbLEfkwygMltEhqug="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { mainProgram = "libssc"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libssh/package.nix b/pkgs/by-name/li/libssh/package.nix index f40d7d7e38bf..a3068241012b 100644 --- a/pkgs/by-name/li/libssh/package.nix +++ b/pkgs/by-name/li/libssh/package.nix @@ -14,12 +14,12 @@ wireshark, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libssh"; version = "0.11.3"; src = fetchurl { - url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/libssh-${version}.tar.xz"; + url = "https://www.libssh.org/files/${lib.versions.majorMinor finalAttrs.version}/libssh-${finalAttrs.version}.tar.xz"; hash = "sha256-fYoTYbsJTsP1EZZOeKWk26aJtZhuESr6vk9NDWxhJcM="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libssh2/package.nix b/pkgs/by-name/li/libssh2/package.nix index eaef9807c897..ea0b34e491df 100644 --- a/pkgs/by-name/li/libssh2/package.nix +++ b/pkgs/by-name/li/libssh2/package.nix @@ -14,12 +14,12 @@ vlc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libssh2"; version = "1.11.1"; src = fetchurl { - url = "https://www.libssh2.org/download/libssh2-${version}.tar.gz"; + url = "https://www.libssh2.org/download/libssh2-${finalAttrs.version}.tar.gz"; hash = "sha256-2ex2y+NNuY7sNTn+LImdJrDIN8s+tGalaw8QnKv2WPc="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; -} +}) diff --git a/pkgs/by-name/li/libstartup_notification/package.nix b/pkgs/by-name/li/libstartup_notification/package.nix index 374c92e963b3..fd308cde106c 100644 --- a/pkgs/by-name/li/libstartup_notification/package.nix +++ b/pkgs/by-name/li/libstartup_notification/package.nix @@ -8,11 +8,11 @@ xcbutil, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libstartup-notification"; version = "0.12"; src = fetchurl { - url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; + url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${finalAttrs.version}.tar.gz"; sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { description = "Application startup notification and feedback library"; license = lib.licenses.lgpl2; }; -} +}) diff --git a/pkgs/by-name/li/libstemmer/package.nix b/pkgs/by-name/li/libstemmer/package.nix index 619cd1e2b79f..3a7b471f9e8e 100644 --- a/pkgs/by-name/li/libstemmer/package.nix +++ b/pkgs/by-name/li/libstemmer/package.nix @@ -6,14 +6,14 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libstemmer"; version = "2.2.0"; src = fetchFromGitHub { owner = "snowballstem"; repo = "snowball"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-qXrypwv/I+5npvGHGsHveijoui0ZnoGYhskCfLkewVE="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fpletz ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libstrophe/package.nix b/pkgs/by-name/li/libstrophe/package.nix index 32e9326b0f90..a1d603f7485a 100644 --- a/pkgs/by-name/li/libstrophe/package.nix +++ b/pkgs/by-name/li/libstrophe/package.nix @@ -11,14 +11,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libstrophe"; version = "0.14.0"; src = fetchFromGitHub { owner = "strophe"; repo = "libstrophe"; - rev = version; + rev = finalAttrs.version; hash = "sha256-53O8hHyw9y0Bzs+BpGouAxuSGJxh6NSNNWZqi7RHAsY="; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { runs well on both Linux, Unix, and Windows based platforms. ''; homepage = "https://strophe.im/libstrophe/"; - changelog = "https://github.com/strophe/libstrophe/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/strophe/libstrophe/blob/${finalAttrs.src.rev}/ChangeLog"; license = with lib.licenses; [ gpl3Only mit @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { flosse ]; }; -} +}) diff --git a/pkgs/by-name/li/libsurvive/package.nix b/pkgs/by-name/li/libsurvive/package.nix index 21ab58178fb6..db75ee608c6b 100644 --- a/pkgs/by-name/li/libsurvive/package.nix +++ b/pkgs/by-name/li/libsurvive/package.nix @@ -12,14 +12,14 @@ eigen, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsurvive"; version = "1.01"; src = fetchFromGitHub { owner = "cntools"; repo = "libsurvive"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; # Fixes 'Unknown CMake command "cnkalman_generate_code"' fetchSubmodules = true; hash = "sha256-NcxdTKra+YkLt/iu9+1QCeQZLV3/qlhma2Ns/+ZYVsk="; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libsvm/package.nix b/pkgs/by-name/li/libsvm/package.nix index 4347c65df84c..e2f5d0454e6f 100644 --- a/pkgs/by-name/li/libsvm/package.nix +++ b/pkgs/by-name/li/libsvm/package.nix @@ -7,14 +7,14 @@ withOpenMP ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsvm"; version = "333"; src = fetchFromGitHub { owner = "cjlin1"; repo = "libsvm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eM7O/skOcxkKV4utlC7G9FvMO+d2yZm5D0BoIUhAPXo="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libtar/package.nix b/pkgs/by-name/li/libtar/package.nix index 42e0f69617f4..9045a2c5d3cd 100644 --- a/pkgs/by-name/li/libtar/package.nix +++ b/pkgs/by-name/li/libtar/package.nix @@ -6,14 +6,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.2.20"; pname = "libtar"; # Maintenance repo for libtar (Arch Linux uses this) src = fetchgit { url = "git://repo.or.cz/libtar.git"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1pjsqnqjaqgkzf1j8m6y5h76bwprffsjjj6gk8rh2fjsha14rqn9"; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/li/libtermkey/package.nix b/pkgs/by-name/li/libtermkey/package.nix index cb1535034a87..6d3b35b056f1 100644 --- a/pkgs/by-name/li/libtermkey/package.nix +++ b/pkgs/by-name/li/libtermkey/package.nix @@ -8,12 +8,12 @@ unibilium, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libtermkey"; version = "0.22"; src = fetchzip { - url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz"; + url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${finalAttrs.version}.tar.gz"; sha256 = "02dks6bj7n23lj005yq41azf95wh3hapmgc2lzyh12vigkjh67rg"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libthai/package.nix b/pkgs/by-name/li/libthai/package.nix index a58384bce9ec..367d472090ab 100644 --- a/pkgs/by-name/li/libthai/package.nix +++ b/pkgs/by-name/li/libthai/package.nix @@ -7,7 +7,7 @@ libdatrie, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libthai"; version = "0.1.30"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://github.com/tlwg/libthai/releases/download/v${version}/libthai-${version}.tar.xz"; + url = "https://github.com/tlwg/libthai/releases/download/v${finalAttrs.version}/libthai-${finalAttrs.version}.tar.xz"; sha256 = "sha256-3bqLU9/lhMMlN2YDAhioiCVIilGn3u8EHQlucVr2S90="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ crertel ]; pkgConfigModules = [ "libthai" ]; }; -} +}) diff --git a/pkgs/by-name/li/libtiger/package.nix b/pkgs/by-name/li/libtiger/package.nix index 915d5900f0d6..46a1b5b2a947 100644 --- a/pkgs/by-name/li/libtiger/package.nix +++ b/pkgs/by-name/li/libtiger/package.nix @@ -9,12 +9,12 @@ cairo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libtiger"; version = "0.3.4"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libtiger/libtiger-${version}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libtiger/libtiger-${finalAttrs.version}.tar.gz"; sha256 = "0rj1bmr9kngrgbxrjbn4f4f9pww0wmf6viflinq7ava7zdav4hkk"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libtomcrypt/package.nix b/pkgs/by-name/li/libtomcrypt/package.nix index 3aaab9b7a303..3dfbe4fb3979 100644 --- a/pkgs/by-name/li/libtomcrypt/package.nix +++ b/pkgs/by-name/li/libtomcrypt/package.nix @@ -7,12 +7,12 @@ libtommath, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libtomcrypt"; version = "1.18.2"; src = fetchurl { - url = "https://github.com/libtom/libtomcrypt/releases/download/v${version}/crypt-${version}.tar.xz"; + url = "https://github.com/libtom/libtomcrypt/releases/download/v${finalAttrs.version}/crypt-${finalAttrs.version}.tar.xz"; sha256 = "113vfrgapyv72lalhd3nkw7jnks8az0gcb5wqn9hj19nhcxlrbcn"; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "Fairly comprehensive, modular and portable cryptographic toolkit"; homepage = "https://www.libtom.net/LibTomCrypt/"; - changelog = "https://github.com/libtom/libtomcrypt/raw/v${version}/changes"; + changelog = "https://github.com/libtom/libtomcrypt/raw/v${finalAttrs.version}/changes"; license = with lib.licenses; [ publicDomain wtfpl @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libtommath/package.nix b/pkgs/by-name/li/libtommath/package.nix index 61d1d497ce03..52580ffa819e 100644 --- a/pkgs/by-name/li/libtommath/package.nix +++ b/pkgs/by-name/li/libtommath/package.nix @@ -5,12 +5,12 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libtommath"; version = "1.3.0"; src = fetchurl { - url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz"; + url = "https://github.com/libtom/libtommath/releases/download/v${finalAttrs.version}/ltm-${finalAttrs.version}.tar.xz"; sha256 = "sha256-KWJy2TQ1mRMI63NgdgDANLVYgHoH6CnnURQuZcz6nQg="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libtpms/package.nix b/pkgs/by-name/li/libtpms/package.nix index b717baca892d..f658b8d23f6c 100644 --- a/pkgs/by-name/li/libtpms/package.nix +++ b/pkgs/by-name/li/libtpms/package.nix @@ -8,14 +8,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libtpms"; version = "0.10.2"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-UhEpq5f/FT5DmtzQBe/Si414mOq+D4glikgRNK60GKQ="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.baloo ]; }; -} +}) diff --git a/pkgs/by-name/li/libtraceevent/package.nix b/pkgs/by-name/li/libtraceevent/package.nix index 0a646a97aac0..38932b914532 100644 --- a/pkgs/by-name/li/libtraceevent/package.nix +++ b/pkgs/by-name/li/libtraceevent/package.nix @@ -13,13 +13,13 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libtraceevent"; version = "1.8.7"; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; - rev = "libtraceevent-${version}"; + rev = "libtraceevent-${finalAttrs.version}"; hash = "sha256-9rDgAHK1m369CGKxC+NEkW7fzOJsgKTQtk9GLfVEoLg="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ wentasah ]; }; -} +}) diff --git a/pkgs/by-name/li/libtracefs/package.nix b/pkgs/by-name/li/libtracefs/package.nix index e5a15e3fc481..bd83e3469db2 100644 --- a/pkgs/by-name/li/libtracefs/package.nix +++ b/pkgs/by-name/li/libtracefs/package.nix @@ -16,12 +16,12 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libtracefs"; version = "1.8.3"; src = fetchzip { - url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-libtracefs-${version}.tar.gz"; + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-libtracefs-${finalAttrs.version}.tar.gz"; hash = "sha256-uN4alsOmj7IFUL2IJSHbgBiztv2Sq0+MktQiRByvhK0="; }; @@ -71,4 +71,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ wentasah ]; }; -} +}) diff --git a/pkgs/by-name/li/libucl/package.nix b/pkgs/by-name/li/libucl/package.nix index 61ce6565153a..de8483c68737 100644 --- a/pkgs/by-name/li/libucl/package.nix +++ b/pkgs/by-name/li/libucl/package.nix @@ -25,14 +25,14 @@ let lua = [ lua ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libucl"; version = "0.9.3"; src = fetchFromGitHub { owner = "vstakhov"; repo = "libucl"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-dub829xZ10sJ5qwegYUiGoyAVLiwg44GKSzz+BMLJis="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ jpotier ]; }; -} +}) diff --git a/pkgs/by-name/li/libucontext/package.nix b/pkgs/by-name/li/libucontext/package.nix index 9d469bf884e6..36c010c7218b 100644 --- a/pkgs/by-name/li/libucontext/package.nix +++ b/pkgs/by-name/li/libucontext/package.nix @@ -7,14 +7,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libucontext"; version = "1.5"; src = fetchFromGitHub { owner = "kaniini"; repo = "libucontext"; - rev = "libucontext-${version}"; + rev = "libucontext-${finalAttrs.version}"; hash = "sha256-asT0pV3s4L4zB2qtDJ+2XYxEP6agIEo1LtCuFeOjpRA="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.lix ]; }; -} +}) diff --git a/pkgs/by-name/li/libudev0-shim/package.nix b/pkgs/by-name/li/libudev0-shim/package.nix index 75d54769cda0..8d474ef4e47f 100644 --- a/pkgs/by-name/li/libudev0-shim/package.nix +++ b/pkgs/by-name/li/libudev0-shim/package.nix @@ -5,14 +5,14 @@ udev, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libudev0-shim"; version = "1"; src = fetchFromGitHub { owner = "archlinux"; repo = "libudev0-shim"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1460qm6rp1cqnns39lj24z7191m8sbpvbjabqbzb55dkdd2kw50z"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libuecc/package.nix b/pkgs/by-name/li/libuecc/package.nix index 50b08142bfdd..203015267e39 100644 --- a/pkgs/by-name/li/libuecc/package.nix +++ b/pkgs/by-name/li/libuecc/package.nix @@ -6,13 +6,13 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "7"; pname = "libuecc"; src = fetchgit { url = "git://git.universe-factory.net/libuecc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1sm05aql75sh13ykgsv3ns4x4zzw9lvzid6misd22gfgf6r9n5fs"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ fpletz ]; }; -} +}) diff --git a/pkgs/by-name/li/libuev/package.nix b/pkgs/by-name/li/libuev/package.nix index c2c16b06f725..1be914e63662 100644 --- a/pkgs/by-name/li/libuev/package.nix +++ b/pkgs/by-name/li/libuev/package.nix @@ -6,14 +6,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libuev"; version = "2.4.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "libuev"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-x1Sk7IuhlBQPFL7Rq4tmEanBxI/WaQ2L5fpUyEWOoi8="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ vifino ]; }; -} +}) diff --git a/pkgs/by-name/li/libuiohook/package.nix b/pkgs/by-name/li/libuiohook/package.nix index bc192a1f6cef..8ae36f2c475f 100644 --- a/pkgs/by-name/li/libuiohook/package.nix +++ b/pkgs/by-name/li/libuiohook/package.nix @@ -19,14 +19,14 @@ libxkbfile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libuiohook"; version = "1.2.2"; src = fetchFromGitHub { owner = "kwhat"; repo = "libuiohook"; - rev = version; + rev = finalAttrs.version; sha256 = "1qlz55fp4i9dd8sdwmy1m8i4i1jy1s09cpmlxzrgf7v34w72ncm7"; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { }; passthru.tests.libuiohook = nixosTests.libuiohook; -} +}) diff --git a/pkgs/by-name/li/libuldaq/package.nix b/pkgs/by-name/li/libuldaq/package.nix index 7dcd9d3c4169..a93b5cb6f672 100644 --- a/pkgs/by-name/li/libuldaq/package.nix +++ b/pkgs/by-name/li/libuldaq/package.nix @@ -6,14 +6,14 @@ libusb1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libuldaq"; version = "1.2.1"; src = fetchFromGitHub { owner = "mccdaq"; repo = "uldaq"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-DA1mxu94z5xDpGK9OBwD02HXlOATv/slqZ4lz5GM7QM="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.simonkampe ]; }; -} +}) diff --git a/pkgs/by-name/li/libunarr/package.nix b/pkgs/by-name/li/libunarr/package.nix index f27a5fc36547..015330ee3250 100644 --- a/pkgs/by-name/li/libunarr/package.nix +++ b/pkgs/by-name/li/libunarr/package.nix @@ -6,12 +6,12 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libunarr"; version = "1.1.1"; src = fetchurl { - url = "https://github.com/selmf/unarr/releases/download/v${version}/unarr-${version}.tar.xz"; + url = "https://github.com/selmf/unarr/releases/download/v${finalAttrs.version}/unarr-${finalAttrs.version}.tar.xz"; hash = "sha256-Mo76BOqZbdOJFrEkeozxdqwpuFyvkhdONNMZmN5BdNI="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libuninameslist/package.nix b/pkgs/by-name/li/libuninameslist/package.nix index f29e99aa2b79..af7849bbc4f0 100644 --- a/pkgs/by-name/li/libuninameslist/package.nix +++ b/pkgs/by-name/li/libuninameslist/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libuninameslist"; version = "20260107"; src = fetchFromGitHub { owner = "fontforge"; repo = "libuninameslist"; - rev = version; + rev = finalAttrs.version; hash = "sha256-o+moQBFXIhnqvAc9F08kLRiXVS5pJEuUJwWl4Y/8AS4="; }; @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/fontforge/libuninameslist/"; - changelog = "https://github.com/fontforge/libuninameslist/blob/${version}/ChangeLog"; + changelog = "https://github.com/fontforge/libuninameslist/blob/${finalAttrs.version}/ChangeLog"; description = "Library of Unicode names and annotation data"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ erictapen ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libupnp/package.nix b/pkgs/by-name/li/libupnp/package.nix index 300f98ae4cb8..08da49dc2ccb 100644 --- a/pkgs/by-name/li/libupnp/package.nix +++ b/pkgs/by-name/li/libupnp/package.nix @@ -5,7 +5,7 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libupnp"; version = "1.14.25"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "pupnp"; repo = "pupnp"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-emMZKskaFYmLnIZLduHlZ5I3praaBgXY2JHLDAGPO28="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { homepage = "https://pupnp.github.io/pupnp/"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/liburcu/package.nix b/pkgs/by-name/li/liburcu/package.nix index e7dae0dec76d..4a50d964d2ce 100644 --- a/pkgs/by-name/li/liburcu/package.nix +++ b/pkgs/by-name/li/liburcu/package.nix @@ -6,12 +6,12 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.15.5"; pname = "liburcu"; src = fetchurl { - url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; + url = "https://lttng.org/files/urcu/userspace-rcu-${finalAttrs.version}.tar.bz2"; hash = "sha256-sveHqKg1EsMlmecc2rzFExRklHuCAUiWvRFBOy14LeE="; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Userspace RCU (read-copy-update) library"; homepage = "https://lttng.org/urcu"; - changelog = "https://github.com/urcu/userspace-rcu/raw/v${version}/ChangeLog"; + changelog = "https://github.com/urcu/userspace-rcu/raw/v${finalAttrs.version}/ChangeLog"; license = lib.licenses.lgpl21Plus; # https://git.liburcu.org/?p=userspace-rcu.git;a=blob;f=include/urcu/arch.h platforms = lib.intersectLists lib.platforms.unix ( @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/li/libusbmuxd/package.nix b/pkgs/by-name/li/libusbmuxd/package.nix index 0c8ccdc34737..398a06eefd26 100644 --- a/pkgs/by-name/li/libusbmuxd/package.nix +++ b/pkgs/by-name/li/libusbmuxd/package.nix @@ -8,14 +8,14 @@ libimobiledevice-glue, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libusbmuxd"; version = "2.1.1"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = "libusbmuxd"; - rev = version; + rev = finalAttrs.version; hash = "sha256-o1EFY/cv+pQrGexvPOwMs5mz9KRcffnloXCQXMzbmDY="; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; preAutoreconf = '' - export RELEASE_VERSION=${version} + export RELEASE_VERSION=${finalAttrs.version} ''; meta = { @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libusbsio/package.nix b/pkgs/by-name/li/libusbsio/package.nix index f4b15d5c413b..14fa09de3a44 100644 --- a/pkgs/by-name/li/libusbsio/package.nix +++ b/pkgs/by-name/li/libusbsio/package.nix @@ -8,12 +8,12 @@ systemdMinimal, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libusbsio"; version = "2.1.11"; src = fetchzip { - url = "https://www.nxp.com/downloads/en/libraries/libusbsio-${version}-src.zip"; + url = "https://www.nxp.com/downloads/en/libraries/libusbsio-${finalAttrs.version}-src.zip"; sha256 = "sha256-qgoeaGWTWdTk5XpJwoauckEQlqB9lp5x2+TN09vQttI="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { sbruder ]; }; -} +}) diff --git a/pkgs/by-name/li/libutempter/package.nix b/pkgs/by-name/li/libutempter/package.nix index e56b6129c7cd..151728e2f442 100644 --- a/pkgs/by-name/li/libutempter/package.nix +++ b/pkgs/by-name/li/libutempter/package.nix @@ -5,12 +5,12 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libutempter"; version = "1.2.1"; src = fetchurl { - url = "http://ftp.altlinux.org/pub/people/ldv/utempter/libutempter-${version}.tar.gz"; + url = "http://ftp.altlinux.org/pub/people/ldv/utempter/libutempter-${finalAttrs.version}.tar.gz"; sha256 = "sha256-ln/vNy85HeUBhDrYdXDGz12r2WUfAPF4MJD7wSsqNMs="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.msteen ]; }; -} +}) diff --git a/pkgs/by-name/li/libversion/package.nix b/pkgs/by-name/li/libversion/package.nix index 30d379af2705..ba5c0d1ee3db 100644 --- a/pkgs/by-name/li/libversion/package.nix +++ b/pkgs/by-name/li/libversion/package.nix @@ -5,14 +5,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libversion"; version = "3.0.4"; src = fetchFromGitHub { owner = "repology"; repo = "libversion"; - rev = version; + rev = finalAttrs.version; hash = "sha256-USgSwAdRHEepq9ZTDHVWkPsZjljfh9sEWOZRfu0H7Go="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ryantm ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libvisio2svg/package.nix b/pkgs/by-name/li/libvisio2svg/package.nix index 9d64a0219573..50d971a0ec0c 100644 --- a/pkgs/by-name/li/libvisio2svg/package.nix +++ b/pkgs/by-name/li/libvisio2svg/package.nix @@ -11,14 +11,14 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libvisio2svg"; version = "0.5.6"; src = fetchFromGitHub { owner = "kakwa"; repo = "libvisio2svg"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-MklZ/pY04kw8BJxoGcBQAWdXytAPkrDz0N0W1t9I5Is="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/li/libvolume_id/package.nix b/pkgs/by-name/li/libvolume_id/package.nix index f39e0b7a01f3..cdaafb458183 100644 --- a/pkgs/by-name/li/libvolume_id/package.nix +++ b/pkgs/by-name/li/libvolume_id/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libvolume_id"; version = "0.81.1"; src = fetchurl { - url = "https://www.marcuscom.com/downloads/libvolume_id-${version}.tar.bz2"; + url = "https://www.marcuscom.com/downloads/libvolume_id-${finalAttrs.version}.tar.bz2"; sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; homepage = "http://www.marcuscom.com/downloads/"; }; -} +}) diff --git a/pkgs/by-name/li/libvpx/package.nix b/pkgs/by-name/li/libvpx/package.nix index f1c99103a243..28a5d6905033 100644 --- a/pkgs/by-name/li/libvpx/package.nix +++ b/pkgs/by-name/li/libvpx/package.nix @@ -134,14 +134,14 @@ assert unitTestsSupport -> curl != null && coreutils != null; assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport); assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libvpx"; version = "1.15.2"; src = fetchFromGitHub { owner = "webmproject"; repo = "libvpx"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-1F5Zlue2DY1yJXwfDfGeh3KcFTQVo9voHcGkgItKgh0="; }; @@ -265,9 +265,9 @@ stdenv.mkDerivation rec { meta = { description = "WebM VP8/VP9 codec SDK"; homepage = "https://www.webmproject.org/"; - changelog = "https://github.com/webmproject/libvpx/raw/v${version}/CHANGELOG"; + changelog = "https://github.com/webmproject/libvpx/raw/v${finalAttrs.version}/CHANGELOG"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ codyopel ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libvterm-neovim/package.nix b/pkgs/by-name/li/libvterm-neovim/package.nix index 3b17c1c6ed84..0dac8eff5579 100644 --- a/pkgs/by-name/li/libvterm-neovim/package.nix +++ b/pkgs/by-name/li/libvterm-neovim/package.nix @@ -6,13 +6,13 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libvterm-neovim"; # Releases are not tagged, look at commit history to find latest release version = "0.3.3"; src = fetchurl { - url = "https://launchpad.net/libvterm/trunk/v${lib.versions.majorMinor version}/+download/libvterm-${version}.tar.gz"; + url = "https://launchpad.net/libvterm/trunk/v${lib.versions.majorMinor finalAttrs.version}/+download/libvterm-${finalAttrs.version}.tar.gz"; hash = "sha256-CRVvQ90hKL00fL7r5Q2aVx0yxk4M8Y0hEZeUav9yJuA="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ rvolosatovs ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libwebp/package.nix b/pkgs/by-name/li/libwebp/package.nix index 1726b821430b..ba0c095a593d 100644 --- a/pkgs/by-name/li/libwebp/package.nix +++ b/pkgs/by-name/li/libwebp/package.nix @@ -34,14 +34,14 @@ libwebp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libwebp"; version = "1.6.0"; src = fetchFromGitHub { owner = "webmproject"; repo = "libwebp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7i4fGBTsTjAkBzCjVqXqX4n22j6dLgF/0mz4ajNA45U="; }; @@ -112,4 +112,4 @@ stdenv.mkDerivation rec { "libwebpmux" ]; }; -} +}) diff --git a/pkgs/by-name/li/libwhich/package.nix b/pkgs/by-name/li/libwhich/package.nix index 7fc953f59344..008e734c02d1 100644 --- a/pkgs/by-name/li/libwhich/package.nix +++ b/pkgs/by-name/li/libwhich/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libwhich"; version = "1.2.0"; src = fetchFromGitHub { owner = "vtjnash"; repo = "libwhich"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-JNIWdI12sL3TZqVA3GeH0KbgqFDbMsEdecea3392Goc="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libwmf/package.nix b/pkgs/by-name/li/libwmf/package.nix index a96299418f75..76872bf26404 100644 --- a/pkgs/by-name/li/libwmf/package.nix +++ b/pkgs/by-name/li/libwmf/package.nix @@ -12,7 +12,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libwmf"; version = "0.2.13"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "caolanm"; repo = "libwmf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-vffohx57OvQKu8DfNXNBm9bPsA8KgkQWs/3mmFn7L6M="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libx86emu/package.nix b/pkgs/by-name/li/libx86emu/package.nix index e1d4dc1cc68b..2578e1f01a59 100644 --- a/pkgs/by-name/li/libx86emu/package.nix +++ b/pkgs/by-name/li/libx86emu/package.nix @@ -5,14 +5,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libx86emu"; version = "3.7"; src = fetchFromGitHub { owner = "wfeldt"; repo = "libx86emu"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ilAmGlkMeuG0FlygMdE3NreFPJJF6g/26C8C5grvjrk="; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { postUnpack = "rm $sourceRoot/git2log"; patchPhase = '' # VERSION is usually generated using Git - echo "${version}" > VERSION + echo "${finalAttrs.version}" > VERSION substituteInPlace Makefile --replace "/usr" "/" ''; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bobvanderlinden ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libxcomp/package.nix b/pkgs/by-name/li/libxcomp/package.nix index f6b7c1b247f0..4d72ddc306da 100644 --- a/pkgs/by-name/li/libxcomp/package.nix +++ b/pkgs/by-name/li/libxcomp/package.nix @@ -10,13 +10,13 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libxcomp"; version = "3.5.99.16"; src = fetchurl { sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; - url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; + url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${finalAttrs.version}-lite.tar.gz"; }; buildInputs = [ @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libxdg_basedir/package.nix b/pkgs/by-name/li/libxdg_basedir/package.nix index 0360d422ce8d..1c63edf0269a 100644 --- a/pkgs/by-name/li/libxdg_basedir/package.nix +++ b/pkgs/by-name/li/libxdg_basedir/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libxdg-basedir"; version = "1.2.3"; src = fetchFromGitHub { owner = "devnev"; repo = "libxdg-basedir"; - tag = "libxdg-basedir-${version}"; + tag = "libxdg-basedir-${finalAttrs.version}"; hash = "sha256-ewtUKDdE6k9Q9hglWwhbTU3DTxvIN41t+zf2Gch9Dkk="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nickcao ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libxlsxwriter/package.nix b/pkgs/by-name/li/libxlsxwriter/package.nix index 896c0f47ea00..182afcf4981e 100644 --- a/pkgs/by-name/li/libxlsxwriter/package.nix +++ b/pkgs/by-name/li/libxlsxwriter/package.nix @@ -7,14 +7,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libxlsxwriter"; version = "1.2.4"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mbi2jxxlXVyBTXkmSraZn6vMQAJ61PX2vwG10q2Ixos="; }; @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { meta = { description = "C library for creating Excel XLSX files"; homepage = "https://libxlsxwriter.github.io/"; - changelog = "https://github.com/jmcnamara/libxlsxwriter/blob/${src.rev}/Changes.txt"; + changelog = "https://github.com/jmcnamara/libxlsxwriter/blob/${finalAttrs.src.rev}/Changes.txt"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix index 8d91adeaf782..99a35aeec67d 100644 --- a/pkgs/by-name/li/libxmlb/package.nix +++ b/pkgs/by-name/li/libxmlb/package.nix @@ -21,7 +21,7 @@ && stdenv.hostPlatform.emulatorAvailable buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libxmlb"; version = "0.3.24"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hughsie"; repo = "libxmlb"; - rev = version; + rev = finalAttrs.version; hash = "sha256-3Yxq0KZMV9GRmNjZ19eIqGq+UJS4PGyVPS6HBcMEbHo="; }; @@ -93,4 +93,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libxmlxx5/package.nix b/pkgs/by-name/li/libxmlxx5/package.nix index 980f534ce75c..f9b7642082ac 100644 --- a/pkgs/by-name/li/libxmlxx5/package.nix +++ b/pkgs/by-name/li/libxmlxx5/package.nix @@ -9,12 +9,12 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libxmlxx5"; version = "5.4"; src = fetchurl { - url = "mirror://gnome/sources/libxml++/${version}/libxml++-${lib.versions.pad 3 version}.tar.xz"; + url = "mirror://gnome/sources/libxml++/${finalAttrs.version}/libxml++-${lib.versions.pad 3 finalAttrs.version}.tar.xz"; hash = "sha256-6aI8Q2aGqUaY0hOOa8uvhJEh1jv6D1DcNP77/XlWaEg="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/li/libyaml/package.nix b/pkgs/by-name/li/libyaml/package.nix index 180edb07d305..383201dad3af 100644 --- a/pkgs/by-name/li/libyaml/package.nix +++ b/pkgs/by-name/li/libyaml/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libyaml"; version = "0.2.5"; src = fetchFromGitHub { owner = "yaml"; repo = "libyaml"; - rev = version; + rev = finalAttrs.version; sha256 = "18zsnsxc53pans4a01cs4401a2cjk3qi098hi440pj4zijifgcsb"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix index 4ae7fb336e06..7e31c1aac735 100644 --- a/pkgs/by-name/li/libyang/package.nix +++ b/pkgs/by-name/li/libyang/package.nix @@ -15,14 +15,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libyang"; version = "3.13.6"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rc/WdBCVZDwensqnVMrQXCPevLg0INidzN9Qwhqw2Mk="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ woffs ]; }; -} +}) diff --git a/pkgs/by-name/li/libzbc/package.nix b/pkgs/by-name/li/libzbc/package.nix index 4f592158a5a9..7e4e032c12fc 100644 --- a/pkgs/by-name/li/libzbc/package.nix +++ b/pkgs/by-name/li/libzbc/package.nix @@ -9,14 +9,14 @@ guiSupport ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libzbc"; version = "6.2.0"; src = fetchFromGitHub { owner = "westerndigitalcorporation"; repo = "libzbc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-8+HF5Wf6lQHbi8Vp2tpom1FO56lQ5RyYsgs8ii+2RD0="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libzbd/package.nix b/pkgs/by-name/li/libzbd/package.nix index b8307fed9903..091cf8a71ee6 100644 --- a/pkgs/by-name/li/libzbd/package.nix +++ b/pkgs/by-name/li/libzbd/package.nix @@ -10,14 +10,14 @@ guiSupport ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libzbd"; version = "2.0.4"; src = fetchFromGitHub { owner = "westerndigitalcorporation"; repo = "libzbd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-iMQjOWsgsS+uI8mqoOXHRAV1+SIu1McUAcrsY+/zcu8="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/libzdb/package.nix b/pkgs/by-name/li/libzdb/package.nix index 7cfa3c4a47b0..8238ba41117d 100644 --- a/pkgs/by-name/li/libzdb/package.nix +++ b/pkgs/by-name/li/libzdb/package.nix @@ -5,12 +5,12 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.4.1"; pname = "libzdb"; src = fetchurl { - url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; + url = "https://www.tildeslash.com/libzdb/dist/libzdb-${finalAttrs.version}.tar.gz"; sha256 = "sha256-W0Yz/CoWiA93YZf0BF9i7421Bi9jAw+iIQEdS4XXNss="; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libzen/package.nix b/pkgs/by-name/li/libzen/package.nix index be527f259824..2aeb42fef49f 100644 --- a/pkgs/by-name/li/libzen/package.nix +++ b/pkgs/by-name/li/libzen/package.nix @@ -5,11 +5,11 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.4.41"; pname = "libzen"; src = fetchurl { - url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; + url = "https://mediaarea.net/download/source/libzen/${finalAttrs.version}/libzen_${finalAttrs.version}.tar.bz2"; sha256 = "sha256-6yN9fT3Kbca6BocZQgon3gk0p4PMrrKGdWKzWvOQHi0="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.devhell ]; }; -} +}) diff --git a/pkgs/by-name/li/libzim/package.nix b/pkgs/by-name/li/libzim/package.nix index c6a208815cfd..5ad134b09014 100644 --- a/pkgs/by-name/li/libzim/package.nix +++ b/pkgs/by-name/li/libzim/package.nix @@ -13,14 +13,14 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libzim"; version = "9.3.0"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; - tag = version; + tag = finalAttrs.version; hash = "sha256-DZiFeZ2ry3JpXDs3mvf0q7diwhkjQ2730KQkDQPbgcY="; }; @@ -63,11 +63,11 @@ stdenv.mkDerivation rec { meta = { description = "Reference implementation of the ZIM specification"; homepage = "https://github.com/openzim/libzim"; - changelog = "https://github.com/openzim/libzim/releases/tag/${version}"; + changelog = "https://github.com/openzim/libzim/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ fab greg ]; }; -} +}) diff --git a/pkgs/by-name/li/lightdm-mini-greeter/package.nix b/pkgs/by-name/li/lightdm-mini-greeter/package.nix index d789afadb058..0aa40aeb47c7 100644 --- a/pkgs/by-name/li/lightdm-mini-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-mini-greeter/package.nix @@ -14,14 +14,14 @@ librsvg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lightdm-mini-greeter"; version = "0.5.1"; src = fetchFromGitHub { owner = "prikhi"; repo = "lightdm-mini-greeter"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-Pm7ExfusFIPktX2C4UE07qgOVhcWhVxnaD3QARpmu7Y="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; changelog = "https://github.com/prikhi/lightdm-mini-greeter/blob/master/CHANGELOG.md"; }; -} +}) diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix index b50a3188827e..4a680551a75a 100644 --- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix @@ -21,14 +21,14 @@ xapp-symbolic-icons, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lightdm-slick-greeter"; version = "2.2.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; - rev = version; + rev = finalAttrs.version; hash = "sha256-zYjtd/Lb9ialq+pzOml4FMfPq9maX848Or6lzyZj4qs="; }; @@ -107,4 +107,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/lightspark/package.nix b/pkgs/by-name/li/lightspark/package.nix index e1c7564b7b68..470213675bea 100644 --- a/pkgs/by-name/li/lightspark/package.nix +++ b/pkgs/by-name/li/lightspark/package.nix @@ -21,14 +21,14 @@ glibmm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lightspark"; version = "0.9.0"; src = fetchFromGitHub { owner = "lightspark"; repo = "lightspark"; - rev = version; + rev = finalAttrs.version; hash = "sha256-2+Kmwj2keCMR7UbKbY6UvrkX4CnW61elres8ltiZuUg="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "lightspark"; }; -} +}) diff --git a/pkgs/by-name/li/likwid/package.nix b/pkgs/by-name/li/likwid/package.nix index 5c877ab22386..49889914b1c7 100644 --- a/pkgs/by-name/li/likwid/package.nix +++ b/pkgs/by-name/li/likwid/package.nix @@ -8,12 +8,12 @@ gnugrep, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "likwid"; version = "5.5.1"; src = fetchurl { - url = "https://ftp.fau.de/pub/likwid/likwid-${version}.tar.gz"; + url = "https://ftp.fau.de/pub/likwid/likwid-${finalAttrs.version}.tar.gz"; hash = "sha256-JceDDmOyA5b8/DsWrnnDm0IgqG03bOt81pSbX/mR23g="; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://hpc.fau.de/research/tools/likwid/"; - changelog = "https://github.com/RRZE-HPC/likwid/releases/tag/v${version}"; + changelog = "https://github.com/RRZE-HPC/likwid/releases/tag/v${finalAttrs.version}"; description = "Performance monitoring and benchmarking suite"; license = lib.licenses.gpl3Only; # Might work on ARM by appropriately setting COMPILER in config.mk @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.vbgl ]; mainProgram = "likwid-perfctr"; }; -} +}) diff --git a/pkgs/by-name/li/lilo/package.nix b/pkgs/by-name/li/lilo/package.nix index 4840b1bbda75..ad0d366b5cda 100644 --- a/pkgs/by-name/li/lilo/package.nix +++ b/pkgs/by-name/li/lilo/package.nix @@ -6,11 +6,11 @@ sharutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lilo"; version = "24.2"; src = fetchurl { - url = "https://www.joonet.de/lilo/ftp/sources/lilo-${version}.tar.gz"; + url = "https://www.joonet.de/lilo/ftp/sources/lilo-${finalAttrs.version}.tar.gz"; hash = "sha256-4VjxneRWDJNevgUHwht5v/F2GLkjDYB2/oxf/5/b1bE="; }; nativeBuildInputs = [ @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ kaction ]; }; -} +}) diff --git a/pkgs/by-name/li/limitcpu/package.nix b/pkgs/by-name/li/limitcpu/package.nix index 1e434a405920..8f9919765675 100644 --- a/pkgs/by-name/li/limitcpu/package.nix +++ b/pkgs/by-name/li/limitcpu/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "limitcpu"; version = "3.2"; src = fetchurl { - url = "mirror://sourceforge/limitcpu/cpulimit-${version}.tar.gz"; + url = "mirror://sourceforge/limitcpu/cpulimit-${finalAttrs.version}.tar.gz"; sha256 = "sha256-Wf/rGjUXr+RZmHFL6EGSYKQ2MvfOwI8LAmwezN/1fPw="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.rycee ]; mainProgram = "cpulimit"; }; -} +}) diff --git a/pkgs/by-name/li/line-awesome/package.nix b/pkgs/by-name/li/line-awesome/package.nix index 363130d4fcb7..1ad61941fdf0 100644 --- a/pkgs/by-name/li/line-awesome/package.nix +++ b/pkgs/by-name/li/line-awesome/package.nix @@ -5,18 +5,18 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "line-awesome"; version = "1.3.0"; src = fetchurl { - url = "https://maxst.icons8.com/vue-static/landings/line-awesome/line-awesome/${version}/line-awesome-${version}.zip"; + url = "https://maxst.icons8.com/vue-static/landings/line-awesome/line-awesome/${finalAttrs.version}/line-awesome-${finalAttrs.version}.zip"; sha256 = "07qkz8s1wjh5xwqlq1b4lpihr1zah3kh6bnqvfwvncld8l9wjqfk"; }; nativeBuildInputs = [ unzip ]; - sourceRoot = "${version}/fonts"; + sourceRoot = "${finalAttrs.version}/fonts"; installPhase = '' mkdir -p $out/share/fonts/truetype @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ puzzlewolf ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/li/lingua-franca/package.nix b/pkgs/by-name/li/lingua-franca/package.nix index a38a325153b8..1950d43a33b0 100644 --- a/pkgs/by-name/li/lingua-franca/package.nix +++ b/pkgs/by-name/li/lingua-franca/package.nix @@ -5,12 +5,12 @@ jdk17_headless, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lfc"; version = "0.4.0"; src = fetchzip { - url = "https://github.com/lf-lang/lingua-franca/releases/download/v${version}/lf-cli-${version}.zip"; + url = "https://github.com/lf-lang/lingua-franca/releases/download/v${finalAttrs.version}/lf-cli-${finalAttrs.version}.zip"; sha256 = "sha256-LrAm77iPUlqVfRdYy2bZ4mim7DHIr5JxPdbrgxokGvc="; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace bin/lfc \ --replace 'base=`dirname $(dirname ''${abs_path})`' "base='$out'" \ - --replace "run_lfc_with_args" "${jdk17_headless}/bin/java -jar $out/lib/jars/org.lflang.lfc-${version}-all.jar" + --replace "run_lfc_with_args" "${jdk17_headless}/bin/java -jar $out/lib/jars/org.lflang.lfc-${finalAttrs.version}-all.jar" ''; installPhase = '' @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ revol-xut ]; }; -} +}) diff --git a/pkgs/by-name/li/linux-router/package.nix b/pkgs/by-name/li/linux-router/package.nix index 0596e28d10ff..7c892ef33181 100644 --- a/pkgs/by-name/li/linux-router/package.nix +++ b/pkgs/by-name/li/linux-router/package.nix @@ -39,14 +39,14 @@ qrencode, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "linux-router"; version = "0.8.1"; src = fetchFromGitHub { owner = "garywill"; repo = "linux-router"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tBrHuZKTf+7ABmE4FVYT9ny62CBa2A7va7OOFUsKJtM="; }; @@ -106,9 +106,9 @@ stdenv.mkDerivation rec { - DNS proxy - Compatible with NetworkManager (automatically set interface as unmanaged) ''; - changelog = "https://github.com/garywill/linux-router/releases/tag/${version}"; + changelog = "https://github.com/garywill/linux-router/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl21Only; platforms = lib.platforms.linux; mainProgram = "lnxrouter"; }; -} +}) diff --git a/pkgs/by-name/li/linux_logo/package.nix b/pkgs/by-name/li/linux_logo/package.nix index 41eb8dc129de..09c40358d19a 100644 --- a/pkgs/by-name/li/linux_logo/package.nix +++ b/pkgs/by-name/li/linux_logo/package.nix @@ -6,14 +6,14 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "linux_logo"; version = "6.01"; src = fetchFromGitHub { owner = "deater"; repo = "linux_logo"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-yBAxPwgKyFFIX0wuG7oG+FbEDpA5cPwyyJgWrFErJ7I="; }; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { description = "Prints an ASCII logo and some system info"; mainProgram = "linux_logo"; homepage = "http://www.deater.net/weave/vmwprod/linux_logo"; - changelog = "https://github.com/deater/linux_logo/blob/${src.rev}/CHANGES"; + changelog = "https://github.com/deater/linux_logo/blob/${finalAttrs.src.rev}/CHANGES"; license = lib.licenses.gpl2Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/linuxdoc-tools/package.nix b/pkgs/by-name/li/linuxdoc-tools/package.nix index 91b418d37fbc..7d3feb00d414 100644 --- a/pkgs/by-name/li/linuxdoc-tools/package.nix +++ b/pkgs/by-name/li/linuxdoc-tools/package.nix @@ -15,14 +15,14 @@ withLatex ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "linuxdoc-tools"; version = "0.9.86"; src = fetchFromGitLab { owner = "agmartin"; repo = "linuxdoc-tools"; - rev = version; + rev = finalAttrs.version; hash = "sha256-AsTlrjTYuuLB2jF0zKPVrxOZ2ygUIyMJFV6qDd7ODwA="; }; @@ -95,4 +95,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ p-h ]; }; -} +}) diff --git a/pkgs/by-name/li/linuxhw-edid-fetcher/package.nix b/pkgs/by-name/li/linuxhw-edid-fetcher/package.nix index 2a76567b1dc1..136544a97cd4 100644 --- a/pkgs/by-name/li/linuxhw-edid-fetcher/package.nix +++ b/pkgs/by-name/li/linuxhw-edid-fetcher/package.nix @@ -19,7 +19,7 @@ # }; # in # "${edids}/lib/firmware/edid/PG278Q_2014.bin"; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "linuxhw-edid-fetcher"; version = "0-unstable-2026-01-08"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gnutar ]; text = '' - repo="''${repo:-"${src}"}" + repo="''${repo:-"${finalAttrs.src}"}" ${builtins.readFile ./linuxhw-edid-fetch.sh} ''; }); @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "linuxhw-edid-fetch"; }; -} +}) diff --git a/pkgs/by-name/li/linuxptp/package.nix b/pkgs/by-name/li/linuxptp/package.nix index c4cc9e76655e..1e1e1cbfe081 100644 --- a/pkgs/by-name/li/linuxptp/package.nix +++ b/pkgs/by-name/li/linuxptp/package.nix @@ -5,14 +5,14 @@ linuxHeaders, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "linuxptp"; version = "4.4"; src = fetchFromGitHub { owner = "nwtime"; repo = "linuxptp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-w1buo+D8Mnd6ytMhQYhvCDqt+RejlNSN/iVjrDR+Khk="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/linuxquota/package.nix b/pkgs/by-name/li/linuxquota/package.nix index 6a1062cde7c5..e944bb0311a5 100644 --- a/pkgs/by-name/li/linuxquota/package.nix +++ b/pkgs/by-name/li/linuxquota/package.nix @@ -9,12 +9,12 @@ linuxquota, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "4.10"; pname = "quota"; src = fetchurl { - url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; + url = "mirror://sourceforge/linuxquota/quota-${finalAttrs.version}.tar.gz"; sha256 = "sha256-oEoMr8opwVvotqxmDgYYi8y4AsGe/i58Ge1/PWZ+z14="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.dezgeg ]; }; -} +}) diff --git a/pkgs/by-name/li/liquidprompt/package.nix b/pkgs/by-name/li/liquidprompt/package.nix index 0c546a193b4f..7137d3fa7faa 100644 --- a/pkgs/by-name/li/liquidprompt/package.nix +++ b/pkgs/by-name/li/liquidprompt/package.nix @@ -5,14 +5,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liquidprompt"; version = "2.2.1"; src = fetchFromGitHub { owner = "liquidprompt"; repo = "liquidprompt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ZVzFGe3ItWsN23iyGpxZEN2KtviYKI8x/sDa2MRio/Y="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ gerschtli ]; }; -} +}) diff --git a/pkgs/by-name/li/liquidwar5/package.nix b/pkgs/by-name/li/liquidwar5/package.nix index a39d316d767a..48bab4249b39 100644 --- a/pkgs/by-name/li/liquidwar5/package.nix +++ b/pkgs/by-name/li/liquidwar5/package.nix @@ -4,11 +4,11 @@ fetchurl, allegro, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "5.6.6"; pname = "liquidwar5"; src = fetchurl { - url = "http://www.ufoot.org/download/liquidwar/v5/${version}/liquidwar-${version}.tar.gz"; + url = "http://www.ufoot.org/download/liquidwar/v5/${finalAttrs.version}/liquidwar-${finalAttrs.version}.tar.gz"; sha256 = "sha256-JF2AZuzDiCm9EQ8AiQ6230TgmMgML7yJpG80BFqsQ/c="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/lisgd/package.nix b/pkgs/by-name/li/lisgd/package.nix index a631f70ef566..e20df90c02b0 100644 --- a/pkgs/by-name/li/lisgd/package.nix +++ b/pkgs/by-name/li/lisgd/package.nix @@ -10,14 +10,14 @@ patches ? [ ], }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lisgd"; version = "0.4.0"; src = fetchFromSourcehut { owner = "~mil"; repo = "lisgd"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ljRZpBo4lW2cYZYxKKMrXanE0YaHSFwcdyECK0czdWY="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/by-name/li/lite/package.nix b/pkgs/by-name/li/lite/package.nix index 9072ec76f914..84af448badef 100644 --- a/pkgs/by-name/li/lite/package.nix +++ b/pkgs/by-name/li/lite/package.nix @@ -9,14 +9,14 @@ openlibm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lite"; version = "1.11"; src = fetchFromGitHub { owner = "rxi"; repo = "lite"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0wxqfb4ly8g7w5qph76xys95b55ackkags8jgd1nasmiyi8gcd5a"; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "lite"; }; -} +}) diff --git a/pkgs/by-name/li/litmus/package.nix b/pkgs/by-name/li/litmus/package.nix index bba8e4c038b2..70b1783b1f62 100644 --- a/pkgs/by-name/li/litmus/package.nix +++ b/pkgs/by-name/li/litmus/package.nix @@ -10,14 +10,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.17"; pname = "litmus"; src = fetchFromGitHub { owner = "notroj"; repo = "litmus"; - tag = version; + tag = finalAttrs.version; # Required for neon m4 macros, bundled neon not used fetchSubmodules = true; hash = "sha256-JsFyZeaUTDCFZtlG8kyycTE14i4U4R6lTTVWLPjKGPU="; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.lorenz ]; mainProgram = "litmus"; }; -} +}) diff --git a/pkgs/by-name/li/litterbox/package.nix b/pkgs/by-name/li/litterbox/package.nix index 455b12c0d3a5..d7f3fc7e6e59 100644 --- a/pkgs/by-name/li/litterbox/package.nix +++ b/pkgs/by-name/li/litterbox/package.nix @@ -7,12 +7,12 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "litterbox"; version = "1.9"; src = fetchzip { - url = "https://git.causal.agency/litterbox/snapshot/litterbox-${version}.tar.gz"; + url = "https://git.causal.agency/litterbox/snapshot/litterbox-${finalAttrs.version}.tar.gz"; hash = "sha256-w4qW7J5CKm+hXHsNNbl9roBslHD14JOe0Nj5WntETqM="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ajwhouse ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/li/littlefs-fuse/package.nix b/pkgs/by-name/li/littlefs-fuse/package.nix index fd59958d36cc..0f7d3ba42dbe 100644 --- a/pkgs/by-name/li/littlefs-fuse/package.nix +++ b/pkgs/by-name/li/littlefs-fuse/package.nix @@ -5,13 +5,13 @@ fuse, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "littlefs-fuse"; version = "2.7.14"; src = fetchFromGitHub { owner = "littlefs-project"; repo = "littlefs-fuse"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-TWvBEoH4YvK4Jdg+QAMyskBUYhCWnmdtEoVXwoKJqIo="; }; buildInputs = [ fuse ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ln -s $out/bin $out/sbin runHook postInstall ''; - meta = src.meta // { + meta = finalAttrs.src.meta // { description = "FUSE wrapper that puts the littlefs in user-space"; license = lib.licenses.bsd3; mainProgram = "littlefs-fuse"; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { # fatal error: 'linux/fs.h' file not found broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/li/livi/package.nix b/pkgs/by-name/li/livi/package.nix index 34a434ba88b1..0d820f3ecac2 100644 --- a/pkgs/by-name/li/livi/package.nix +++ b/pkgs/by-name/li/livi/package.nix @@ -14,7 +14,7 @@ libGL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "livi"; version = "0.3.2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "guidog"; repo = "livi"; domain = "gitlab.gnome.org"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-cLvSK50RnXCYoXwpp+unTVnxqCkPa3Zr4dZT0TpYFpE="; }; nativeBuildInputs = [ @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/guidog/livi"; - changelog = "https://gitlab.gnome.org/guidog/livi/-/blob/v${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/guidog/livi/-/blob/v${finalAttrs.version}/NEWS?ref_type=tags"; description = "Small video player targeting mobile devices (also named μPlayer)"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "livi"; maintainers = with lib.maintainers; [ mksafavi ]; }; -} +}) diff --git a/pkgs/by-name/lk/lksctp-tools/package.nix b/pkgs/by-name/lk/lksctp-tools/package.nix index aa5c7a9ca6bc..a0cccfb978c1 100644 --- a/pkgs/by-name/lk/lksctp-tools/package.nix +++ b/pkgs/by-name/lk/lksctp-tools/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lksctp-tools"; version = "1.0.21"; src = fetchFromGitHub { owner = "sctp"; repo = "lksctp-tools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-+vbdNvHuJLYp901QgtBzMejlbzMyr9Z1eXxR3Zy7eAE="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { ]; # library is lgpl21 platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ll/llpp/package.nix b/pkgs/by-name/ll/llpp/package.nix index f88f0028046a..36b71ef91c8f 100644 --- a/pkgs/by-name/ll/llpp/package.nix +++ b/pkgs/by-name/ll/llpp/package.nix @@ -24,14 +24,14 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "llpp"; version = "42"; src = fetchFromGitHub { owner = "criticic"; repo = "llpp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-B/jKvBtBwMOErUVmGFGXXIT8FzMl1DFidfDCHIH41TU="; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - sed -i "2d;s/ver=.*/ver=${version}/" build.bash + sed -i "2d;s/ver=.*/ver=${finalAttrs.version}/" build.bash ''; strictDeps = true; @@ -100,4 +100,4 @@ stdenv.mkDerivation rec { lib.licenses.bsd3 ]; }; -} +}) diff --git a/pkgs/by-name/lm/lm4flash/package.nix b/pkgs/by-name/lm/lm4flash/package.nix index 46bfbe2c3e41..4bf6c7855f22 100644 --- a/pkgs/by-name/lm/lm4flash/package.nix +++ b/pkgs/by-name/lm/lm4flash/package.nix @@ -11,17 +11,17 @@ let SUBSYSTEM=="usb", ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00fd", MODE="0666" ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lm4flash"; version = "0.1.3"; src = fetchFromGitHub { owner = "utzig"; repo = "lm4tools"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ZjuCH/XjQEgg6KHAvb95/BkAy+C2OdbtBb/i6K30+uo="; }; - sourceRoot = "${src.name}/lm4flash"; + sourceRoot = "${finalAttrs.src.name}/lm4flash"; strictDeps = true; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ MostafaKhaled ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index 3137d88a0563..093043be1999 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -21,14 +21,14 @@ pugixml, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lms"; version = "3.74.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-D1Sg6XzZ8t/dFKrVh7k+KGLg2r6LeLGJk4FweVb4L1A="; }; @@ -70,11 +70,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/epoupon/lms"; - changelog = "https://github.com/epoupon/lms/releases/tag/${src.rev}"; + changelog = "https://github.com/epoupon/lms/releases/tag/${finalAttrs.src.rev}"; description = "Lightweight Music Server - Access your self-hosted music using a web interface"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "lms"; maintainers = with lib.maintainers; [ mksafavi ]; }; -} +}) diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix index d69ed07aaa3e..b59d8ea3c0ae 100644 --- a/pkgs/by-name/ln/lnav/package.nix +++ b/pkgs/by-name/ln/lnav/package.nix @@ -82,6 +82,11 @@ stdenv.mkDerivation (finalAttrs: { extraArgs = [ "--version-regex=^v(\\d+(?:\\.\\d+)*)$" ]; }; + outputs = [ + "out" + "man" + ]; + meta = { homepage = "https://github.com/tstack/lnav"; description = "Logfile Navigator"; diff --git a/pkgs/by-name/lo/lockdep/package.nix b/pkgs/by-name/lo/lockdep/package.nix index 6464f8cb85be..9f0b76fcb33f 100644 --- a/pkgs/by-name/lo/lockdep/package.nix +++ b/pkgs/by-name/lo/lockdep/package.nix @@ -8,7 +8,7 @@ valgrind, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lockdep"; # it would be nice to be able to pick a kernel version in sync with something @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "5.0.21"; fullver = "5.0.21"; src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + url = "mirror://kernel/linux/kernel/v5.x/linux-${finalAttrs.version}.tar.xz"; sha256 = "1my2m9hvnvdrvzcg0fgqgaga59y2cd5zlpv7xrfj2nn98sjhglwq"; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/lo/lockfileProgs/package.nix b/pkgs/by-name/lo/lockfileProgs/package.nix index 1040d43fc0e1..2cdf16824d98 100644 --- a/pkgs/by-name/lo/lockfileProgs/package.nix +++ b/pkgs/by-name/lo/lockfileProgs/package.nix @@ -5,12 +5,12 @@ liblockfile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lockfile-progs"; version = "0.1.19"; src = fetchurl { - url = "mirror://debian/pool/main/l/lockfile-progs/lockfile-progs_${version}.tar.gz"; + url = "mirror://debian/pool/main/l/lockfile-progs/lockfile-progs_${finalAttrs.version}.tar.gz"; sha256 = "sha256-LFcEsByPR0+CkheA5Fkqknsr9qbXYWNUpsXXzVZkhX4="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/lo/log4cplus/package.nix b/pkgs/by-name/lo/log4cplus/package.nix index da97f95ed5ca..187a662a7224 100644 --- a/pkgs/by-name/lo/log4cplus/package.nix +++ b/pkgs/by-name/lo/log4cplus/package.nix @@ -5,12 +5,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "log4cplus"; version = "2.1.2"; src = fetchurl { - url = "mirror://sourceforge/log4cplus/log4cplus-${version}.tar.bz2"; + url = "mirror://sourceforge/log4cplus/log4cplus-${finalAttrs.version}.tar.bz2"; hash = "sha256-JFDfu0qzXdLJ5k2MdQxRS/cpO4HY8yr3qxJEF/cK360="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/lo/logiops_0_2_3/package.nix b/pkgs/by-name/lo/logiops_0_2_3/package.nix index c7228d4f9912..345e0ddee3c8 100644 --- a/pkgs/by-name/lo/logiops_0_2_3/package.nix +++ b/pkgs/by-name/lo/logiops_0_2_3/package.nix @@ -9,14 +9,14 @@ libconfig, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "logiops"; version = "0.2.3"; src = fetchFromGitHub { owner = "pixlone"; repo = "logiops"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-1v728hbIM2ODtB+r6SYzItczRJCsbuTvhYD2OUM1+/E="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/lo/logrotate/package.nix b/pkgs/by-name/lo/logrotate/package.nix index e8882b8bae82..7e8139df25aa 100644 --- a/pkgs/by-name/lo/logrotate/package.nix +++ b/pkgs/by-name/lo/logrotate/package.nix @@ -11,14 +11,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "logrotate"; version = "3.22.0"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-D7E2mpC7v2kbsb1EyhR6hLvGbnIvGB2MK1n1gptYyKI="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "logrotate"; }; -} +}) diff --git a/pkgs/by-name/lo/logtop/package.nix b/pkgs/by-name/lo/logtop/package.nix index f2b9f68d3511..3c6b0ca7b5e8 100644 --- a/pkgs/by-name/lo/logtop/package.nix +++ b/pkgs/by-name/lo/logtop/package.nix @@ -7,12 +7,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "logtop"; version = "0.7"; src = fetchFromGitHub { - rev = "logtop-${version}"; + rev = "logtop-${finalAttrs.version}"; owner = "JulienPalard"; repo = "logtop"; sha256 = "1f8vk9gybldxvc0kwz38jxmwvzwangsvlfslpsx8zf04nvbkqi12"; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.starcraft66 ]; mainProgram = "logtop"; }; -} +}) diff --git a/pkgs/by-name/lo/loki/package.nix b/pkgs/by-name/lo/loki/package.nix index 15fa6e8b2121..54bf660d9e2f 100644 --- a/pkgs/by-name/lo/loki/package.nix +++ b/pkgs/by-name/lo/loki/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "loki"; version = "0.1.7"; src = fetchurl { - url = "mirror://sourceforge/loki-lib/Loki/Loki%20${version}/loki-${version}.tar.gz"; + url = "mirror://sourceforge/loki-lib/Loki/Loki%20${finalAttrs.version}/loki-${finalAttrs.version}.tar.gz"; sha256 = "1xhwna961fl4298ac5cc629x5030zlw31vx4h8zws290amw5860g"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ peterhoeg ]; }; -} +}) diff --git a/pkgs/by-name/lo/lolcode/package.nix b/pkgs/by-name/lo/lolcode/package.nix index ec6e3efaab6c..a296311cd95c 100644 --- a/pkgs/by-name/lo/lolcode/package.nix +++ b/pkgs/by-name/lo/lolcode/package.nix @@ -9,7 +9,7 @@ readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lolcode"; version = "0.11.2"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "justinmeza"; repo = "lci"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-VMBW3/sw+1kI6iuOckSPU1TIeY6QORcSfFLFkRYw3Gs="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/lo/lombok/package.nix b/pkgs/by-name/lo/lombok/package.nix index 4a498c2d383f..092e63a9e5c3 100644 --- a/pkgs/by-name/lo/lombok/package.nix +++ b/pkgs/by-name/lo/lombok/package.nix @@ -6,12 +6,12 @@ jdk, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lombok"; version = "1.18.42"; src = fetchurl { - url = "https://projectlombok.org/downloads/lombok-${version}.jar"; + url = "https://projectlombok.org/downloads/lombok-${finalAttrs.version}.jar"; sha256 = "sha256-NIik6ZlMJllrqs7r7ljK02pQ472uxb5ytYNNPDtWAwY="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { homepage = "https://projectlombok.org/"; maintainers = [ lib.maintainers.CrystalGamma ]; }; -} +}) diff --git a/pkgs/by-name/lo/loudgain/package.nix b/pkgs/by-name/lo/loudgain/package.nix index 730dcd266526..3d91132b2cea 100644 --- a/pkgs/by-name/lo/loudgain/package.nix +++ b/pkgs/by-name/lo/loudgain/package.nix @@ -11,14 +11,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "loudgain"; version = "0.6.8"; src = fetchFromGitHub { owner = "Moonbase59"; repo = "loudgain"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-XLj+n0GlY/GAkJlW2JVMd0jxMzgdv/YeSTuF6QUIGwU="; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm" ''; - meta = src.meta // { + meta = finalAttrs.src.meta // { license = lib.licenses.free; }; -} +}) diff --git a/pkgs/by-name/lo/lout/package.nix b/pkgs/by-name/lo/lout/package.nix index 38abe5edf0cf..b1615e247c25 100644 --- a/pkgs/by-name/lo/lout/package.nix +++ b/pkgs/by-name/lo/lout/package.nix @@ -5,14 +5,14 @@ ghostscript, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lout"; version = "3.43.2"; src = fetchFromGitHub { owner = "william8000"; repo = "lout"; - rev = version; + rev = finalAttrs.version; hash = "sha256-8WMRnlb1EGtUo8g9yoIBinKb1ICZMqUZka/5950Lc1M="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/lp/lprint/package.nix b/pkgs/by-name/lp/lprint/package.nix index 12155a67eaa1..b3cff9d725c4 100644 --- a/pkgs/by-name/lp/lprint/package.nix +++ b/pkgs/by-name/lp/lprint/package.nix @@ -9,14 +9,14 @@ enableExperimental ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lprint"; version = "1.3.1"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "lprint"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-1OOLGQ8S4oRNSJanX/AzJ+g5F+jYnE/+o+ie5ucY22U="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pandapip1 ]; }; -} +}) diff --git a/pkgs/by-name/lr/lr/package.nix b/pkgs/by-name/lr/lr/package.nix index 5badeb50feaf..770bfc28c746 100644 --- a/pkgs/by-name/lr/lr/package.nix +++ b/pkgs/by-name/lr/lr/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lr"; version = "2.0.1"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "lr"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-zpHThIB1FS45RriE214SM9ZQJ1HyuBkBi/+PTeJjEFc="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ vikanezrimaya ]; mainProgram = "lr"; }; -} +}) diff --git a/pkgs/by-name/lr/lrcalc/package.nix b/pkgs/by-name/lr/lrcalc/package.nix index aa40b030ad7b..a3c0429f4a7a 100644 --- a/pkgs/by-name/lr/lrcalc/package.nix +++ b/pkgs/by-name/lr/lrcalc/package.nix @@ -8,14 +8,14 @@ sage, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.1"; pname = "lrcalc"; src = fetchFromBitbucket { owner = "asbuch"; repo = "lrcalc"; - rev = "lrcalc-${version}"; + rev = "lrcalc-${finalAttrs.version}"; sha256 = "0s3amf3z75hnrjyszdndrvk4wp5p630dcgyj341i6l57h43d1p4k"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/lr/lrdf/package.nix b/pkgs/by-name/lr/lrdf/package.nix index 4c11211c1a19..06a4f6bc6a83 100644 --- a/pkgs/by-name/lr/lrdf/package.nix +++ b/pkgs/by-name/lr/lrdf/package.nix @@ -10,14 +10,14 @@ ladspaPlugins, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lrdf"; version = "0.6.1"; src = fetchFromGitHub { owner = "swh"; repo = "LRDF"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "00wzkfb8y0aqd519ypz067cq099dpc89w69zw8ln39vl6f9x2pd4"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/lr/lrzip/package.nix b/pkgs/by-name/lr/lrzip/package.nix index b970e75ac2ce..c1bf65572123 100644 --- a/pkgs/by-name/lr/lrzip/package.nix +++ b/pkgs/by-name/lr/lrzip/package.nix @@ -14,14 +14,14 @@ let inherit (stdenv.hostPlatform) isx86; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lrzip"; version = "0.651"; src = fetchFromGitHub { owner = "ckolivas"; repo = "lrzip"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Mb324ojtLV0S10KhL7Vjf3DhSOtCy1pFMTzvLkTnpXM="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/lr/lrzsz/package.nix b/pkgs/by-name/lr/lrzsz/package.nix index 4b65642e2534..8eff28432c69 100644 --- a/pkgs/by-name/lr/lrzsz/package.nix +++ b/pkgs/by-name/lr/lrzsz/package.nix @@ -6,12 +6,12 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lrzsz"; version = "0.12.20"; src = fetchurl { - url = "https://ohse.de/uwe/releases/lrzsz-${version}.tar.gz"; + url = "https://ohse.de/uwe/releases/lrzsz-${finalAttrs.version}.tar.gz"; sha256 = "1wcgfa9fsigf1gri74gq0pa7pyajk12m4z69x7ci9c6x9fqkd2y2"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ls/lsdvd/package.nix b/pkgs/by-name/ls/lsdvd/package.nix index 8f2ae69322c0..8c4357c004b9 100644 --- a/pkgs/by-name/ls/lsdvd/package.nix +++ b/pkgs/by-name/ls/lsdvd/package.nix @@ -6,11 +6,11 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lsdvd"; version = "0.17"; src = fetchurl { - url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz"; + url = "mirror://sourceforge/lsdvd/lsdvd-${finalAttrs.version}.tar.gz"; sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x"; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "lsdvd"; }; -} +}) diff --git a/pkgs/by-name/ls/lse/package.nix b/pkgs/by-name/ls/lse/package.nix index f46959a34679..ea49a85ca343 100644 --- a/pkgs/by-name/ls/lse/package.nix +++ b/pkgs/by-name/ls/lse/package.nix @@ -6,14 +6,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lse"; version = "4.14nw"; src = fetchFromGitHub { owner = "diego-treitos"; repo = "linux-smart-enumeration"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qGLmrbyeyhHG6ONs7TJLTm68xpvxB1iAnMUApfTSqEk="; }; @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { meta = { description = "Linux enumeration tool with verbosity levels"; homepage = "https://github.com/diego-treitos/linux-smart-enumeration"; - changelog = "https://github.com/diego-treitos/linux-smart-enumeration/releases/tag/${version}"; + changelog = "https://github.com/diego-treitos/linux-smart-enumeration/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "lse.sh"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ls/lsfg-vk/package.nix b/pkgs/by-name/ls/lsfg-vk/package.nix index 31910fcfaa7c..ae33cddcc9bf 100644 --- a/pkgs/by-name/ls/lsfg-vk/package.nix +++ b/pkgs/by-name/ls/lsfg-vk/package.nix @@ -6,14 +6,14 @@ llvmPackages, }: -llvmPackages.stdenv.mkDerivation rec { +llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "lsfg-vk"; version = "1.0.0"; src = fetchFromGitHub { owner = "PancakeTAS"; repo = "lsfg-vk"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hWpuPH7mKbeMaLaRUwtlkNLy4lOnJEe+yd54L7y2kV0="; fetchSubmodules = true; }; @@ -36,9 +36,9 @@ llvmPackages.stdenv.mkDerivation rec { meta = { description = "Vulkan layer for frame generation (Requires owning Lossless Scaling)"; homepage = "https://github.com/PancakeTAS/lsfg-vk/"; - changelog = "https://github.com/PancakeTAS/lsfg-vk/releases/tag/${src.tag}"; + changelog = "https://github.com/PancakeTAS/lsfg-vk/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pabloaul ]; }; -} +}) diff --git a/pkgs/by-name/ls/lsscsi/package.nix b/pkgs/by-name/ls/lsscsi/package.nix index 1499ad0b8d32..22bd5c90be74 100644 --- a/pkgs/by-name/ls/lsscsi/package.nix +++ b/pkgs/by-name/ls/lsscsi/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lsscsi"; version = "0.32"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-${version}.tgz"; + url = "http://sg.danny.cz/scsi/lsscsi-${finalAttrs.version}.tgz"; sha256 = "sha256-CoAOnpTcoqtwLWXXJ3eujK4Hjj100Ly+1kughJ6AKaE="; }; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ls/lswt/package.nix b/pkgs/by-name/ls/lswt/package.nix index e811966665f0..b1d5f8b242d1 100644 --- a/pkgs/by-name/ls/lswt/package.nix +++ b/pkgs/by-name/ls/lswt/package.nix @@ -7,14 +7,14 @@ wayland, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lswt"; version = "2.0.0"; src = fetchFromSourcehut { owner = "~leon_plickat"; repo = "lswt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-8jP6I2zsDt57STtuq4F9mcsckrjvaCE5lavqKTjhNT0="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "lswt"; }; -} +}) diff --git a/pkgs/by-name/lt/ltc-tools/package.nix b/pkgs/by-name/lt/ltc-tools/package.nix index 5c81f5aad3af..fcf583f6d387 100644 --- a/pkgs/by-name/lt/ltc-tools/package.nix +++ b/pkgs/by-name/lt/ltc-tools/package.nix @@ -8,14 +8,14 @@ jack2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ltc-tools"; version = "0.7.0"; src = fetchFromGitHub { owner = "x42"; repo = "ltc-tools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ tg-x ]; }; -} +}) diff --git a/pkgs/by-name/lt/ltunify/package.nix b/pkgs/by-name/lt/ltunify/package.nix index d808af58949d..3105d954b35c 100644 --- a/pkgs/by-name/lt/ltunify/package.nix +++ b/pkgs/by-name/lt/ltunify/package.nix @@ -8,14 +8,14 @@ # Although we copy in the udev rules here, you probably just want to use # logitech-udev-rules instead of adding this to services.udev.packages on NixOS -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ltunify"; version = "0.3"; src = fetchFromGitHub { owner = "Lekensteyn"; repo = "ltunify"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-9avri/2H0zv65tkBsIi9yVxx3eVS9oCkVCCFdjXqSgI="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ltunify"; }; -} +}) diff --git a/pkgs/by-name/lu/luaformatter/package.nix b/pkgs/by-name/lu/luaformatter/package.nix index 8a9384d8d8c5..b6b6aacaf2db 100644 --- a/pkgs/by-name/lu/luaformatter/package.nix +++ b/pkgs/by-name/lu/luaformatter/package.nix @@ -12,14 +12,14 @@ let antlr4 = antlr4_9; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "luaformatter"; version = "1.3.6"; src = fetchFromGitHub { owner = "Koihik"; repo = "LuaFormatter"; - rev = version; + rev = finalAttrs.version; sha256 = "14l1f9hrp6m7z3cm5yl0njba6gfixzdirxjl8nihp9val0685vm0"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "lua-format"; }; -} +}) diff --git a/pkgs/by-name/lu/luppp/package.nix b/pkgs/by-name/lu/luppp/package.nix index fd0256da290b..383bbfa2ad4b 100644 --- a/pkgs/by-name/lu/luppp/package.nix +++ b/pkgs/by-name/lu/luppp/package.nix @@ -13,14 +13,14 @@ ntk, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "luppp"; version = "1.2.1"; src = fetchFromGitHub { owner = "openAVproductions"; repo = "openAV-Luppp"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "1ncbn099fyfnr7jw2bp3wf2g9k738lw53m6ssw6wji2wxwmghv78"; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "luppp"; }; -} +}) diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index d2558db26135..ac222b857b56 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -18,18 +18,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lux-cli"; - version = "0.22.4"; + version = "0.25.1"; src = fetchFromGitHub { owner = "lumen-oss"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-f0FNl7VAG5e1rlmVYQci6jBA5udiXQpmI2cFnp6g8DI="; + hash = "sha256-0VPXRO8ApVKToP1/2xJlOxi5UTXSfXkCuHV0hECv4VA="; }; buildAndTestSubdir = "lux-cli"; - cargoHash = "sha256-tf92/GIKCA+KRmN/l5/Sw7qew9oiWna38WgfjRwnQlk="; + cargoHash = "sha256-GkzTN4DjbzyvLAuiXONyMXm8Bgd9t6tj2cqTi/ir268="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/lv/lv2-cpp-tools/package.nix b/pkgs/by-name/lv/lv2-cpp-tools/package.nix index c221ba7c6934..d191a72cf518 100644 --- a/pkgs/by-name/lv/lv2-cpp-tools/package.nix +++ b/pkgs/by-name/lv/lv2-cpp-tools/package.nix @@ -8,12 +8,12 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lv2-cpp-tools"; version = "1.0.5"; src = fetchzip { - url = "http://deb.debian.org/debian/pool/main/l/lv2-c++-tools/lv2-c++-tools_${version}.orig.tar.bz2"; + url = "http://deb.debian.org/debian/pool/main/l/lv2-c++-tools/lv2-c++-tools_${finalAttrs.version}.orig.tar.bz2"; sha256 = "039bq7d7s2bhfcnlsfq0mqxr9a9iqwg5bwcpxfi24c6yl6krydsi"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.michalrus ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/lv/lv2bm/package.nix b/pkgs/by-name/lv/lv2bm/package.nix index b4c1e1ea24d1..d1149b519d08 100644 --- a/pkgs/by-name/lv/lv2bm/package.nix +++ b/pkgs/by-name/lv/lv2bm/package.nix @@ -12,14 +12,14 @@ sratom, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lv2bm"; version = "1.1"; src = fetchFromGitHub { owner = "moddevices"; repo = "lv2bm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0vlppxfb9zbmffazs1kiyb79py66s8x9hihj36m2vz86zsq7ybl0"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "lv2bm"; }; -} +}) diff --git a/pkgs/by-name/lw/lwgrp/package.nix b/pkgs/by-name/lw/lwgrp/package.nix index 9ddac9bd3bbb..db1356ea70f1 100644 --- a/pkgs/by-name/lw/lwgrp/package.nix +++ b/pkgs/by-name/lw/lwgrp/package.nix @@ -6,14 +6,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lwgrp"; version = "1.0.6"; src = fetchFromGitHub { owner = "LLNL"; repo = "lwgrp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ZpxxcCqK+qdvnCvobeBV6htRF8wThiQgVFYgEigqmIE="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix index b03a96499a2f..63a8597bf885 100644 --- a/pkgs/by-name/lx/lxcfs/package.nix +++ b/pkgs/by-name/lx/lxcfs/package.nix @@ -15,14 +15,14 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxcfs"; version = "6.0.5"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mRTM06QyWcB4XOi0w2qvyDABGuu1SPJX0gjlBktDOac="; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.lxc ]; }; -} +}) diff --git a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix index 7a2293fc167a..341188ab873a 100644 --- a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix +++ b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix @@ -11,7 +11,7 @@ let ps.pyqt6 ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxqt-panel-profiles"; version = "1.3"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "MrReplikant"; repo = "lxqt-panel-profiles"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-mI/Rg3YeK64R3cCn+xz4+CHZldGteZ4Id4h/YUcreW4="; }; @@ -46,10 +46,10 @@ stdenv.mkDerivation rec { meta = { description = ""; homepage = "https://codeberg.org/MrReplikant/lxqt-panel-profiles/"; - changelog = "https://codeberg.org/MrReplikant/lxqt-panel-profiles/releases/tag/${version}"; + changelog = "https://codeberg.org/MrReplikant/lxqt-panel-profiles/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ linuxissuper ]; mainProgram = "lxqt-panel-profiles"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ly/lynx/package.nix b/pkgs/by-name/ly/lynx/package.nix index 2ec3cab0c39d..f5eb99b2e0a2 100644 --- a/pkgs/by-name/ly/lynx/package.nix +++ b/pkgs/by-name/ly/lynx/package.nix @@ -11,14 +11,14 @@ nukeReferences, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lynx"; version = "2.9.2"; src = fetchurl { urls = [ - "https://invisible-island.net/archives/lynx/tarballs/lynx${version}.tar.bz2" - "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2" + "https://invisible-island.net/archives/lynx/tarballs/lynx${finalAttrs.version}.tar.bz2" + "https://invisible-mirror.net/archives/lynx/tarballs/lynx${finalAttrs.version}.tar.bz2" ]; hash = "sha256-c3S4mTbZkWaeEB9Ol/LJWSA24ejNqnuvwlmnerb7B84="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ly/lyra/package.nix b/pkgs/by-name/ly/lyra/package.nix index 40d083d61cc8..ef6b1b5857a8 100644 --- a/pkgs/by-name/ly/lyra/package.nix +++ b/pkgs/by-name/ly/lyra/package.nix @@ -6,14 +6,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lyra"; version = "1.7.0"; src = fetchFromGitHub { owner = "bfgroup"; repo = "lyra"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-X8wJwSfOo7v2SKYrKJ4RhpEmOdEkS8lPHIqCxP46VF4="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = lib.licenses.boost; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/lz/lzop/package.nix b/pkgs/by-name/lz/lzop/package.nix index d7dafe6f7545..562c7a2a5a39 100644 --- a/pkgs/by-name/lz/lzop/package.nix +++ b/pkgs/by-name/lz/lzop/package.nix @@ -5,12 +5,12 @@ lzo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lzop"; version = "1.04"; src = fetchurl { - url = "https://www.lzop.org/download/lzop-${version}.tar.gz"; + url = "https://www.lzop.org/download/lzop-${finalAttrs.version}.tar.gz"; sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky"; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "lzop"; }; -} +}) diff --git a/pkgs/by-name/m1/m17-cxx-demod/package.nix b/pkgs/by-name/m1/m17-cxx-demod/package.nix index f3fd9808c80c..e3bc49bba761 100644 --- a/pkgs/by-name/m1/m17-cxx-demod/package.nix +++ b/pkgs/by-name/m1/m17-cxx-demod/package.nix @@ -9,14 +9,14 @@ codec2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "m17-cxx-demod"; version = "2.3"; src = fetchFromGitHub { owner = "mobilinkd"; repo = "m17-cxx-demod"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-mvppkFBmmPVqvlqIqrbwGrOBih5zS5sZrV/usEhHiws="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/m4/m4acut/package.nix b/pkgs/by-name/m4/m4acut/package.nix index 9408fd792022..2805835b69b4 100644 --- a/pkgs/by-name/m4/m4acut/package.nix +++ b/pkgs/by-name/m4/m4acut/package.nix @@ -6,14 +6,14 @@ l-smash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "m4acut"; version = "0.1.2"; src = fetchFromGitHub { owner = "nu774"; repo = "m4acut"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1hzf9f1fzmlpnxjaxhs2w22wzb28vd87ycaddnix1mmhvh3nvzkd"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "m4acut"; }; -} +}) diff --git a/pkgs/by-name/m4/m4ri/package.nix b/pkgs/by-name/m4/m4ri/package.nix index 1d29c4554345..1abc5e614225 100644 --- a/pkgs/by-name/m4/m4ri/package.nix +++ b/pkgs/by-name/m4/m4ri/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "20260122"; pname = "m4ri"; src = fetchFromGitHub { owner = "malb"; repo = "m4ri"; - rev = version; + rev = finalAttrs.version; hash = "sha256-/M/DVl2tRXIz5l3LFwY8Bvxnzjeoluy+zVgBVpPSdZM="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/m4/m4rie/package.nix b/pkgs/by-name/m4/m4rie/package.nix index 796b50ef7ecb..de7d2414eb57 100644 --- a/pkgs/by-name/m4/m4rie/package.nix +++ b/pkgs/by-name/m4/m4rie/package.nix @@ -7,14 +7,14 @@ m4ri, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "20250128"; pname = "m4rie"; src = fetchFromGitHub { owner = "malb"; repo = "m4rie"; - rev = version; + rev = finalAttrs.version; hash = "sha256-tw6ZX8hKfr9wQLF2nuO1dSkkTYZX6pzNWMlWfzLqQNE="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ma/macchanger/package.nix b/pkgs/by-name/ma/macchanger/package.nix index 49857d1237e4..9a721f0ed200 100644 --- a/pkgs/by-name/ma/macchanger/package.nix +++ b/pkgs/by-name/ma/macchanger/package.nix @@ -7,14 +7,14 @@ texinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "macchanger"; version = "1.7.0"; src = fetchFromGitHub { owner = "alobbs"; repo = "macchanger"; - rev = version; + rev = finalAttrs.version; sha256 = "1hypx6sxhd2b1nsxj314hpkhj7q4x9p2kfaaf20rjkkkig0nck9r"; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "macchanger"; }; -} +}) diff --git a/pkgs/by-name/ma/macopix/package.nix b/pkgs/by-name/ma/macopix/package.nix index 9893cd314807..c25d32f1c0c8 100644 --- a/pkgs/by-name/ma/macopix/package.nix +++ b/pkgs/by-name/ma/macopix/package.nix @@ -8,14 +8,14 @@ versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "macopix"; version = "3.4.0"; # GitHub does not contain tags # https://github.com/chimari/MaCoPiX/issues/6 src = fetchurl { - url = "http://rosegray.sakura.ne.jp/macopix/macopix-${version}.tar.gz"; + url = "http://rosegray.sakura.ne.jp/macopix/macopix-${finalAttrs.version}.tar.gz"; hash = "sha256-1AjqdPPCc9UQWqLdWlA+Va+MmvKL8dAIfJURPifN7RI="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ma/maeparser/package.nix b/pkgs/by-name/ma/maeparser/package.nix index 1a7e4d6ef558..6c9c74220f11 100644 --- a/pkgs/by-name/ma/maeparser/package.nix +++ b/pkgs/by-name/ma/maeparser/package.nix @@ -7,14 +7,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "maeparser"; version = "1.3.3"; src = fetchFromGitHub { owner = "schrodinger"; repo = "maeparser"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-xRyf/n8ezmMPMhlQFapVpnT2LReLe7spXB9jFC+VPRA="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; 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 3ab4aaac897b..6103be6f22ff 100644 --- a/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/pkgs/by-name/ma/magic-vlsi/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "magic-vlsi"; - version = "8.3.593"; + version = "8.3.597"; src = fetchFromGitHub { owner = "RTimothyEdwards"; repo = "magic"; tag = finalAttrs.version; - hash = "sha256-o9x29CDOtSQpQvTach6RaTJxRd2iTjyYi94ZjffUxVI="; + hash = "sha256-aFT/uTs/nMb8srf0Hjit03qM7+x1yZasIrSv8cjLS88="; leaveDotGit = true; }; @@ -37,9 +37,9 @@ stdenv.mkDerivation (finalAttrs: { }) (fetchpatch { - name = "neuer-fix-name.patch"; - url = "https://github.com/RTimothyEdwards/magic/commit/a70ca249c3a4e7a256a4482bd887452267c8cd52.patch"; - hash = "sha256-sNQDz4/hBtwJeDrOCe+LfJkuaB0zRzX7w1aDv8ZD7Pw="; + name = "fix_txinput_termbits.patch"; + url = "https://github.com/RTimothyEdwards/magic/commit/790f0196d4fef21dc8a3f5646ccf87a531c4d6aa.patch"; + hash = "sha256-zpmFT813USxX3PDpi6TGlWpWX4xfdirVrVtAlBtkSF0="; }) ]; diff --git a/pkgs/by-name/ma/magicard-cups-driver/package.nix b/pkgs/by-name/ma/magicard-cups-driver/package.nix index 5d1c59754891..0db2cfdd900f 100644 --- a/pkgs/by-name/ma/magicard-cups-driver/package.nix +++ b/pkgs/by-name/ma/magicard-cups-driver/package.nix @@ -6,13 +6,13 @@ cups, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "magicard-cups-driver"; version = "1.4.0"; src = fetchzip { # https://support.magicard.com/solution/linux-driver/ - url = "https://f08ddbe93aa02eaf9a6c-f08cd513e3a8c914f4f8f62af1786149.ssl.cf3.rackcdn.com/magicard_ltd-linux_driver-${version}.tar.gz"; + url = "https://f08ddbe93aa02eaf9a6c-f08cd513e3a8c914f4f8f62af1786149.ssl.cf3.rackcdn.com/magicard_ltd-linux_driver-${finalAttrs.version}.tar.gz"; hash = "sha256-1k2Twn1JBizw/tzQ0xF1uJIecblRd6VurB7FAUop5F0="; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Replace the supplied cmake generated makefile (which is useless on a different machine) # with the CMakeLists.txt taken from v1.3.4 of the driver and patch it to make it compatible with v1.4.0 prePatch = '' - cp ${src_v1_3_4}/CMakeLists.txt CMakeLists.txt + cp ${finalAttrs.src_v1_3_4}/CMakeLists.txt CMakeLists.txt rm makefile ''; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ _0x3f ]; }; -} +}) diff --git a/pkgs/by-name/ma/mailcap/package.nix b/pkgs/by-name/ma/mailcap/package.nix index 6a809eb9e53e..03a5c011d3d3 100644 --- a/pkgs/by-name/ma/mailcap/package.nix +++ b/pkgs/by-name/ma/mailcap/package.nix @@ -13,12 +13,12 @@ nix-update, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mailcap"; version = "2.1.54"; src = fetchurl { - url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz"; + url = "https://releases.pagure.org/mailcap/mailcap-${finalAttrs.version}.tar.xz"; hash = "sha256-mkAyIC/A0rCFj0GxZzianP5SrCTsKC5kebkHZTGd4RM="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ c0bw3b ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ma/mailcheck/package.nix b/pkgs/by-name/ma/mailcheck/package.nix index 0f5e19254729..c5971b9bfe1c 100644 --- a/pkgs/by-name/ma/mailcheck/package.nix +++ b/pkgs/by-name/ma/mailcheck/package.nix @@ -4,14 +4,14 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mailcheck"; version = "1.91.2"; patches = [ ./mailcheck-Makefile.patch ]; src = fetchurl { - url = "mirror://sourceforge/mailcheck/mailcheck_${version}.tar.gz"; + url = "mirror://sourceforge/mailcheck/mailcheck_${finalAttrs.version}.tar.gz"; sha256 = "0p0azaxsnjvjbg41ycicc1i0kzw6jiynq8k49cfkdhlckxfdm9kc"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maildir and remote POP3 and IMAP mailboxes. ''; }; -} +}) diff --git a/pkgs/by-name/ma/maildrop/package.nix b/pkgs/by-name/ma/maildrop/package.nix index e13819560d14..c750bd6d787b 100644 --- a/pkgs/by-name/ma/maildrop/package.nix +++ b/pkgs/by-name/ma/maildrop/package.nix @@ -9,12 +9,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "maildrop"; version = "3.2.1"; src = fetchurl { - url = "mirror://sourceforge/courier/maildrop/${version}/maildrop-${version}.tar.bz2"; + url = "mirror://sourceforge/courier/maildrop/${finalAttrs.version}/maildrop-${finalAttrs.version}.tar.bz2"; hash = "sha256-PFiQ9NQzItTmPz6Aw6YJzeYF9ylm1iNPyIZBjZSdJLk="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ma/makebootfat/package.nix b/pkgs/by-name/ma/makebootfat/package.nix index f39cd82e1116..ffc44f94467f 100644 --- a/pkgs/by-name/ma/makebootfat/package.nix +++ b/pkgs/by-name/ma/makebootfat/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "makebootfat"; version = "1.4"; src = fetchurl { - url = "mirror://sourceforge/advancemame/makebootfat-${version}.tar.gz"; + url = "mirror://sourceforge/advancemame/makebootfat-${finalAttrs.version}.tar.gz"; sha256 = "0v0g1xax0y6hmw2x10nfhchp9n7vqyvgc33gcxqax8jdq2pxm1q2"; }; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "makebootfat"; }; -} +}) diff --git a/pkgs/by-name/ma/makefile2graph/package.nix b/pkgs/by-name/ma/makefile2graph/package.nix index 787a4231351e..33cd5e60d721 100644 --- a/pkgs/by-name/ma/makefile2graph/package.nix +++ b/pkgs/by-name/ma/makefile2graph/package.nix @@ -7,14 +7,14 @@ gnumake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "makefile2graph"; version = "2021.11.06"; src = fetchFromGitHub { owner = "lindenb"; repo = "makefile2graph"; - tag = version; + tag = finalAttrs.version; hash = "sha256-4jyftC0eCJ13X/L4uEWhT5FA5/UXUmSHSoba89GSySQ="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ma/makerpm/package.nix b/pkgs/by-name/ma/makerpm/package.nix index 7977299bd612..d7edcd74cb97 100644 --- a/pkgs/by-name/ma/makerpm/package.nix +++ b/pkgs/by-name/ma/makerpm/package.nix @@ -7,7 +7,7 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.0"; pname = "makerpm"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ivan-tkatchev"; repo = "makerpm"; - rev = version; + rev = finalAttrs.version; sha256 = "089dkbh5705ppyi920rd0ksjc0143xmvnhm8qrx93rsgwc1ggi1y"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.ivan-tkatchev ]; }; -} +}) diff --git a/pkgs/by-name/ma/malt/package.nix b/pkgs/by-name/ma/malt/package.nix index 42cc34333d32..d6283f4fce23 100644 --- a/pkgs/by-name/ma/malt/package.nix +++ b/pkgs/by-name/ma/malt/package.nix @@ -8,14 +8,14 @@ libunwind, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "malt"; version = "1.4.1"; src = fetchFromGitHub { owner = "memtt"; repo = "malt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-4lCAEk/b8APuOo+x/kGSTg7vFSBZf/VBuSMDM7o5sts="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ skohtv ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ma/mamba/package.nix b/pkgs/by-name/ma/mamba/package.nix index 82b20777f72c..d6af2ccfc0fb 100644 --- a/pkgs/by-name/ma/mamba/package.nix +++ b/pkgs/by-name/ma/mamba/package.nix @@ -14,14 +14,14 @@ libsmf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mamba"; version = "2.6"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-S1+nGnB1LHIUgYves0qtWh+QXYKjtKWICpOo38b3zbY="; fetchSubmodules = true; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ma/man-db/package.nix b/pkgs/by-name/ma/man-db/package.nix index 0b173b013f7b..b86a1acab0e7 100644 --- a/pkgs/by-name/ma/man-db/package.nix +++ b/pkgs/by-name/ma/man-db/package.nix @@ -20,12 +20,12 @@ let libiconv' = if stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "man-db"; version = "2.13.1"; src = fetchurl { - url = "mirror://savannah/man-db/man-db-${version}.tar.xz"; + url = "mirror://savannah/man-db/man-db-${finalAttrs.version}.tar.xz"; hash = "sha256-iv67b362u4VCkpRYhB9cfm8kDjDIY1jB+8776gdsh9k="; }; @@ -128,4 +128,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "man"; }; -} +}) diff --git a/pkgs/by-name/ma/mandoc/package.nix b/pkgs/by-name/ma/mandoc/package.nix index b546854d7816..22d603e8ef20 100644 --- a/pkgs/by-name/ma/mandoc/package.nix +++ b/pkgs/by-name/ma/mandoc/package.nix @@ -14,12 +14,12 @@ let utf8Locale = if stdenv.hostPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mandoc"; version = "1.14.6"; src = fetchurl { - url = "https://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz"; + url = "https://mandoc.bsd.lv/snapshots/mandoc-${finalAttrs.version}.tar.gz"; sha256 = "8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c"; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "man"; }; -} +}) diff --git a/pkgs/by-name/ma/mangareader/package.nix b/pkgs/by-name/ma/mangareader/package.nix index ca8f169f120b..d754ce16c6e0 100644 --- a/pkgs/by-name/ma/mangareader/package.nix +++ b/pkgs/by-name/ma/mangareader/package.nix @@ -7,14 +7,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mangareader"; version = "2.2.2"; src = fetchFromGitHub { owner = "g-fb"; repo = "mangareader"; - rev = version; + rev = finalAttrs.version; hash = "sha256-e5mG286Pj4Ey1/VzRxzXsY3bqI3XA0IBtnFTXwas/0s="; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt manga reader for local files"; homepage = "https://github.com/g-fb/mangareader"; - changelog = "https://github.com/g-fb/mangareader/releases/tag/${src.rev}"; + changelog = "https://github.com/g-fb/mangareader/releases/tag/${finalAttrs.src.rev}"; mainProgram = "mangareader"; platforms = lib.platforms.linux; license = with lib.licenses; [ @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ zendo ]; }; -} +}) diff --git a/pkgs/by-name/ma/map-cmd/package.nix b/pkgs/by-name/ma/map-cmd/package.nix index e78da614fa34..ab905772d2c2 100644 --- a/pkgs/by-name/ma/map-cmd/package.nix +++ b/pkgs/by-name/ma/map-cmd/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "map"; version = "0.1.1"; src = fetchFromGitHub { owner = "soveran"; repo = "map"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-yGzmhZwv1qKy0JNcSzqL996APQO8OGWQ1GBkEkKTOXA="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pogobanane ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index 69f406d37fca..44fb40058e43 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -28,14 +28,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mapserver"; version = "8.6.0"; src = fetchFromGitHub { owner = "MapServer"; repo = "MapServer"; - rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; + rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; hash = "sha256-KfCYYbBAsOKWkpaPIiN+xxu1IXoMkk0NWSdndk8FpTg="; }; @@ -104,4 +104,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.geospatial ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ma/mariadb-galera/package.nix b/pkgs/by-name/ma/mariadb-galera/package.nix index 5d71dfcd944b..c85fdb37bc4a 100644 --- a/pkgs/by-name/ma/mariadb-galera/package.nix +++ b/pkgs/by-name/ma/mariadb-galera/package.nix @@ -10,14 +10,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mariadb-galera"; version = "26.4.24"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; - tag = "release_${version}"; + tag = "release_${finalAttrs.version}"; hash = "sha256-mpf+YY0m+UwvemdZt6SfRP9IJlq5IZtlOJMucADc1oM="; fetchSubmodules = true; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ma/marisa/package.nix b/pkgs/by-name/ma/marisa/package.nix index e4add9a10ce9..c325fe577d15 100644 --- a/pkgs/by-name/ma/marisa/package.nix +++ b/pkgs/by-name/ma/marisa/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "marisa"; version = "0.3.0"; src = fetchFromGitHub { owner = "s-yata"; repo = "marisa-trie"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XOXX0NuU+erL/KDAZgBeX+LKO9uSEOyP1/VuMDE5pi0="; }; @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/s-yata/marisa-trie"; - changelog = "https://github.com/s-yata/marisa-trie/releases/tag/${src.tag}"; + changelog = "https://github.com/s-yata/marisa-trie/releases/tag/${finalAttrs.src.tag}"; description = "Static and space-efficient trie data structure library"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ sifmelcara ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ma/marker/package.nix b/pkgs/by-name/ma/marker/package.nix index 20f1f653e33e..5a79599b0881 100644 --- a/pkgs/by-name/ma/marker/package.nix +++ b/pkgs/by-name/ma/marker/package.nix @@ -14,14 +14,14 @@ pandoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "marker"; version = "2023.05.02"; src = fetchFromGitHub { owner = "fabiocolacio"; repo = "Marker"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0="; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - meson rewrite kwargs set project / version '${version}' + meson rewrite kwargs set project / version '${finalAttrs.version}' ''; meta = { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - changelog = "https://github.com/fabiocolacio/Marker/releases/tag/${version}"; + changelog = "https://github.com/fabiocolacio/Marker/releases/tag/${finalAttrs.version}"; mainProgram = "marker"; }; -} +}) diff --git a/pkgs/by-name/ma/marwaita-orange/package.nix b/pkgs/by-name/ma/marwaita-orange/package.nix index 5ce559ef717c..d69ce7854a19 100644 --- a/pkgs/by-name/ma/marwaita-orange/package.nix +++ b/pkgs/by-name/ma/marwaita-orange/package.nix @@ -9,14 +9,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "marwaita-orange"; version = "24"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "marwaita-orange"; - rev = version; + rev = finalAttrs.version; hash = "sha256-/F/nboht7YG9pXVv7/ZvZ4QkxfB+h201G1KZLRohM80="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/ma/marwaita-red/package.nix b/pkgs/by-name/ma/marwaita-red/package.nix index df84010e943a..f9ba337f8bd7 100644 --- a/pkgs/by-name/ma/marwaita-red/package.nix +++ b/pkgs/by-name/ma/marwaita-red/package.nix @@ -9,14 +9,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "marwaita-red"; version = "24"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "marwaita-red"; - rev = version; + rev = finalAttrs.version; hash = "sha256-21U3Z53v2PDJ7Io9WZypQiZPM4mjTa3z6W+vE9qNouA="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/ma/marwaita-teal/package.nix b/pkgs/by-name/ma/marwaita-teal/package.nix index 9d1f18b76238..e8f6e2306687 100644 --- a/pkgs/by-name/ma/marwaita-teal/package.nix +++ b/pkgs/by-name/ma/marwaita-teal/package.nix @@ -9,14 +9,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "marwaita-teal"; version = "24"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "marwaita-teal"; - rev = version; + rev = finalAttrs.version; hash = "sha256-63VJrmb0TcsXT1JM77+ZxN4kOZPBlqR2ANAhY041QCA="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/ma/marwaita-yellow/package.nix b/pkgs/by-name/ma/marwaita-yellow/package.nix index f3d20ee0a6a8..b221c5264d51 100644 --- a/pkgs/by-name/ma/marwaita-yellow/package.nix +++ b/pkgs/by-name/ma/marwaita-yellow/package.nix @@ -9,14 +9,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "marwaita-yellow"; version = "23"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "marwaita-yellow"; - rev = version; + rev = finalAttrs.version; hash = "sha256-1nGQvN6xacMoRyT7WkNC2lKX/QnXA7pCBz1kIo0aOwA="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/ma/masscan/package.nix b/pkgs/by-name/ma/masscan/package.nix index c3a3f658d3c9..c9eadc25de5a 100644 --- a/pkgs/by-name/ma/masscan/package.nix +++ b/pkgs/by-name/ma/masscan/package.nix @@ -8,14 +8,14 @@ libpcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "masscan"; version = "1.3.2"; src = fetchFromGitHub { owner = "robertdavidgraham"; repo = "masscan"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-mnGC/moQANloR5ODwRjzJzBa55OEZ9QU+9WpAHxQE/g="; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" - "GITVER=${version}" + "GITVER=${finalAttrs.version}" "CC=${stdenv.cc.targetPrefix}cc" ]; @@ -67,9 +67,9 @@ stdenv.mkDerivation rec { description = "Fast scan of the Internet"; mainProgram = "masscan"; homepage = "https://github.com/robertdavidgraham/masscan"; - changelog = "https://github.com/robertdavidgraham/masscan/releases/tag/${version}"; + changelog = "https://github.com/robertdavidgraham/masscan/releases/tag/${finalAttrs.version}"; license = lib.licenses.agpl3Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ rnhmjoj ]; }; -} +}) diff --git a/pkgs/by-name/ma/massdns/package.nix b/pkgs/by-name/ma/massdns/package.nix index 8ee4306d127a..f31ffb22f8f8 100644 --- a/pkgs/by-name/ma/massdns/package.nix +++ b/pkgs/by-name/ma/massdns/package.nix @@ -4,20 +4,20 @@ fetchFromGitHub, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "massdns"; version = "1.1.0"; src = fetchFromGitHub { owner = "blechschmidt"; repo = "massdns"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-hrnAg5ErPt93RV4zobRGVtcKt4aM2tC52r08T7+vRGc="; }; makeFlags = [ "PREFIX=$(out)" - "PROJECT_FLAGS=-DMASSDNS_REVISION='\"v${version}\"'" + "PROJECT_FLAGS=-DMASSDNS_REVISION='\"v${finalAttrs.version}\"'" ]; buildFlags = if stdenv.hostPlatform.isLinux then "all" else "nolinux"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Resolve large amounts of domain names"; homepage = "https://github.com/blechschmidt/massdns"; - changelog = "https://github.com/blechschmidt/massdns/releases/tag/v${version}"; + changelog = "https://github.com/blechschmidt/massdns/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ geoffreyfrogeye ]; mainProgram = "massdns"; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { # error: use of undeclared identifier 'MSG_NOSIGNAL' badPlatforms = lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/ma/master_me/package.nix b/pkgs/by-name/ma/master_me/package.nix index b0697ddf0dec..433a684780f2 100644 --- a/pkgs/by-name/ma/master_me/package.nix +++ b/pkgs/by-name/ma/master_me/package.nix @@ -9,14 +9,14 @@ pkg-config, python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "master_me"; version = "1.3.1"; src = fetchFromGitHub { owner = "trummerschlunk"; repo = "master_me"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-eesMXxRcCgzhSQ+WUqM00EuKYhFxysjH+RWKHKGYzUM="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; mainProgram = "master_me"; }; -} +}) diff --git a/pkgs/by-name/ma/matchbox/package.nix b/pkgs/by-name/ma/matchbox/package.nix index bfeeeed9a6a7..804dffdda545 100644 --- a/pkgs/by-name/ma/matchbox/package.nix +++ b/pkgs/by-name/ma/matchbox/package.nix @@ -9,7 +9,7 @@ libXext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "matchbox"; version = "1.2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lX11 -L${libX11}/lib -lXext -L${libXext}/lib"; src = fetchurl { - url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2"; + url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${finalAttrs.version}/matchbox-window-manager-${finalAttrs.version}.tar.bz2"; sha256 = "1zyfq438b466ygcz78nvsmnsc5bhg4wcfnpxb43kbkwpyx53m8l1"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ma/materia-kde-theme/package.nix b/pkgs/by-name/ma/materia-kde-theme/package.nix index 0cfc022f3901..34c6574b2966 100644 --- a/pkgs/by-name/ma/materia-kde-theme/package.nix +++ b/pkgs/by-name/ma/materia-kde-theme/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "materia-kde-theme"; version = "20220714"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "materia-kde"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-/LA+H2ekxuO1RpfaPJruRGeWPVopA0rZUxU4Mh7YQ0s="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.diffumist ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ma/mathgl/package.nix b/pkgs/by-name/ma/mathgl/package.nix index 8d06aa75ba62..64e6a2c35a1e 100644 --- a/pkgs/by-name/ma/mathgl/package.nix +++ b/pkgs/by-name/ma/mathgl/package.nix @@ -7,12 +7,12 @@ libpng, libGL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mathgl"; version = "8.0.3"; src = fetchurl { - url = "mirror://sourceforge/mathgl/mathgl-${version}.tar.gz"; + url = "mirror://sourceforge/mathgl/mathgl-${finalAttrs.version}.tar.gz"; sha256 = "sha256-m7qe5qD4bRuPPzugN008t3b3ctu28aAWhMpsC9ViBNY="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { # build tool make_bin is built for host broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; -} +}) diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix index 8c93567d6657..bdfd051a427d 100644 --- a/pkgs/by-name/ma/matrix-brandy/package.nix +++ b/pkgs/by-name/ma/matrix-brandy/package.nix @@ -7,14 +7,14 @@ SDL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "matrix-brandy"; version = "1.23.5"; src = fetchFromGitHub { owner = "stardot"; repo = "MatrixBrandy"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-sMgYgV4/vV1x5xSICXRpW6K8uCdVlJrS7iEg6XzQRo8="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ fiq ]; }; -} +}) diff --git a/pkgs/by-name/ma/maxcso/package.nix b/pkgs/by-name/ma/maxcso/package.nix index 32c88d145bd4..a7e69e3dd301 100644 --- a/pkgs/by-name/ma/maxcso/package.nix +++ b/pkgs/by-name/ma/maxcso/package.nix @@ -7,14 +7,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "maxcso"; version = "1.13.0"; src = fetchFromGitHub { owner = "unknownbrackets"; repo = "maxcso"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-6LjR1ZMZsi6toz9swPzNmSAlrUykwvVdYi1mR8Ctq5U="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { license = lib.licenses.isc; mainProgram = "maxcso"; }; -} +}) diff --git a/pkgs/by-name/ma/maxflow/package.nix b/pkgs/by-name/ma/maxflow/package.nix index 3bc2434fb477..a6d6eb678a6c 100644 --- a/pkgs/by-name/ma/maxflow/package.nix +++ b/pkgs/by-name/ma/maxflow/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "maxflow"; version = "3.0.5"; src = fetchFromGitHub { owner = "gerddie"; repo = "maxflow"; - rev = version; + rev = finalAttrs.version; hash = "sha256-a84SxGMnfBEaoMEeeIFffTOtErSN5yzZBrAUDjkalGY="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.tadfisher ]; }; -} +}) diff --git a/pkgs/by-name/ma/maxlib/package.nix b/pkgs/by-name/ma/maxlib/package.nix index 02e78af05757..2d01f1665c3b 100644 --- a/pkgs/by-name/ma/maxlib/package.nix +++ b/pkgs/by-name/ma/maxlib/package.nix @@ -5,14 +5,14 @@ puredata, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "maxlib"; version = "1.5.7"; src = fetchFromGitHub { owner = "electrickery"; repo = "pd-maxlib"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "10w9qfgn26lj3zqjksf2r1wsjpf5xy4dx22jay9l6idy9q62mxsn"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mb/mb2md/package.nix b/pkgs/by-name/mb/mb2md/package.nix index e6886554a23c..f420d6fdc42f 100644 --- a/pkgs/by-name/mb/mb2md/package.nix +++ b/pkgs/by-name/mb/mb2md/package.nix @@ -9,12 +9,12 @@ let perlDeps = with perlPackages; [ TimeDate ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.20"; pname = "mb2md"; src = fetchurl { - url = "http://batleth.sapienti-sat.org/projects/mb2md/mb2md-${version}.pl.gz"; + url = "http://batleth.sapienti-sat.org/projects/mb2md/mb2md-${finalAttrs.version}.pl.gz"; sha256 = "0bvkky3c90738h3skd2f1b2yy5xzhl25cbh9w2dy97rs86ssjidg"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.jb55 ]; }; -} +}) diff --git a/pkgs/by-name/mb/mbelib/package.nix b/pkgs/by-name/mb/mbelib/package.nix index bf6f2faad166..4522985c6c5a 100644 --- a/pkgs/by-name/mb/mbelib/package.nix +++ b/pkgs/by-name/mb/mbelib/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mbelib"; version = "1.3.0"; src = fetchFromGitHub { owner = "szechyjs"; repo = "mbelib"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0v6b7nf8fgxy7vzgcwffqyql5zhldrz30c88k1ylbjp78hwh4rif"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.aciceri ]; }; -} +}) diff --git a/pkgs/by-name/mb/mblaze/package.nix b/pkgs/by-name/mb/mblaze/package.nix index 4cc1e7a0087e..d9a187726dfd 100644 --- a/pkgs/by-name/mb/mblaze/package.nix +++ b/pkgs/by-name/mb/mblaze/package.nix @@ -13,7 +13,7 @@ ruby, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mblaze"; version = "1.3"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "leahneukirchen"; repo = "mblaze"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-398wiXJ/iG9ZfPGDZc57xH37lft3NpEZuLE0Qhb2GGc="; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.ajgrf ]; }; -} +}) diff --git a/pkgs/by-name/mb/mbpfan/package.nix b/pkgs/by-name/mb/mbpfan/package.nix index 40195b99e452..ab0a660f07d5 100644 --- a/pkgs/by-name/mb/mbpfan/package.nix +++ b/pkgs/by-name/mb/mbpfan/package.nix @@ -4,13 +4,13 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mbpfan"; version = "2.4.0"; src = fetchFromGitHub { owner = "dgraziotin"; repo = "mbpfan"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-F9IWUcILOuLn5K4zRSU5jn+1Wk1xy0CONSI6JTXU2pA="; }; installPhase = '' @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/mb/mbusd/package.nix b/pkgs/by-name/mb/mbusd/package.nix index a80cf02fd297..e381c2abbfb8 100644 --- a/pkgs/by-name/mb/mbusd/package.nix +++ b/pkgs/by-name/mb/mbusd/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mbusd"; version = "0.5.2"; src = fetchFromGitHub { owner = "3cky"; repo = "mbusd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-RQRSqlbPwBhw0SiNSP+euMVAwVBJo3lx0qB5gyWA+cM="; }; @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { meta = { description = "Modbus TCP to Modbus RTU (RS-232/485) gateway"; homepage = "https://github.com/3cky/mbusd"; - changelog = "https://github.com/3cky/mbusd/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/3cky/mbusd/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ sikmir ]; platforms = lib.platforms.unix; mainProgram = "mbusd"; }; -} +}) diff --git a/pkgs/by-name/mc/mcabber/package.nix b/pkgs/by-name/mc/mcabber/package.nix index 3d33be3e2deb..f81f251e3cac 100644 --- a/pkgs/by-name/mc/mcabber/package.nix +++ b/pkgs/by-name/mc/mcabber/package.nix @@ -12,12 +12,12 @@ gpgme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mcabber"; version = "1.1.2"; src = fetchurl { - url = "https://mcabber.com/files/mcabber-${version}.tar.bz2"; + url = "https://mcabber.com/files/mcabber-${finalAttrs.version}.tar.bz2"; sha256 = "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4"; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; downloadPage = "http://mcabber.com/files/"; }; -} +}) diff --git a/pkgs/by-name/mc/mcrcon/package.nix b/pkgs/by-name/mc/mcrcon/package.nix index 107674b96afd..4762a959dc75 100644 --- a/pkgs/by-name/mc/mcrcon/package.nix +++ b/pkgs/by-name/mc/mcrcon/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mcrcon"; version = "0.7.2"; src = fetchFromGitHub { owner = "Tiiffi"; repo = "mcrcon"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-cedeKsZgEyu0jqN4kBSgMJzFNUfCVXCEwH3M54miSG4="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "mcrcon"; }; -} +}) diff --git a/pkgs/by-name/mc/mcron/package.nix b/pkgs/by-name/mc/mcron/package.nix index 35cf291a9932..c673770e9d92 100644 --- a/pkgs/by-name/mc/mcron/package.nix +++ b/pkgs/by-name/mc/mcron/package.nix @@ -6,12 +6,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mcron"; version = "1.2.1"; src = fetchurl { - url = "mirror://gnu/mcron/mcron-${version}.tar.gz"; + url = "mirror://gnu/mcron/mcron-${finalAttrs.version}.tar.gz"; sha256 = "0bkn235g2ia4f7ispr9d55c7bc18282r3qd8ldhh5q2kiin75zi0"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/mc/mctc-lib/package.nix b/pkgs/by-name/mc/mctc-lib/package.nix index 823a5c150a6b..3473b3dbaa7e 100644 --- a/pkgs/by-name/mc/mctc-lib/package.nix +++ b/pkgs/by-name/mc/mctc-lib/package.nix @@ -19,14 +19,14 @@ assert ( ] ); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mctc-lib"; version = "0.5.1"; src = fetchFromGitHub { owner = "grimme-lab"; repo = "mctc-lib"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rlwUNeuLzgSWZXDKCFS/H82+oH23tEzhhILqC/ZV6PI="; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/md/mdadm4/package.nix b/pkgs/by-name/md/mdadm4/package.nix index d5cb54bc0766..2143acc494e5 100644 --- a/pkgs/by-name/md/mdadm4/package.nix +++ b/pkgs/by-name/md/mdadm4/package.nix @@ -13,13 +13,13 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mdadm"; version = "4.4"; src = fetchgit { url = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git"; - tag = "mdadm-${version}"; + tag = "mdadm-${finalAttrs.version}"; hash = "sha256-jGmc8fkJM0V9J7V7tQPXSF/WD0kzyEAloBAwaAFenS0="; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "INSTALL=install" "BINDIR=$(out)/sbin" "SYSTEMD_DIR=$(out)/lib/systemd/system" - "MANDIR=$(out)/share/man" + "MANDIR=$(man)/share/man" "RUN_DIR=/dev/.mdadm" "STRIP=" ] @@ -51,6 +51,11 @@ stdenv.mkDerivation rec { "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; + outputs = [ + "out" + "man" + ]; + installFlags = [ "install-systemd" ]; enableParallelBuilding = true; @@ -98,4 +103,4 @@ stdenv.mkDerivation rec { mainProgram = "mdadm"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/md/mdf2iso/package.nix b/pkgs/by-name/md/mdf2iso/package.nix index d4ee1fba77af..7f80896d50a0 100644 --- a/pkgs/by-name/md/mdf2iso/package.nix +++ b/pkgs/by-name/md/mdf2iso/package.nix @@ -4,7 +4,7 @@ fetchgit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mdf2iso"; version = "0.3.1"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { meta = { description = "Small utility that converts MDF images to ISO format"; - homepage = src.url; + homepage = finalAttrs.src.url; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.oxij ]; mainProgram = "mdf2iso"; }; -} +}) diff --git a/pkgs/by-name/md/mdk/package.nix b/pkgs/by-name/md/mdk/package.nix index 533d250b21d3..67b51b62c568 100644 --- a/pkgs/by-name/md/mdk/package.nix +++ b/pkgs/by-name/md/mdk/package.nix @@ -7,11 +7,11 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnu-mdk"; version = "1.3.1"; src = fetchurl { - url = "mirror://gnu/mdk/v${version}/mdk-${version}.tar.gz"; + url = "mirror://gnu/mdk/v${finalAttrs.version}/mdk-${finalAttrs.version}.tar.gz"; sha256 = "sha256-67ljk4xojBUP9qrtwp8w0JAgoeMdVbMMIQHwh3NRbRk="; }; nativeBuildInputs = [ @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/md/mdns/package.nix b/pkgs/by-name/md/mdns/package.nix index 8545a70ced14..cb2d9aa212b6 100644 --- a/pkgs/by-name/md/mdns/package.nix +++ b/pkgs/by-name/md/mdns/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mdns"; version = "1.4.3"; src = fetchFromGitHub { owner = "mjansson"; repo = "mdns"; - rev = version; + rev = finalAttrs.version; hash = "sha256-2uv+Ibnbl6hsdjFqPhcHXbv+nIEIT4+tgtwGndpZCqo="; }; @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = { description = "Public domain mDNS/DNS-SD library in C"; homepage = "https://github.com/mjansson/mdns"; - changelog = "https://github.com/mjansson/mdns/blob/${src.rev}/CHANGELOG"; + changelog = "https://github.com/mjansson/mdns/blob/${finalAttrs.src.rev}/CHANGELOG"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ hexa ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/md/mdp/package.nix b/pkgs/by-name/md/mdp/package.nix index a237114c62a6..179976ef1114 100644 --- a/pkgs/by-name/md/mdp/package.nix +++ b/pkgs/by-name/md/mdp/package.nix @@ -5,14 +5,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.0.18"; pname = "mdp"; src = fetchFromGitHub { owner = "visit1985"; repo = "mdp"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-7ltqnvNzdr+sJiiiCQpp25dzhOrcUCOAgMTt1RIgVTw="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix; mainProgram = "mdp"; }; -} +}) diff --git a/pkgs/by-name/me/med/package.nix b/pkgs/by-name/me/med/package.nix index 42a74e0790b1..59a323ba595d 100644 --- a/pkgs/by-name/me/med/package.nix +++ b/pkgs/by-name/me/med/package.nix @@ -9,14 +9,14 @@ readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "med"; version = "3.10.1"; src = fetchFromGitHub { owner = "allencch"; repo = "med"; - rev = version; + rev = finalAttrs.version; hash = "sha256-m2lVRSNaklB0Xfqgtyc0lNWXfTD8wTWsE06eGv4FOBE="; }; @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { meta = { description = "GUI game memory scanner and editor"; homepage = "https://github.com/allencch/med"; - changelog = "https://github.com/allencch/med/releases/tag/${version}"; + changelog = "https://github.com/allencch/med/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ zebreus ]; platforms = lib.platforms.linux; license = lib.licenses.bsd3; mainProgram = "med"; }; -} +}) diff --git a/pkgs/by-name/me/media-player-info/package.nix b/pkgs/by-name/me/media-player-info/package.nix index a620b07c5dea..65202e6e3f5b 100644 --- a/pkgs/by-name/me/media-player-info/package.nix +++ b/pkgs/by-name/me/media-player-info/package.nix @@ -10,7 +10,7 @@ systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "media-player-info"; version = "26"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "media-player-info"; repo = "media-player-info"; - rev = version; + rev = finalAttrs.version; hash = "sha256-VoMr5Lxy6u/BA/9t65/S8AW41YU0FLp6eftYUVdoMjY="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ttuegel ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/me/mediasynclite/package.nix b/pkgs/by-name/me/mediasynclite/package.nix index adf67f1e30a1..fb18b8f47f30 100644 --- a/pkgs/by-name/me/mediasynclite/package.nix +++ b/pkgs/by-name/me/mediasynclite/package.nix @@ -12,14 +12,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mediasynclite"; version = "0.4.2"; src = fetchFromGitHub { owner = "iBroadcastMediaServices"; repo = "MediaSyncLiteLinux"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ToSkR6tPJMBCcj1NUBAywKjCAPlpmh+ngIopFrT2PIA="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ tobz619 ]; }; -} +}) diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix index fdcf965a896c..e77668ed5613 100644 --- a/pkgs/by-name/me/mediawriter/package.nix +++ b/pkgs/by-name/me/mediawriter/package.nix @@ -10,14 +10,14 @@ xz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mediawriter"; version = "5.2.9"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "MediaWriter"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tZ0GzaEzhklD/FJocnRmet+dvBwZoNYVhJfF1NY6puE="; }; @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { meta = { description = "Tool to write images files to portable media"; homepage = "https://github.com/FedoraQt/MediaWriter"; - changelog = "https://github.com/FedoraQt/MediaWriter/releases/tag/${version}"; + changelog = "https://github.com/FedoraQt/MediaWriter/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl2Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "mediawriter"; }; -} +}) diff --git a/pkgs/by-name/me/medusa/package.nix b/pkgs/by-name/me/medusa/package.nix index 4995d47f01fe..4e7be18c3250 100644 --- a/pkgs/by-name/me/medusa/package.nix +++ b/pkgs/by-name/me/medusa/package.nix @@ -8,15 +8,15 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "medusa"; version = "2.3"; src = fetchFromGitHub { owner = "jmk-foofus"; repo = "medusa"; - tag = version; - hash = "sha256-devirQMmS8mtxT5H5XafRRvCyfcvwoWxtTp0V1SJeSM="; + tag = finalAttrs.version; + hash = "sha256-ftn5RBE3NYfjXLq8Gm92sbFW+M925BDuL/VmwfPYXpo="; }; outputs = [ @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { meta = { description = "Speedy, parallel, and modular, login brute-forcer"; homepage = "https://github.com/jmk-foofus/medusa"; - changelog = "https://github.com/jmk-foofus/medusa/releases/tag/${src.tag}"; + changelog = "https://github.com/jmk-foofus/medusa/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl2Plus; maintainers = [ ]; mainProgram = "medusa"; }; -} +}) diff --git a/pkgs/by-name/me/megatools/package.nix b/pkgs/by-name/me/megatools/package.nix index 3af1c2c46902..73dfbd3f6ee0 100644 --- a/pkgs/by-name/me/megatools/package.nix +++ b/pkgs/by-name/me/megatools/package.nix @@ -14,13 +14,13 @@ fuse, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "megatools"; version = "1.11.5"; src = fetchgit { url = "https://xff.cz/git/megatools"; - rev = version; + rev = finalAttrs.version; hash = "sha256-XOGjdvMw8wfhBwyOBnQqiiJeOGvYXKMYxiJ6BZeEwDQ="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/me/mela/package.nix b/pkgs/by-name/me/mela/package.nix index e28aae4d03b0..c5a9dc9f7ee5 100644 --- a/pkgs/by-name/me/mela/package.nix +++ b/pkgs/by-name/me/mela/package.nix @@ -5,14 +5,14 @@ gfortran, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mela"; version = "2.0.1"; src = fetchFromGitHub { owner = "vbertone"; repo = "MELA"; - rev = version; + rev = finalAttrs.version; sha256 = "01sgd4mwx4n58x95brphp4dskqkkx8434bvsr38r5drg9na5nc9y"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; }; -} +}) diff --git a/pkgs/by-name/me/memorado/package.nix b/pkgs/by-name/me/memorado/package.nix index 7a7778744d9a..a1fd942c7c7a 100644 --- a/pkgs/by-name/me/memorado/package.nix +++ b/pkgs/by-name/me/memorado/package.nix @@ -14,14 +14,14 @@ wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "memorado"; version = "0.6"; src = fetchFromGitHub { owner = "wbernard"; repo = "Memorado"; - tag = version; + tag = finalAttrs.version; hash = "sha256-pHbZ8zBfgAHLmCaMRS4MS/awFat41OG++hSSHz3k2KM="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ onny ]; }; -} +}) diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix index f8b11cd05f9e..710486be77fe 100644 --- a/pkgs/by-name/me/memray/package.nix +++ b/pkgs/by-name/me/memray/package.nix @@ -1,85 +1 @@ -{ - lib, - elfutils, - fetchFromGitHub, - libunwind, - lz4, - pkg-config, - python3Packages, -}: - -python3Packages.buildPythonApplication rec { - pname = "memray"; - version = "1.19.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "bloomberg"; - repo = "memray"; - tag = "v${version}"; - hash = "sha256-RdOtgNSkFIVl8Uve2iaJ7G0X1IHJ/Yo4h8hWP3pTV8g="; - }; - - build-system = with python3Packages; [ - distutils - setuptools - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - elfutils # for `-ldebuginfod` - libunwind - lz4 - ] - ++ (with python3Packages; [ cython ]); - - dependencies = with python3Packages; [ - pkgconfig - textual - jinja2 - rich - ]; - - nativeCheckInputs = - with python3Packages; - [ - ipython - pytest-cov-stub # fix Unknown pytest.mark.no_cover - pytest-textual-snapshot - pytestCheckHook - ] - ++ lib.optionals (pythonOlder "3.14") [ greenlet ]; - - pythonImportsCheck = [ "memray" ]; - - enabledTestPaths = [ "tests" ]; - - disabledTests = [ - # Import issue - "test_header_allocator" - "test_hybrid_stack_of_allocations_inside_ceval" - - # The following snapshot tests started failing since updating textual to 3.5.0 - "TestTUILooks" - "test_merge_threads" - "test_tui_basic" - "test_tui_gradient" - "test_tui_pause" - "test_unmerge_threads" - ]; - - disabledTestPaths = [ - # Very time-consuming and some tests fails (performance-related?) - "tests/integration/test_main.py" - ]; - - meta = { - description = "Memory profiler for Python"; - homepage = "https://bloomberg.github.io/memray/"; - changelog = "https://github.com/bloomberg/memray/releases/tag/${src.tag}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ fab ]; - platforms = lib.platforms.linux; - }; -} +{ python3Packages }: with python3Packages; toPythonApplication memray diff --git a/pkgs/by-name/me/memtester/package.nix b/pkgs/by-name/me/memtester/package.nix index 2d95a1a13e0c..b0a9a4f62949 100644 --- a/pkgs/by-name/me/memtester/package.nix +++ b/pkgs/by-name/me/memtester/package.nix @@ -4,7 +4,7 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "memtester"; version = "4.7.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz"; + url = "http://pyropus.ca/software/memtester/old-versions/memtester-${finalAttrs.version}.tar.gz"; sha256 = "sha256-5CfeZj970i0evuivElBqhSwBC9T8vKHg5rApctKYtbs="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "memtester"; }; -} +}) diff --git a/pkgs/by-name/me/memtier-benchmark/package.nix b/pkgs/by-name/me/memtier-benchmark/package.nix index c0c5546aabef..8228b7027ed2 100644 --- a/pkgs/by-name/me/memtier-benchmark/package.nix +++ b/pkgs/by-name/me/memtier-benchmark/package.nix @@ -10,20 +10,20 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "memtier-benchmark"; version = "2.2.0"; src = fetchFromGitHub { owner = "redislabs"; repo = "memtier_benchmark"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-FzuURsGob9ZQC0C18wKLhamCyARirtvGLq5lF64JOX8="; }; patchPhase = '' substituteInPlace ./configure.ac \ - --replace '1.2.8' '${version}' + --replace '1.2.8' '${finalAttrs.version}' ''; nativeBuildInputs = [ @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ thoughtpolice ]; mainProgram = "memtier_benchmark"; }; -} +}) diff --git a/pkgs/by-name/me/mencal/package.nix b/pkgs/by-name/me/mencal/package.nix index 964124888033..797297ae09b0 100644 --- a/pkgs/by-name/me/mencal/package.nix +++ b/pkgs/by-name/me/mencal/package.nix @@ -5,12 +5,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mencal"; version = "3.0"; src = fetchurl { - url = "http://kyberdigi.cz/projects/mencal/files/mencal-${version}.tar.gz"; + url = "http://kyberdigi.cz/projects/mencal/files/mencal-${finalAttrs.version}.tar.gz"; sha256 = "9328d0b2f3f57847e8753c5184531f4832be7123d1b6623afdff892074c03080"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "mencal"; }; -} +}) diff --git a/pkgs/by-name/me/menu-cache/package.nix b/pkgs/by-name/me/menu-cache/package.nix index 34e522e6f797..85ee7b390a16 100644 --- a/pkgs/by-name/me/menu-cache/package.nix +++ b/pkgs/by-name/me/menu-cache/package.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library to read freedesktop.org menu files"; - homepage = "https://blog.lxde.org/tag/menu-cache/"; - license = lib.licenses.gpl2Plus; + homepage = "https://github.com/lxde/menu-cache"; + license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.ttuegel ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; diff --git a/pkgs/by-name/me/merkaartor/package.nix b/pkgs/by-name/me/merkaartor/package.nix index f20f0d193a4d..c582cfe961d1 100644 --- a/pkgs/by-name/me/merkaartor/package.nix +++ b/pkgs/by-name/me/merkaartor/package.nix @@ -20,14 +20,14 @@ zbar, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "merkaartor"; version = "0.20.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "merkaartor"; - tag = version; + tag = finalAttrs.version; hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec="; }; @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.geospatial ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/me/meson-tools/package.nix b/pkgs/by-name/me/meson-tools/package.nix index 565d9f275458..87e7b7f3770e 100644 --- a/pkgs/by-name/me/meson-tools/package.nix +++ b/pkgs/by-name/me/meson-tools/package.nix @@ -5,14 +5,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "meson-tools"; version = "0.1"; src = fetchFromGitHub { owner = "afaerber"; repo = "meson-tools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1bvshfa9pa012yzdwapi3nalpgcwmfq7d3n3w3mlr357a6kq64qk"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ lopsided98 ]; }; -} +}) diff --git a/pkgs/by-name/me/messer-slim/package.nix b/pkgs/by-name/me/messer-slim/package.nix index 97540747afcd..93f74a7820e9 100644 --- a/pkgs/by-name/me/messer-slim/package.nix +++ b/pkgs/by-name/me/messer-slim/package.nix @@ -7,14 +7,14 @@ gcc-unwrapped, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "5.1"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-E1GxHdzY/5bxy8+ur3+/dheDOrmWaOrNcYDNSaY9cMU="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bzizou ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/me/metaBuildEnv/package.nix b/pkgs/by-name/me/metaBuildEnv/package.nix index 4b23dbd32b59..3c9bc1ad7682 100644 --- a/pkgs/by-name/me/metaBuildEnv/package.nix +++ b/pkgs/by-name/me/metaBuildEnv/package.nix @@ -4,16 +4,16 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "meta-build-env"; version = "0.1"; src = fetchurl { - url = "http://www.meta-environment.org/releases/meta-build-env-${version}.tar.gz"; + url = "http://www.meta-environment.org/releases/meta-build-env-${finalAttrs.version}.tar.gz"; sha256 = "1imn1gaan4fv73v8w3k3lgyjzkcn7bdp69k6hlz0vqdg17ysd1x3"; }; meta = { platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/me/metamath/package.nix b/pkgs/by-name/me/metamath/package.nix index f38d658ed637..c47a216a26ab 100644 --- a/pkgs/by-name/me/metamath/package.nix +++ b/pkgs/by-name/me/metamath/package.nix @@ -5,7 +5,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "metamath"; version = "0.198"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "metamath"; repo = "metamath-exe"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Cg1dgz+uphDlGhKH3mTywtAccWinC5+pwNv4TB3YAnI="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.taneb ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/me/metastore/package.nix b/pkgs/by-name/me/metastore/package.nix index d2900010b015..db06ce16a7d8 100644 --- a/pkgs/by-name/me/metastore/package.nix +++ b/pkgs/by-name/me/metastore/package.nix @@ -5,14 +5,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.1.2"; pname = "metastore"; src = fetchFromGitHub { owner = "przemoc"; repo = "metastore"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0mb10wfckswqgi0bq25ncgabnd3iwj7s7hhg3wpcyfgckdynwizv"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sstef ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mf/mfoc/package.nix b/pkgs/by-name/mf/mfoc/package.nix index 49c199a04305..02e286a95a81 100644 --- a/pkgs/by-name/mf/mfoc/package.nix +++ b/pkgs/by-name/mf/mfoc/package.nix @@ -8,14 +8,14 @@ libnfc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mfoc"; version = "0.10.7"; src = fetchFromGitHub { owner = "nfc-tools"; repo = "mfoc"; - rev = "mfoc-${version}"; + rev = "mfoc-${finalAttrs.version}"; sha256 = "0hbg1fn4000qdg1cfc7y8l0vh1mxlxcz7gapkcq54xp2l6kk1z65"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ offline ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/mh/mhddfs/package.nix b/pkgs/by-name/mh/mhddfs/package.nix index b970ef80a714..702c8157f35c 100644 --- a/pkgs/by-name/mh/mhddfs/package.nix +++ b/pkgs/by-name/mh/mhddfs/package.nix @@ -8,12 +8,12 @@ uthash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mhddfs"; version = "0.1.39"; src = fetchurl { - url = "https://mhddfs.uvw.ru/downloads/mhddfs_${version}.tar.gz"; + url = "https://mhddfs.uvw.ru/downloads/mhddfs_${finalAttrs.version}.tar.gz"; sha256 = "14ggmh91vv69fp2qpz0nxp0hprlw2wsijss2k2485hb0ci4cabvh"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.makefu ]; mainProgram = "mhddfs"; }; -} +}) diff --git a/pkgs/by-name/mi/microdnf/package.nix b/pkgs/by-name/mi/microdnf/package.nix index 028bcd2e1474..c55fdc6cc7ba 100644 --- a/pkgs/by-name/mi/microdnf/package.nix +++ b/pkgs/by-name/mi/microdnf/package.nix @@ -14,14 +14,14 @@ pcre2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "microdnf"; version = "3.10.1"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "microdnf"; - rev = version; + rev = finalAttrs.version; hash = "sha256-xWHE05CeX8I8YO0gqf5FDiqLexirwKdyCe4grclOVYc="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "microdnf"; }; -} +}) diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix index 4d25d21b5f71..83d6b93b7b3d 100644 --- a/pkgs/by-name/mi/micronaut/package.nix +++ b/pkgs/by-name/mi/micronaut/package.nix @@ -7,12 +7,12 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "micronaut"; version = "4.10.0"; src = fetchzip { - url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; + url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${finalAttrs.version}/micronaut-cli-${finalAttrs.version}.zip"; sha256 = "sha256-FYky14Lnl5B+zLgulFJdRdaDIQi+FhoUjce+LKYaMKE="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ moaxcp ]; mainProgram = "mn"; }; -} +}) diff --git a/pkgs/by-name/mi/microscheme/package.nix b/pkgs/by-name/mi/microscheme/package.nix index 30edec06a7a3..b64055660f8a 100644 --- a/pkgs/by-name/mi/microscheme/package.nix +++ b/pkgs/by-name/mi/microscheme/package.nix @@ -6,14 +6,14 @@ unixtools, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "microscheme"; version = "0.9.3"; src = fetchFromGitHub { owner = "ryansuchocki"; repo = "microscheme"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "5qTWsBCfj5DCZ3f9W1bdo6WAc1DZqVxg8D7pwC95duQ="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ ardumont ]; }; -} +}) diff --git a/pkgs/by-name/mi/microsocks/package.nix b/pkgs/by-name/mi/microsocks/package.nix index 1f935426dd4b..3be9b333d21a 100644 --- a/pkgs/by-name/mi/microsocks/package.nix +++ b/pkgs/by-name/mi/microsocks/package.nix @@ -5,14 +5,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "microsocks"; version = "1.0.5"; src = fetchFromGitHub { owner = "rofl0r"; repo = "microsocks"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-5NR2gtm+uMkjmkV/dv3DzSedfNvYpHZgFHVSrybl0Tk="; }; @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/rofl0r/microsocks/releases/tag/v${version}"; + changelog = "https://github.com/rofl0r/microsocks/releases/tag/v${finalAttrs.version}"; description = "Tiny, portable SOCKS5 server with very moderate resource usage"; homepage = "https://github.com/rofl0r/microsocks"; license = lib.licenses.mit; mainProgram = "microsocks"; maintainers = with lib.maintainers; [ ramblurr ]; }; -} +}) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 4782101959d6..f4165829168f 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -162,11 +162,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "144.0.3719.92"; + version = "144.0.3719.104"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-fi1vQIc069HS7t/pF+bC/QBbyZbpQvggUyt9pjKZUBo="; + hash = "sha256-x+p8wte4KFoWiH9aIk9ym282Hb+Y1369YoxEXtgokVA="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/mi/microsoft-gsl/package.nix b/pkgs/by-name/mi/microsoft-gsl/package.nix index b3ac62f24f3c..868a4b8e9ee7 100644 --- a/pkgs/by-name/mi/microsoft-gsl/package.nix +++ b/pkgs/by-name/mi/microsoft-gsl/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "microsoft-gsl"; version = "4.2.1"; src = fetchFromGitHub { owner = "Microsoft"; repo = "GSL"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rfSfgyjU1U6gaWzlx2CeaCSb784L29vHDAC/PQl+s6E="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { yuriaisaka ]; }; -} +}) diff --git a/pkgs/by-name/mi/mid2key/package.nix b/pkgs/by-name/mi/mid2key/package.nix index e58cf4fdb697..f5c3624b4464 100644 --- a/pkgs/by-name/mi/mid2key/package.nix +++ b/pkgs/by-name/mi/mid2key/package.nix @@ -9,14 +9,14 @@ xorgproto, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mid2key"; version = "1"; src = fetchFromGitHub { owner = "dnschneid"; repo = "mid2key"; - rev = "r${version}"; + rev = "r${finalAttrs.version}"; sha256 = "Zo0mqdBJ1JKD9ZCA8te3f5opyYslFncYcx9iuXq2B9g="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "mid2key"; }; -} +}) diff --git a/pkgs/by-name/mi/midi-trigger/package.nix b/pkgs/by-name/mi/midi-trigger/package.nix index 8ae0f33aa156..4d637059b804 100644 --- a/pkgs/by-name/mi/midi-trigger/package.nix +++ b/pkgs/by-name/mi/midi-trigger/package.nix @@ -6,14 +6,14 @@ lv2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "midi-trigger"; version = "0.0.4"; src = fetchFromGitHub { owner = "unclechu"; repo = "MIDI-Trigger"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-tMnN8mTd6Bm46ZIDy0JPSVe77xCZws2XwQLQexDWPgU="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/mi/midicsv/package.nix b/pkgs/by-name/mi/midicsv/package.nix index 0fc9cf828c0a..5edc2554770e 100644 --- a/pkgs/by-name/mi/midicsv/package.nix +++ b/pkgs/by-name/mi/midicsv/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "midicsv"; version = "1.1"; src = fetchurl { - url = "https://www.fourmilab.ch/webtools/midicsv/midicsv-${version}.tar.gz"; + url = "https://www.fourmilab.ch/webtools/midicsv/midicsv-${finalAttrs.version}.tar.gz"; sha256 = "1vvhk2nf9ilfw0wchmxy8l13hbw9cnpz079nsx5srsy4nnd78nkw"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/mi/migmix/package.nix b/pkgs/by-name/mi/migmix/package.nix index 0f7a7a1135c4..318c94128ed0 100644 --- a/pkgs/by-name/mi/migmix/package.nix +++ b/pkgs/by-name/mi/migmix/package.nix @@ -4,25 +4,25 @@ fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "migmix"; version = "20150712"; srcs = [ (fetchzip { - url = "mirror://osdn/mix-mplus-ipa/63544/migmix-1p-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63544/migmix-1p-${finalAttrs.version}.zip"; sha256 = "0wp44axcalaak04nj3dgpx0vk13nqa3ihx2vjv4acsgv83x8ciph"; }) (fetchzip { - url = "mirror://osdn/mix-mplus-ipa/63544/migmix-2p-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63544/migmix-2p-${finalAttrs.version}.zip"; sha256 = "0y7s3rbxrp5bv56qgihk8b847lqgibfhn2wlkzx7z655fbzdgxw9"; }) (fetchzip { - url = "mirror://osdn/mix-mplus-ipa/63544/migmix-1m-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63544/migmix-1m-${finalAttrs.version}.zip"; sha256 = "1sfym0chy8ilyd9sr3mjc0bf63vc33p05ynpdc11miivxn4qsshx"; }) (fetchzip { - url = "mirror://osdn/mix-mplus-ipa/63544/migmix-2m-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63544/migmix-2m-${finalAttrs.version}.zip"; sha256 = "0hg04rvm39fh4my4akmv4rhfc14s3ipz2aw718h505k9hppkhkch"; }) ]; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = lib.licenses.ipa; maintainers = [ lib.maintainers.mikoim ]; }; -} +}) diff --git a/pkgs/by-name/mi/migu/package.nix b/pkgs/by-name/mi/migu/package.nix index 97da8af6e0cb..5fb44d845a19 100644 --- a/pkgs/by-name/mi/migu/package.nix +++ b/pkgs/by-name/mi/migu/package.nix @@ -4,25 +4,25 @@ fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "migu"; version = "20150712"; srcs = [ (fetchzip { - url = "mirror://osdn/mix-mplus-ipa/63545/migu-1p-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63545/migu-1p-${finalAttrs.version}.zip"; sha256 = "04wpbk5xbbcv2rzac8yzj4ww7sk2hy2rg8zs96yxc5vzj9q7svf6"; }) (fetchzip { - url = "mirror://osdn/mix-mplus-ipa/63545/migu-1c-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63545/migu-1c-${finalAttrs.version}.zip"; sha256 = "1k7ymix14ac5fb44bjvbaaf24784zzpyc1jj2280c0zdnpxksyk6"; }) (fetchzip { - url = "mirror://osdn/mix-mplus-ipa/63545/migu-1m-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63545/migu-1m-${finalAttrs.version}.zip"; sha256 = "07r8id83v92hym21vrqmfsfxb646v8258001pkjhgfnfg1yvw8lm"; }) (fetchzip { - url = "mirror://osdn/mix-mplus-ipa/63545/migu-2m-${version}.zip"; + url = "mirror://osdn/mix-mplus-ipa/63545/migu-2m-${finalAttrs.version}.zip"; sha256 = "1pvzbrawh43589j8rfxk86y1acjbgzzdy5wllvdkpm1qnx28zwc2"; }) ]; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = lib.licenses.ipa; maintainers = [ lib.maintainers.mikoim ]; }; -} +}) diff --git a/pkgs/by-name/mi/millipixels/package.nix b/pkgs/by-name/mi/millipixels/package.nix index 29b3391c84d6..6ad3acff6c8a 100644 --- a/pkgs/by-name/mi/millipixels/package.nix +++ b/pkgs/by-name/mi/millipixels/package.nix @@ -24,14 +24,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "millipixels"; version = "0.23.0"; src = fetchFromGitLab { owner = "Librem5"; repo = "millipixels"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; domain = "source.puri.sm"; hash = "sha256-Sj14t6LeZWNONcgrwJxN4J1/85m1SLgmmcRnHQUULHI="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ _999eagle ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mi/mimic/package.nix b/pkgs/by-name/mi/mimic/package.nix index 9d8a9436696c..931460357fb8 100644 --- a/pkgs/by-name/mi/mimic/package.nix +++ b/pkgs/by-name/mi/mimic/package.nix @@ -16,14 +16,14 @@ libpulseaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mimic"; version = "1.3.0.1"; src = fetchFromGitHub { owner = "MycroftAI"; repo = "mimic1"; - rev = version; + rev = finalAttrs.version; sha256 = "1agwgby9ql8r3x5rd1rgx3xp9y4cdg4pi3kqlz3vanv9na8nf3id"; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.fx-chun ]; }; -} +}) diff --git a/pkgs/by-name/mi/minder/package.nix b/pkgs/by-name/mi/minder/package.nix index 8654f9d39bb6..09a7a5f6b358 100644 --- a/pkgs/by-name/mi/minder/package.nix +++ b/pkgs/by-name/mi/minder/package.nix @@ -21,14 +21,14 @@ pantheon, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "minder"; version = "2.0.4"; src = fetchFromGitHub { owner = "phase1geo"; repo = "minder"; - tag = version; + tag = finalAttrs.version; hash = "sha256-IY4phXunB4ypU6wRhhXA2wg7Vsv8WvcL6nEXDiOGj/E="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.pantheon ]; mainProgram = "com.github.phase1geo.minder"; }; -} +}) diff --git a/pkgs/by-name/mi/mingetty/package.nix b/pkgs/by-name/mi/mingetty/package.nix index a25990fdf646..caf8f29c3688 100644 --- a/pkgs/by-name/mi/mingetty/package.nix +++ b/pkgs/by-name/mi/mingetty/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mingetty"; version = "1.08"; src = fetchurl { - url = "mirror://sourceforge/mingetty/mingetty-${version}.tar.gz"; + url = "mirror://sourceforge/mingetty/mingetty-${finalAttrs.version}.tar.gz"; sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mi/mingtest/package.nix b/pkgs/by-name/mi/mingtest/package.nix index d007fdaf9cb2..225f32e4c875 100644 --- a/pkgs/by-name/mi/mingtest/package.nix +++ b/pkgs/by-name/mi/mingtest/package.nix @@ -5,13 +5,13 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { name = "mingtest"; version = "0.2.1"; src = fetchFromGitHub { owner = "craflin"; repo = "mingtest"; - tag = version; + tag = finalAttrs.version; hash = "sha256-buFr5w+3YJ2gJeQ8YTsFrUMU9hWq/iAJ6cW6ykvETfM="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mi/minia/package.nix b/pkgs/by-name/mi/minia/package.nix index 4d954e8659a9..656e289e64e0 100644 --- a/pkgs/by-name/mi/minia/package.nix +++ b/pkgs/by-name/mi/minia/package.nix @@ -7,14 +7,14 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "minia"; version = "3.2.1"; src = fetchFromGitHub { owner = "GATB"; repo = "minia"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "0bmfrywixaaql898l0ixsfkhxjf2hb08ssnqzlzacfizxdp46siq"; fetchSubmodules = true; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jbedo ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/mi/minicom/package.nix b/pkgs/by-name/mi/minicom/package.nix index 49530f84a505..cf510f1de499 100644 --- a/pkgs/by-name/mi/minicom/package.nix +++ b/pkgs/by-name/mi/minicom/package.nix @@ -10,7 +10,7 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "minicom"; version = "2.10"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "minicom-team"; repo = "minicom"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-wC6VlMRwuhV1zQ26wNx7gijuze8E2CvnzpqOSIPzq2s="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ peterhoeg ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/mi/minimacy/package.nix b/pkgs/by-name/mi/minimacy/package.nix index aa53e55a9635..c627ffaba3f9 100644 --- a/pkgs/by-name/mi/minimacy/package.nix +++ b/pkgs/by-name/mi/minimacy/package.nix @@ -10,14 +10,14 @@ makeBinaryWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "minimacy"; version = "1.2.0"; src = fetchFromGitHub { owner = "ambermind"; repo = "minimacy"; - rev = version; + rev = finalAttrs.version; hash = "sha256-uA+4dnhOnv7qRE7nqew8a14DGaQblsMY2uBZ+iyLtFU="; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/mi/minimap2/package.nix b/pkgs/by-name/mi/minimap2/package.nix index 8dc0f3b3631b..32c04a12d019 100644 --- a/pkgs/by-name/mi/minimap2/package.nix +++ b/pkgs/by-name/mi/minimap2/package.nix @@ -8,14 +8,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "minimap2"; version = "2.30"; src = fetchFromGitHub { repo = "minimap2"; owner = "lh3"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-TnJ/h04QdTdL56yyh+3Po19UAzrAkictu5Q6OiCQ2DY="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.arcadio ]; }; -} +}) diff --git a/pkgs/by-name/mi/mininet/package.nix b/pkgs/by-name/mi/mininet/package.nix index 5f57a874aa91..6f309d675c5f 100644 --- a/pkgs/by-name/mi/mininet/package.nix +++ b/pkgs/by-name/mi/mininet/package.nix @@ -39,7 +39,7 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mininet"; version = "2.3.1b4"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mininet"; repo = "mininet"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Z7Vbfu0EJ4+rCpckXrt3hgxeB9N2nnyPIXgPBnpV4uw="; }; @@ -102,4 +102,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ teto ]; mainProgram = "mnexec"; }; -} +}) diff --git a/pkgs/by-name/mi/minipro/package.nix b/pkgs/by-name/mi/minipro/package.nix index 28c4be89ba5e..9f37f027622d 100644 --- a/pkgs/by-name/mi/minipro/package.nix +++ b/pkgs/by-name/mi/minipro/package.nix @@ -6,21 +6,21 @@ libusb1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "minipro"; version = "0.7.2"; src = fetchFromGitLab { owner = "DavidGriffith"; repo = "minipro"; - rev = version; + rev = finalAttrs.version; hash = "sha256-NIaBN+T/EzYBhBtBEIvIAmqmksYDDiMJsWm9zCzZOxE="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; makeFlags = [ - "VERSION=${version}" + "VERSION=${finalAttrs.version}" "PREFIX=$(out)" "UDEV_DIR=$(out)/lib/udev" "COMPLETIONS_DIR=$(out)/share/bash-completion/completions" @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { mainProgram = "minipro"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/mi/minisign/package.nix b/pkgs/by-name/mi/minisign/package.nix index aee10433cf8f..56657694ce01 100644 --- a/pkgs/by-name/mi/minisign/package.nix +++ b/pkgs/by-name/mi/minisign/package.nix @@ -7,14 +7,14 @@ libsodium, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "minisign"; version = "0.12"; src = fetchFromGitHub { repo = "minisign"; owner = "jedisct1"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-qhAzhht9p4bsa2ntJwhcNurm8QgYYiKi3dA3ifpT8aw="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "minisign"; }; -} +}) diff --git a/pkgs/by-name/mi/ministat/package.nix b/pkgs/by-name/mi/ministat/package.nix index c416e33459b8..2cef20febb7b 100644 --- a/pkgs/by-name/mi/ministat/package.nix +++ b/pkgs/by-name/mi/ministat/package.nix @@ -4,13 +4,13 @@ fetchgit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ministat"; version = "20150715-1"; src = fetchgit { url = "https://git.decadent.org.uk/git/ministat.git"; - tag = "debian/${version}"; + tag = "debian/${finalAttrs.version}"; sha256 = "1p4g0yqgsy4hiqhr8gqp8d38zxzrss5qz70s0bw3i2pg4w668k6f"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "ministat"; }; -} +}) diff --git a/pkgs/by-name/mi/minivmac/package.nix b/pkgs/by-name/mi/minivmac/package.nix index 663a3cf47515..613938eb85cb 100644 --- a/pkgs/by-name/mi/minivmac/package.nix +++ b/pkgs/by-name/mi/minivmac/package.nix @@ -7,14 +7,14 @@ libx11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "minivmac-erichelgeson"; version = "2024.06.08"; src = fetchFromGitHub { owner = "erichelgeson"; repo = "minivmac"; - rev = version; + rev = finalAttrs.version; hash = "sha256-iiEE0ioXh3keKUPfAB+YcE1iggGLpxT9N8LSVFDhttE="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; sourceProvenance = [ lib.sourceTypes.fromSource ]; }; -} +}) diff --git a/pkgs/by-name/mi/minixml/package.nix b/pkgs/by-name/mi/minixml/package.nix index aba92f7242e4..0908cd5aa773 100644 --- a/pkgs/by-name/mi/minixml/package.nix +++ b/pkgs/by-name/mi/minixml/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mxml"; version = "3.3.1"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "mxml"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-l7GUA+vlSECi/72eU3Y9COpGtLTRh3vYcHUi+uRkCn8="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/mi/mint-artwork/package.nix b/pkgs/by-name/mi/mint-artwork/package.nix index 45271ebfbdcf..e2214460388c 100644 --- a/pkgs/by-name/mi/mint-artwork/package.nix +++ b/pkgs/by-name/mi/mint-artwork/package.nix @@ -6,14 +6,14 @@ nixos-artwork, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mint-artwork"; version = "1.9.3"; src = fetchurl { urls = [ - "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20251218152602/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${finalAttrs.version}.tar.xz" + "https://web.archive.org/web/20251218152602/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${finalAttrs.version}.tar.xz" ]; hash = "sha256-XH3RZq9ls0e9mM7cZhCSkNMUwMJyBeFTdfn006PaqNg="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/mi/miredo/package.nix b/pkgs/by-name/mi/miredo/package.nix index 81644d34d797..089238f373cc 100644 --- a/pkgs/by-name/mi/miredo/package.nix +++ b/pkgs/by-name/mi/miredo/package.nix @@ -7,14 +7,14 @@ judy, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.2.6"; pname = "miredo"; buildInputs = [ judy ]; src = fetchurl { - url = "https://www.remlab.net/files/miredo/miredo-${version}.tar.xz"; + url = "https://www.remlab.net/files/miredo/miredo-${finalAttrs.version}.tar.xz"; sha256 = "0j9ilig570snbmj48230hf7ms8kvcwi2wblycqrmhh85lksd49ps"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index aae36828c467..3e9e5da10c18 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.182.0", + "version": "3.184.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.182.0/mirrord_linux_x86_64", - "hash": "sha256-Qm1+qI5WMgoDwudvxynv+He1g7RgqCfbsTjKwYxzCLk=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.184.0/mirrord_linux_x86_64", + "hash": "sha256-/1LTDzulmiMzoobMUyADv+MWthoL/slQldgImUFikC4=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.182.0/mirrord_linux_aarch64", - "hash": "sha256-3Jfv1HUV/jOApA0XJQkK1W/W83KyD59A6jr3TcLUJo4=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.184.0/mirrord_linux_aarch64", + "hash": "sha256-zlpLCuJO+gouYYCBZ2Oo711QIvSfDXX/81JyyL3vdKE=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.182.0/mirrord_mac_universal", - "hash": "sha256-+0NXyGjJ7HJmLVYPgIVjbXuFidnPmHmDY6hFf3CABxA=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.184.0/mirrord_mac_universal", + "hash": "sha256-iHTWgj18BDrvW0PCriWZdkMKA0V0D828xoaD3mSHTac=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.182.0/mirrord_mac_universal", - "hash": "sha256-+0NXyGjJ7HJmLVYPgIVjbXuFidnPmHmDY6hFf3CABxA=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.184.0/mirrord_mac_universal", + "hash": "sha256-iHTWgj18BDrvW0PCriWZdkMKA0V0D828xoaD3mSHTac=" } } } diff --git a/pkgs/by-name/mi/miscfiles/package.nix b/pkgs/by-name/mi/miscfiles/package.nix index 5d585e3a2840..99227d8a2db9 100644 --- a/pkgs/by-name/mi/miscfiles/package.nix +++ b/pkgs/by-name/mi/miscfiles/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "miscfiles"; version = "1.5"; src = fetchurl { - url = "mirror://gnu/miscfiles/miscfiles-${version}.tar.gz"; + url = "mirror://gnu/miscfiles/miscfiles-${finalAttrs.version}.tar.gz"; sha256 = "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka"; }; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index 0a03eb3aa178..615784301b3a 100644 --- a/pkgs/by-name/mi/mistral-vibe/package.nix +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mistral-vibe"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-GqJHFgeaq2oBF1HI0g30IJ+QSj2szvCUUiT7up4VOpk="; + hash = "sha256-eZqNxibJ0Ps65tHT6msaizRxvUPNNq0OZ++aAYvUi0E="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/mi/mix2nix/package.nix b/pkgs/by-name/mi/mix2nix/package.nix index 450a1c62bc4b..b15d6855a9b6 100644 --- a/pkgs/by-name/mi/mix2nix/package.nix +++ b/pkgs/by-name/mi/mix2nix/package.nix @@ -5,14 +5,14 @@ beamPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mix2nix"; version = "0.2.0"; src = fetchFromGitHub { owner = "ydlr"; repo = "mix2nix"; - rev = version; + rev = finalAttrs.version; hash = "sha256-hD4lpP8GPkNXuMMDOOTEmy+rOwOSCxQwR0Mjq8i4oDM="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ydlr ]; teams = [ lib.teams.beam ]; }; -} +}) diff --git a/pkgs/by-name/mi/mixxx/package.nix b/pkgs/by-name/mi/mixxx/package.nix index 0eb52e3fb809..9a209abc01b2 100644 --- a/pkgs/by-name/mi/mixxx/package.nix +++ b/pkgs/by-name/mi/mixxx/package.nix @@ -49,14 +49,14 @@ kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mixxx"; version = "2.5.4"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; - rev = version; + rev = finalAttrs.version; hash = "sha256-D/+ys7VE2/xHUiDG80/voc1BFxwp9M0V89gPWy57XA0="; }; @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { homepage = "https://mixxx.org"; description = "Digital DJ mixing software"; mainProgram = "mixxx"; - changelog = "https://github.com/mixxxdj/mixxx/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/mixxxdj/mixxx/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ benley @@ -155,4 +155,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mj/mjpegtools/package.nix b/pkgs/by-name/mj/mjpegtools/package.nix index ee5c37e7020f..e89cdfcd91f8 100644 --- a/pkgs/by-name/mj/mjpegtools/package.nix +++ b/pkgs/by-name/mj/mjpegtools/package.nix @@ -18,12 +18,12 @@ # - libpng-apng as alternative to libpng? # - libXxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mjpegtools"; version = "2.2.1"; src = fetchurl { - url = "mirror://sourceforge/mjpeg/mjpegtools-${version}.tar.gz"; + url = "mirror://sourceforge/mjpeg/mjpegtools-${finalAttrs.version}.tar.gz"; sha256 = "sha256-sYBTbX2ZYLBeACOhl7ANyxAJKaSaq3HRnVX0obIQ9Jo="; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/mk/mkcue/package.nix b/pkgs/by-name/mk/mkcue/package.nix index daba3ee1f99c..2db2f07069a1 100644 --- a/pkgs/by-name/mk/mkcue/package.nix +++ b/pkgs/by-name/mk/mkcue/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mkcue"; version = "1"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/m/mkcue/mkcue_${version}.orig.tar.gz"; + url = "http://http.debian.net/debian/pool/main/m/mkcue/mkcue_${finalAttrs.version}.orig.tar.gz"; sha256 = "0rs897wp08z4hd904bjb5sl4lb8qxj82x5ayklr28bhg9pd5gbra"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; mainProgram = "mkcue"; }; -} +}) diff --git a/pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix b/pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix index 209bc1093f9d..525198bbef91 100644 --- a/pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix +++ b/pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix @@ -4,15 +4,15 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mkinitcpio-nfs-utils"; version = "0.3"; src = fetchurl { - url = "https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-nfs-utils-${version}.tar.xz"; + url = "https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-nfs-utils-${finalAttrs.version}.tar.xz"; sha256 = "0fc93sfk41ycpa33083kyd7i4y00ykpbhj5qlw611bjghj4x946j"; # ugh, upstream... - name = "mkinitcpio-nfs-utils-${version}.tar.gz"; + name = "mkinitcpio-nfs-utils-${finalAttrs.version}.tar.gz"; }; makeFlags = [ @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/mk/mkrand/package.nix b/pkgs/by-name/mk/mkrand/package.nix index c919e16eb58e..f91d348e8b70 100644 --- a/pkgs/by-name/mk/mkrand/package.nix +++ b/pkgs/by-name/mk/mkrand/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mkrand"; version = "0.1.0"; src = fetchurl { - url = "https://github.com/mknight-tag/MKRAND/releases/download/v${version}/mkrand-${version}.tar.gz"; + url = "https://github.com/mknight-tag/MKRAND/releases/download/v${finalAttrs.version}/mkrand-${finalAttrs.version}.tar.gz"; sha256 = "1irwyv2j5c3606k3qbq77yrd65y27rcq3jdlp295rz875q8iq9fs"; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/mk/mktemp/package.nix b/pkgs/by-name/mk/mktemp/package.nix index 44ed887af8be..e0b6f1e88470 100644 --- a/pkgs/by-name/mk/mktemp/package.nix +++ b/pkgs/by-name/mk/mktemp/package.nix @@ -6,7 +6,7 @@ groff, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mktemp"; version = "1.7"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "ftp://ftp.mktemp.org/pub/mktemp/mktemp-${version}.tar.gz"; + url = "ftp://ftp.mktemp.org/pub/mktemp/mktemp-${finalAttrs.version}.tar.gz"; sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { license = lib.licenses.isc; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/mk/mktorrent/package.nix b/pkgs/by-name/mk/mktorrent/package.nix index d514c56c6a56..3bb71c702c4d 100644 --- a/pkgs/by-name/mk/mktorrent/package.nix +++ b/pkgs/by-name/mk/mktorrent/package.nix @@ -5,14 +5,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mktorrent"; version = "1.1"; src = fetchFromGitHub { owner = "pobrn"; repo = "mktorrent"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "17pdc5mandl739f8q26n5is8ga56s83aqcrwhlnnplbxwx2inidr"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "mktorrent"; }; -} +}) diff --git a/pkgs/by-name/ml/mle/package.nix b/pkgs/by-name/ml/mle/package.nix index 203ef415a42c..d55cfce4560a 100644 --- a/pkgs/by-name/ml/mle/package.nix +++ b/pkgs/by-name/ml/mle/package.nix @@ -9,14 +9,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mle"; version = "1.7.2"; src = fetchFromGitHub { owner = "adsr"; repo = "mle"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0rkk7mh6w5y1lrbdv7wmxdgl5cqzpzw0p26adazkqlfdyb6wbj9k"; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ adsr ]; mainProgram = "mle"; }; -} +}) diff --git a/pkgs/by-name/ml/mlib/package.nix b/pkgs/by-name/ml/mlib/package.nix index 92873bb77f17..8f1240d42ef0 100644 --- a/pkgs/by-name/ml/mlib/package.nix +++ b/pkgs/by-name/ml/mlib/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mlib"; version = "0.8.0"; src = fetchFromGitHub { owner = "P-p-H-d"; repo = "mlib"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-l91UGIxCd6868F21jHTEQd6CgKtuUigxgZJTTnuVPwo="; }; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { macro to access the container). ''; homepage = "https://github.com/P-p-H-d/mlib"; - changelog = "https://github.com/P-p-H-d/mlib/releases/tag/${src.rev}"; + changelog = "https://github.com/P-p-H-d/mlib/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ azahi ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ml/mlkit/package.nix b/pkgs/by-name/ml/mlkit/package.nix index c2d17bdc687d..476090110b92 100644 --- a/pkgs/by-name/ml/mlkit/package.nix +++ b/pkgs/by-name/ml/mlkit/package.nix @@ -6,14 +6,14 @@ mlton, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mlkit"; version = "4.7.18"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-OACdbHwg3sEAVw+Fje0tWVHh7Xy6C/WdOQHfexOezlo="; }; @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { meta = { description = "Standard ML Compiler and Toolkit"; homepage = "https://elsman.com/mlkit/"; - changelog = "https://github.com/melsman/mlkit/blob/v${version}/NEWS.md"; + changelog = "https://github.com/melsman/mlkit/blob/v${finalAttrs.version}/NEWS.md"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ athas ]; }; -} +}) diff --git a/pkgs/by-name/ml/mlvwm/package.nix b/pkgs/by-name/ml/mlvwm/package.nix index f1053ed1e2f2..ef442ca930a7 100644 --- a/pkgs/by-name/ml/mlvwm/package.nix +++ b/pkgs/by-name/ml/mlvwm/package.nix @@ -10,14 +10,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mlvwm"; version = "0.9.4"; src = fetchFromGitHub { owner = "morgant"; repo = "mlvwm"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ElKmi+ANuB3LPwZTMcr5HEMESjDwENbYnNIGdRP24d0="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.j0hax ]; mainProgram = "mlvwm"; }; -} +}) diff --git a/pkgs/by-name/mm/MMA/package.nix b/pkgs/by-name/mm/MMA/package.nix index b3e83c1e1d37..65f131ff8623 100644 --- a/pkgs/by-name/mm/MMA/package.nix +++ b/pkgs/by-name/mm/MMA/package.nix @@ -8,12 +8,12 @@ timidity, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "25.05.0"; pname = "mma"; src = fetchurl { - url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; + url = "https://www.mellowood.ca/mma/mma-bin-${finalAttrs.version}.tar.gz"; sha256 = "sha256-J72uTwAlWa/dRPf7/lO1epbmjTQar+3/U//+IJ9u4PM="; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mm/mmdoc/package.nix b/pkgs/by-name/mm/mmdoc/package.nix index d28f84d10f02..f7945b81c88f 100644 --- a/pkgs/by-name/mm/mmdoc/package.nix +++ b/pkgs/by-name/mm/mmdoc/package.nix @@ -11,14 +11,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mmdoc"; version = "0.20.0"; src = fetchFromGitHub { owner = "ryantm"; repo = "mmdoc"; - rev = version; + rev = finalAttrs.version; hash = "sha256-NS8i5xvCwq0pSdfxnaxnpuwmDAkfH6Tkc4N2F6aGvWY="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ryantm ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/mm/mmex/package.nix b/pkgs/by-name/mm/mmex/package.nix index 036f3865df19..d16aea4fc5d3 100644 --- a/pkgs/by-name/mm/mmex/package.nix +++ b/pkgs/by-name/mm/mmex/package.nix @@ -18,14 +18,14 @@ wxsqlite3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "money-manager-ex"; version = "1.9.1"; src = fetchFromGitHub { owner = "moneymanagerex"; repo = "moneymanagerex"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-U8DvJPJwShbuKlKsWylH9kUEEw8/SY8KnYWNyInhE9k="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix; mainProgram = "mmex"; }; -} +}) diff --git a/pkgs/by-name/mm/mmv/package.nix b/pkgs/by-name/mm/mmv/package.nix index c439db1a1cb4..750c0b41773f 100644 --- a/pkgs/by-name/mm/mmv/package.nix +++ b/pkgs/by-name/mm/mmv/package.nix @@ -13,14 +13,14 @@ help2man, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mmv"; version = "2.10"; src = fetchFromGitHub { owner = "rrthomas"; repo = "mmv"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-h+hdrIQz+7jKdMdJtWhBbZgvmNTIOr7Q38nhfAWC+G4="; fetchSubmodules = true; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ siraben ]; }; -} +}) diff --git a/pkgs/by-name/mo/mo/package.nix b/pkgs/by-name/mo/mo/package.nix index e303dd2bc1ec..f8abc2bebb5c 100644 --- a/pkgs/by-name/mo/mo/package.nix +++ b/pkgs/by-name/mo/mo/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mo"; version = "3.0.5"; src = fetchFromGitHub { owner = "tests-always-included"; repo = "mo"; - rev = version; + rev = finalAttrs.version; hash = "sha256-CFAvTpziKzSkdomvCf8PPXYbYcJxjB4EValz2RdD2b0="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sheepforce ]; mainProgram = "mo"; }; -} +}) diff --git a/pkgs/by-name/mo/mockobjects/package.nix b/pkgs/by-name/mo/mockobjects/package.nix index c8a4c25a727d..a1cb6e54c172 100644 --- a/pkgs/by-name/mo/mockobjects/package.nix +++ b/pkgs/by-name/mo/mockobjects/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mockobjects"; version = "0.09"; src = fetchurl { - url = "mirror://sourceforge/mockobjects/mockobjects-bin-${version}.tar"; + url = "mirror://sourceforge/mockobjects/mockobjects-bin-${finalAttrs.version}.tar"; sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 8d08bdd95a7b..c8e822816436 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -9,12 +9,12 @@ }: let pname = "models-dev"; - version = "0-unstable-2026-01-24"; + version = "0-unstable-2026-01-30"; src = fetchFromGitHub { owner = "anomalyco"; repo = "models.dev"; - rev = "545bf83089a0d0bc4001b14c485270e10161cdd8"; - hash = "sha256-iby02kRswqBqBP1pQS7vMMsRTY7VLiccdd7aoanOURw="; + rev = "8b2b4b40a1f10a27aa15a4de83a7cee6c2aa9b02"; + hash = "sha256-FtdPmJU3g9KNBDrxbFQR0Tx0cCmlNS48JSD9AUiB+7s="; }; node_modules = stdenvNoCC.mkDerivation { @@ -109,13 +109,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Comprehensive open-source database of AI model specifications, pricing, and capabilities"; - homepage = "https://github.com/anomalyco/models-dev"; + homepage = "https://github.com/anomalyco/models.dev"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ delafthi ]; - badPlatforms = [ - # error: Invalid DNS result order - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/by-name/mo/modern-cpp-kafka/package.nix b/pkgs/by-name/mo/modern-cpp-kafka/package.nix index b2b135bcd317..24bb85ebe3a8 100644 --- a/pkgs/by-name/mo/modern-cpp-kafka/package.nix +++ b/pkgs/by-name/mo/modern-cpp-kafka/package.nix @@ -10,14 +10,14 @@ rapidjson, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "modern-cpp-kafka"; version = "2023.03.07"; src = fetchFromGitHub { repo = "modern-cpp-kafka"; owner = "morganstanley"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7hkwM1YbveQpDRqwMZ3MXM88LTwlAT7uB8NL0t409To="; }; @@ -83,4 +83,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ditsuke ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/mo/modsecurity-crs/package.nix b/pkgs/by-name/mo/modsecurity-crs/package.nix index 13339cc6c498..d17eb2eb5e51 100644 --- a/pkgs/by-name/mo/modsecurity-crs/package.nix +++ b/pkgs/by-name/mo/modsecurity-crs/package.nix @@ -4,24 +4,24 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.3.4"; pname = "modsecurity-crs"; src = fetchFromGitHub { owner = "coreruleset"; repo = "coreruleset"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-WDJW4K85YdHrw9cys3LrnZUoTxc0WhiuCW6CiC1cAbk="; }; installPhase = '' - install -D -m444 -t $out/rules ${src}/rules/*.conf - install -D -m444 -t $out/rules ${src}/rules/*.data - install -D -m444 -t $out/share/doc/modsecurity-crs ${src}/*.md - install -D -m444 -t $out/share/doc/modsecurity-crs ${src}/{CHANGES,INSTALL,LICENSE} - install -D -m444 -t $out/share/modsecurity-crs ${src}/rules/*.example - install -D -m444 -t $out/share/modsecurity-crs ${src}/crs-setup.conf.example + install -D -m444 -t $out/rules ${finalAttrs.src}/rules/*.conf + install -D -m444 -t $out/rules ${finalAttrs.src}/rules/*.data + install -D -m444 -t $out/share/doc/modsecurity-crs ${finalAttrs.src}/*.md + install -D -m444 -t $out/share/doc/modsecurity-crs ${finalAttrs.src}/{CHANGES,INSTALL,LICENSE} + install -D -m444 -t $out/share/modsecurity-crs ${finalAttrs.src}/rules/*.example + install -D -m444 -t $out/share/modsecurity-crs ${finalAttrs.src}/crs-setup.conf.example cat > $out/share/modsecurity-crs/modsecurity-crs.load.example <> "$out/bin/mozlz4a" echo "export PYTHONPATH='$PYTHONPATH'" >> "$out/bin/mozlz4a" @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { homepage = "https://gist.github.com/Tblue/62ff47bef7f894e92ed5"; mainProgram = "mozlz4a"; }; -} +}) diff --git a/pkgs/by-name/mp/mp3cat/package.nix b/pkgs/by-name/mp/mp3cat/package.nix index 6062c67fb13f..be8bb7f4720b 100644 --- a/pkgs/by-name/mp/mp3cat/package.nix +++ b/pkgs/by-name/mp/mp3cat/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mp3cat"; version = "0.5"; src = fetchFromGitHub { owner = "tomclegg"; repo = "mp3cat"; - rev = version; + rev = finalAttrs.version; sha256 = "0n6hjg2wgd06m561zc3ib5w2m3pwpf74njv2b2w4sqqh5md2ymfr"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "mp3cat"; }; -} +}) diff --git a/pkgs/by-name/mp/mp3fs/package.nix b/pkgs/by-name/mp/mp3fs/package.nix index c4b57f293377..f14c129cddd8 100644 --- a/pkgs/by-name/mp/mp3fs/package.nix +++ b/pkgs/by-name/mp/mp3fs/package.nix @@ -13,14 +13,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mp3fs"; version = "1.1.1"; src = fetchFromGitHub { owner = "khenriks"; repo = "mp3fs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-dF+DfkNKvYOucS6KjYR1MMGxayM+1HVS8mbmaavmgKM="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ Luflosi ]; mainProgram = "mp3fs"; }; -} +}) diff --git a/pkgs/by-name/mp/mp4v2/package.nix b/pkgs/by-name/mp/mp4v2/package.nix index 40a8da44fa5a..b7783192c615 100644 --- a/pkgs/by-name/mp/mp4v2/package.nix +++ b/pkgs/by-name/mp/mp4v2/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mp4v2"; version = "5.0.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # 2020-06-20: THE current upstream, maintained and used in distros fork. owner = "TechSmith"; repo = "mp4v2"; - rev = "Release-ThirdParty-MP4v2-${version}"; + rev = "Release-ThirdParty-MP4v2-${finalAttrs.version}"; sha256 = "sha256-OP+oVTH9pqYfHtYL1Kjrs1qey/J40ijLi5Gu8GJnvSY="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.mpl11; }; -} +}) diff --git a/pkgs/by-name/mp/mpack/package.nix b/pkgs/by-name/mp/mpack/package.nix index e9ceb444c513..cd89efce2e4d 100644 --- a/pkgs/by-name/mp/mpack/package.nix +++ b/pkgs/by-name/mp/mpack/package.nix @@ -8,12 +8,12 @@ mpack, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpack"; version = "1.6"; src = fetchurl { - url = "http://ftp.andrew.cmu.edu/pub/mpack/mpack-${version}.tar.gz"; + url = "http://ftp.andrew.cmu.edu/pub/mpack/mpack-${finalAttrs.version}.tar.gz"; hash = "sha256-J0EIuzo5mCpO/BT7OmUpjmbI5xNnw9q/STOBYtIHqUw="; }; @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { mpack 2>&1 || echo "mpack exited with error code $?" ''; package = mpack; - version = "mpack version ${version}"; + version = "mpack version ${finalAttrs.version}"; }; }; @@ -99,4 +99,4 @@ stdenv.mkDerivation rec { license = lib.licenses.free; maintainers = with lib.maintainers; [ tomodachi94 ]; }; -} +}) diff --git a/pkgs/by-name/mp/mpage/package.nix b/pkgs/by-name/mp/mpage/package.nix index 3f247a65a37a..f9eca32cb763 100644 --- a/pkgs/by-name/mp/mpage/package.nix +++ b/pkgs/by-name/mp/mpage/package.nix @@ -4,12 +4,12 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpage"; version = "2.5.8"; src = fetchurl { - url = "https://www.mesa.nl/pub/mpage/mpage-${version}.tgz"; + url = "https://www.mesa.nl/pub/mpage/mpage-${finalAttrs.version}.tgz"; sha256 = "sha256-I1HpHSV5SzWN9mGPF6cBOijTUOwgQI/gb4Ej3EZz/pM="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { homepage = "http://www.mesa.nl/pub/mpage/"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/mp/mpd-notification/package.nix b/pkgs/by-name/mp/mpd-notification/package.nix index cedeb101719d..939d9bf99f21 100644 --- a/pkgs/by-name/mp/mpd-notification/package.nix +++ b/pkgs/by-name/mp/mpd-notification/package.nix @@ -12,14 +12,14 @@ systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpd-notification"; version = "0.9.3"; src = fetchFromGitHub { owner = "eworm-de"; repo = "mpd-notification"; - rev = version; + rev = finalAttrs.version; hash = "sha256-1xTIqJtTz7vfg34JvlwNe6kNZuPfd3KnAT0rI8ZYk2U="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "mpd-notification"; }; -} +}) diff --git a/pkgs/by-name/mp/mpdas/package.nix b/pkgs/by-name/mp/mpdas/package.nix index 3cb3a3281b1a..27d04cf8b6b9 100644 --- a/pkgs/by-name/mp/mpdas/package.nix +++ b/pkgs/by-name/mp/mpdas/package.nix @@ -7,14 +7,14 @@ curl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpdas"; version = "0.4.5"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "mpdas"; - rev = version; + rev = finalAttrs.version; sha256 = "0fcqc4w6iwbi1n3cllcgj0k61zffhqkbr8668myxap21m35x8y1r"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "mpdas"; }; -} +}) diff --git a/pkgs/by-name/mp/mpdecimal/package.nix b/pkgs/by-name/mp/mpdecimal/package.nix index 4a66cc35d719..ca1d0bba4969 100644 --- a/pkgs/by-name/mp/mpdecimal/package.nix +++ b/pkgs/by-name/mp/mpdecimal/package.nix @@ -5,7 +5,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpdecimal"; version = "4.0.1"; outputs = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-${version}.tar.gz"; + url = "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-${finalAttrs.version}.tar.gz"; hash = "sha256-ltM6u0uwBwx74P7UJGzThBYYgyX4IEaCFEcZOFRbGsg="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix ++ lib.platforms.windows; }; -} +}) diff --git a/pkgs/by-name/mp/mpdscribble/package.nix b/pkgs/by-name/mp/mpdscribble/package.nix index e957afda27af..af9d85695815 100644 --- a/pkgs/by-name/mp/mpdscribble/package.nix +++ b/pkgs/by-name/mp/mpdscribble/package.nix @@ -13,12 +13,12 @@ systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpdscribble"; version = "0.24"; src = fetchurl { - url = "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz"; + url = "https://www.musicpd.org/download/mpdscribble/${finalAttrs.version}/mpdscribble-${finalAttrs.version}.tar.xz"; sha256 = "sha256-9rTLp0izuH5wUnC0kjyOI+lMLgD+3VC+sUaNvi+yqOc="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "mpdscribble"; }; -} +}) diff --git a/pkgs/by-name/mp/mpifileutils/package.nix b/pkgs/by-name/mp/mpifileutils/package.nix index e8a8899324e7..b910f8bb3b47 100644 --- a/pkgs/by-name/mp/mpifileutils/package.nix +++ b/pkgs/by-name/mp/mpifileutils/package.nix @@ -13,14 +13,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpifileutils"; version = "0.12"; src = fetchFromGitHub { owner = "hpc"; repo = "mpifileutils"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-WnjStOLWP/VsZyl2wPqR1Q+YqlJQRCQ4R50uOyqkWuM="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/mp/mpir/package.nix b/pkgs/by-name/mp/mpir/package.nix index 8a45d1202a23..a1412ca3a592 100644 --- a/pkgs/by-name/mp/mpir/package.nix +++ b/pkgs/by-name/mp/mpir/package.nix @@ -10,7 +10,7 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpir"; version = "3.0.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://mpir.org/mpir-${version}.tar.bz2"; + url = "https://mpir.org/mpir-${finalAttrs.version}.tar.bz2"; sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj"; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { downloadPage = "https://mpir.org/downloads.html"; homepage = "https://mpir.org/"; }; -} +}) diff --git a/pkgs/by-name/mp/mpris-scrobbler/package.nix b/pkgs/by-name/mp/mpris-scrobbler/package.nix index 47824af4f687..067f82d86ed6 100644 --- a/pkgs/by-name/mp/mpris-scrobbler/package.nix +++ b/pkgs/by-name/mp/mpris-scrobbler/package.nix @@ -15,14 +15,14 @@ xdg-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpris-scrobbler"; version = "0.5.7"; src = fetchFromGitHub { owner = "mariusor"; repo = "mpris-scrobbler"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Ro2Eop4CGvcT1hiCYxxmECFp5oefmAnBT9twnVfpsvY="; }; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dversion=${version}" + "-Dversion=${finalAttrs.version}" ]; env.NIX_CFLAGS_COMPILE = toString ( @@ -83,4 +83,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "mpris-scrobbler"; }; -} +}) diff --git a/pkgs/by-name/mp/mpv/scripts/inhibit-gnome.nix b/pkgs/by-name/mp/mpv/scripts/inhibit-gnome.nix index 984e0e79ca5b..81f861cb6c06 100644 --- a/pkgs/by-name/mp/mpv/scripts/inhibit-gnome.nix +++ b/pkgs/by-name/mp/mpv/scripts/inhibit-gnome.nix @@ -8,14 +8,14 @@ mpv-unwrapped, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpv-inhibit-gnome"; version = "0.1.3"; src = fetchFromGitHub { owner = "Guldoman"; repo = "mpv_inhibit_gnome"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-LSGg5gAQE2JpepBqhz6D6d3NlqYaU4bjvYf1F+oLphQ="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ myaats ]; }; -} +}) diff --git a/pkgs/by-name/mp/mpv/scripts/mpris.nix b/pkgs/by-name/mp/mpv/scripts/mpris.nix index a2a661fed9cc..3720a6a0029c 100644 --- a/pkgs/by-name/mp/mpv/scripts/mpris.nix +++ b/pkgs/by-name/mp/mpv/scripts/mpris.nix @@ -9,14 +9,14 @@ ffmpeg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpv-mpris"; version = "1.2"; src = fetchFromGitHub { owner = "hoyon"; repo = "mpv-mpris"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Q2kNaXZtI6U+x2f00x5CiHZq4o64xFTNC/3W4IiP0+4="; }; passthru.updateScript = gitUpdater { }; @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ajs124 ]; - changelog = "https://github.com/hoyon/mpv-mpris/releases/tag/${version}"; + changelog = "https://github.com/hoyon/mpv-mpris/releases/tag/${finalAttrs.version}"; }; -} +}) diff --git a/pkgs/by-name/mp/mpvpaper/package.nix b/pkgs/by-name/mp/mpvpaper/package.nix index 643e2a375375..5b1edf675698 100644 --- a/pkgs/by-name/mp/mpvpaper/package.nix +++ b/pkgs/by-name/mp/mpvpaper/package.nix @@ -15,14 +15,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpvpaper"; version = "1.8"; src = fetchFromGitHub { owner = "GhostNaN"; repo = "mpvpaper"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-JTlZSl8CZmWx7YTd0T58pwq10L1GKXNfAw0XlIsz7F8="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { mainProgram = "mpvpaper"; maintainers = with lib.maintainers; [ atila ]; }; -} +}) diff --git a/pkgs/by-name/mq/mqtt-exporter/package.nix b/pkgs/by-name/mq/mqtt-exporter/package.nix index 8ae7fe04a6aa..60fde8c7b47a 100644 --- a/pkgs/by-name/mq/mqtt-exporter/package.nix +++ b/pkgs/by-name/mq/mqtt-exporter/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, python3, }: @@ -16,11 +17,13 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-z2y43sRlwgy3Bwhu8rvlTkf6HOT+v8kjo5FT3lo5CEA="; }; - postPatch = '' - # https://github.com/kpetremann/mqtt-exporter/pull/117 - substituteInPlace pyproject.toml \ - --replace-fail "mqtt_exporter.main:main" "mqtt_exporter.main:main_mqtt_exporter" - ''; + patches = [ + (fetchpatch { + name = "Fix `mqtt-exporter` script"; + url = "https://github.com/kpetremann/mqtt-exporter/commit/53f5f31b28cb5aeec1c8d0bb7d1aea56f036082e.diff"; + hash = "sha256-LS+kO6bHofNQxk9o+ExsJnaecwfY/40S0MIJwpJxCAI="; + }) + ]; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/mr/mrbayes/package.nix b/pkgs/by-name/mr/mrbayes/package.nix index 64a70846bf45..9a8b77e34096 100644 --- a/pkgs/by-name/mr/mrbayes/package.nix +++ b/pkgs/by-name/mr/mrbayes/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mrbayes"; version = "3.2.7a"; src = fetchFromGitHub { owner = "NBISweden"; repo = "MrBayes"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-pkkxZ6YHRn/I1SJpT9A+EK4S5hWGmFdcDBJS0zh5mLA="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { homepage = "https://nbisweden.github.io/MrBayes/"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mr/mricron/package.nix b/pkgs/by-name/mr/mricron/package.nix index 0a02ff058b2a..81c2c1a0a160 100644 --- a/pkgs/by-name/mr/mricron/package.nix +++ b/pkgs/by-name/mr/mricron/package.nix @@ -18,12 +18,12 @@ libx11, zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mricron"; version = "1.0.20190902"; src = fetchurl { - url = "https://github.com/neurolabusc/MRIcron/releases/download/v${version}/MRIcron_linux.zip"; + url = "https://github.com/neurolabusc/MRIcron/releases/download/v${finalAttrs.version}/MRIcron_linux.zip"; hash = "sha256-C155u9dvYEyWRfTv3KNQFI6aMWIAjgvdSIqMuYVIOQA="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ adriangl ]; mainProgram = "mricron"; }; -} +}) diff --git a/pkgs/by-name/mr/mrtg/package.nix b/pkgs/by-name/mr/mrtg/package.nix index c8bb63a2859e..0b05834ba47b 100644 --- a/pkgs/by-name/mr/mrtg/package.nix +++ b/pkgs/by-name/mr/mrtg/package.nix @@ -16,12 +16,12 @@ let ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mrtg"; version = "2.17.10"; src = fetchurl { - url = "https://oss.oetiker.ch/mrtg/pub/mrtg-${version}.tar.gz"; + url = "https://oss.oetiker.ch/mrtg/pub/mrtg-${finalAttrs.version}.tar.gz"; sha256 = "sha256-x/EcteIXpQDYfuO10mxYqGUu28DTKRaIu3krAQ+uQ6w="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ms/mscgen/package.nix b/pkgs/by-name/ms/mscgen/package.nix index 4bf3c3ddd1c8..d5f58b968ecd 100644 --- a/pkgs/by-name/ms/mscgen/package.nix +++ b/pkgs/by-name/ms/mscgen/package.nix @@ -13,12 +13,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mscgen"; version = "0.20"; src = fetchurl { - url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; + url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${finalAttrs.version}.tar.gz"; sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "mscgen"; }; -} +}) diff --git a/pkgs/by-name/ms/msfpc/package.nix b/pkgs/by-name/ms/msfpc/package.nix index 92cee31e2529..dd2babc2b75b 100644 --- a/pkgs/by-name/ms/msfpc/package.nix +++ b/pkgs/by-name/ms/msfpc/package.nix @@ -9,14 +9,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "msfpc"; version = "1.4.5"; src = fetchFromGitHub { owner = "g0tmi1k"; repo = "msfpc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "UIdE0oSaNu16pf+M96x8AnNju88hdzokv86wm8uBYDQ="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ emilytrau ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ms/msgpuck/package.nix b/pkgs/by-name/ms/msgpuck/package.nix index 0d0745d9f0bf..b2a415b5c3bb 100644 --- a/pkgs/by-name/ms/msgpuck/package.nix +++ b/pkgs/by-name/ms/msgpuck/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "msgpuck"; version = "2.0"; src = fetchFromGitHub { owner = "rtsisyk"; repo = "msgpuck"; - rev = version; + rev = finalAttrs.version; sha256 = "0cjq86kncn3lv65vig9cqkqqv2p296ymcjjbviw0j1s85cfflps0"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ izorkin ]; }; -} +}) diff --git a/pkgs/by-name/ms/msieve/package.nix b/pkgs/by-name/ms/msieve/package.nix index b449c4e64c9b..3370bc459f32 100644 --- a/pkgs/by-name/ms/msieve/package.nix +++ b/pkgs/by-name/ms/msieve/package.nix @@ -7,13 +7,13 @@ ecm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "msieve"; version = "1056"; src = fetchsvn { url = "svn://svn.code.sf.net/p/msieve/code/trunk"; - rev = version; + rev = finalAttrs.version; hash = "sha256-6ErVn4pYPMG5VFjOQURLsHNpN0pGdp55+rjY8988onU="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.roconnor ]; platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/ms/mstore/package.nix b/pkgs/by-name/ms/mstore/package.nix index 91de4859b7d9..f8bf37cfe228 100644 --- a/pkgs/by-name/ms/mstore/package.nix +++ b/pkgs/by-name/ms/mstore/package.nix @@ -19,14 +19,14 @@ assert ( ] ); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mstore"; version = "0.3.0"; src = fetchFromGitHub { owner = "grimme-lab"; repo = "mstore"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-zfrxdrZ1Um52qTRNGJoqZNQuHhK3xM/mKfk0aBLrcjw="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/ms/mstpd/package.nix b/pkgs/by-name/ms/mstpd/package.nix index 7a782267e06c..8ac547aa902a 100644 --- a/pkgs/by-name/ms/mstpd/package.nix +++ b/pkgs/by-name/ms/mstpd/package.nix @@ -6,14 +6,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mstpd"; version = "0.0.8"; src = fetchFromGitHub { owner = "mstpd"; repo = "mstpd"; - rev = version; + rev = finalAttrs.version; sha256 = "1xkfydxljdnj49p5r3mirk4k146428b6imfc9bkfps9yjn64mkgb"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mt/mt-st/package.nix b/pkgs/by-name/mt/mt-st/package.nix index 909bcd1afd51..c5725bc4c6e0 100644 --- a/pkgs/by-name/mt/mt-st/package.nix +++ b/pkgs/by-name/mt/mt-st/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mt-st"; version = "1.8"; src = fetchFromGitHub { owner = "iustin"; repo = "mt-st"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Sl+/v+ko3K4npY/M49H1YDxqOMy923qcAkTohi5Xg70="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.redvers ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mt/mtm/package.nix b/pkgs/by-name/mt/mtm/package.nix index c7a897ef70d7..df9b381480e7 100644 --- a/pkgs/by-name/mt/mtm/package.nix +++ b/pkgs/by-name/mt/mtm/package.nix @@ -5,7 +5,7 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mtm"; version = "1.2.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "deadpixi"; repo = "mtm"; - rev = version; + rev = finalAttrs.version; sha256 = "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "mtm"; }; -} +}) diff --git a/pkgs/by-name/mt/mtpfs/package.nix b/pkgs/by-name/mt/mtpfs/package.nix index e3bdb418c772..868ca86dfd5a 100644 --- a/pkgs/by-name/mt/mtpfs/package.nix +++ b/pkgs/by-name/mt/mtpfs/package.nix @@ -10,7 +10,7 @@ libid3tag, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mtpfs"; version = "1.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://www.adebenham.com/files/mtp/mtpfs-${version}.tar.gz"; + url = "https://www.adebenham.com/files/mtp/mtpfs-${finalAttrs.version}.tar.gz"; sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mtpfs.x86_64-darwin mainProgram = "mtpfs"; }; -} +}) diff --git a/pkgs/by-name/mt/mtprotoproxy/package.nix b/pkgs/by-name/mt/mtprotoproxy/package.nix index bd69fbea102d..75b4d1aa41eb 100644 --- a/pkgs/by-name/mt/mtprotoproxy/package.nix +++ b/pkgs/by-name/mt/mtprotoproxy/package.nix @@ -6,14 +6,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mtprotoproxy"; version = "1.1.1"; src = fetchFromGitHub { owner = "alexbers"; repo = "mtprotoproxy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-tQ6e1Y25V4qAqBvhhKdirSCYzeALfH+PhNtcHTuBurs="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "mtprotoproxy"; }; -} +}) diff --git a/pkgs/by-name/mu/mujs/package.nix b/pkgs/by-name/mu/mujs/package.nix index 46aa66e1f97c..e933ee95d8cc 100644 --- a/pkgs/by-name/mu/mujs/package.nix +++ b/pkgs/by-name/mu/mujs/package.nix @@ -7,12 +7,12 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mujs"; version = "1.3.6"; src = fetchurl { - url = "https://mujs.com/downloads/mujs-${version}.tar.gz"; + url = "https://mujs.com/downloads/mujs-${finalAttrs.version}.tar.gz"; hash = "sha256-fPOl5iLP9BkD7/8DNFGPyUrwYyVnUsOLpGGKUZHkTxg="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; license = lib.licenses.isc; }; -} +}) diff --git a/pkgs/by-name/mu/multicharge/package.nix b/pkgs/by-name/mu/multicharge/package.nix index eb3e1c26fcda..b4fcbe0cf512 100644 --- a/pkgs/by-name/mu/multicharge/package.nix +++ b/pkgs/by-name/mu/multicharge/package.nix @@ -23,14 +23,14 @@ assert ( ] ); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "multicharge"; version = "0.3.1"; src = fetchFromGitHub { owner = "grimme-lab"; repo = "multicharge"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-8qwM3dpvFoL2WrMWNf14zYtRap0ijdfZ95XaTlkHhqQ="; }; @@ -83,4 +83,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/mu/multilockscreen/package.nix b/pkgs/by-name/mu/multilockscreen/package.nix index 9a22f7b521f2..b69e9bc7dc41 100644 --- a/pkgs/by-name/mu/multilockscreen/package.nix +++ b/pkgs/by-name/mu/multilockscreen/package.nix @@ -36,14 +36,14 @@ let coreutils ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "multilockscreen"; version = "1.2.0"; src = fetchFromGitHub { owner = "jeffmhubbard"; repo = "multilockscreen"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1bfpbazvhaz9x356nsghz0czysh9b75g79cd9s35v0x0rrzdr9qj"; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ kylesferrazza ]; }; -} +}) diff --git a/pkgs/by-name/mu/multimon-ng/package.nix b/pkgs/by-name/mu/multimon-ng/package.nix index 7145ca6686dd..04ceaa43ed4a 100644 --- a/pkgs/by-name/mu/multimon-ng/package.nix +++ b/pkgs/by-name/mu/multimon-ng/package.nix @@ -10,14 +10,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "multimon-ng"; version = "1.4.1"; src = fetchFromGitHub { owner = "EliasOenal"; repo = "multimon-ng"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-/2NHUlAojDamNq/EVs8hoBYVikPLAFFFu/2syG4Xo4U="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/mu/multirun/package.nix b/pkgs/by-name/mu/multirun/package.nix index abcdac4a5c44..eb3098f1b4be 100644 --- a/pkgs/by-name/mu/multirun/package.nix +++ b/pkgs/by-name/mu/multirun/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "multirun"; version = "1.1.3"; src = fetchFromGitHub { owner = "nicolas-van"; repo = "multirun"; - rev = version; + rev = finalAttrs.version; hash = "sha256-I95nxZD65tHiok4MzsGG7gyaxPHbqQLuRWdHUPNhLu8="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { mainProgram = "multirun"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/mu/multitail/package.nix b/pkgs/by-name/mu/multitail/package.nix index 5099f3917c09..5e6c95aa66bc 100644 --- a/pkgs/by-name/mu/multitail/package.nix +++ b/pkgs/by-name/mu/multitail/package.nix @@ -7,14 +7,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "7.1.5"; pname = "multitail"; src = fetchFromGitHub { owner = "folkertvanheusden"; repo = "multitail"; - rev = version; + rev = finalAttrs.version; hash = "sha256-c9NlQLgHngNBbADZ6/legWFaKHJAQR/LZIfh8bJoc4Y="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; mainProgram = "multitail"; }; -} +}) diff --git a/pkgs/by-name/mu/multitime/package.nix b/pkgs/by-name/mu/multitime/package.nix index 6447521edbd0..f876590dce2d 100644 --- a/pkgs/by-name/mu/multitime/package.nix +++ b/pkgs/by-name/mu/multitime/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "multitime"; version = "1.5"; src = fetchFromGitHub { owner = "ltratt"; repo = "multitime"; - rev = "multitime-${version}"; + rev = "multitime-${finalAttrs.version}"; sha256 = "sha256-oLtBUJbu+tVhzsUv+toz2oLeXCVLYKHQXUNsqpCZBGc="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "multitime"; }; -} +}) diff --git a/pkgs/by-name/mu/munin/package.nix b/pkgs/by-name/mu/munin/package.nix index 26cb48d9d5bc..c5ef37db62cd 100644 --- a/pkgs/by-name/mu/munin/package.nix +++ b/pkgs/by-name/mu/munin/package.nix @@ -15,14 +15,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.0.76"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-9PfIzUObm3Nu2k2TFjbQ3cqIDkPz07ZUczEcfm3bpDc="; }; @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ]; preBuild = '' - echo "${version}" > RELEASE + echo "${finalAttrs.version}" > RELEASE substituteInPlace "Makefile" \ --replace "/bin/pwd" "pwd" \ --replace "HTMLOld.3pm" "HTMLOld.3" @@ -177,4 +177,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/mu/muparser/package.nix b/pkgs/by-name/mu/muparser/package.nix index 1d2ff0b6f8b4..e9ea748a2476 100644 --- a/pkgs/by-name/mu/muparser/package.nix +++ b/pkgs/by-name/mu/muparser/package.nix @@ -6,14 +6,14 @@ llvmPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "muparser"; version = "2.3.5"; src = fetchFromGitHub { owner = "beltoforion"; repo = "muparser"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-CE3xgJr2RNsNMrj8Cf6xd/pD9M1OlHEclTW6xZV5X30="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/mu/muparserx/package.nix b/pkgs/by-name/mu/muparserx/package.nix index 628026382cdb..f9db3d10bf04 100644 --- a/pkgs/by-name/mu/muparserx/package.nix +++ b/pkgs/by-name/mu/muparserx/package.nix @@ -6,14 +6,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "muparserx"; version = "4.0.12"; src = fetchFromGitHub { owner = "beltoforion"; repo = "muparserx"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-rekPXmncNdVX6LvPQP1M2Pzs3pyiCCcLPLnPFiyWJ4s="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/mu/mupen64plus/package.nix b/pkgs/by-name/mu/mupen64plus/package.nix index a1b0171e17d5..4700710bd4a6 100644 --- a/pkgs/by-name/mu/mupen64plus/package.nix +++ b/pkgs/by-name/mu/mupen64plus/package.nix @@ -15,12 +15,12 @@ vulkan-loader, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mupen64plus"; version = "2.6.0"; src = fetchurl { - url = "https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/mupen64plus-bundle-src-${version}.tar.gz"; + url = "https://github.com/mupen64plus/mupen64plus-core/releases/download/${finalAttrs.version}/mupen64plus-bundle-src-${finalAttrs.version}.tar.gz"; sha256 = "sha256-KX4XGAzXanuOqAnRob4smO1cc1LccWllqA3rWYsh4TE="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; mainProgram = "mupen64plus"; }; -} +}) diff --git a/pkgs/by-name/mu/musl-fts/package.nix b/pkgs/by-name/mu/musl-fts/package.nix index f9b3030a8e82..09c7cedb009b 100644 --- a/pkgs/by-name/mu/musl-fts/package.nix +++ b/pkgs/by-name/mu/musl-fts/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "musl-fts"; version = "1.2.7"; src = fetchFromGitHub { owner = "void-linux"; repo = "musl-fts"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "Azw5qrz6OKDcpYydE6jXzVxSM5A8oYWAztrHr+O/DOE="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.pjjw ]; }; -} +}) diff --git a/pkgs/by-name/mu/musl-obstack/package.nix b/pkgs/by-name/mu/musl-obstack/package.nix index 3f0a4310c18a..e0172eb8aab9 100644 --- a/pkgs/by-name/mu/musl-obstack/package.nix +++ b/pkgs/by-name/mu/musl-obstack/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "musl-obstack"; version = "1.2.3"; src = fetchFromGitHub { owner = "void-linux"; repo = "musl-obstack"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-oydS7FubUniMHAUWfg84OH9+CZ0JCrTXy7jzwOyJzC8="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.pjjw ]; }; -} +}) diff --git a/pkgs/by-name/mu/mustache-hpp/package.nix b/pkgs/by-name/mu/mustache-hpp/package.nix index 39279cf626ff..75feee67ff43 100644 --- a/pkgs/by-name/mu/mustache-hpp/package.nix +++ b/pkgs/by-name/mu/mustache-hpp/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mustache"; version = "4.1"; src = fetchFromGitHub { owner = "kainjow"; repo = "Mustache"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kainjow/Mustache"; license = lib.licenses.boost; }; -} +}) diff --git a/pkgs/by-name/mu/mustache-spec/package.nix b/pkgs/by-name/mu/mustache-spec/package.nix index ab83abc0e2ff..0329ac22b946 100644 --- a/pkgs/by-name/mu/mustache-spec/package.nix +++ b/pkgs/by-name/mu/mustache-spec/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mustache-spec"; version = "1.0.2"; src = fetchFromGitHub { owner = "mustache"; repo = "mustache"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "03xrfyjzm5ss6zkdlpl9ypwzcglspcdcnr3f94vj1rjfqm2rxcjw"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ Profpatsch ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/mv/mvapich/package.nix b/pkgs/by-name/mv/mvapich/package.nix index ed7b23248174..cd0081708930 100644 --- a/pkgs/by-name/mv/mvapich/package.nix +++ b/pkgs/by-name/mv/mvapich/package.nix @@ -30,12 +30,12 @@ assert builtins.elem network [ "ofi" ]; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mvapich"; version = "4.1"; src = fetchurl { - url = "https://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich-${version}.tar.gz"; + url = "https://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich-${finalAttrs.version}.tar.gz"; sha256 = "sha256-JaU9NyW2aeLGSBWPt8n8WxOIlT86L5SXSFhsRH0OQ+4="; }; @@ -123,4 +123,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mx/mxnet/package.nix b/pkgs/by-name/mx/mxnet/package.nix index a075a184595b..fbed8ae66b98 100644 --- a/pkgs/by-name/mx/mxnet/package.nix +++ b/pkgs/by-name/mx/mxnet/package.nix @@ -22,13 +22,13 @@ # mxnet is not maintained, and other projects are migrating away from it. # https://github.com/apache/mxnet/issues/21206 -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mxnet"; version = "1.9.1"; src = fetchurl { - name = "apache-mxnet-src-${version}-incubating.tar.gz"; - url = "mirror://apache/incubator/mxnet/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; + name = "apache-mxnet-src-${finalAttrs.version}-incubating.tar.gz"; + url = "mirror://apache/incubator/mxnet/${finalAttrs.version}/apache-mxnet-src-${finalAttrs.version}-incubating.tar.gz"; hash = "sha256-EephMoF02MKblvNBl34D3rC/Sww3rOZY+T442euMkyI="; }; @@ -96,4 +96,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mx/mxt-app/package.nix b/pkgs/by-name/mx/mxt-app/package.nix index 5f562549c933..b2eea816e245 100644 --- a/pkgs/by-name/mx/mxt-app/package.nix +++ b/pkgs/by-name/mx/mxt-app/package.nix @@ -6,14 +6,14 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.46"; pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-SeP48xdZ43dL28tg7mo8SmObUt3R+8oyETst6yKkhnU="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "mxt-app"; }; -} +}) diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix index ba6ee26406bf..a90f076f3abf 100644 --- a/pkgs/by-name/my/mydumper/package.nix +++ b/pkgs/by-name/my/mydumper/package.nix @@ -20,14 +20,14 @@ versionCheckHook, mydumper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mydumper"; version = "0.21.1-1"; src = fetchFromGitHub { owner = "mydumper"; repo = "mydumper"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6x0d1Ywgy6kkfDs3KsS6pRK0/3z9Ur7klO8xMTsoDPI="; # as of mydumper v0.16.5-1, mydumper extracted its docs into a submodule fetchSubmodules = true; @@ -105,13 +105,13 @@ stdenv.mkDerivation rec { passthru.tests = testers.testVersion { package = mydumper; command = "myloader --version"; - version = "myloader v${version}"; + version = "myloader v${finalAttrs.version}"; }; meta = { description = "High-performance MySQL backup tool"; homepage = "https://github.com/mydumper/mydumper"; - changelog = "https://github.com/mydumper/mydumper/releases/tag/v${version}"; + changelog = "https://github.com/mydumper/mydumper/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ @@ -119,4 +119,4 @@ stdenv.mkDerivation rec { michaelglass ]; }; -} +}) diff --git a/pkgs/by-name/my/myrddin/package.nix b/pkgs/by-name/my/myrddin/package.nix index 6906c6e6204f..8a84e941eabf 100644 --- a/pkgs/by-name/my/myrddin/package.nix +++ b/pkgs/by-name/my/myrddin/package.nix @@ -8,14 +8,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "myrddin"; version = "0.3.1"; src = fetchFromGitHub { repo = "mc"; owner = "oridb"; - rev = "r${version}"; + rev = "r${finalAttrs.version}"; sha256 = "7ImjiG/rIKGPHq3Vh/mftY7pqw/vfOxD3LJeT87HmCk="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/my/mysql2pgsql/package.nix b/pkgs/by-name/my/mysql2pgsql/package.nix index 47c834240afd..91d3638473ee 100644 --- a/pkgs/by-name/my/mysql2pgsql/package.nix +++ b/pkgs/by-name/my/mysql2pgsql/package.nix @@ -6,12 +6,12 @@ }: # The homepage says this script is mature.. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mysql2pgsql"; version = "0.0.1a"; src = fetchurl { - url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-${version}.tgz"; + url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-${finalAttrs.version}.tgz"; sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { mainProgram = "mysql2psql"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/my/mysql_jdbc/package.nix b/pkgs/by-name/my/mysql_jdbc/package.nix index 062a7579bad6..762dbd7294d6 100644 --- a/pkgs/by-name/my/mysql_jdbc/package.nix +++ b/pkgs/by-name/my/mysql_jdbc/package.nix @@ -7,12 +7,12 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mysql-connector-java"; version = "9.4.0"; src = fetchurl { - url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip"; + url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${finalAttrs.version}.zip"; hash = "sha256-Ze/HzVelG3p5tFnu0lvP0gKWvGr3yGWGBjlVEBZorJ4="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -} +}) diff --git a/pkgs/by-name/my/mysqltuner/package.nix b/pkgs/by-name/my/mysqltuner/package.nix index 0455ba4c650b..27df67b86ab0 100644 --- a/pkgs/by-name/my/mysqltuner/package.nix +++ b/pkgs/by-name/my/mysqltuner/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mysqltuner"; version = "2.7.0"; src = fetchFromGitHub { owner = "major"; repo = "MySQLTuner-perl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-v0+iFmAzbFelVyZSRvcSd0AgW73N6no0/n6LuBooKN4="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "mysqltuner"; }; -} +}) diff --git a/pkgs/by-name/my/mythes/package.nix b/pkgs/by-name/my/mythes/package.nix index 9fe998421a9b..b93f3663103f 100644 --- a/pkgs/by-name/my/mythes/package.nix +++ b/pkgs/by-name/my/mythes/package.nix @@ -8,12 +8,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mythes"; version = "1.2.4"; src = fetchurl { - url = "mirror://sourceforge/hunspell/mythes-${version}.tar.gz"; + url = "mirror://sourceforge/hunspell/mythes-${finalAttrs.version}.tar.gz"; sha256 = "0prh19wy1c74kmzkkavm9qslk99gz8h8wmjvwzjc6lf8v2az708y"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; inherit (hunspell.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/n2/n2n/package.nix b/pkgs/by-name/n2/n2n/package.nix index a6f7af4322bd..3900b2da8268 100644 --- a/pkgs/by-name/n2/n2n/package.nix +++ b/pkgs/by-name/n2/n2n/package.nix @@ -7,7 +7,7 @@ libcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "n2n"; version = "3.0"; # nixpkgs-update: no auto update @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ntop"; repo = "n2n"; - rev = version; + rev = finalAttrs.version; hash = "sha256-OXmcc6r+fTHs/tDNF3akSsynB/bVRKB6Fl5oYxmu+E0="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ malte-v ]; }; -} +}) diff --git a/pkgs/by-name/na/nabi/package.nix b/pkgs/by-name/na/nabi/package.nix index 2f5d3de9f995..75ffefd7619e 100644 --- a/pkgs/by-name/na/nabi/package.nix +++ b/pkgs/by-name/na/nabi/package.nix @@ -9,14 +9,14 @@ automake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nabi"; version = "1.0.1"; src = fetchFromGitHub { owner = "libhangul"; repo = "nabi"; - tag = "nabi-${version}"; + tag = "nabi-${finalAttrs.version}"; hash = "sha256-C6K8sXVCGf45VZtGSCB5emFzZPV21kG9JxAwBHRiFsY="; }; @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { description = "Easy Hangul XIM"; mainProgram = "nabi"; homepage = "https://github.com/libhangul/nabi"; - changelog = "https://github.com/libhangul/nabi/blob/nabi-${version}/NEWS"; + changelog = "https://github.com/libhangul/nabi/blob/nabi-${finalAttrs.version}/NEWS"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ianwookim ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/na/namecoind/package.nix b/pkgs/by-name/na/namecoind/package.nix index d2c51f2bdc85..6e212b63afcd 100644 --- a/pkgs/by-name/na/namecoind/package.nix +++ b/pkgs/by-name/na/namecoind/package.nix @@ -18,14 +18,14 @@ withWallet ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "namecoind"; version = "28.0"; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; - tag = "nc${version}"; + tag = "nc${finalAttrs.version}"; hash = "sha256-r6rVgPrKz7nZ07oXw7KmVhGF4jVn6L+R9YHded+3E9k="; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/na/nanobench/package.nix b/pkgs/by-name/na/nanobench/package.nix index af59b41ee20b..4c09d1ff2479 100644 --- a/pkgs/by-name/na/nanobench/package.nix +++ b/pkgs/by-name/na/nanobench/package.nix @@ -7,14 +7,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nanobench"; version = "4.3.11"; src = fetchFromGitHub { owner = "martinus"; repo = "nanobench"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6OoVU31cNY0pIYpK/PdB9Qej+9IJo7+fHFQCTymBVrk="; }; @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { meta = { description = "Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20"; homepage = "https://nanobench.ankerl.com/"; - changelog = "https://github.com/martinus/nanobench/releases/tag/v${version}"; + changelog = "https://github.com/martinus/nanobench/releases/tag/v${finalAttrs.version}"; platforms = lib.platforms.all; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mtpham99 ]; }; -} +}) diff --git a/pkgs/by-name/na/nanomsg/package.nix b/pkgs/by-name/na/nanomsg/package.nix index 7198183e3113..19a9eb0ee3ad 100644 --- a/pkgs/by-name/na/nanomsg/package.nix +++ b/pkgs/by-name/na/nanomsg/package.nix @@ -6,14 +6,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.1.5"; pname = "nanomsg"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nanomsg"; - rev = version; + rev = finalAttrs.version; sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { mainProgram = "nanocat"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/na/nanovna-qt/package.nix b/pkgs/by-name/na/nanovna-qt/package.nix index 370e3d06fd5c..8aa65712cde6 100644 --- a/pkgs/by-name/na/nanovna-qt/package.nix +++ b/pkgs/by-name/na/nanovna-qt/package.nix @@ -9,7 +9,7 @@ qt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nanovna-qt"; # 20200507 dropped support for NanoVNA V2.2 # We could add later versions as separate packages if someone needs, but not updating it @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nanovna-v2"; repo = "NanoVNA-QT"; - rev = version; + rev = finalAttrs.version; hash = "sha256-0nRpjLglCog9e4bSkaNSwjrwmLwut3Ykr3AaYZCaMEs="; }; @@ -73,8 +73,8 @@ stdenv.mkDerivation rec { homepage = "https://nanorfe.com/nanovna-v2.html"; mainProgram = "vna_qt"; license = lib.licenses.gpl2Only; - changelog = "https://github.com/nanovna-v2/NanoVNA-QT/releases/tag/v${version}"; + changelog = "https://github.com/nanovna-v2/NanoVNA-QT/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ chuangzhu ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/na/napi-rs-cli/package.nix b/pkgs/by-name/na/napi-rs-cli/package.nix index e28bf970a1c5..7673464d4362 100644 --- a/pkgs/by-name/na/napi-rs-cli/package.nix +++ b/pkgs/by-name/na/napi-rs-cli/package.nix @@ -6,12 +6,12 @@ nodejs, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "napi-rs-cli"; version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@napi-rs/cli/-/cli-${version}.tgz"; + url = "https://registry.npmjs.org/@napi-rs/cli/-/cli-${finalAttrs.version}.tgz"; hash = "sha256-DeqH3pEtGZoKEBz5G0RfDO9LWHGMKL2OiWS1uWk4v44="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ winter ]; inherit (nodejs.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix index 46bdfb4c271e..2db9b0f9ce13 100644 --- a/pkgs/by-name/na/narsil/package.nix +++ b/pkgs/by-name/na/narsil/package.nix @@ -11,14 +11,14 @@ SDL2_mixer, SDL2_ttf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "narsil"; version = "1.4.0-112-gaa252eb26"; src = fetchFromGitHub { owner = "NickMcConnell"; repo = "NarSil"; - tag = version; + tag = finalAttrs.version; hash = "sha256-FqWoyq6FFCknT29Zkrkozi0+2JkrhJ2fKXVSbh5ZWXo="; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/NickMcConnell/NarSil/"; description = "Unofficial rewrite of Sil, a roguelike influenced by Angband"; mainProgram = "narsil"; - changelog = "https://github.com/NickMcConnell/NarSil/releases/tag/${version}"; + changelog = "https://github.com/NickMcConnell/NarSil/releases/tag/${finalAttrs.version}"; longDescription = '' NarSil attempts to be an almost-faithful recreation of Sil 1.3.0, but based on the codebase of modern Angband. @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { ]; license = lib.licenses.gpl2; }; -} +}) diff --git a/pkgs/by-name/na/nat-traverse/package.nix b/pkgs/by-name/na/nat-traverse/package.nix index ac7c1b38db24..8041308df517 100644 --- a/pkgs/by-name/na/nat-traverse/package.nix +++ b/pkgs/by-name/na/nat-traverse/package.nix @@ -5,12 +5,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nat-traverse"; version = "0.7"; src = fetchurl { - url = "https://www.speicherleck.de/iblech/nat-traverse/nat-traverse-${version}.tar.bz2"; + url = "https://www.speicherleck.de/iblech/nat-traverse/nat-traverse-${finalAttrs.version}.tar.bz2"; sha256 = "0knwnqsjwv7sa5wjb863ghabs7s269a73qwkmxpsbngjw9s0j2ih"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.iblech ]; mainProgram = "nat-traverse"; }; -} +}) diff --git a/pkgs/by-name/na/natural-docs/package.nix b/pkgs/by-name/na/natural-docs/package.nix index 57710a42f751..c2bcd9e429e3 100644 --- a/pkgs/by-name/na/natural-docs/package.nix +++ b/pkgs/by-name/na/natural-docs/package.nix @@ -6,12 +6,12 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "natural-docs"; version = "2.3.1"; src = fetchzip { - url = "https://naturaldocs.org/download/natural_docs/${version}/Natural_Docs_${version}.zip"; + url = "https://naturaldocs.org/download/natural_docs/${finalAttrs.version}/Natural_Docs_${finalAttrs.version}.zip"; sha256 = "sha256-gjAhS2hdFA8G+E5bJD18BQdb7PrBeRnpBBSlnVJ5hgY="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.nkpvk ]; mainProgram = "NaturalDocs"; }; -} +}) diff --git a/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix b/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix index 3bd30f8d83f5..07c83270838b 100644 --- a/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix +++ b/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix @@ -5,14 +5,14 @@ stdenv, lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nautilus-open-in-blackbox"; version = "0.1.1"; src = fetchFromGitHub { owner = "ppvan"; repo = "nautilus-open-in-blackbox"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5rvh3qNalpjamcBVQrnAW6GxhwPPlRxP5h045YDqvrM="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ppvan/nautilus-open-in-blackbox"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/na/nav/package.nix b/pkgs/by-name/na/nav/package.nix index 72f350e4ef03..72b5577c752b 100644 --- a/pkgs/by-name/na/nav/package.nix +++ b/pkgs/by-name/na/nav/package.nix @@ -6,12 +6,12 @@ libxcrypt-legacy, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nav"; version = "1.5.0"; src = fetchurl { - url = "https://github.com/Jojo4GH/nav/releases/download/v${version}/nav-${stdenv.hostPlatform.parsed.cpu.name}-unknown-linux-gnu.tar.gz"; + url = "https://github.com/Jojo4GH/nav/releases/download/v${finalAttrs.version}/nav-${stdenv.hostPlatform.parsed.cpu.name}-unknown-linux-gnu.tar.gz"; sha256 = { x86_64-linux = "sha256-LQdw8/V1KFNM6TY1rFt/RiZuiRQXM+8HNGkJXDrE/mw="; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; mainProgram = "nav"; }; -} +}) diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix index 86d56303e855..897b6b2d61f2 100644 --- a/pkgs/by-name/nb/nb/package.nix +++ b/pkgs/by-name/nb/nb/package.nix @@ -9,14 +9,14 @@ bashInteractive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nb"; version = "7.24.0"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; - rev = version; + rev = finalAttrs.version; hash = "sha256-oGVuBwnuKQqlhwW8gBWwhR09ZVBYV3vWzJxKu+KTlL8="; }; @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "nb"; }; -} +}) diff --git a/pkgs/by-name/nb/nbd/package.nix b/pkgs/by-name/nb/nbd/package.nix index f05bbc697327..7a813bdef3f9 100644 --- a/pkgs/by-name/nb/nbd/package.nix +++ b/pkgs/by-name/nb/nbd/package.nix @@ -13,12 +13,12 @@ gnutls, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nbd"; version = "3.25"; src = fetchurl { - url = "https://github.com/NetworkBlockDevice/nbd/releases/download/nbd-${version}/nbd-${version}.tar.xz"; + url = "https://github.com/NetworkBlockDevice/nbd/releases/download/nbd-${finalAttrs.version}/nbd-${finalAttrs.version}.tar.xz"; hash = "sha256-9cj9D8tXsckmWU0OV/NWQy7ghni+8dQNCI8IMPDL3Qo="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ nickcao ]; }; -} +}) diff --git a/pkgs/by-name/nb/nbench/package.nix b/pkgs/by-name/nb/nbench/package.nix index 8dbfa82c22ae..065315d93659 100644 --- a/pkgs/by-name/nb/nbench/package.nix +++ b/pkgs/by-name/nb/nbench/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nbench-byte"; version = "2.2.3"; src = fetchurl { - url = "http://www.math.utah.edu/~mayer/linux/nbench-byte-${version}.tar.gz"; + url = "http://www.math.utah.edu/~mayer/linux/nbench-byte-${finalAttrs.version}.tar.gz"; sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bennofs ]; mainProgram = "nbench"; }; -} +}) diff --git a/pkgs/by-name/nc/ncmpc/package.nix b/pkgs/by-name/nc/ncmpc/package.nix index e06495336f37..a2873d4b0f05 100644 --- a/pkgs/by-name/nc/ncmpc/package.nix +++ b/pkgs/by-name/nc/ncmpc/package.nix @@ -15,14 +15,14 @@ pcre2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ncmpc"; version = "0.52"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-j/hZdKl1LQ/yEGDUv9k5PQJ6pngAl52mVCpfacWrRw0="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fpletz ]; mainProgram = "ncmpc"; }; -} +}) diff --git a/pkgs/by-name/nc/ncmpcpp/package.nix b/pkgs/by-name/nc/ncmpcpp/package.nix index af22c8f658be..deb4fa6a1d90 100644 --- a/pkgs/by-name/nc/ncmpcpp/package.nix +++ b/pkgs/by-name/nc/ncmpcpp/package.nix @@ -21,14 +21,14 @@ taglib, # tag editor }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ncmpcpp"; version = "0.10.1"; src = fetchFromGitHub { owner = "ncmpcpp"; repo = "ncmpcpp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-w3deSy71SWWD2kZKREowZh3KMNCBfBJbrjM0vW4/GrI="; }; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = { description = "Featureful ncurses based MPD client inspired by ncmpc"; homepage = "https://rybczak.net/ncmpcpp/"; - changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ koral @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "ncmpcpp"; }; -} +}) diff --git a/pkgs/by-name/nc/ncompress/package.nix b/pkgs/by-name/nc/ncompress/package.nix index 332ce4ece99e..3004eccac908 100644 --- a/pkgs/by-name/nc/ncompress/package.nix +++ b/pkgs/by-name/nc/ncompress/package.nix @@ -5,14 +5,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ncompress"; version = "5.0"; src = fetchFromGitHub { owner = "vapier"; repo = "ncompress"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Yhs3C5/kR7Ve56E84usYJprxIMAIwXVahLi1N9TIfj0="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { description = "Fast, simple LZW file compressor"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/nc/ncpamixer/package.nix b/pkgs/by-name/nc/ncpamixer/package.nix index 63bd4f94fd5c..231dd9836837 100644 --- a/pkgs/by-name/nc/ncpamixer/package.nix +++ b/pkgs/by-name/nc/ncpamixer/package.nix @@ -10,14 +10,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ncpamixer"; version = "1.3.9"; src = fetchFromGitHub { owner = "fulhax"; repo = "ncpamixer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-uafjAaXtn97NNmRPxeHmbAaMeHIR/nrQKsTqDX5NRGU="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "ncpamixer"; }; -} +}) diff --git a/pkgs/by-name/nc/ncrack/package.nix b/pkgs/by-name/nc/ncrack/package.nix index 99ac046e4168..92a1242d385c 100644 --- a/pkgs/by-name/nc/ncrack/package.nix +++ b/pkgs/by-name/nc/ncrack/package.nix @@ -7,14 +7,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ncrack"; version = "0.7"; src = fetchFromGitHub { owner = "nmap"; repo = "ncrack"; - rev = version; + rev = finalAttrs.version; sha256 = "1gnv5xdd7n04glcpy7q1mkb6f8gdhdrhlrh8z6k4g2pjdhxlz26g"; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/nd/ndisc6/package.nix b/pkgs/by-name/nd/ndisc6/package.nix index 7ae78945b8b2..8db2d17cac31 100644 --- a/pkgs/by-name/nd/ndisc6/package.nix +++ b/pkgs/by-name/nd/ndisc6/package.nix @@ -5,12 +5,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ndisc6"; version = "1.0.4"; src = fetchurl { - url = "https://www.remlab.net/files/ndisc6/archive/ndisc6-${version}.tar.bz2"; + url = "https://www.remlab.net/files/ndisc6/archive/ndisc6-${finalAttrs.version}.tar.bz2"; sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/pkgs/by-name/nd/ndn-cxx/package.nix b/pkgs/by-name/nd/ndn-cxx/package.nix index 05b0394ae52e..e3d276635057 100644 --- a/pkgs/by-name/nd/ndn-cxx/package.nix +++ b/pkgs/by-name/nd/ndn-cxx/package.nix @@ -12,14 +12,14 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ndn-cxx"; version = "0.9.0"; src = fetchFromGitHub { owner = "named-data"; repo = "ndn-cxx"; - rev = "ndn-cxx-${version}"; + rev = "ndn-cxx-${finalAttrs.version}"; sha256 = "sha256-u9+QxqdCET1f5B54HF+Jk/YuQvhcYWsPNIVHi5l0XTM="; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { bertof ]; }; -} +}) diff --git a/pkgs/by-name/nd/ndn-tools/package.nix b/pkgs/by-name/nd/ndn-tools/package.nix index 812cd1d9403e..28df89391490 100644 --- a/pkgs/by-name/nd/ndn-tools/package.nix +++ b/pkgs/by-name/nd/ndn-tools/package.nix @@ -11,14 +11,14 @@ wafHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ndn-tools"; version = "24.07"; src = fetchFromGitHub { owner = "named-data"; repo = "ndn-tools"; - rev = "ndn-tools-${version}"; + rev = "ndn-tools-${finalAttrs.version}"; sha256 = "sha256-rzGd+8SkztrkXRXcEcQm6rOtAGnF7h/Jg8jaBb7FP9w="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ bertof ]; }; -} +}) diff --git a/pkgs/by-name/nd/ndppd/package.nix b/pkgs/by-name/nd/ndppd/package.nix index 18b873e009eb..5340b7347ec5 100644 --- a/pkgs/by-name/nd/ndppd/package.nix +++ b/pkgs/by-name/nd/ndppd/package.nix @@ -6,14 +6,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ndppd"; version = "0.2.5"; src = fetchFromGitHub { owner = "DanielAdolfsson"; repo = "ndppd"; - rev = version; + rev = finalAttrs.version; sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ndppd"; }; -} +}) diff --git a/pkgs/by-name/nd/ndstool/package.nix b/pkgs/by-name/nd/ndstool/package.nix index 5c3fcf4eaeb3..ce5457d96eba 100644 --- a/pkgs/by-name/nd/ndstool/package.nix +++ b/pkgs/by-name/nd/ndstool/package.nix @@ -6,14 +6,14 @@ automake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ndstool"; version = "2.3.1"; src = fetchFromGitHub { owner = "devkitPro"; repo = "ndstool"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-121xEmbt1WBR1wi4RLw9/iLHqkpyXImXKiCNnLCYnJs="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; mainProgram = "ndstool"; }; -} +}) diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix index c30eaf0fa0e6..57651137c8ac 100644 --- a/pkgs/by-name/ne/neatvnc/package.nix +++ b/pkgs/by-name/ne/neatvnc/package.nix @@ -14,14 +14,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "neatvnc"; version = "0.9.5"; src = fetchFromGitHub { owner = "any1"; repo = "neatvnc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-wAIifLw2rlu44jXMu/k31B7qePdJt6pT6TOhNxcyfLw="; }; @@ -59,9 +59,9 @@ stdenv.mkDerivation rec { - Interoperability with the Freedesktop.org ecosystem ''; homepage = "https://github.com/any1/neatvnc"; - changelog = "https://github.com/any1/neatvnc/releases/tag/v${version}"; + changelog = "https://github.com/any1/neatvnc/releases/tag/v${finalAttrs.version}"; license = lib.licenses.isc; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ nickcao ]; }; -} +}) diff --git a/pkgs/by-name/ne/neil/package.nix b/pkgs/by-name/ne/neil/package.nix index 469375139948..59b73e74564e 100644 --- a/pkgs/by-name/ne/neil/package.nix +++ b/pkgs/by-name/ne/neil/package.nix @@ -6,14 +6,14 @@ babashka, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "neil"; version = "0.3.68"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ulqVrFsuYvRKxASHI6AqnHkKKdmDVgtivsRIscivcXw="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = babashka.meta.platforms; maintainers = with lib.maintainers; [ jlesquembre ]; }; -} +}) diff --git a/pkgs/by-name/ne/neko/package.nix b/pkgs/by-name/ne/neko/package.nix index b3e654b72396..649bb8db3d22 100644 --- a/pkgs/by-name/ne/neko/package.nix +++ b/pkgs/by-name/ne/neko/package.nix @@ -20,14 +20,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "neko"; version = "2.4.1"; src = fetchFromGitHub { owner = "HaxeFoundation"; repo = "neko"; - rev = "v${lib.replaceStrings [ "." ] [ "-" ] version}"; + rev = "v${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; hash = "sha256-cTu+AlDnpXAow6jM77Ct9DM8p//z6N1utk7Wsd+0g9U="; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; -} +}) diff --git a/pkgs/by-name/ne/nelua/package.nix b/pkgs/by-name/ne/nelua/package.nix index 4a01e5d43be7..864c0b710eae 100644 --- a/pkgs/by-name/ne/nelua/package.nix +++ b/pkgs/by-name/ne/nelua/package.nix @@ -6,7 +6,7 @@ unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nelua"; version = "0-unstable-2025-06-24"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace lualib/nelua/version.lua \ - --replace "NELUA_GIT_HASH = nil" "NELUA_GIT_HASH = '${src.rev}'" \ - --replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "0-unstable-" version}'" + --replace "NELUA_GIT_HASH = nil" "NELUA_GIT_HASH = '${finalAttrs.src.rev}'" \ + --replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "0-unstable-" finalAttrs.version}'" ''; makeFlags = [ "PREFIX=$(out)" ]; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ne/nemo-fileroller/package.nix b/pkgs/by-name/ne/nemo-fileroller/package.nix index 39225ebed4fa..b180c9a36cf3 100644 --- a/pkgs/by-name/ne/nemo-fileroller/package.nix +++ b/pkgs/by-name/ne/nemo-fileroller/package.nix @@ -12,18 +12,18 @@ cinnamon-translations, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nemo-fileroller"; version = "6.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; - rev = version; + rev = finalAttrs.version; hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8="; }; - sourceRoot = "${src.name}/nemo-fileroller"; + sourceRoot = "${finalAttrs.src.name}/nemo-fileroller"; nativeBuildInputs = [ meson @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/ne/nemo-python/package.nix b/pkgs/by-name/ne/nemo-python/package.nix index 60c5aeb60d67..db9d9410fa53 100644 --- a/pkgs/by-name/ne/nemo-python/package.nix +++ b/pkgs/by-name/ne/nemo-python/package.nix @@ -11,18 +11,18 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nemo-python"; version = "6.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; - rev = version; + rev = finalAttrs.version; hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8="; }; - sourceRoot = "${src.name}/nemo-python"; + sourceRoot = "${finalAttrs.src.name}/nemo-python"; patches = [ # Load extensions from NEMO_PYTHON_EXTENSION_DIR environment variable @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/ne/nemo-seahorse/package.nix b/pkgs/by-name/ne/nemo-seahorse/package.nix index 6942814cd111..382bb69e81d5 100644 --- a/pkgs/by-name/ne/nemo-seahorse/package.nix +++ b/pkgs/by-name/ne/nemo-seahorse/package.nix @@ -16,18 +16,18 @@ gpgme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nemo-seahorse"; version = "6.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8="; }; - sourceRoot = "${src.name}/nemo-seahorse"; + sourceRoot = "${finalAttrs.src.name}/nemo-seahorse"; nativeBuildInputs = [ glib @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix index 6c7285943c23..85cbbce49a82 100644 --- a/pkgs/by-name/ne/nemo/package.nix +++ b/pkgs/by-name/ne/nemo/package.nix @@ -35,14 +35,14 @@ let ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nemo"; version = "6.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo"; - rev = version; + rev = finalAttrs.version; hash = "sha256-jsAKNKpNsheyugI6dVQAYYrOTmHLDjJCbjlWmAChFgU="; }; @@ -126,4 +126,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.cinnamon ]; mainProgram = "nemo"; }; -} +}) diff --git a/pkgs/by-name/ne/neo/package.nix b/pkgs/by-name/ne/neo/package.nix index a912366c2e81..01ad2c8aa22b 100644 --- a/pkgs/by-name/ne/neo/package.nix +++ b/pkgs/by-name/ne/neo/package.nix @@ -5,12 +5,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "neo"; version = "0.6.1"; src = fetchurl { - url = "https://github.com/st3w/neo/releases/download/v${version}/neo-${version}.tar.gz"; + url = "https://github.com/st3w/neo/releases/download/v${finalAttrs.version}/neo-${finalAttrs.version}.tar.gz"; sha256 = "sha256-pV5O1e/QpK8kjRYBinqq07YX7x06wF0pKiWKOKr0ank="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.abbe ]; mainProgram = "neo"; }; -} +}) diff --git a/pkgs/by-name/ne/neo4j/package.nix b/pkgs/by-name/ne/neo4j/package.nix index b9889b93998a..30bed9da58f5 100644 --- a/pkgs/by-name/ne/neo4j/package.nix +++ b/pkgs/by-name/ne/neo4j/package.nix @@ -10,12 +10,12 @@ bashNonInteractive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "neo4j"; version = "2025.10.1"; src = fetchurl { - url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; + url = "https://neo4j.com/artifact.php?name=neo4j-community-${finalAttrs.version}-unix.tar.gz"; hash = "sha256-aa3hZeM0ehMt6mZk/Of9qG85GnrvsasA8hzpQOppLwk="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ offline ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ne/nest/package.nix b/pkgs/by-name/ne/nest/package.nix index d30f94fd0ddd..a52b00f5c1ab 100644 --- a/pkgs/by-name/ne/nest/package.nix +++ b/pkgs/by-name/ne/nest/package.nix @@ -18,14 +18,14 @@ withMpi ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nest"; version = "3.9"; src = fetchFromGitHub { owner = "nest"; repo = "nest-simulator"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-4tGLRAsJLOHl9frdo35p/uoTiT2zfstx1e+fv5+ZBCs="; }; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = { description = "Command line tool for simulating neural networks"; homepage = "https://www.nest-simulator.org/"; - changelog = "https://github.com/nest/nest-simulator/releases/tag/v${version}"; + changelog = "https://github.com/nest/nest-simulator/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ jiegec @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ne/netcdf/package.nix b/pkgs/by-name/ne/netcdf/package.nix index 281030e06f63..f35fd1168b55 100644 --- a/pkgs/by-name/ne/netcdf/package.nix +++ b/pkgs/by-name/ne/netcdf/package.nix @@ -18,12 +18,12 @@ let inherit (hdf5) mpiSupport mpi; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; version = "4.9.3"; src = fetchurl { - url = "https://downloads.unidata.ucar.edu/netcdf-c/${version}/netcdf-c-${version}.tar.gz"; + url = "https://downloads.unidata.ucar.edu/netcdf-c/${finalAttrs.version}/netcdf-c-${finalAttrs.version}.tar.gz"; hash = "sha256-pHQUmETmFEVmZz+s8Jf+olPchDw3vAp9PeBH3Irdpd0="; }; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { description = "Libraries for the Unidata network Common Data Format"; platforms = lib.platforms.unix; homepage = "https://www.unidata.ucar.edu/software/netcdf/"; - changelog = "https://docs.unidata.ucar.edu/netcdf-c/${version}/RELEASE_NOTES.html"; + changelog = "https://docs.unidata.ucar.edu/netcdf-c/${finalAttrs.version}/RELEASE_NOTES.html"; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/ne/netcdfcxx4/package.nix b/pkgs/by-name/ne/netcdfcxx4/package.nix index 8f0a1c3b502f..ca25c6be32a5 100644 --- a/pkgs/by-name/ne/netcdfcxx4/package.nix +++ b/pkgs/by-name/ne/netcdfcxx4/package.nix @@ -9,14 +9,14 @@ cmake, ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netcdf-cxx4"; version = "4.3.1"; src = fetchFromGitHub { owner = "Unidata"; repo = "netcdf-cxx4"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ne/netcdffortran/package.nix b/pkgs/by-name/ne/netcdffortran/package.nix index 20d769b9f4bf..50c745633639 100644 --- a/pkgs/by-name/ne/netcdffortran/package.nix +++ b/pkgs/by-name/ne/netcdffortran/package.nix @@ -7,14 +7,14 @@ curl, gfortran, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netcdf-fortran"; version = "4.4.5"; src = fetchFromGitHub { owner = "Unidata"; repo = "netcdf-fortran"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-nC93NcA4VJbrqaLwyhjP10j/t6rQSYcAzKBxclpZVe0="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bzizou ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ne/netdiscover/package.nix b/pkgs/by-name/ne/netdiscover/package.nix index 23ad01061446..d717ca952b55 100644 --- a/pkgs/by-name/ne/netdiscover/package.nix +++ b/pkgs/by-name/ne/netdiscover/package.nix @@ -7,14 +7,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netdiscover"; version = "0.21"; src = fetchFromGitHub { owner = "netdiscover-scanner"; repo = "netdiscover"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8m59kdhmH8uxOUCqkvr909DhXDCpMF4grO9ULrrZqjA="; }; @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { meta = { description = "Network address discovering tool, developed mainly for those wireless networks without dhcp server, it also works on hub/switched networks"; homepage = "https://github.com/netdiscover-scanner/netdiscover"; - changelog = "https://github.com/netdiscover-scanner/netdiscover/releases/tag/${src.tag}"; + changelog = "https://github.com/netdiscover-scanner/netdiscover/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ vdot0x23 ]; platforms = lib.platforms.unix; mainProgram = "netdiscover"; }; -} +}) diff --git a/pkgs/by-name/ne/nethogs/package.nix b/pkgs/by-name/ne/nethogs/package.nix index fd1e92db737a..006122654ec5 100644 --- a/pkgs/by-name/ne/nethogs/package.nix +++ b/pkgs/by-name/ne/nethogs/package.nix @@ -6,14 +6,14 @@ libpcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nethogs"; version = "0.8.8"; src = fetchFromGitHub { owner = "raboof"; repo = "nethogs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+yVMyGSBIBWYjA9jaGWvrcsNPbJ6S4ax9H1BhWHYUUU="; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "VERSION=${version}" + "VERSION=${finalAttrs.version}" "nethogs" ]; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.rycee ]; mainProgram = "nethogs"; }; -} +}) diff --git a/pkgs/by-name/ne/netmask/package.nix b/pkgs/by-name/ne/netmask/package.nix index 848f90803e21..59847d82c024 100644 --- a/pkgs/by-name/ne/netmask/package.nix +++ b/pkgs/by-name/ne/netmask/package.nix @@ -6,14 +6,14 @@ texinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netmask"; version = "2.4.4"; src = fetchFromGitHub { owner = "tlby"; repo = "netmask"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1269bmdvl534wr0bamd7cqbnr76pnb14yn8ly4qsfg29kh7hrds6"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.jensbin ]; mainProgram = "netmask"; }; -} +}) diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix index e21694473f55..49ea197daf58 100644 --- a/pkgs/by-name/ne/netpbm/package.nix +++ b/pkgs/by-name/ne/netpbm/package.nix @@ -17,7 +17,7 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; @@ -129,10 +129,10 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; meta = { - changelog = "https://sourceforge.net/p/netpbm/code/${src.rev}/tree/advanced/doc/HISTORY"; + changelog = "https://sourceforge.net/p/netpbm/code/${finalAttrs.src.rev}/tree/advanced/doc/HISTORY"; homepage = "https://netpbm.sourceforge.net/"; description = "Toolkit for manipulation of graphic images"; license = lib.licenses.free; # http://netpbm.svn.code.sourceforge.net/p/netpbm/code/trunk/doc/copyright_summary platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/ne/netplan/package.nix b/pkgs/by-name/ne/netplan/package.nix index 3c701018a25d..bfddf1c00643 100644 --- a/pkgs/by-name/ne/netplan/package.nix +++ b/pkgs/by-name/ne/netplan/package.nix @@ -12,14 +12,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netplan"; version = "0.106.1"; src = fetchFromGitHub { owner = "canonical"; repo = "netplan"; - rev = version; + rev = finalAttrs.version; hash = "sha256-wQ4gd9+9YU92WGRMjSiF/zLCGxhaSl8s22pH1jr+Mm0="; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "netplan"; }; -} +}) diff --git a/pkgs/by-name/ne/netrw/package.nix b/pkgs/by-name/ne/netrw/package.nix index 989b549d8541..f8e30334ce17 100644 --- a/pkgs/by-name/ne/netrw/package.nix +++ b/pkgs/by-name/ne/netrw/package.nix @@ -10,7 +10,7 @@ assert checksumType == "mhash" -> libmhash != null; assert checksumType == "openssl" -> openssl != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netrw"; version = "1.3.2"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "https://mamuti.net/files/netrw/netrw-${version}.tar.bz2" - "http://www.sourcefiles.org/Networking/FTP/Other/netrw-${version}.tar.bz2" + "https://mamuti.net/files/netrw/netrw-${finalAttrs.version}.tar.bz2" + "http://www.sourcefiles.org/Networking/FTP/Other/netrw-${finalAttrs.version}.tar.bz2" ]; sha256 = "1gnl80i5zkyj2lpnb4g0q0r5npba1x6cnafl2jb3i3pzlfz1bndr"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { homepage = "https://mamuti.net/netrw/index.en.html"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix index 94109f2d976d..8f6438b9adbd 100644 --- a/pkgs/by-name/ne/netsniff-ng/package.nix +++ b/pkgs/by-name/ne/netsniff-ng/package.nix @@ -20,14 +20,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netsniff-ng"; version = "0.6.9"; src = fetchFromGitHub { repo = "netsniff-ng"; owner = "netsniff-ng"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-P1xZqhZ/HJV3fAvh4xhhApZ0+FLDFqvYrZlbvb+FV7I="; }; @@ -106,4 +106,4 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ gpl2Only ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ne/networkd-dispatcher/package.nix b/pkgs/by-name/ne/networkd-dispatcher/package.nix index 15527a405e4f..93aa216f6f91 100644 --- a/pkgs/by-name/ne/networkd-dispatcher/package.nix +++ b/pkgs/by-name/ne/networkd-dispatcher/package.nix @@ -11,7 +11,7 @@ iw, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "networkd-dispatcher"; version = "2.2.4"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { domain = "gitlab.com"; owner = "craftyguy"; repo = "networkd-dispatcher"; - rev = version; + rev = finalAttrs.version; hash = "sha256-yO9/HlUkaQmW/n9N3vboHw//YMzBjxIHA2zAxgZNEv0="; }; @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ onny ]; }; -} +}) diff --git a/pkgs/by-name/ne/networkmanager_dmenu/package.nix b/pkgs/by-name/ne/networkmanager_dmenu/package.nix index 1fb63d815f47..5c31b173fee9 100644 --- a/pkgs/by-name/ne/networkmanager_dmenu/package.nix +++ b/pkgs/by-name/ne/networkmanager_dmenu/package.nix @@ -12,14 +12,14 @@ let inherit (python3Packages) python pygobject3; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "networkmanager_dmenu"; version = "2.6.2"; src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-NTkGKUZ3xA9ZWBLZgjIR5wrUXVhccGkGqnnm0a79p+Q="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.jensbin ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ne/neverball/package.nix b/pkgs/by-name/ne/neverball/package.nix index ecc9828ab8dd..4f048d68a04b 100644 --- a/pkgs/by-name/ne/neverball/package.nix +++ b/pkgs/by-name/ne/neverball/package.nix @@ -16,11 +16,11 @@ makeBinaryWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "neverball"; version = "1.6.0"; src = fetchurl { - url = "https://neverball.org/neverball-${version}.tar.gz"; + url = "https://neverball.org/neverball-${finalAttrs.version}.tar.gz"; sha256 = "184gm36c6p6vaa6gwrfzmfh86klhnb03pl40ahsjsvprlk667zkk"; }; patches = [ @@ -113,4 +113,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ Rhys-T ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/ne/new-session-manager/package.nix b/pkgs/by-name/ne/new-session-manager/package.nix index e2b8ce9dd8d3..748038ca00bd 100644 --- a/pkgs/by-name/ne/new-session-manager/package.nix +++ b/pkgs/by-name/ne/new-session-manager/package.nix @@ -10,14 +10,14 @@ fltk, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "new-session-manager"; version = "1.6.1"; src = fetchFromGitHub { owner = "linuxaudio"; repo = "new-session-manager"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-5G2GlBuKjC/r1SMm78JKia7bMA97YcvUR5l6zBucemw="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index a86b8da4663d..5190d8eef435 100644 --- a/pkgs/by-name/ne/nextcloud-client/package.nix +++ b/pkgs/by-name/ne/nextcloud-client/package.nix @@ -21,7 +21,7 @@ libsysprof-capture, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nextcloud-client"; version = "4.0.6"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nextcloud-releases"; repo = "desktop"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GPNJ2zrHzHQgJvj1ANi6LYsTlkuc5splFAwC5XaR3+0="; }; @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = { - changelog = "https://github.com/nextcloud/desktop/releases/tag/v${version}"; + changelog = "https://github.com/nextcloud/desktop/releases/tag/v${finalAttrs.version}"; description = "Desktop sync client for Nextcloud"; homepage = "https://nextcloud.com"; license = lib.licenses.gpl2Plus; @@ -105,4 +105,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "nextcloud"; }; -} +}) diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/README.md b/pkgs/by-name/ne/nexusmods-app/vendored/README.md index f92cbf87e634..49e760bbfe55 100644 --- a/pkgs/by-name/ne/nexusmods-app/vendored/README.md +++ b/pkgs/by-name/ne/nexusmods-app/vendored/README.md @@ -2,12 +2,12 @@ This directory contains a vendored copy of `games.json`, along with tooling to g ## Purpose -The games data is fetched at runtime by NexusMods.App, however it is also included at build time for two reasons: +The games data is fetched at runtime by NexusMods.App, however, it is also included at build time for two reasons: 1. It allows tests to run against real data. 2. It is used as cached data, speeding up the app's initial run. -It is not vital for the file to contain all games, however ideally it should contain all games _supported_ by this version of NexusMods.App. +It is not vital for the file to contain all games, however, ideally it should contain all games _supported_ by this version of NexusMods.App. That way the initial run's cached data is more useful. If this file grows too large, because we are including too many games, we can patch the `csproj` build spec so that `games.json` is not used at build time. diff --git a/pkgs/by-name/nf/nf-test/package.nix b/pkgs/by-name/nf/nf-test/package.nix index 925c787e46d5..82dc41015d81 100644 --- a/pkgs/by-name/nf/nf-test/package.nix +++ b/pkgs/by-name/nf/nf-test/package.nix @@ -8,13 +8,13 @@ stdenv, testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nf-test"; version = "0.9.3"; src = fetchurl { - url = "https://github.com/askimed/nf-test/releases/download/v${version}/nf-test-${version}.tar.gz"; + url = "https://github.com/askimed/nf-test/releases/download/v${finalAttrs.version}/nf-test-${finalAttrs.version}.tar.gz"; hash = "sha256-LLylgv34HiMXg+sjBbMdeLVPMV5+h+Z2xEWCiBqbNEY="; }; sourceRoot = "."; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { mainProgram = "nf-test"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/nf/nfd/package.nix b/pkgs/by-name/nf/nfd/package.nix index d8d61476109e..964f1ed11a66 100644 --- a/pkgs/by-name/nf/nfd/package.nix +++ b/pkgs/by-name/nf/nfd/package.nix @@ -15,14 +15,14 @@ withWebSocket ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nfd"; version = "24.07"; src = fetchFromGitHub { owner = "named-data"; repo = "NFD"; - rev = "NFD-${version}"; + rev = "NFD-${finalAttrs.version}"; hash = "sha256-HbKPO3gwQWOZf4QZE+N7tAiqsNl1GrcwE4EUGjWmf5s="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ bertof ]; }; -} +}) diff --git a/pkgs/by-name/nf/nfdump/package.nix b/pkgs/by-name/nf/nfdump/package.nix index c5cf9f6ba504..ffa6e506a0d6 100644 --- a/pkgs/by-name/nf/nfdump/package.nix +++ b/pkgs/by-name/nf/nfdump/package.nix @@ -12,14 +12,14 @@ bison, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nfdump"; version = "1.7.6"; src = fetchFromGitHub { owner = "phaag"; repo = "nfdump"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4iyoQAjOQW4KNJbRmdisdecuOz+DFvQGEKgq8cq7GDI="; }; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { nfdump is a set of tools for working with netflow data. ''; homepage = "https://github.com/phaag/nfdump"; - changelog = "https://github.com/phaag/nfdump/releases/tag/v${version}"; + changelog = "https://github.com/phaag/nfdump/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ takikawa ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix index 490842c5ecac..af613da6bf43 100644 --- a/pkgs/by-name/nf/nfs-ganesha/package.nix +++ b/pkgs/by-name/nf/nfs-ganesha/package.nix @@ -23,7 +23,7 @@ dbus, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nfs-ganesha"; version = "9.4"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; - tag = "V${version}"; + tag = "V${finalAttrs.version}"; hash = "sha256-Adax64aaioYfPg7SMtylS2wpYV52l8KgXBA8eJefGkY="; }; @@ -128,4 +128,4 @@ stdenv.mkDerivation rec { "tools" ]; }; -} +}) diff --git a/pkgs/by-name/nf/nfs-utils/package.nix b/pkgs/by-name/nf/nfs-utils/package.nix index a3dd7cf73e2b..a6d056e03bec 100644 --- a/pkgs/by-name/nf/nfs-utils/package.nix +++ b/pkgs/by-name/nf/nfs-utils/package.nix @@ -38,12 +38,12 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nfs-utils"; version = "2.8.4"; src = fetchurl { - url = "mirror://kernel/linux/utils/nfs-utils/${version}/nfs-utils-${version}.tar.xz"; + url = "mirror://kernel/linux/utils/nfs-utils/${finalAttrs.version}/nfs-utils-${finalAttrs.version}.tar.xz"; hash = "sha256-EcTMWYpDTX00C60+Byo3O6HcwsSfhV1EsgIiK3js2/U="; }; @@ -197,4 +197,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.dotlambda ]; }; -} +}) diff --git a/pkgs/by-name/ng/nginx-config-formatter/package.nix b/pkgs/by-name/ng/nginx-config-formatter/package.nix index e7d303678bd1..ce1bbadaef82 100644 --- a/pkgs/by-name/ng/nginx-config-formatter/package.nix +++ b/pkgs/by-name/ng/nginx-config-formatter/package.nix @@ -5,14 +5,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.3.0"; pname = "nginx-config-formatter"; src = fetchFromGitHub { owner = "slomkowski"; repo = "nginx-config-formatter"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-0jXm82a4bYpbOJnz+y7+dSg1LZy1Mu28IgBxd24Y5ck="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/slomkowski/nginx-config-formatter"; mainProgram = "nginxfmt"; }; -} +}) diff --git a/pkgs/by-name/ni/nifi/package.nix b/pkgs/by-name/ni/nifi/package.nix index 2dd3db34e5a4..4830730548aa 100644 --- a/pkgs/by-name/ni/nifi/package.nix +++ b/pkgs/by-name/ni/nifi/package.nix @@ -7,12 +7,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nifi"; version = "1.28.1"; src = fetchzip { - url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; + url = "mirror://apache/nifi/${finalAttrs.version}/nifi-${finalAttrs.version}-bin.zip"; hash = "sha256-YFQIV2/B+8/fBmrWPs7Q3FkqaIxBqNBP0BIkIm4M7Zo="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ izorkin ]; }; -} +}) diff --git a/pkgs/by-name/ni/nifticlib/package.nix b/pkgs/by-name/ni/nifticlib/package.nix index 94840f078cf3..1584813a906a 100644 --- a/pkgs/by-name/ni/nifticlib/package.nix +++ b/pkgs/by-name/ni/nifticlib/package.nix @@ -6,14 +6,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nifticlib"; version = "3.0.1"; src = fetchFromGitHub { owner = "NIFTI-Imaging"; repo = "nifti_clib"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0hamm6nvbjdjjd5md4jahzvn5559frigxaiybnjkh59ckxwb1hy4"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.publicDomain; }; -} +}) diff --git a/pkgs/by-name/ni/niftyseg/package.nix b/pkgs/by-name/ni/niftyseg/package.nix index 90c559a930c4..3d2f1cdc869d 100644 --- a/pkgs/by-name/ni/niftyseg/package.nix +++ b/pkgs/by-name/ni/niftyseg/package.nix @@ -7,14 +7,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "niftyseg"; version = "1.0"; src = fetchFromGitHub { owner = "KCL-BMEIS"; repo = "NiftySeg"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-FDthq1ild9XOw3E3O7Lpfn6hBF1Frhv1NxfEA8500n8="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ni/nilfs-utils/package.nix b/pkgs/by-name/ni/nilfs-utils/package.nix index 85be191214b9..9a4c6d54ab51 100644 --- a/pkgs/by-name/ni/nilfs-utils/package.nix +++ b/pkgs/by-name/ni/nilfs-utils/package.nix @@ -8,14 +8,14 @@ e2fsprogs, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nilfs-utils"; version = "2.2.12"; src = fetchFromGitHub { owner = "nilfs-dev"; repo = "nilfs-utils"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-9IUuam5g24+eywEeNZET8TAvKJVevJBwHTHSwN9Tz58="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { ]; downloadPage = "http://nilfs.sourceforge.net/en/download.html"; }; -} +}) diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix index be4b5791d0b8..149a6c2c02e7 100644 --- a/pkgs/by-name/ni/ninjas2/package.nix +++ b/pkgs/by-name/ni/ninjas2/package.nix @@ -10,14 +10,14 @@ libsamplerate, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ninjas2"; version = "0.2.0"; src = fetchFromGitHub { owner = "clearly-broken-software"; repo = "ninjas2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1kwp6pmnfar2ip9693gprfbcfscklgri1k1ycimxzlqr61nkd2k9"; fetchSubmodules = true; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ninjas2"; }; -} +}) diff --git a/pkgs/by-name/ni/ninvaders/package.nix b/pkgs/by-name/ni/ninvaders/package.nix index 5e6b0b53b975..5840093711ee 100644 --- a/pkgs/by-name/ni/ninvaders/package.nix +++ b/pkgs/by-name/ni/ninvaders/package.nix @@ -6,14 +6,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ninvaders"; version = "0.1.2"; src = fetchFromGitHub { owner = "sf-refugees"; repo = "ninvaders"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1wmwws1zsap4bfc2439p25vnja0hnsf57k293rdxw626gly06whi"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ _1000101 ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ni/nip2/package.nix b/pkgs/by-name/ni/nip2/package.nix index 45cea2aa7ac5..faf3ba81e236 100644 --- a/pkgs/by-name/ni/nip2/package.nix +++ b/pkgs/by-name/ni/nip2/package.nix @@ -16,12 +16,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nip2"; version = "8.9.1"; src = fetchurl { - url = "https://github.com/libvips/nip2/releases/download/v${version}/nip2-${version}.tar.gz"; + url = "https://github.com/libvips/nip2/releases/download/v${finalAttrs.version}/nip2-${finalAttrs.version}.tar.gz"; sha256 = "sha256-t14m6z+5lPqpiOjgdDbKwqSWXCyrCL7zlo6BeoZtds0="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "nip2"; }; -} +}) diff --git a/pkgs/by-name/ni/nix-bash-completions/package.nix b/pkgs/by-name/ni/nix-bash-completions/package.nix index ef47e2e8a979..0504a7612224 100644 --- a/pkgs/by-name/ni/nix-bash-completions/package.nix +++ b/pkgs/by-name/ni/nix-bash-completions/package.nix @@ -5,14 +5,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.6.8"; pname = "nix-bash-completions"; src = fetchFromGitHub { owner = "hedning"; repo = "nix-bash-completions"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1n5zs6xcnv4bv1hdaypmz7fv4j7dsr4a0ifah99iyj4p5j85i1bc"; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { # Set a lower priority such that Nix wins in case of conflicts. priority = 10; }; -} +}) diff --git a/pkgs/by-name/ni/nix-plugins/package.nix b/pkgs/by-name/ni/nix-plugins/package.nix index eb9fb26dafb1..c889a9cbd29b 100644 --- a/pkgs/by-name/ni/nix-plugins/package.nix +++ b/pkgs/by-name/ni/nix-plugins/package.nix @@ -9,14 +9,14 @@ boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nix-plugins"; version = "16.0.1"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-plugins"; - rev = version; + rev = finalAttrs.version; hash = "sha256-1P5oVXSx/hGK5MB2grxWtmqsKGtTEmT1XD5+NSsLFUw="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ni/nix-top/package.nix b/pkgs/by-name/ni/nix-top/package.nix index bf334ad9b711..8bbce9919244 100644 --- a/pkgs/by-name/ni/nix-top/package.nix +++ b/pkgs/by-name/ni/nix-top/package.nix @@ -21,14 +21,14 @@ let findutils ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nix-top"; version = "0.4.0"; src = fetchFromGitHub { owner = "jerith666"; repo = "nix-top"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-dpH1qfAHt8kDEG1QMFcD67rOhDsWZuaw3WSUZdPx3oQ="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "nix-top"; }; -} +}) diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix index e3e2abf8bee9..188bff71bcad 100644 --- a/pkgs/by-name/ni/nix-your-shell/package.nix +++ b/pkgs/by-name/ni/nix-your-shell/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "nix-your-shell"; - version = "1.4.7"; + version = "1.4.8"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = "nix-your-shell"; tag = "v${version}"; - hash = "sha256-CE1yVD0uT5QnCfuTshAvM4r0BQ6XeaT22PdEhaYJJk8="; + hash = "sha256-2KiqDqKKT28yjCEtU0vFd+dFktGd6Xp+yxSSI/R7fjc="; }; - cargoHash = "sha256-BGyO+MK5pRMNFauRvTWxluHoPjqqsIJP1yajWEJnIvI="; + cargoHash = "sha256-BBKnA/QX37qEtWw69+nS1NjurI2GXASUrfY1E0iL/0Q="; passthru = { generate-config = diff --git a/pkgs/by-name/ni/nix-zsh-completions/package.nix b/pkgs/by-name/ni/nix-zsh-completions/package.nix index d864721339e3..5f8c1ad4c2d2 100644 --- a/pkgs/by-name/ni/nix-zsh-completions/package.nix +++ b/pkgs/by-name/ni/nix-zsh-completions/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nix-zsh-completions"; version = "0.5.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-zsh-completions"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bgbMc4HqigqgdkvUe/CWbUclwxpl17ESLzCIP8Sz+F8="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { sebtm ]; }; -} +}) diff --git a/pkgs/by-name/ni/nixos-generators/package.nix b/pkgs/by-name/ni/nixos-generators/package.nix index cf9b0abfdfa5..34248dd1d614 100644 --- a/pkgs/by-name/ni/nixos-generators/package.nix +++ b/pkgs/by-name/ni/nixos-generators/package.nix @@ -10,13 +10,13 @@ bash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nixos-generators"; version = "1.8.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-generators"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY="; }; strictDeps = true; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { mainProgram = "nixos-generate"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ni/nixos-init/Cargo.lock b/pkgs/by-name/ni/nixos-init/Cargo.lock index 1be95a5be152..4f44e49b6219 100644 --- a/pkgs/by-name/ni/nixos-init/Cargo.lock +++ b/pkgs/by-name/ni/nixos-init/Cargo.lock @@ -14,6 +14,17 @@ version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +[[package]] +name = "bootspec" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75726e2aa2b4c5a9d5c4cf3cb7f24658b6ec861616088f3ef3fb72edc0599286" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "cfg-if" version = "1.0.1" @@ -73,6 +84,12 @@ version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" +[[package]] +name = "itoa" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010" + [[package]] name = "libc" version = "0.2.174" @@ -91,14 +108,23 @@ version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +[[package]] +name = "memchr" +version = "2.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" + [[package]] name = "nixos-init" version = "0.1.0" dependencies = [ "anyhow", + "bootspec", "env_logger", "indoc", "log", + "serde", + "serde_json", "tempfile", ] @@ -108,6 +134,24 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "proc-macro2" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +dependencies = [ + "proc-macro2", +] + [[package]] name = "r-efi" version = "5.3.0" @@ -127,6 +171,66 @@ dependencies = [ "windows-sys 0.60.2", ] +[[package]] +name = "ryu" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea" + +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.145" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", + "serde_core", +] + +[[package]] +name = "syn" +version = "2.0.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "tempfile" version = "3.20.0" @@ -140,6 +244,32 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicode-ident" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" + [[package]] name = "wasi" version = "0.14.2+wasi-0.2.4" diff --git a/pkgs/by-name/ni/nixos-init/Cargo.toml b/pkgs/by-name/ni/nixos-init/Cargo.toml index 0672931045c6..a6495ad1ffdf 100644 --- a/pkgs/by-name/ni/nixos-init/Cargo.toml +++ b/pkgs/by-name/ni/nixos-init/Cargo.toml @@ -7,6 +7,9 @@ edition = "2024" anyhow = "1.0.98" log = "0.4.27" env_logger = { version = "0.11.8", default-features = false } +serde = { version = "1.0.228", features = ["derive"] } +serde_json = "1.0.145" +bootspec = "2.0.0" [dev-dependencies] tempfile = "3.20.0" diff --git a/pkgs/by-name/ni/nixos-init/README.md b/pkgs/by-name/ni/nixos-init/README.md index c187f0d07b39..7bcf47e792ed 100644 --- a/pkgs/by-name/ni/nixos-init/README.md +++ b/pkgs/by-name/ni/nixos-init/README.md @@ -29,7 +29,7 @@ robust. writing correct software easier and should improve the quality of the NixOS boot code. - Most things can be started much later than one might assume. Because systemd - services are parallelized, this should improve start up time. + services are parallelized, this should improve startup time. ## Invariants @@ -50,7 +50,7 @@ closure. Currently nixos-init comes in at ~500 KiB. - `initrd-init`: Initializes the system on boot, setting up the tree for systemd to start. - `find-etc`: Finds the `/etc` paths in `/sysroot` so that the initrd doesn't - directly depend on the toplevel reducing the need to rebuild the initrd on + directly depend on the toplevel, reducing the need to rebuild the initrd on every generation. - `chroot-realpath`: Figures out the canonical path inside a chroot. diff --git a/pkgs/by-name/ni/nixos-init/src/activate.rs b/pkgs/by-name/ni/nixos-init/src/activate.rs index 048b037d9a51..6b5ac049a528 100644 --- a/pkgs/by-name/ni/nixos-init/src/activate.rs +++ b/pkgs/by-name/ni/nixos-init/src/activate.rs @@ -1,4 +1,7 @@ -use std::{fs, path::Path}; +use std::{ + fs, + path::{Path, PathBuf}, +}; use anyhow::{Context, Result}; @@ -9,7 +12,8 @@ use crate::{config::Config, fs::atomic_symlink}; /// This runs both during boot and during re-activation initiated by switch-to-configuration. pub fn activate(prefix: &str, toplevel: impl AsRef, config: &Config) -> Result<()> { log::info!("Setting up /run/current-system..."); - atomic_symlink(&toplevel, format!("{prefix}/run/current-system"))?; + let system_path = PathBuf::from(prefix).join("run/current-system"); + atomic_symlink(&toplevel, system_path)?; log::info!("Setting up modprobe..."); setup_modprobe(&config.modprobe_binary)?; @@ -92,10 +96,9 @@ fn setup_firmware_search_path(firmware: impl AsRef) -> Result<()> { /// /// We do this here accidentally. `/usr/bin/env` is currently load-bearing for `NixOS`. fn setup_usrbinenv(prefix: &str, env_binary: impl AsRef) -> Result<()> { - const USRBINENV_PATH: &str = "/usr/bin/env"; - - fs::create_dir_all(format!("{prefix}/usr/bin")).context("Failed to create /usr/bin")?; - atomic_symlink(&env_binary, format!("{prefix}{USRBINENV_PATH}")) + let usrbin_path = PathBuf::from(prefix).join("usr/bin"); + fs::create_dir_all(&usrbin_path).context("Failed to create /usr/bin")?; + atomic_symlink(&env_binary, usrbin_path.join("env")) } /// Setup /bin/sh. @@ -103,6 +106,6 @@ fn setup_usrbinenv(prefix: &str, env_binary: impl AsRef) -> Result<()> { /// `/bin/sh` is an essential part of a Linux system as this path is hardcoded in the `system()` call /// from libc. See `man systemd(3)`. fn setup_binsh(prefix: &str, sh_binary: impl AsRef) -> Result<()> { - const BINSH_PATH: &str = "/bin/sh"; - atomic_symlink(&sh_binary, format!("{prefix}{BINSH_PATH}")) + let binsh_path = PathBuf::from(prefix).join("bin/sh"); + atomic_symlink(&sh_binary, binsh_path) } diff --git a/pkgs/by-name/ni/nixos-init/src/config.rs b/pkgs/by-name/ni/nixos-init/src/config.rs index b974943cb56a..fa5eea0d3605 100644 --- a/pkgs/by-name/ni/nixos-init/src/config.rs +++ b/pkgs/by-name/ni/nixos-init/src/config.rs @@ -1,43 +1,39 @@ -use std::env; +use serde::Deserialize; +use std::fs; +use std::path::{Path, PathBuf}; use anyhow::{Context, Result}; +use bootspec::BootJson; +#[derive(Deserialize)] pub struct Config { pub firmware: String, pub modprobe_binary: String, pub nix_store_mount_opts: Vec, pub env_binary: Option, pub sh_binary: Option, + pub etc_basedir: Option, + pub etc_metadata_image: Option, } impl Config { - /// Read the config from the environment. - /// - /// These options are provided by wrapping the binary when assembling the toplevel. - pub fn from_env() -> Result { - let nix_store_mount_opts = required("NIX_STORE_MOUNT_OPTS")? - .split(',') - .map(std::borrow::ToOwned::to_owned) - .collect(); + /// Read the config from the metadata file in the toplevel directory. + pub fn from_toplevel(toplevel: impl AsRef, prefix: &str) -> Result { + let bootspec_path = + PathBuf::from(prefix).join(toplevel.as_ref().join("boot.json").strip_prefix("/")?); - Ok(Self { - firmware: required("FIRMWARE")?, - modprobe_binary: required("MODPROBE_BINARY")?, - nix_store_mount_opts, - env_binary: optional("ENV_BINARY"), - sh_binary: optional("SH_BINARY"), - }) + let boot_json: BootJson = fs::read(bootspec_path) + .context("Failed to read bootspec file") + .and_then(|raw| serde_json::from_slice(&raw).context("Failed to read bootspec JSON"))?; + + let config = boot_json + .extensions + .get("org.nixos.nixos-init.v1") + .context("Failed to extract nixos-init bootspec extension") + .and_then(|v| { + serde_json::from_value(v.clone()).context("Failed to deserialise config") + })?; + + Ok(config) } } - -/// Read a required environment variable -/// -/// Fail with useful context if the variable is not set in the environment. -fn required(key: &str) -> Result { - env::var(key).with_context(|| format!("Failed to read {key} from environment")) -} - -/// Read an optional environment variable -fn optional(key: &str) -> Option { - env::var(key).ok() -} diff --git a/pkgs/by-name/ni/nixos-init/src/find_etc.rs b/pkgs/by-name/ni/nixos-init/src/find_etc.rs index fb9faabe21b2..2af0dab6ffbb 100644 --- a/pkgs/by-name/ni/nixos-init/src/find_etc.rs +++ b/pkgs/by-name/ni/nixos-init/src/find_etc.rs @@ -2,6 +2,7 @@ use std::{os::unix, path::Path}; use anyhow::{Context, Result}; +use crate::config::Config; use crate::{SYSROOT_PATH, canonicalize_in_chroot, find_toplevel_in_prefix}; /// Entrypoint for the `find-etc` binary. @@ -12,20 +13,23 @@ use crate::{SYSROOT_PATH, canonicalize_in_chroot, find_toplevel_in_prefix}; /// need to re-build it. pub fn find_etc() -> Result<()> { let toplevel = find_toplevel_in_prefix(SYSROOT_PATH)?; + let config = Config::from_toplevel(&toplevel, SYSROOT_PATH)?; - let etc_metadata_image = Path::new(SYSROOT_PATH).join( - canonicalize_in_chroot(SYSROOT_PATH, &toplevel.join("etc-metadata-image"))? - .strip_prefix("/")?, - ); + let basedir = config + .etc_basedir + .context("Failed to read etc_basedir from bootspec")?; + let etc_basedir = Path::new(SYSROOT_PATH) + .join(canonicalize_in_chroot(SYSROOT_PATH, Path::new(&basedir))?.strip_prefix("/")?); - let etc_basedir = Path::new(SYSROOT_PATH).join( - canonicalize_in_chroot(SYSROOT_PATH, &toplevel.join("etc-basedir"))?.strip_prefix("/")?, - ); + let metadata_image = config + .etc_metadata_image + .context("Failed to read etc_metadata_image from bootspec")?; + let etc_metadata_image = Path::new(SYSROOT_PATH) + .join(canonicalize_in_chroot(SYSROOT_PATH, Path::new(&metadata_image))?.strip_prefix("/")?); + unix::fs::symlink(etc_basedir, "/etc-basedir").context("Failed to link /etc-basedir")?; unix::fs::symlink(etc_metadata_image, "/etc-metadata-image") .context("Failed to link /etc-metadata-image")?; - unix::fs::symlink(etc_basedir, "/etc-basedir").context("Failed to link /etc-basedir")?; - Ok(()) } diff --git a/pkgs/by-name/ni/nixos-init/src/init.rs b/pkgs/by-name/ni/nixos-init/src/init.rs index aec7db39c951..44af1979f4b2 100644 --- a/pkgs/by-name/ni/nixos-init/src/init.rs +++ b/pkgs/by-name/ni/nixos-init/src/init.rs @@ -60,7 +60,7 @@ fn remount_nix_store(prefix: &str, nix_store_mount_opts: &[String]) -> Result<() if let Some(last_nix_store_mount) = mounts.find_mountpoint(&nix_store_path) { for opt in nix_store_mount_opts { if !last_nix_store_mount.mntopts.contains(opt) { - missing_opts.push(opt.to_string()); + missing_opts.push(opt.clone()); } } if !missing_opts.is_empty() { diff --git a/pkgs/by-name/ni/nixos-init/src/initrd_init.rs b/pkgs/by-name/ni/nixos-init/src/initrd_init.rs index c391f9b9c645..ac18705404a0 100644 --- a/pkgs/by-name/ni/nixos-init/src/initrd_init.rs +++ b/pkgs/by-name/ni/nixos-init/src/initrd_init.rs @@ -8,13 +8,14 @@ use crate::{ /// /// Initialize `NixOS` from a systemd initrd. pub fn initrd_init() -> Result<()> { - let config = Config::from_env().context("Failed to get configuration")?; let init_in_sysroot = find_init_in_prefix(SYSROOT_PATH).context("Failed to find init in sysroot")?; let init_path = if let Ok(toplevel) = verify_init_is_nixos(SYSROOT_PATH, &init_in_sysroot) { log::info!("Initializing NixOS..."); - init(SYSROOT_PATH, toplevel, &config)?; + let config = Config::from_toplevel(&toplevel, SYSROOT_PATH) + .context("Failed to get configuration")?; + init(SYSROOT_PATH, &toplevel, &config)?; None } else { log::info!("Not initializing NixOS. Switching to new root immediately..."); diff --git a/pkgs/by-name/ni/nixos-install/nixos-install.8 b/pkgs/by-name/ni/nixos-install/nixos-install.8 index e1af90a37d76..5b4f8c936720 100644 --- a/pkgs/by-name/ni/nixos-install/nixos-install.8 +++ b/pkgs/by-name/ni/nixos-install/nixos-install.8 @@ -12,7 +12,7 @@ .Op Fl -verbose | v .Op Fl I Ar path .Op Fl -root Ar root -.Op Fl -system Ar path +.Op Fl -system | -closure | -store-path Ar path .Op Fl -flake Ar flake-uri .Op Fl -file | f Ar path .Op Fl -attr | A Ar attrPath @@ -94,8 +94,8 @@ Defaults to .Ar root as the root of the NixOS installation. . -.It Fl -system Ar path -If this option is provided, +.It Fl -system Ar path , Fl -closure Ar path , Fl -store-path Ar path +If one of those options is provided, .Nm will install the specified closure rather than attempt to build one from .Pa /mnt/etc/nixos/configuration.nix Ns diff --git a/pkgs/by-name/ni/nixos-install/nixos-install.sh b/pkgs/by-name/ni/nixos-install/nixos-install.sh index 2a592223a921..fe3a8bf26d45 100755 --- a/pkgs/by-name/ni/nixos-install/nixos-install.sh +++ b/pkgs/by-name/ni/nixos-install/nixos-install.sh @@ -36,7 +36,7 @@ while [ "$#" -gt 0 ]; do --root) mountPoint="$1"; shift 1 ;; - --system|--closure) + --system|--closure|--store-path) system="$1"; shift 1 ;; --flake) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index bedfdba11536..aeae7b435523 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -40,19 +40,23 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa common_build_flags.add_argument("--print-build-logs", "-L", action="store_true") common_build_flags.add_argument("--show-trace", action="store_true") + # Flags that apply to both flake evaluation and building flake_common_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) - flake_common_flags.add_argument("--accept-flake-config", action="store_true") - flake_common_flags.add_argument("--refresh", action="store_true") - flake_common_flags.add_argument("--impure", action="store_true") flake_common_flags.add_argument("--offline", action="store_true") flake_common_flags.add_argument("--no-net", action="store_true") - flake_common_flags.add_argument("--recreate-lock-file", action="store_true") - flake_common_flags.add_argument("--no-update-lock-file", action="store_true") - flake_common_flags.add_argument("--no-write-lock-file", action="store_true") - flake_common_flags.add_argument("--no-registries", action="store_true") - flake_common_flags.add_argument("--commit-lock-file", action="store_true") - flake_common_flags.add_argument("--update-input", action="append") - flake_common_flags.add_argument("--override-input", nargs=2, action="append") + + # Flags that only apply during flake evaluation (and thus aren't passed to remote builders) + flake_eval_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) + flake_eval_flags.add_argument("--accept-flake-config", action="store_true") + flake_eval_flags.add_argument("--refresh", action="store_true") + flake_eval_flags.add_argument("--impure", action="store_true") + flake_eval_flags.add_argument("--recreate-lock-file", action="store_true") + flake_eval_flags.add_argument("--no-update-lock-file", action="store_true") + flake_eval_flags.add_argument("--no-write-lock-file", action="store_true") + flake_eval_flags.add_argument("--no-registries", action="store_true") + flake_eval_flags.add_argument("--commit-lock-file", action="store_true") + flake_eval_flags.add_argument("--update-input", action="append") + flake_eval_flags.add_argument("--override-input", nargs=2, action="append") classic_build_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) classic_build_flags.add_argument( @@ -74,6 +78,7 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa "common_flags": common_flags, "common_build_flags": common_build_flags, "flake_common_flags": flake_common_flags, + "flake_eval_flags": flake_eval_flags, "classic_build_flags": classic_build_flags, "copy_flags": copy_flags, } diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py index 8cfe53f8e77a..f8c20878f5e1 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/models.py @@ -150,8 +150,8 @@ class GroupedNixArgs: build_flags: Args common_flags: Args copy_flags: Args + flake_eval_flags: Args flake_build_flags: Args - flake_common_flags: Args @classmethod def from_parsed_args_groups(cls, args_groups: dict[str, Namespace]) -> Self: @@ -159,6 +159,7 @@ class GroupedNixArgs: common_build_flags = common_flags | vars(args_groups["common_build_flags"]) build_flags = common_build_flags | vars(args_groups["classic_build_flags"]) flake_common_flags = common_flags | vars(args_groups["flake_common_flags"]) + flake_eval_flags = vars(args_groups["flake_eval_flags"]) flake_build_flags = common_build_flags | flake_common_flags copy_flags = common_flags | vars(args_groups["copy_flags"]) # --no-build-output -> --no-link @@ -169,8 +170,8 @@ class GroupedNixArgs: build_flags=build_flags, common_flags=common_flags, copy_flags=copy_flags, + flake_eval_flags=flake_eval_flags, flake_build_flags=flake_build_flags, - flake_common_flags=flake_common_flags, ) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py index 5d3a74ea821e..735be1680013 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py @@ -43,7 +43,9 @@ def reexec( drv = nix.build_flake( NIXOS_REBUILD_ATTR, flake, - grouped_nix_args.flake_build_flags | {"no_link": True}, + grouped_nix_args.flake_build_flags + | grouped_nix_args.flake_eval_flags + | {"no_link": True}, ) else: build_attr = BuildAttr.from_arg(args.attr, args.file) @@ -101,7 +103,8 @@ def _get_system_attr( case Action.BUILD_IMAGE if flake: variants = nix.get_build_image_variants_flake( flake, - eval_flags=grouped_nix_args.flake_common_flags, + eval_flags=grouped_nix_args.flake_build_flags + | grouped_nix_args.flake_eval_flags, ) _validate_image_variant(args.image_variant, variants) attr = f"config.system.build.images.{args.image_variant}" @@ -164,7 +167,8 @@ def _build_system( attr, flake, build_host, - eval_flags=grouped_nix_args.flake_common_flags, + eval_flags=grouped_nix_args.flake_build_flags + | grouped_nix_args.flake_eval_flags, flake_build_flags={"no_link": no_link, "dry_run": dry_run} | grouped_nix_args.flake_build_flags, copy_flags=grouped_nix_args.copy_flags, @@ -174,7 +178,8 @@ def _build_system( attr, flake, flake_build_flags={"no_link": no_link, "dry_run": dry_run} - | grouped_nix_args.flake_build_flags, + | grouped_nix_args.flake_build_flags + | grouped_nix_args.flake_eval_flags, ) case (Remote(_), None): path_to_config = nix.build_remote( @@ -259,7 +264,8 @@ def _activate_system( image_name = nix.get_build_image_name_flake( flake, args.image_variant, - eval_flags=grouped_nix_args.flake_common_flags, + eval_flags=grouped_nix_args.flake_build_flags + | grouped_nix_args.flake_eval_flags, ) else: image_name = nix.get_build_image_name( @@ -329,7 +335,10 @@ def build_and_activate_system( def edit(flake: Flake | None, grouped_nix_args: GroupedNixArgs) -> None: if flake: - nix.edit_flake(flake, grouped_nix_args.flake_build_flags) + nix.edit_flake( + flake, + grouped_nix_args.flake_build_flags | grouped_nix_args.flake_eval_flags, + ) else: nix.edit() @@ -360,7 +369,10 @@ def repl( grouped_nix_args: GroupedNixArgs, ) -> None: if flake: - nix.repl_flake(flake, grouped_nix_args.flake_build_flags) + nix.repl_flake( + flake, + grouped_nix_args.flake_build_flags | grouped_nix_args.flake_eval_flags, + ) else: nix.repl(build_attr, grouped_nix_args.build_flags) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py index cd8716c7d024..8d922809b05d 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py @@ -97,13 +97,8 @@ def test_parse_args() -> None: "foo2", "bar2", ] - assert nr.utils.dict_to_flags(g1.flake_common_flags) == [ - "--option", - "foo1", - "bar1", - "--option", - "foo2", - "bar2", + # flake_eval_flags contains only eval-specific flags + assert nr.utils.dict_to_flags(g1.flake_eval_flags) == [ "--update-input", "input1", "--update-input", @@ -115,6 +110,15 @@ def test_parse_args() -> None: "override2", "input2", ] + # flake_build_flags contains common build flags (for remote builds) + assert nr.utils.dict_to_flags(g1.flake_build_flags) == [ + "--option", + "foo1", + "bar1", + "--option", + "foo2", + "bar2", + ] r2, g2 = nr.parse_args( [ diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py index 544233e6fd73..bc6bbdee3dda 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_models.py @@ -180,3 +180,46 @@ def test_profile_from_arg(mock_mkdir: Mock) -> None: Path("/nix/var/nix/profiles/system-profiles/something"), ) mock_mkdir.assert_called_once() + + +def test_grouped_nix_args_flake_build_flags() -> None: + """Test that flake_build_flags excludes evaluation-only flags.""" + from argparse import Namespace + + args_groups = { + "common_flags": Namespace(v=0, quiet=0, max_jobs=None, cores=None), + "common_build_flags": Namespace(builders=None, include=None), + "flake_common_flags": Namespace(offline=True, no_net=False), + "flake_eval_flags": Namespace( + override_input=[["nixpkgs", "/local"]], + impure=True, + refresh=True, + accept_flake_config=False, + recreate_lock_file=False, + no_update_lock_file=False, + no_write_lock_file=False, + no_registries=False, + commit_lock_file=False, + update_input=None, + ), + "classic_build_flags": Namespace(no_build_output=False), + "copy_flags": Namespace(s=False), + } + + grouped = m.GroupedNixArgs.from_parsed_args_groups(args_groups) + + # flake_eval_flags should contain ONLY eval-only flags + assert "override_input" in grouped.flake_eval_flags + assert "impure" in grouped.flake_eval_flags + assert "refresh" in grouped.flake_eval_flags + # flake_eval_flags should NOT contain common/build flags + assert "offline" not in grouped.flake_eval_flags + + # flake_build_flags should NOT contain eval-only flags + assert "override_input" not in grouped.flake_build_flags + assert "impure" not in grouped.flake_build_flags + assert "refresh" not in grouped.flake_build_flags + + # But flake_build_flags should still have common flags + assert "offline" in grouped.flake_build_flags + assert grouped.flake_build_flags["offline"] is True diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_services.py index 7fec0818954e..529073e62464 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_services.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_services.py @@ -23,8 +23,8 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) - build_flags={"build": True}, common_flags={"common": True}, copy_flags={"copy": True}, + flake_eval_flags={"flake_eval": True}, flake_build_flags={"flake_build": True}, - flake_common_flags={"flake_common": True}, ) s.reexec(argv, args, grouped_nix_args) mock_build.assert_has_calls( @@ -76,14 +76,14 @@ def test_reexec_flake( build_flags={"build": True}, common_flags={"common": True}, copy_flags={"copy": True}, + flake_eval_flags={"flake_eval": True}, flake_build_flags={"flake_build": True}, - flake_common_flags={"flake_common": True}, ) s.reexec(argv, args, grouped_nix_args) mock_build.assert_called_once_with( s.NIXOS_REBUILD_ATTR, n.models.Flake(ANY, ANY), - {"flake_build": True, "no_link": True}, + {"flake_build": True, "flake_eval": True, "no_link": True}, ) # do not exec if there is no new version mock_execve.assert_not_called() @@ -122,8 +122,8 @@ def test_reexec_skip_if_already_reexec(mock_build: Mock, mock_execve: Mock) -> N build_flags={"build": True}, common_flags={"common": True}, copy_flags={"copy": True}, + flake_eval_flags={"flake_eval": True}, flake_build_flags={"flake_build": True}, - flake_common_flags={"flake_common": True}, ) s.reexec(argv, args, grouped_nix_args) mock_build.assert_not_called() diff --git a/pkgs/by-name/ni/nixos-render-docs/README.md b/pkgs/by-name/ni/nixos-render-docs/README.md index 4c0af6db096e..5c8742765582 100644 --- a/pkgs/by-name/ni/nixos-render-docs/README.md +++ b/pkgs/by-name/ni/nixos-render-docs/README.md @@ -13,7 +13,7 @@ Maintaining our own documentation rendering framework may appear extreme but has - The amount of code involved is minimal because it's single-purpose Several alternatives to `nixos-render-docs` were discussed in the past. -A detailed analysis can be found in a [table comparing documentation rendering framework](https://ethercalc.net/dc4vcnnl8zv0). +A detailed analysis can be found in a [table comparing documentation rendering frameworks](https://ethercalc.net/dc4vcnnl8zv0). ## Redirects system @@ -78,7 +78,7 @@ In case this identifier is renamed, the mapping would change into: ## Rendering multiple pages -The `include` directive accepts an argument `into-file` to specify the file into which the imported markdown should be rendered to. We can use this argument to set up multipage rendering of the manuals. +The `include` directive accepts an argument `into-file` to specify the file into which the imported markdown should be rendered. We can use this argument to set up multipage rendering of the manuals. For example diff --git a/pkgs/by-name/nj/njam/package.nix b/pkgs/by-name/nj/njam/package.nix index ab96bc160e7c..5e858b0dc690 100644 --- a/pkgs/by-name/nj/njam/package.nix +++ b/pkgs/by-name/nj/njam/package.nix @@ -8,12 +8,12 @@ SDL_net, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "njam"; version = "1.25"; src = fetchurl { - url = "mirror://sourceforge/njam/njam-${version}-src.tar.gz"; + url = "mirror://sourceforge/njam/njam-${finalAttrs.version}-src.tar.gz"; sha256 = "0ysvqw017xkvddj957pdfmbmji7qi20nyr7f0zxvcvm6c7d3cc7s"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/nl/nlojet/package.nix b/pkgs/by-name/nl/nlojet/package.nix index 501e80f2ddd8..975fe5d33fc2 100644 --- a/pkgs/by-name/nl/nlojet/package.nix +++ b/pkgs/by-name/nl/nlojet/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nlojet++"; version = "4.1.3"; src = fetchurl { - url = "https://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz"; + url = "https://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${finalAttrs.version}.tar.gz"; sha256 = "18qfn5kjzvnyh29x40zm2maqzfmrnay9r58n8pfpq5lcphdhhv8p"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; }; -} +}) diff --git a/pkgs/by-name/nm/nmap/package.nix b/pkgs/by-name/nm/nmap/package.nix index d16274c7342b..f141e7f8fe4d 100644 --- a/pkgs/by-name/nm/nmap/package.nix +++ b/pkgs/by-name/nm/nmap/package.nix @@ -14,12 +14,12 @@ withLua ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nmap"; version = "7.98"; src = fetchurl { - url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; + url = "https://nmap.org/dist/nmap-${finalAttrs.version}.tar.bz2"; hash = "sha256-zoRzE+qunlyfIXCOQtKre1bH4OuIA3KaMJL1iIbYl+Y="; }; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = { description = "Free and open source utility for network discovery and security auditing"; homepage = "http://www.nmap.org"; - changelog = "https://nmap.org/changelog.html#${version}"; + changelog = "https://nmap.org/changelog.html#${finalAttrs.version}"; license = lib.licenses.gpl2Only; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { fpletz ]; }; -} +}) diff --git a/pkgs/by-name/nm/nmon/package.nix b/pkgs/by-name/nm/nmon/package.nix index 13a991261fe7..392641dcb867 100644 --- a/pkgs/by-name/nm/nmon/package.nix +++ b/pkgs/by-name/nm/nmon/package.nix @@ -5,18 +5,18 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nmon"; version = "16q"; src = fetchurl { - url = "mirror://sourceforge/nmon/lmon${version}.c"; + url = "mirror://sourceforge/nmon/lmon${finalAttrs.version}.c"; sha256 = "sha256-G3ioFnLBkpGz0RpuMZ3ZsjoCKiYtuh786gCNbfUaylE="; }; buildInputs = [ ncurses ]; dontUnpack = true; - buildPhase = "${stdenv.cc.targetPrefix}cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D ${ + buildPhase = "${stdenv.cc.targetPrefix}cc -o nmon ${finalAttrs.src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D ${ with stdenv.hostPlatform; if isx86 then "X86" @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ sveitser ]; }; -} +}) diff --git a/pkgs/by-name/nm/nmrpflash/package.nix b/pkgs/by-name/nm/nmrpflash/package.nix index 39965f82c63f..ac616ee67405 100644 --- a/pkgs/by-name/nm/nmrpflash/package.nix +++ b/pkgs/by-name/nm/nmrpflash/package.nix @@ -6,14 +6,14 @@ pkg-config, stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nmrpflash"; version = "0.9.26"; src = fetchFromGitHub { owner = "jclehner"; repo = "nmrpflash"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-I+6bZtiwR1DbZ8ykIBVBqo1LdQftUaU301aMh01StqU="; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; PREFIX = "${placeholder "out"}"; - STANDALONE_VERSION = version; + STANDALONE_VERSION = finalAttrs.version; preInstall = '' mkdir -p $out/bin @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { mainProgram = "nmrpflash"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/nm/nms/package.nix b/pkgs/by-name/nm/nms/package.nix index 270e34a4ea97..043186785d48 100644 --- a/pkgs/by-name/nm/nms/package.nix +++ b/pkgs/by-name/nm/nms/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nms"; version = "1.0.1"; src = fetchFromGitHub { owner = "bartobri"; repo = "no-more-secrets"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-QVCEpplsZCSQ+Fq1LBtCuPBvnzgLsmLcSrxR+e4nA5I="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/nn/nnpdf/package.nix b/pkgs/by-name/nn/nnpdf/package.nix index 6ed461495f4d..ace23e580293 100644 --- a/pkgs/by-name/nn/nnpdf/package.nix +++ b/pkgs/by-name/nn/nnpdf/package.nix @@ -14,14 +14,14 @@ swig, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nnpdf"; version = "4.0.9"; src = fetchFromGitHub { owner = "NNPDF"; repo = "nnpdf"; - rev = version; + rev = finalAttrs.version; hash = "sha256-PyhkHlOlzKfDxUX91NkeZWjdEzFR4PW0Yh5Yz6ZA27g="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.veprbl ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/no/nodenv/package.nix b/pkgs/by-name/no/nodenv/package.nix index ba7447b0cc26..cda86406bdd0 100644 --- a/pkgs/by-name/no/nodenv/package.nix +++ b/pkgs/by-name/no/nodenv/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nodenv"; version = "1.5.0"; src = fetchFromGitHub { owner = "nodenv"; repo = "nodenv"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-PGeZKL7qsffMAZIsCLB244Fuu48GyWw5Rh67ePu6h38="; }; @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { description = "Manage multiple NodeJS versions"; mainProgram = "nodenv"; homepage = "https://github.com/nodenv/nodenv/"; - changelog = "https://github.com/nodenv/nodenv/releases/tag/v${version}"; + changelog = "https://github.com/nodenv/nodenv/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ alexnortung ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix index 483b345a9bd9..1faa5263eec1 100644 --- a/pkgs/by-name/no/notcurses/package.nix +++ b/pkgs/by-name/no/notcurses/package.nix @@ -15,14 +15,14 @@ qrcodegen, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "notcurses"; version = "3.0.17"; src = fetchFromGitHub { owner = "dankamongmen"; repo = "notcurses"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-HbyQmuxwfEWlSe/y6w0ZRui0NCFYb0SJh7YA6PC3jdY="; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; inherit (ncurses.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/no/notejot/package.nix b/pkgs/by-name/no/notejot/package.nix index 06b9f447f120..768b91d2ca01 100644 --- a/pkgs/by-name/no/notejot/package.nix +++ b/pkgs/by-name/no/notejot/package.nix @@ -16,14 +16,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "notejot"; version = "3.5.1"; src = fetchFromGitHub { owner = "lainsce"; repo = "notejot"; - rev = version; + rev = finalAttrs.version; hash = "sha256-p5F0OITgfZyvHwndI5r5BE524+nft7A2XfR3BJZFamU="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "io.github.lainsce.Notejot"; }; -} +}) diff --git a/pkgs/by-name/no/notemap/package.nix b/pkgs/by-name/no/notemap/package.nix index db1a555e353f..8fb4432a30f8 100644 --- a/pkgs/by-name/no/notemap/package.nix +++ b/pkgs/by-name/no/notemap/package.nix @@ -6,12 +6,12 @@ libressl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "notemap"; version = "1.3"; src = fetchzip { - url = "https://git.causal.agency/notemap/snapshot/notemap-${version}.tar.gz"; + url = "https://git.causal.agency/notemap/snapshot/notemap-${finalAttrs.version}.tar.gz"; sha256 = "0s9c1xx0iggyzclqw3294bjv7qgvd5l5zgbryks4hvfibr73r6ps"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { homepage = "https://git.causal.agency/notemap/about/"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/no/notify-osd-customizable/package.nix b/pkgs/by-name/no/notify-osd-customizable/package.nix index dec0f271062d..38ba69f7bcc5 100644 --- a/pkgs/by-name/no/notify-osd-customizable/package.nix +++ b/pkgs/by-name/no/notify-osd-customizable/package.nix @@ -16,12 +16,12 @@ let baseURI = "https://launchpad.net/~leolik/+archive/leolik"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "notify-osd"; version = "0.9.35+16.04.20160415"; src = fetchurl { - url = "${baseURI}/+files/notify-osd_${version}-0ubuntu1-leolik~ppa0.tar.gz"; + url = "${baseURI}/+files/notify-osd_${finalAttrs.version}-0ubuntu1-leolik~ppa0.tar.gz"; sha256 = "026dr46jh3xc4103wnslzy7pxbxkkpflh52c59j8vzwaa7bvvzkv"; name = "notify-osd-customizable.tar.gz"; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.imalison ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/no/notmuch-bower/package.nix b/pkgs/by-name/no/notmuch-bower/package.nix index a25b45c6e788..4de7cb94fd55 100644 --- a/pkgs/by-name/no/notmuch-bower/package.nix +++ b/pkgs/by-name/no/notmuch-bower/package.nix @@ -10,14 +10,14 @@ file, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "notmuch-bower"; version = "1.1.1"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-THIMCIk6ugPpogfQ5DTHIgFD7no5IIVYfz2mqBvKBlY="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/no/novnc/package.nix b/pkgs/by-name/no/novnc/package.nix index d27f36c17375..d39c6484f562 100644 --- a/pkgs/by-name/no/novnc/package.nix +++ b/pkgs/by-name/no/novnc/package.nix @@ -6,14 +6,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "novnc"; version = "1.6.0"; src = fetchFromGitHub { owner = "novnc"; repo = "noVNC"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-VYG0p70ZvRzK9IeA+5J95FqF+zWgj/8EcxnVOk+YL9o="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ neverbehave ]; mainProgram = "novnc"; }; -} +}) diff --git a/pkgs/by-name/np/npth/package.nix b/pkgs/by-name/np/npth/package.nix index b73afcaf3438..146a238d40e4 100644 --- a/pkgs/by-name/np/npth/package.nix +++ b/pkgs/by-name/np/npth/package.nix @@ -6,12 +6,12 @@ pkgsCross, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "npth"; version = "1.8"; src = fetchurl { - url = "mirror://gnupg/npth/npth-${version}.tar.bz2"; + url = "mirror://gnupg/npth/npth-${finalAttrs.version}.tar.bz2"; hash = "sha256-i9JLTyOjBl1uWybpirqc54PqT9eBBpwbNdFJaU6Qyj4="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/nq/nq/package.nix b/pkgs/by-name/nq/nq/package.nix index 28e2b1eefc7f..a70d1dfefa24 100644 --- a/pkgs/by-name/nq/nq/package.nix +++ b/pkgs/by-name/nq/nq/package.nix @@ -5,7 +5,7 @@ perl, # for tests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nq"; version = "1.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "leahneukirchen"; repo = "nq"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-gdVBSE2a4rq46o0uO9ICww6zicVgn6ykf4CeJ/MmiF4="; }; @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { meta = { description = "Unix command line queue utility"; homepage = "https://github.com/leahneukirchen/nq"; - changelog = "https://github.com/leahneukirchen/nq/blob/v${version}/NEWS.md"; + changelog = "https://github.com/leahneukirchen/nq/blob/v${finalAttrs.version}/NEWS.md"; license = lib.licenses.publicDomain; platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/nq/nqc/package.nix b/pkgs/by-name/nq/nqc/package.nix index ab10ff8fcc0d..1e7287b2ed86 100644 --- a/pkgs/by-name/nq/nqc/package.nix +++ b/pkgs/by-name/nq/nqc/package.nix @@ -5,12 +5,12 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nqc"; version = "3.1.r6"; src = fetchurl { - url = "https://bricxcc.sourceforge.net/nqc/release/nqc-${version}.tgz"; + url = "https://bricxcc.sourceforge.net/nqc/release/nqc-${finalAttrs.version}.tgz"; sha256 = "sha256-v9XmVPY5r3pYjP3vTSK9Xvz/9UexClbOvr3ljvK/52Y="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mpl10; maintainers = with lib.maintainers; [ christophcharles ]; }; -} +}) diff --git a/pkgs/by-name/nq/nqptp/package.nix b/pkgs/by-name/nq/nqptp/package.nix index bd536ebd8043..3ebecf9c898c 100644 --- a/pkgs/by-name/nq/nqptp/package.nix +++ b/pkgs/by-name/nq/nqptp/package.nix @@ -7,14 +7,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.2.4"; pname = "nqptp"; src = fetchFromGitHub { owner = "mikebrady"; repo = "nqptp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-roTNcr3v2kzE6vQ5plAVtlw1+2yJplltOYsGGibtoZo="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; -} +}) diff --git a/pkgs/by-name/ns/nsis/package.nix b/pkgs/by-name/ns/nsis/package.nix index b99bdf9ca9ea..172d5d0459a5 100644 --- a/pkgs/by-name/ns/nsis/package.nix +++ b/pkgs/by-name/ns/nsis/package.nix @@ -9,22 +9,22 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nsis"; version = "3.11"; src = fetchurl { - url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2"; + url = "mirror://sourceforge/project/nsis/NSIS%203/${finalAttrs.version}/nsis-${finalAttrs.version}-src.tar.bz2"; sha256 = "19e72062676ebdc67c11dc032ba80b979cdbffd3886c60b04bb442cdd401ff4b"; }; srcWinDistributable = fetchzip { - url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip"; + url = "mirror://sourceforge/project/nsis/NSIS%203/${finalAttrs.version}/nsis-${finalAttrs.version}.zip"; sha256 = "e574f335ab9d3ad73118f46615e5c9f2a52f3e4622ecbb7e5886badbc8601348"; }; postUnpack = '' mkdir -p $out/share/nsis - cp -avr ${srcWinDistributable}/{Contrib,Include,Plugins,Stubs} \ + cp -avr ${finalAttrs.srcWinDistributable}/{Contrib,Include,Plugins,Stubs} \ $out/share/nsis chmod -R u+w $out/share/nsis ''; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "SKIPUTILS=all" "SKIPMISC=all" "NSIS_CONFIG_CONST_DATA=no" - "VERSION=${version}" + "VERSION=${finalAttrs.version}" ] ++ lib.optional stdenv.hostPlatform.isDarwin "APPEND_LINKFLAGS=-liconv"; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { mainProgram = "makensis"; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ns/nsnake/package.nix b/pkgs/by-name/ns/nsnake/package.nix index 78ff27090da4..8b2ce6607c98 100644 --- a/pkgs/by-name/ns/nsnake/package.nix +++ b/pkgs/by-name/ns/nsnake/package.nix @@ -5,14 +5,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nsnake"; version = "3.0.1"; src = fetchFromGitHub { owner = "alexdantas"; repo = "nSnake"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-MixwIhyymruruV8G8PjmR9EoZBpaDVBCKBccSFL0lS8="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ clerie ]; }; -} +}) diff --git a/pkgs/by-name/ns/nspr/package.nix b/pkgs/by-name/ns/nspr/package.nix index 17c205840377..e23c676c7b0a 100644 --- a/pkgs/by-name/ns/nspr/package.nix +++ b/pkgs/by-name/ns/nspr/package.nix @@ -6,12 +6,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nspr"; version = "4.38.2"; src = fetchurl { - url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; + url = "mirror://mozilla/nspr/releases/v${finalAttrs.version}/src/nspr-${finalAttrs.version}.tar.gz"; hash = "sha256-5Akvrqt3vcmzLbERPkIVlI7naOJsRmbbO1pgs18skQU="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.mpl20; }; -} +}) diff --git a/pkgs/by-name/ns/nss_ldap/package.nix b/pkgs/by-name/ns/nss_ldap/package.nix index 5e6702eead58..d1cd40253f31 100644 --- a/pkgs/by-name/ns/nss_ldap/package.nix +++ b/pkgs/by-name/ns/nss_ldap/package.nix @@ -6,12 +6,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nss_ldap"; version = "265"; src = fetchurl { - url = "http://www.padl.com/download/nss_ldap-${version}.tar.gz"; + url = "http://www.padl.com/download/nss_ldap-${finalAttrs.version}.tar.gz"; sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ns/nss_wrapper/package.nix b/pkgs/by-name/ns/nss_wrapper/package.nix index a86a20c8eaaa..58f9b5925865 100644 --- a/pkgs/by-name/ns/nss_wrapper/package.nix +++ b/pkgs/by-name/ns/nss_wrapper/package.nix @@ -6,12 +6,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nss_wrapper"; version = "1.1.16"; src = fetchurl { - url = "mirror://samba/cwrap/nss_wrapper-${version}.tar.gz"; + url = "mirror://samba/cwrap/nss_wrapper-${finalAttrs.version}.tar.gz"; sha256 = "sha256-3HmrByd5vkQDtFtgzQRN0TeA1LuWddJ6vxkyrafIqI0="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ns/nssmdns/package.nix b/pkgs/by-name/ns/nssmdns/package.nix index f58f47b00b61..981fa15fafb1 100644 --- a/pkgs/by-name/ns/nssmdns/package.nix +++ b/pkgs/by-name/ns/nssmdns/package.nix @@ -6,14 +6,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nss-mdns"; version = "0.15.1"; src = fetchFromGitHub { owner = "avahi"; repo = "nss-mdns"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-iRaf9/gu9VkGi1VbGpxvC5q+0M8ivezCz/oAKEg5V1M="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.gnu ++ lib.platforms.linux ++ lib.platforms.freebsd; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ns/nsync/package.nix b/pkgs/by-name/ns/nsync/package.nix index 601376952bd6..52c8276d9a5e 100644 --- a/pkgs/by-name/ns/nsync/package.nix +++ b/pkgs/by-name/ns/nsync/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nsync"; version = "1.29.2"; src = fetchFromGitHub { owner = "google"; repo = "nsync"; - rev = version; + rev = finalAttrs.version; hash = "sha256-RAwrS8Vz5fZwZRvF4OQfn8Ls11S8OIV2TmJpNrBE4MI="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/nt/ntbtls/package.nix b/pkgs/by-name/nt/ntbtls/package.nix index 4de2601cb3e0..3ccaed6883af 100644 --- a/pkgs/by-name/nt/ntbtls/package.nix +++ b/pkgs/by-name/nt/ntbtls/package.nix @@ -9,12 +9,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ntbtls"; version = "0.3.2"; src = fetchurl { - url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2"; + url = "mirror://gnupg/ntbtls/ntbtls-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-vfy5kCSs7JxsS5mK1juzkh30z+5KdyrWwMoyTbvysHw="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ joachifm ]; }; -} +}) diff --git a/pkgs/by-name/nt/ntfs2btrfs/package.nix b/pkgs/by-name/nt/ntfs2btrfs/package.nix index b45feea7c651..7ad2579512c4 100644 --- a/pkgs/by-name/nt/ntfs2btrfs/package.nix +++ b/pkgs/by-name/nt/ntfs2btrfs/package.nix @@ -13,14 +13,14 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ntfs2btrfs"; version = "20250616"; src = fetchFromGitHub { owner = "maharmstone"; repo = "ntfs2btrfs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-hRPidvpBVm42Rg+acwHQ6b8WHGMPbE6SHwlrQrB+fD8="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { mainProgram = "ntfs2btrfs"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/nt/ntirpc/package.nix b/pkgs/by-name/nt/ntirpc/package.nix index 5e2423ee3bfc..f2b8f7bef38a 100644 --- a/pkgs/by-name/nt/ntirpc/package.nix +++ b/pkgs/by-name/nt/ntirpc/package.nix @@ -10,14 +10,14 @@ prometheus-cpp-lite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ntirpc"; version = "7.2"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "ntirpc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-4E6wDAwinCNn7arRgBulg7e0x9S/steh+mjwNY4X3Vc="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/nt/ntk/package.nix b/pkgs/by-name/nt/ntk/package.nix index da570f2672ad..518ab796b8f7 100644 --- a/pkgs/by-name/nt/ntk/package.nix +++ b/pkgs/by-name/nt/ntk/package.nix @@ -10,13 +10,13 @@ wafHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ntk"; version = "1.3.1001"; src = fetchFromGitHub { owner = "linuxaudio"; repo = "ntk"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-NyEdg6e+9CI9V+TIgdpPyH1ei+Vq8pUxD3wPzWY5fEU="; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Fork of FLTK 1.3.0 with additional functionality"; - version = version; + version = finalAttrs.version; homepage = "http://non.tuxfamily.org/"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/nt/ntp/package.nix b/pkgs/by-name/nt/ntp/package.nix index 916ad6a4e2f1..ea7fda8098a9 100644 --- a/pkgs/by-name/nt/ntp/package.nix +++ b/pkgs/by-name/nt/ntp/package.nix @@ -9,12 +9,12 @@ libcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ntp"; version = "4.2.8p18"; src = fetchurl { - url = "https://archive.ntp.org/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz"; + url = "https://archive.ntp.org/ntp4/ntp-${lib.versions.majorMinor finalAttrs.version}/ntp-${finalAttrs.version}.tar.gz"; hash = "sha256-z4TF8/saKVKElCYk2CP/+mNBROCWz8T5lprJjvX0aOU="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/nt/ntttcp/package.nix b/pkgs/by-name/nt/ntttcp/package.nix index fdcf2dc1f6c1..b70b308b26b2 100644 --- a/pkgs/by-name/nt/ntttcp/package.nix +++ b/pkgs/by-name/nt/ntttcp/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ntttcp"; version = "1.4.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "ntttcp-for-linux"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-6O7qSrR6EFr7k9lHQHGs/scZxJJ5DBNDxlSL5hzlRf4="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ntttcp"; }; -} +}) diff --git a/pkgs/by-name/nu/nudoku/package.nix b/pkgs/by-name/nu/nudoku/package.nix index 1234f3177f37..81f21feb46b0 100644 --- a/pkgs/by-name/nu/nudoku/package.nix +++ b/pkgs/by-name/nu/nudoku/package.nix @@ -9,14 +9,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nudoku"; version = "5.0.0"; src = fetchFromGitHub { owner = "jubalh"; repo = "nudoku"; - rev = version; + rev = finalAttrs.version; hash = "sha256-aOtP23kNd15DdV6on7o80QnEf0CiUBubHfFE8M1mhg0="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ weathercold ]; }; -} +}) diff --git a/pkgs/by-name/nu/nullidentdmod/package.nix b/pkgs/by-name/nu/nullidentdmod/package.nix index ad2c1206321f..170686f4bcdf 100644 --- a/pkgs/by-name/nu/nullidentdmod/package.nix +++ b/pkgs/by-name/nu/nullidentdmod/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nullidentdmod"; version = "1.3"; src = fetchFromGitHub { owner = "Ranthrall"; repo = "nullidentdmod"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1ahwm5pyidc6m07rh5ls2lc25kafrj233nnbcybprgl7bqdq1b0k"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ das_j ]; platforms = lib.platforms.linux; # Must be run by systemd }; -} +}) diff --git a/pkgs/by-name/nu/nulloy/package.nix b/pkgs/by-name/nu/nulloy/package.nix index 661e22c72235..87242233ac22 100644 --- a/pkgs/by-name/nu/nulloy/package.nix +++ b/pkgs/by-name/nu/nulloy/package.nix @@ -11,14 +11,14 @@ gst_all_1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nulloy"; version = "0.9.9"; src = fetchFromGitHub { owner = "nulloy"; repo = "nulloy"; - rev = version; + rev = finalAttrs.version; hash = "sha256-vFg789vBV7ks+4YiWWl3u0/kQjzpAiX8dMfXU0hynDM="; }; @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { meta = { description = "Music player with a waveform progress bar"; homepage = "https://nulloy.com"; - changelog = "https://github.com/nulloy/nulloy/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/nulloy/nulloy/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.gpl3Only; mainProgram = "nulloy"; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/nu/num-utils/package.nix b/pkgs/by-name/nu/num-utils/package.nix index d07cdba31012..d0d8a32b8421 100644 --- a/pkgs/by-name/nu/num-utils/package.nix +++ b/pkgs/by-name/nu/num-utils/package.nix @@ -5,12 +5,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "num-utils"; version = "0.5"; src = fetchurl { - url = "https://suso.suso.org/programs/num-utils/downloads/num-utils-${version}.tar.gz"; + url = "https://suso.suso.org/programs/num-utils/downloads/num-utils-${finalAttrs.version}.tar.gz"; sha256 = "0kn6yskjww2agcqvas5l2xp55mp4njdxqkdicchlji3qzih2fn83"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/nu/numactl/package.nix b/pkgs/by-name/nu/numactl/package.nix index 43cec54a2fc7..68407c7075b7 100644 --- a/pkgs/by-name/nu/numactl/package.nix +++ b/pkgs/by-name/nu/numactl/package.nix @@ -6,14 +6,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "numactl"; version = "2.0.18"; src = fetchFromGitHub { owner = "numactl"; repo = "numactl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ry29RUNa0Hv5gIhy2RTVT94mHhgfdIwb5aqjBycxxj0="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { ]; # libnuma is lgpl21 platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index 09993322d130..74cca53a7c9e 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "numbat"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "numbat"; tag = "v${version}"; - hash = "sha256-afQlT7SaqYlSaBiEDWOOrjCG+ZsnxIVfxSWrHh+P9Mk="; + hash = "sha256-Wh7HmE9UPu7+/aguaqON2/pmEHulYw69O0YjoKeDuRg="; }; - cargoHash = "sha256-y4/yH+bnTivLmck7jREa5vn/ZEDxsaetTyFyvd3hi6c="; + cargoHash = "sha256-F8fjrkQVWmDKGXNYG1e1Fvu9z1EgHC/2zuqN3O/2exE="; env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules"; diff --git a/pkgs/by-name/nu/numdiff/package.nix b/pkgs/by-name/nu/numdiff/package.nix index 5d8f728ade2d..0823780d7816 100644 --- a/pkgs/by-name/nu/numdiff/package.nix +++ b/pkgs/by-name/nu/numdiff/package.nix @@ -5,12 +5,12 @@ libintl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "numdiff"; version = "5.9.0"; src = fetchurl { - url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz"; + url = "mirror://savannah/numdiff/numdiff-${finalAttrs.version}.tar.gz"; sha256 = "1vzmjh8mhwwysn4x4m2vif7q2k8i19x8azq7pzmkwwj4g48lla47"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix b/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix index 3cf4b444d531..5caded156795 100644 --- a/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix +++ b/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix @@ -10,14 +10,14 @@ gtk-engine-murrine, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "numix-solarized-gtk-theme"; version = "20230408"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "numix-solarized-gtk-theme"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-r5xCe8Ew+/SuCUaZ0yjlumORTy/y1VwbQQjQ6uEyGsY="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.offline ]; }; -} +}) diff --git a/pkgs/by-name/nu/nuraft/package.nix b/pkgs/by-name/nu/nuraft/package.nix index 8a367cb66465..25c95d990394 100644 --- a/pkgs/by-name/nu/nuraft/package.nix +++ b/pkgs/by-name/nu/nuraft/package.nix @@ -10,14 +10,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nuraft"; version = "2.1.0"; src = fetchFromGitHub { owner = "eBay"; repo = "NuRaft"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-puO8E7tSLqB0oq/NlzEZqQgIZKm7ZUb4HhR0XuI9dco="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wheelsandmetal ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/by-name/nu/nushell-plugin-dbus/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/dbus.nix rename to pkgs/by-name/nu/nushell-plugin-dbus/package.nix diff --git a/pkgs/shells/nushell/plugins/desktop_notifications.nix b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix similarity index 81% rename from pkgs/shells/nushell/plugins/desktop_notifications.nix rename to pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix index 6886e659903f..88d363befbd4 100644 --- a/pkgs/shells/nushell/plugins/desktop_notifications.nix +++ b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_desktop_notifications"; - version = "0.108.0"; + version = "0.110.0"; src = fetchFromGitHub { owner = "FMotalleb"; repo = "nu_plugin_desktop_notifications"; tag = "v${finalAttrs.version}"; - hash = "sha256-9NkWPoTdMxFlI/BkP8w0ltC6UVh3/tg9gjwBuS3k/Cg="; + hash = "sha256-jd4T0+id/1rpjOWuzqbqxnyvmoe4LCiYux/dJlO3F6c="; }; - cargoHash = "sha256-GK6ytH/SDHh6GlLrSA2oJLza1tvYOUp4cR5CM6bloz8="; + cargoHash = "sha256-7ZiQr8RBQCNQK3/tLasilZcu+HWp066iDFI67L8iZMg="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/by-name/nu/nushell-plugin-formats/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/formats.nix rename to pkgs/by-name/nu/nushell-plugin-formats/package.nix diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/by-name/nu/nushell-plugin-gstat/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/gstat.nix rename to pkgs/by-name/nu/nushell-plugin-gstat/package.nix diff --git a/pkgs/shells/nushell/plugins/hcl.nix b/pkgs/by-name/nu/nushell-plugin-hcl/package.nix similarity index 82% rename from pkgs/shells/nushell/plugins/hcl.nix rename to pkgs/by-name/nu/nushell-plugin-hcl/package.nix index 8576fe1cfb26..1897861520c2 100644 --- a/pkgs/shells/nushell/plugins/hcl.nix +++ b/pkgs/by-name/nu/nushell-plugin-hcl/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_hcl"; - version = "0.108.0"; + version = "0.110.0"; src = fetchFromGitHub { owner = "Yethal"; repo = "nu_plugin_hcl"; tag = finalAttrs.version; - hash = "sha256-WyZ8uSYWNzurqpE+BP0hKsknurP7Iyf5L8Y5DjVQZsA="; + hash = "sha256-8P0gNLe8OjB3NoDxHtDUp859O1O4WwmDeACJe5u8GPg="; }; - cargoHash = "sha256-2b/0B9W01gGuGc482DYQSbRR2LLZXQxUG2fYB5TklPQ="; + cargoHash = "sha256-ACtnklcypc2gjWujPSLUgwGbah2G+QHLD7fr7S7QNAg="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix similarity index 83% rename from pkgs/shells/nushell/plugins/highlight.nix rename to pkgs/by-name/nu/nushell-plugin-highlight/package.nix index 2c119c71a676..716eba425c10 100644 --- a/pkgs/shells/nushell/plugins/highlight.nix +++ b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_highlight"; - version = "1.4.10+0.108.0"; + version = "1.4.12+0.110.0"; src = fetchFromGitHub { owner = "cptpiepmatz"; repo = "nu-plugin-highlight"; tag = "v${finalAttrs.version}"; - hash = "sha256-ynvLvGMxFiYOYGPDdlv1509lWU5DpfBK9Mwa9gLeHsI="; + hash = "sha256-20b+EiB95BzDVWibWQuG8ozPRV8LbxG7fHEbyTk3xTE="; fetchSubmodules = true; }; - cargoHash = "sha256-Xq7ctnzcrSPzo3M3p3Vxtj0U0U9Miw+2VuyYs6P3GlQ="; + cargoHash = "sha256-pkLcTjZYLERMhK18zPdfldHrECHXQpcg5i6rsyxw7nQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/by-name/nu/nushell-plugin-net/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/net.nix rename to pkgs/by-name/nu/nushell-plugin-net/package.nix diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/by-name/nu/nushell-plugin-polars/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/polars.nix rename to pkgs/by-name/nu/nushell-plugin-polars/package.nix diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/by-name/nu/nushell-plugin-query/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/query.nix rename to pkgs/by-name/nu/nushell-plugin-query/package.nix diff --git a/pkgs/shells/nushell/plugins/semver.nix b/pkgs/by-name/nu/nushell-plugin-semver/package.nix similarity index 81% rename from pkgs/shells/nushell/plugins/semver.nix rename to pkgs/by-name/nu/nushell-plugin-semver/package.nix index 131106f8c63b..9be26f55ebcb 100644 --- a/pkgs/shells/nushell/plugins/semver.nix +++ b/pkgs/by-name/nu/nushell-plugin-semver/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_semver"; - version = "0.11.8"; + version = "0.11.14"; src = fetchFromGitHub { owner = "abusch"; repo = "nu_plugin_semver"; tag = "v${finalAttrs.version}"; - hash = "sha256-ui9zyE5g4LiU2+Csv4p0D61fmPXaDMhnpQ34ggEg3eA="; + hash = "sha256-mfwgwY/iYdMz8Qn6a9zfpMHWHl2n1Q8ClkT+KiCAGyk="; }; - cargoHash = "sha256-5W0GbKz18rQ+3TjNanzV4H4LE/7TLZ+8/FbGHffE2RY="; + cargoHash = "sha256-5zVqMUC+wg2joo1DKuTUdRwsC5iH7uuyML9SnB2bZCs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/shells/nushell/plugins/skim.nix b/pkgs/by-name/nu/nushell-plugin-skim/package.nix similarity index 81% rename from pkgs/shells/nushell/plugins/skim.nix rename to pkgs/by-name/nu/nushell-plugin-skim/package.nix index 80060c2ea7a4..62529940b426 100644 --- a/pkgs/shells/nushell/plugins/skim.nix +++ b/pkgs/by-name/nu/nushell-plugin-skim/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_skim"; - version = "0.20.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "idanarye"; repo = "nu_plugin_skim"; tag = "v${finalAttrs.version}"; - hash = "sha256-2CqgtV2DnBd8HqnRdZRiT14aw+meaX4A3ndTGvbsMfo="; + hash = "sha256-TdsemIPbknJiglxhQwBch8iJ9GVa+Sj3fqSq4xaDqfk="; }; - cargoHash = "sha256-3Kua+gZl4Ff6jfSNyEVDbPVH4YfGXhwtuEjcUADecQE="; + cargoHash = "sha256-vpRL4oiOmhnGO+eWWTA7/RvVrtouVzqJvPGZY/cHeXY="; nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/by-name/nu/nushell-plugin-units/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/units.nix rename to pkgs/by-name/nu/nushell-plugin-units/package.nix diff --git a/pkgs/shells/nushell/default.nix b/pkgs/by-name/nu/nushell/package.nix similarity index 94% rename from pkgs/shells/nushell/default.nix rename to pkgs/by-name/nu/nushell/package.nix index 2b52179dc8ae..4e5a2f2b24b9 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/by-name/nu/nushell/package.nix @@ -23,7 +23,7 @@ let # NOTE: when updating this to a new non-patch version, please also try to # update the plugins. Plugins only work if they are compiled for the same # major/minor version. - version = "0.109.1"; + version = "0.110.0"; in rustPlatform.buildRustPackage { pname = "nushell"; @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; tag = version; - hash = "sha256-XNDEfmvmUNS90PU4e/EWFyJeg428R8nFPJHpF3tgRWo="; + hash = "sha256-iytTJZ70kg2Huwj/BSwDX4h9DVDTlJR2gEHAB2pGn/k="; }; - cargoHash = "sha256-UX0WmvrzrWlrTnvMqaWAxoSie7RzQSC4thEb26LAz+A="; + cargoHash = "sha256-a/N0a9ZVqXAjAl5Z7BdEsIp0He3h0S/owS0spEPb3KI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/nu/nusmv/package.nix b/pkgs/by-name/nu/nusmv/package.nix index 9bd86ba048dd..fb32ef5d1a0e 100644 --- a/pkgs/by-name/nu/nusmv/package.nix +++ b/pkgs/by-name/nu/nusmv/package.nix @@ -5,7 +5,7 @@ autoPatchelfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "NuSMV"; version = "2.7.0"; @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { fetchurl ( if isx86_64 && isLinux then { - url = "https://nusmv.fbk.eu/distrib/${version}/NuSMV-${version}-linux64.tar.xz"; + url = "https://nusmv.fbk.eu/distrib/${finalAttrs.version}/NuSMV-${finalAttrs.version}-linux64.tar.xz"; sha256 = "019d1pa5aw58n11is1024hs8d520b3pp2iyix78vp04yv7wd42l8"; } else if isx86_64 && isDarwin then { - url = "https://nusmv.fbk.eu/distrib/${version}/NuSMV-${version}-macos-universal.tar.xz"; + url = "https://nusmv.fbk.eu/distrib/${finalAttrs.version}/NuSMV-${finalAttrs.version}-macos-universal.tar.xz"; sha256 = "098wllv4yx284qv9nsi8kd5pgh10cr1hig01a1p2rxgfmrki52wm"; } else @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/nu/nuttcp/package.nix b/pkgs/by-name/nu/nuttcp/package.nix index a08f346f7be9..dd359bd25a07 100644 --- a/pkgs/by-name/nu/nuttcp/package.nix +++ b/pkgs/by-name/nu/nuttcp/package.nix @@ -5,12 +5,12 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nuttcp"; version = "8.2.2"; src = fetchurl { - url = "http://nuttcp.net/nuttcp/nuttcp-${version}.tar.bz2"; + url = "http://nuttcp.net/nuttcp/nuttcp-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-fq16ieeqoFnSDjQELFihmMKYHK1ylVDROI3fyQNtOYM="; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp nuttcp-${version} $out/bin/nuttcp + cp nuttcp-${finalAttrs.version} $out/bin/nuttcp ''; postInstall = '' @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "nuttcp"; }; -} +}) diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix index 840b684ef3b9..3440a333a980 100644 --- a/pkgs/by-name/nv/nvc/package.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -14,14 +14,14 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nvc"; version = "1.18.2"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; - tag = "r${version}"; + tag = "r${finalAttrs.version}"; hash = "sha256-a1enY86rlLwlRSmY0R4ZfXUo6PddlIAeaKnvfJVcYCQ="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/nv/nvi/package.nix b/pkgs/by-name/nv/nvi/package.nix index 48b381611940..bfb63a2ec043 100644 --- a/pkgs/by-name/nv/nvi/package.nix +++ b/pkgs/by-name/nv/nvi/package.nix @@ -8,12 +8,12 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nvi"; version = "1.81.6"; src = fetchurl { - url = "https://deb.debian.org/debian/pool/main/n/nvi/nvi_${version}.orig.tar.gz"; + url = "https://deb.debian.org/debian/pool/main/n/nvi/nvi_${finalAttrs.version}.orig.tar.gz"; hash = "sha256-i8NIiJFZo0zyaPgHILJvRZ29cjtWFhB9NnOdAH5Ml40="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { aleksana ]; }; -} +}) diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix index 3dafa5e48eac..dc53242f5100 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix @@ -3,14 +3,14 @@ lib, fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nvidia-docker"; version = "2.5.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-docker"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-kHzwFnN/DbpOe1sYDJkrRMxXE1bMiyuCPsbPGq07M9g="; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mkdir bin cp nvidia-docker bin - substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version} + substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${finalAttrs.version} ''; installPhase = '' @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ cpcloud ]; }; -} +}) diff --git a/pkgs/by-name/nv/nvidia-modprobe/package.nix b/pkgs/by-name/nv/nvidia-modprobe/package.nix index 5567889efc80..09e2752e1576 100644 --- a/pkgs/by-name/nv/nvidia-modprobe/package.nix +++ b/pkgs/by-name/nv/nvidia-modprobe/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, gnum4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nvidia-modprobe"; version = "590.48.01"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Vtp5FDDmzbwtDe11O0w/S8Mptpp8Li21/gBfJzfE0/g="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/nv/nvimpager/package.nix b/pkgs/by-name/nv/nvimpager/package.nix index 08c930168ab4..cb02e45ab2dc 100644 --- a/pkgs/by-name/nv/nvimpager/package.nix +++ b/pkgs/by-name/nv/nvimpager/package.nix @@ -11,14 +11,14 @@ util-linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nvimpager"; version = "0.13.0"; src = fetchFromGitHub { owner = "lucc"; repo = "nvimpager"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Au9rRZMZfU4qHi/ng6JO8FnMpySKDbKzr75SBPY3QiA="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.lucc ]; mainProgram = "nvimpager"; }; -} +}) diff --git a/pkgs/by-name/nw/nwg-launchers/package.nix b/pkgs/by-name/nw/nwg-launchers/package.nix index 4ed956ec6e8b..ff6bb71e35b1 100644 --- a/pkgs/by-name/nw/nwg-launchers/package.nix +++ b/pkgs/by-name/nw/nwg-launchers/package.nix @@ -13,14 +13,14 @@ gtk-layer-shell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nwg-launchers"; version = "0.7.1.1"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-launchers"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+waoJHU/QrVH7o9qfwdvFTFJzTGLcV9CeYPn3XHEAkM="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/nw/nwipe/package.nix b/pkgs/by-name/nw/nwipe/package.nix index dbe647f66d00..a808324195b7 100644 --- a/pkgs/by-name/nw/nwipe/package.nix +++ b/pkgs/by-name/nw/nwipe/package.nix @@ -13,14 +13,14 @@ dmidecode, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nwipe"; version = "0.39"; src = fetchFromGitHub { owner = "martijnvanbrummelen"; repo = "nwipe"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-uWsN4DWzmipx/+gfMl8GXTg3pSKT0UPOkqVfdHfUPdA="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/nx/nx-libs/package.nix b/pkgs/by-name/nx/nx-libs/package.nix index de0f1b09400a..f63952b649c5 100644 --- a/pkgs/by-name/nx/nx-libs/package.nix +++ b/pkgs/by-name/nx/nx-libs/package.nix @@ -28,13 +28,13 @@ gccmakedep, libtirpc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nx-libs"; version = "3.5.99.26"; src = fetchFromGitHub { owner = "ArcticaProject"; repo = "nx-libs"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-qVOdD85sBMxKYx1cSLAGKeODsKKAm9UPBmYzPBbBOzQ="; }; @@ -106,4 +106,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix b/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix index 1d14cedc23e2..55ba6bf2ab6d 100644 --- a/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix +++ b/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix @@ -13,14 +13,14 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nxpmicro-mfgtools"; version = "1.5.139"; src = fetchFromGitHub { owner = "nxp-imx"; repo = "mfgtools"; - rev = "uuu_${version}"; + rev = "uuu_${finalAttrs.version}"; sha256 = "sha256-t5usUGbcdLQlqPpZkNDeGncka9VfkpO7U933Kw/Sm7U="; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; - preConfigure = "echo ${version} > .tarball-version"; + preConfigure = "echo ${finalAttrs.version} > .tarball-version"; postInstall = '' # rules printed by the following invocation are static, @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { mainProgram = "uuu"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ny/nyancat/package.nix b/pkgs/by-name/ny/nyancat/package.nix index e69f49da85e3..93595fcae53d 100644 --- a/pkgs/by-name/ny/nyancat/package.nix +++ b/pkgs/by-name/ny/nyancat/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nyancat"; version = "1.5.2"; src = fetchFromGitHub { owner = "klange"; repo = "nyancat"; - rev = version; + rev = finalAttrs.version; sha256 = "1mg8nm5xzcq1xr8cvx24ym2vmafkw53rijllwcdm9miiz0p5ky9k"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "nyancat"; }; -} +}) diff --git a/pkgs/by-name/ny/nylon/package.nix b/pkgs/by-name/ny/nylon/package.nix index 17ffd478aa05..e733c231fc40 100644 --- a/pkgs/by-name/ny/nylon/package.nix +++ b/pkgs/by-name/ny/nylon/package.nix @@ -15,11 +15,11 @@ let ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nylon"; version = "1.21"; src = fetchurl { - url = "https://monkey.org/~marius/nylon/nylon-${version}.tar.gz"; + url = "https://monkey.org/~marius/nylon/nylon-${finalAttrs.version}.tar.gz"; sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "nylon"; }; -} +}) diff --git a/pkgs/by-name/oa/oatpp/package.nix b/pkgs/by-name/oa/oatpp/package.nix index b3b0c5101ae0..40bcea40b6ad 100644 --- a/pkgs/by-name/oa/oatpp/package.nix +++ b/pkgs/by-name/oa/oatpp/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oatpp"; version = "1.3.1"; src = fetchFromGitHub { owner = "oatpp"; repo = "oatpp"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-pTQ0DD4naE9m+6FfCVGg/i3WpNbtaR+38yyqjqN0uH0="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ob/obex_data_server/package.nix b/pkgs/by-name/ob/obex_data_server/package.nix index 6e1fcf7b54d5..cc02979615cd 100644 --- a/pkgs/by-name/ob/obex_data_server/package.nix +++ b/pkgs/by-name/ob/obex_data_server/package.nix @@ -11,12 +11,12 @@ dbus, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "obex-data-server"; version = "0.4.6"; src = fetchurl { - url = "http://tadas.dailyda.com/software/obex-data-server-${version}.tar.gz"; + url = "http://tadas.dailyda.com/software/obex-data-server-${finalAttrs.version}.tar.gz"; sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/ob/obexd/package.nix b/pkgs/by-name/ob/obexd/package.nix index f37f0c8fe0c5..eb20f172618f 100644 --- a/pkgs/by-name/ob/obexd/package.nix +++ b/pkgs/by-name/ob/obexd/package.nix @@ -10,12 +10,12 @@ libical, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "obexd"; version = "0.48"; src = fetchurl { - url = "mirror://kernel/linux/bluetooth/obexd-${version}.tar.bz2"; + url = "mirror://kernel/linux/bluetooth/obexd-${finalAttrs.version}.tar.bz2"; sha256 = "1i20dnibvnq9lnkkhajr5xx3kxlwf9q5c4jm19kyb0q1klzgzlb8"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/ob/obexfs/package.nix b/pkgs/by-name/ob/obexfs/package.nix index 3d5c2c999545..bf7acd56bb8b 100644 --- a/pkgs/by-name/ob/obexfs/package.nix +++ b/pkgs/by-name/ob/obexfs/package.nix @@ -8,12 +8,12 @@ obexftp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "obexfs"; version = "0.12"; src = fetchurl { - url = "mirror://sourceforge/openobex/obexfs-${version}.tar.gz"; + url = "mirror://sourceforge/openobex/obexfs-${finalAttrs.version}.tar.gz"; sha256 = "1g3krpygk6swa47vbmp9j9s8ahqqcl9ra8r25ybgzv2d9pmjm9kj"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.lgpl2Plus; }; -} +}) diff --git a/pkgs/by-name/ob/obexftp/package.nix b/pkgs/by-name/ob/obexftp/package.nix index 0bb2ec9acc03..5b98bc39d73a 100644 --- a/pkgs/by-name/ob/obexftp/package.nix +++ b/pkgs/by-name/ob/obexftp/package.nix @@ -8,12 +8,12 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "obexftp"; version = "0.24.2"; src = fetchurl { - url = "mirror://sourceforge/openobex/obexftp-${version}-Source.tar.gz"; + url = "mirror://sourceforge/openobex/obexftp-${finalAttrs.version}-Source.tar.gz"; sha256 = "18w9r78z78ri5qc8fjym4nk1jfbrkyr789sq7rxrkshf1a7b83yl"; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.lgpl2Plus; }; -} +}) diff --git a/pkgs/by-name/ob/obuild/package.nix b/pkgs/by-name/ob/obuild/package.nix index 48dda80fb8ab..b871bc14eba7 100644 --- a/pkgs/by-name/ob/obuild/package.nix +++ b/pkgs/by-name/ob/obuild/package.nix @@ -5,14 +5,14 @@ ocamlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "obuild"; version = "0.1.11"; src = fetchFromGitHub { owner = "ocaml-obuild"; repo = "obuild"; - rev = "obuild-v${version}"; + rev = "obuild-v${finalAttrs.version}"; hash = "sha256-me9/FVD7S0uPIpFZzcxDfYKVWn9ifq6JryBAGCo681I="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/oc/ocl-icd/package.nix b/pkgs/by-name/oc/ocl-icd/package.nix index 38de95f11b20..1b6fad3afa82 100644 --- a/pkgs/by-name/oc/ocl-icd/package.nix +++ b/pkgs/by-name/oc/ocl-icd/package.nix @@ -8,14 +8,14 @@ windows, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ocl-icd"; version = "2.3.4"; src = fetchFromGitHub { owner = "OCL-dev"; repo = "ocl-icd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-7q5+33oWMA/PQOz6awC+LOBVTKeXNluHxDNAq8bJPYU="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = with lib.maintainers; [ r-burns ]; }; -} +}) diff --git a/pkgs/by-name/oc/ocproxy/package.nix b/pkgs/by-name/oc/ocproxy/package.nix index 997e4b6311c0..7c9092524d59 100644 --- a/pkgs/by-name/oc/ocproxy/package.nix +++ b/pkgs/by-name/oc/ocproxy/package.nix @@ -7,14 +7,14 @@ libevent, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.60"; pname = "ocproxy"; src = fetchFromGitHub { owner = "cernekee"; repo = "ocproxy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "03323nnhb4y9nzwva04mq7xg03dvdrgp689g89f69jqc261skcqx"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.joko ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/oc/ocr-a/package.nix b/pkgs/by-name/oc/ocr-a/package.nix index 962ed2722fb3..44e209c6af78 100644 --- a/pkgs/by-name/oc/ocr-a/package.nix +++ b/pkgs/by-name/oc/ocr-a/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "OCR-A"; version = "1.0"; src = fetchurl { - url = "mirror://sourceforge/ocr-a-font/OCR-A/${version}/OCRA.ttf"; + url = "mirror://sourceforge/ocr-a-font/OCR-A/${finalAttrs.version}/OCRA.ttf"; sha256 = "0kpmjjxwzm84z8maz6lq9sk1b0xv1zkvl28lwj7i0m2xf04qixd0"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ V ]; }; -} +}) diff --git a/pkgs/by-name/oc/octomap/package.nix b/pkgs/by-name/oc/octomap/package.nix index 63887220e674..718bf0405725 100644 --- a/pkgs/by-name/oc/octomap/package.nix +++ b/pkgs/by-name/oc/octomap/package.nix @@ -5,18 +5,18 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "octomap"; version = "1.10.0"; src = fetchFromGitHub { owner = "OctoMap"; repo = "octomap"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-QxQHxxFciR6cvB/b8i0mr1hqGxOXhXmB4zgdsD977Mw="; }; - sourceRoot = "${src.name}/octomap"; + sourceRoot = "${finalAttrs.src.name}/octomap"; nativeBuildInputs = [ cmake ]; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lopsided98 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/oc/octopus-caller/package.nix b/pkgs/by-name/oc/octopus-caller/package.nix index 59083e235d06..7725237e4e82 100644 --- a/pkgs/by-name/oc/octopus-caller/package.nix +++ b/pkgs/by-name/oc/octopus-caller/package.nix @@ -12,14 +12,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "octopus"; version = "0.7.4"; src = fetchFromGitHub { owner = "luntergroup"; repo = "octopus"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-FAogksVxUlzMlC0BqRu22Vchj6VX+8yNlHRLyb3g1sE="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jbedo ]; platforms = lib.platforms.x86_64; }; -} +}) diff --git a/pkgs/by-name/od/odp-dpdk/package.nix b/pkgs/by-name/od/odp-dpdk/package.nix index 03c39be171a5..dff8d5b18357 100644 --- a/pkgs/by-name/od/odp-dpdk/package.nix +++ b/pkgs/by-name/od/odp-dpdk/package.nix @@ -18,14 +18,14 @@ libnl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "odp-dpdk"; version = "1.46.0.0_DPDK_22.11"; src = fetchFromGitHub { owner = "OpenDataPlane"; repo = "odp-dpdk"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-9stWGupRSQwUXOdPEQ9Rhkim22p5BBA5Z+2JCYS7Za0="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.abuibrahim ]; }; -} +}) diff --git a/pkgs/by-name/od/odyssey/package.nix b/pkgs/by-name/od/odyssey/package.nix index 73f6dc5f4ef6..6f03d92a6af4 100644 --- a/pkgs/by-name/od/odyssey/package.nix +++ b/pkgs/by-name/od/odyssey/package.nix @@ -9,14 +9,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "odyssey"; version = "1.3"; src = fetchFromGitHub { owner = "yandex"; repo = "odyssey"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-1ALTKRjpKmmFcAuhmgpcbJBkNuUlTyau8xWDRHh7gf0="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; mainProgram = "odyssey"; }; -} +}) diff --git a/pkgs/by-name/oe/oed/package.nix b/pkgs/by-name/oe/oed/package.nix index 5df9d20cd3e4..fe96dc2f906a 100644 --- a/pkgs/by-name/oe/oed/package.nix +++ b/pkgs/by-name/oe/oed/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oed"; version = "7.4"; src = fetchFromGitHub { owner = "ibara"; repo = "oed"; - rev = "oed-${version}"; + rev = "oed-${finalAttrs.version}"; hash = "sha256-bbV89YhrmL7tOgKly5OfQDRz4QE0UzZrVsmoXiJ7ZZw="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { mainProgram = "ed"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/og/ogmtools/package.nix b/pkgs/by-name/og/ogmtools/package.nix index 555ddb9834f2..f8c9b6cfa33c 100644 --- a/pkgs/by-name/og/ogmtools/package.nix +++ b/pkgs/by-name/og/ogmtools/package.nix @@ -7,12 +7,12 @@ libdvdread, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ogmtools"; version = "1.5"; src = fetchurl { - url = "https://www.bunkus.org/videotools/ogmtools/ogmtools-${version}.tar.bz2"; + url = "https://www.bunkus.org/videotools/ogmtools/ogmtools-${finalAttrs.version}.tar.bz2"; sha256 = "1spx81p5wf59ksl3r3gvf78d77sh7gj8a6lw773iv67bphfivmn8"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix index 0384e9b66a80..869da90f84d6 100644 --- a/pkgs/by-name/oi/oidc-agent/package.nix +++ b/pkgs/by-name/oi/oidc-agent/package.nix @@ -13,14 +13,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oidc-agent"; version = "5.3.3"; src = fetchFromGitHub { owner = "indigo-dc"; repo = "oidc-agent"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-PV1aswfvEMtsgHWKfdtIo/BV+MHKKdul2vjFdyoT2Ic="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ xinyangli ]; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/oi/ois/package.nix b/pkgs/by-name/oi/ois/package.nix index e0df9cf62d5d..e34157871dd4 100644 --- a/pkgs/by-name/oi/ois/package.nix +++ b/pkgs/by-name/oi/ois/package.nix @@ -6,14 +6,14 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ois"; version = "1.5.1"; src = fetchFromGitHub { owner = "wgois"; repo = "OIS"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ir6p+Tzf8L5VOW/rsG4yelsth7INbhABO2T7pfMHcFo="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.zlib; }; -} +}) diff --git a/pkgs/by-name/ol/olsrd/package.nix b/pkgs/by-name/ol/olsrd/package.nix index 3e52a9a05017..8ba2a5e9ea70 100644 --- a/pkgs/by-name/ol/olsrd/package.nix +++ b/pkgs/by-name/ol/olsrd/package.nix @@ -7,14 +7,14 @@ flex, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "olsrd"; version = "0.9.8"; src = fetchFromGitHub { owner = "OLSR"; repo = "olsrd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1xk355dm5pfjil1j4m724vkdnc178lv6hi6s1g0xgpd59avbx90j"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/om/om4/package.nix b/pkgs/by-name/om/om4/package.nix index 1efc9047ec26..1e3a549b2d0d 100644 --- a/pkgs/by-name/om/om4/package.nix +++ b/pkgs/by-name/om/om4/package.nix @@ -6,14 +6,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "om4"; version = "6.7"; src = fetchFromGitHub { owner = "ibara"; repo = "m4"; - tag = "om4-${version}"; + tag = "om4-${finalAttrs.version}"; hash = "sha256-/b+Fcz6lg2hW541TzBhB9M86wUS7BT6pHzqXxTs0BxI="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/om/omniorb/package.nix b/pkgs/by-name/om/omniorb/package.nix index fc6e3160b466..1dfb0c63c69d 100644 --- a/pkgs/by-name/om/omniorb/package.nix +++ b/pkgs/by-name/om/omniorb/package.nix @@ -6,13 +6,13 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "omniorb"; version = "4.3.3"; src = fetchurl { - url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; + url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${finalAttrs.version}/omniORB-${finalAttrs.version}.tar.bz2"; hash = "sha256-rM0l4stwxOM+0iew2T6WaeOMRgGWN4h8dxOYhw7UXno="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ smironov ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/on/oneko/package.nix b/pkgs/by-name/on/oneko/package.nix index 524fdbfde59b..8eae793e0dec 100644 --- a/pkgs/by-name/on/oneko/package.nix +++ b/pkgs/by-name/on/oneko/package.nix @@ -8,14 +8,14 @@ libXext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version_name = "1.2.hanami.6"; version = "1.2.6"; pname = "oneko"; src = fetchFromGitHub { owner = "IreneKnapp"; repo = "oneko"; - rev = version_name; + rev = finalAttrs.version_name; sha256 = "0vx12v5fm8ar3f1g6jbpmd3b1q652d32nc67ahkf28djbqjgcbnc"; }; nativeBuildInputs = [ @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "oneko"; }; -} +}) diff --git a/pkgs/by-name/on/onestepback/package.nix b/pkgs/by-name/on/onestepback/package.nix index 71f6cb2f9b99..1a04842f869a 100644 --- a/pkgs/by-name/on/onestepback/package.nix +++ b/pkgs/by-name/on/onestepback/package.nix @@ -5,17 +5,17 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "onestepback"; version = "0.997"; srcs = [ (fetchurl { - url = "http://www.vide.memoire.free.fr/pages/onestepback/OneStepBack-v${version}.zip"; + url = "http://www.vide.memoire.free.fr/pages/onestepback/OneStepBack-v${finalAttrs.version}.zip"; hash = "sha256-uB6pfnTkMKeP71rAvn1olJJeCL84222UT5uxG72sywE="; }) (fetchurl { - url = "http://www.vide.memoire.free.fr/pages/onestepback/OneStepBack-wm2-v${version}.zip"; + url = "http://www.vide.memoire.free.fr/pages/onestepback/OneStepBack-wm2-v${finalAttrs.version}.zip"; hash = "sha256-Zdv4ZrQPficbCxPBKF3RFNavlSn/VV/efiZVUT86zRc="; }) ]; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/on/oniguruma/package.nix b/pkgs/by-name/on/oniguruma/package.nix index 8f667789d2eb..e0484a75461f 100644 --- a/pkgs/by-name/on/oniguruma/package.nix +++ b/pkgs/by-name/on/oniguruma/package.nix @@ -5,13 +5,13 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oniguruma"; version = "6.9.10"; # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages src = fetchurl { - url = "https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz"; + url = "https://github.com/kkos/oniguruma/releases/download/v${finalAttrs.version}/onig-${finalAttrs.version}.tar.gz"; sha256 = "sha256-Klz8WuJZ5Ol/hraN//wVLNr/6U4gYLdwy4JyONdp/AU="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ artturin ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/oo/oonf-olsrd2/package.nix b/pkgs/by-name/oo/oonf-olsrd2/package.nix index 2fe56e1da48a..14f15cb782a4 100644 --- a/pkgs/by-name/oo/oonf-olsrd2/package.nix +++ b/pkgs/by-name/oo/oonf-olsrd2/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oonf-olsrd2"; version = "0.15.1"; src = fetchFromGitHub { owner = "OLSR"; repo = "OONF"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7EH2K7gaBGD95WFlG6RRhKEWJm91Xv2GOHYQjZWuzl0="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ mkg20001 ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix index 640bfbe55e52..544eadfa2eb5 100644 --- a/pkgs/by-name/op/opa-envoy-plugin/package.nix +++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix @@ -14,16 +14,16 @@ assert buildGoModule rec { pname = "opa-envoy-plugin"; - version = "1.12.2-envoy"; + version = "1.13.1-envoy"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa-envoy-plugin"; tag = "v${version}"; - hash = "sha256-9S4W/YCrlLonzTn2T8mha0j41P+yJf0l1UOgcdG+L30="; + hash = "sha256-XG1xnPOE922H/yMNyY0M8x5KW90TPZlq5UAXCEtgR18="; }; - vendorHash = "sha256-8gDHfC9UfN4Vz6f34gaQyxCLlQWg/F3QglSvM/bTUec="; + vendorHash = "sha256-vZgDQYkid1xNJhmefifcp695R672mz6tpo3g/gzrdBg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/opam2json/package.nix b/pkgs/by-name/op/opam2json/package.nix index 002289e51f3b..a8cbfbb6e494 100644 --- a/pkgs/by-name/op/opam2json/package.nix +++ b/pkgs/by-name/op/opam2json/package.nix @@ -5,14 +5,14 @@ opam-installer, ocamlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opam2json"; version = "0.4"; src = fetchFromGitHub { owner = "tweag"; repo = "opam2json"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-5pXfbUfpVABtKbii6aaI2EdAZTjHJ2QntEf0QD2O5AM="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; homepage = "https://github.com/tweag/opam2json"; }; -} +}) diff --git a/pkgs/by-name/op/open-isns/package.nix b/pkgs/by-name/op/open-isns/package.nix index 49b61c761142..8904c48d0729 100644 --- a/pkgs/by-name/op/open-isns/package.nix +++ b/pkgs/by-name/op/open-isns/package.nix @@ -8,14 +8,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "open-isns"; version = "0.103"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "open-isns"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-buqQMsoxRCbWiBDq0XAg93J7bjbdxeIernV8sDVxCAA="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index 7cbeeee10eda..7db842f22698 100644 --- a/pkgs/by-name/op/open-policy-agent/package.nix +++ b/pkgs/by-name/op/open-policy-agent/package.nix @@ -14,16 +14,16 @@ assert buildGoModule (finalAttrs: { pname = "open-policy-agent"; - version = "1.12.3"; + version = "1.13.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; tag = "v${finalAttrs.version}"; - hash = "sha256-PfOEjWy97COEdGpCcSHCdXVWZzJUwDAGoCi4kr2FWQs="; + hash = "sha256-MBfzoaIZY3u4PtchCzquhrkasjwnARag/UCc5JBTfmw="; }; - vendorHash = "sha256-vlF4TBjfinaY48UNefXFWbrWenD7eYYYMkByI2M32X8="; + vendorHash = "sha256-Jn0vi1Ihyeog/LaUcuu/V9dd8l9LSdRSbtH1GPJrT50="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/openbsm/package.nix b/pkgs/by-name/op/openbsm/package.nix index e7344ce386a4..f048b4680060 100644 --- a/pkgs/by-name/op/openbsm/package.nix +++ b/pkgs/by-name/op/openbsm/package.nix @@ -4,14 +4,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openbsm"; version = "1.1"; src = fetchFromGitHub { owner = "openbsm"; repo = "openbsm"; - rev = lib.toUpper (builtins.replaceStrings [ "." "-" ] [ "_" "_" ] "openbsm-${version}"); + rev = lib.toUpper (builtins.replaceStrings [ "." "-" ] [ "_" "_" ] "openbsm-${finalAttrs.version}"); sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/by-name/op/opencbm/package.nix b/pkgs/by-name/op/opencbm/package.nix index 1c2d56aa7ed5..c7e8c45ba390 100644 --- a/pkgs/by-name/op/opencbm/package.nix +++ b/pkgs/by-name/op/opencbm/package.nix @@ -8,14 +8,14 @@ libusb1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencbm"; version = "0.4.99.104"; src = fetchFromGitHub { owner = "OpenCBM"; repo = "OpenCBM"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-5lj5F79Gbhrvi9dxKGobdyDyBLGcptAtxx9SANhLrKw="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/op/opencc/package.nix b/pkgs/by-name/op/opencc/package.nix index c156b9ca79ac..16169635f95e 100644 --- a/pkgs/by-name/op/opencc/package.nix +++ b/pkgs/by-name/op/opencc/package.nix @@ -10,14 +10,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencc"; version = "1.1.9"; src = fetchFromGitHub { owner = "BYVoid"; repo = "OpenCC"; - rev = "ver.${version}"; + rev = "ver.${finalAttrs.version}"; sha256 = "sha256-JBTegQs9ALp4LdKKYMNp9GYEgqR9O8IkX6LqatvaTic="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sifmelcara ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/op/opencflite/package.nix b/pkgs/by-name/op/opencflite/package.nix index 06e3a921fb9f..7dbd1766c048 100644 --- a/pkgs/by-name/op/opencflite/package.nix +++ b/pkgs/by-name/op/opencflite/package.nix @@ -10,14 +10,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencflite"; version = "635.21.8"; src = fetchFromGitHub { owner = "gerickson"; repo = "opencflite"; - rev = "opencflite-${version}"; + rev = "opencflite-${finalAttrs.version}"; hash = "sha256-ijyj4SFYQ0wZAFM2ehNnR9+yu5yDTSVW3VBycBT9l+A="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wegank ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/op/opencloud-desktop-shell-integration-dolphin/package.nix b/pkgs/by-name/op/opencloud-desktop-shell-integration-dolphin/package.nix index 5653e74ed504..ad8899db36de 100644 --- a/pkgs/by-name/op/opencloud-desktop-shell-integration-dolphin/package.nix +++ b/pkgs/by-name/op/opencloud-desktop-shell-integration-dolphin/package.nix @@ -8,14 +8,14 @@ opencloud-desktop-shell-integration-resources, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencloud-desktop-shell-integration-dolphin"; version = "1.0.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "desktop-shell-integration-dolphin"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+Bu/kN4RvR/inWQHYcfWOF6BWHTFm5jlea/QeT4NhFQ="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { mainProgram = "opencloud-desktop-shell-integration-dolphin"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/op/opencloud-desktop-shell-integration-resources/package.nix b/pkgs/by-name/op/opencloud-desktop-shell-integration-resources/package.nix index 4e1e61333455..3566d55cdd5e 100644 --- a/pkgs/by-name/op/opencloud-desktop-shell-integration-resources/package.nix +++ b/pkgs/by-name/op/opencloud-desktop-shell-integration-resources/package.nix @@ -6,14 +6,14 @@ kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencloud-desktop-shell-integration-resources"; version = "1.0.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "desktop-shell-integration-resources"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TqJanrAKD3aNQu5jL1Dt0bn84dYBNGImAKBGsAY2xeU="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ k900 ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 3ed705fb2d34..6a0e2807ecc5 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -114,18 +114,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall install -Dm755 dist/opencode-*/bin/opencode $out/bin/opencode - install -Dm644 schema.json $out/share/opencode/schema.json - - runHook postInstall - ''; - - postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' - installShellCompletion --cmd opencode \ - --bash <($out/bin/opencode completion) \ - --zsh <(SHELL=/bin/zsh $out/bin/opencode completion) - ''; - - postFixup = '' wrapProgram $out/bin/opencode \ --prefix PATH : ${ lib.makeBinPath ( @@ -137,6 +125,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { ] ) } + + install -Dm644 schema.json $out/share/opencode/schema.json + + runHook postInstall + ''; + + postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd opencode \ + --bash <($out/bin/opencode completion) \ + --zsh <(SHELL=/bin/zsh $out/bin/opencode completion) ''; nativeInstallCheckInputs = [ diff --git a/pkgs/by-name/op/opencollada/package.nix b/pkgs/by-name/op/opencollada/package.nix index b5d8cddae639..2fc051ca686f 100644 --- a/pkgs/by-name/op/opencollada/package.nix +++ b/pkgs/by-name/op/opencollada/package.nix @@ -10,14 +10,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencollada"; version = "1.6.68"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCOLLADA"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w"; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/op/opencore-amr/package.nix b/pkgs/by-name/op/opencore-amr/package.nix index 159e9162ebe8..2063c06d1d48 100644 --- a/pkgs/by-name/op/opencore-amr/package.nix +++ b/pkgs/by-name/op/opencore-amr/package.nix @@ -4,11 +4,11 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencore-amr"; version = "0.1.6"; src = fetchurl { - url = "mirror://sourceforge/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; + url = "mirror://sourceforge/opencore-amr/opencore-amr/opencore-amr-${finalAttrs.version}.tar.gz"; hash = "sha256-SD60BhCI4rNLNY5HVAtdSVqWzUaONhBQ+uYVsYCdxKE="; }; @@ -19,4 +19,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.kiloreux ]; }; -} +}) diff --git a/pkgs/by-name/op/opendbx/package.nix b/pkgs/by-name/op/opendbx/package.nix index 75240d494fab..1fcc08bf6efe 100644 --- a/pkgs/by-name/op/opendbx/package.nix +++ b/pkgs/by-name/op/opendbx/package.nix @@ -12,12 +12,12 @@ let inherit (lib) getDev; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opendbx"; version = "1.4.6"; src = fetchurl { - url = "https://linuxnetworks.de/opendbx/download/opendbx-${version}.tar.gz"; + url = "https://linuxnetworks.de/opendbx/download/opendbx-${finalAttrs.version}.tar.gz"; sha256 = "0z29h6zx5f3gghkh1a0060w6wr572ci1rl2a3480znf728wa0ii2"; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/op/opendht/package.nix b/pkgs/by-name/op/opendht/package.nix index 5c8dbb54c36b..f93feb89d649 100644 --- a/pkgs/by-name/op/opendht/package.nix +++ b/pkgs/by-name/op/opendht/package.nix @@ -20,14 +20,14 @@ enablePushNotifications ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opendht"; version = "3.5.4"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mnnd6yATIk/TEuFG/M98d+pfeh42IKWBBYjkTP52xeM="; }; @@ -83,4 +83,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/op/opendkim/package.nix b/pkgs/by-name/op/opendkim/package.nix index 41c5866a57f7..a39efe59c53d 100644 --- a/pkgs/by-name/op/opendkim/package.nix +++ b/pkgs/by-name/op/opendkim/package.nix @@ -12,14 +12,14 @@ unbound, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opendkim"; version = "2.11.0-Beta2"; src = fetchFromGitHub { owner = "trusteddomainproject"; repo = "OpenDKIM"; - rev = "rel-opendkim-${lib.replaceStrings [ "." ] [ "-" ] version}"; + rev = "rel-opendkim-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; sha256 = "0nx3in8sa6xna4vfacj8g60hfzk61jpj2ldag80xzxip9c3rd2pw"; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/op/opendmarc/package.nix b/pkgs/by-name/op/opendmarc/package.nix index 3630c4f126c6..66e04b4f42b4 100644 --- a/pkgs/by-name/op/opendmarc/package.nix +++ b/pkgs/by-name/op/opendmarc/package.nix @@ -9,14 +9,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opendmarc"; version = "1.4.2"; src = fetchFromGitHub { owner = "trusteddomainproject"; repo = "opendmarc"; - rev = "rel-opendmarc-${builtins.replaceStrings [ "." ] [ "-" ] version}"; + rev = "rel-opendmarc-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; hash = "sha256-vnWtTvHhzCed7P6rN3wAz6zfRvtV0cLn5GhDxLF8H3c="; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { helsinki-Jo ]; }; -} +}) diff --git a/pkgs/by-name/op/opendune/package.nix b/pkgs/by-name/op/opendune/package.nix index 7f6df84157c4..e8fc1d01859a 100644 --- a/pkgs/by-name/op/opendune/package.nix +++ b/pkgs/by-name/op/opendune/package.nix @@ -15,14 +15,14 @@ # datadir=/path/to/opendune-data # - download dune2 into [datadir] http://www.bestoldgames.net/eng/old-games/dune-2.php -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opendune"; version = "0.9"; src = fetchFromGitHub { owner = "OpenDUNE"; repo = "OpenDUNE"; - rev = version; + rev = finalAttrs.version; sha256 = "15rvrnszdy3db8s0dmb696l4isb3x2cpj7wcl4j09pdi59pc8p37"; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/op/openfortivpn-webview-qt/package.nix b/pkgs/by-name/op/openfortivpn-webview-qt/package.nix index db5c59c61d96..de5e04521282 100644 --- a/pkgs/by-name/op/openfortivpn-webview-qt/package.nix +++ b/pkgs/by-name/op/openfortivpn-webview-qt/package.nix @@ -4,17 +4,17 @@ fetchFromGitHub, qt6Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openfortivpn-webview-qt"; version = "1.2.3"; src = fetchFromGitHub { owner = "gm-vm"; repo = "openfortivpn-webview"; - rev = "v${version}-electron"; + rev = "v${finalAttrs.version}-electron"; hash = "sha256-jGDCFdqRfnYwUgVs3KO1pDr52JgkYVRHi2KvABaZFl4="; }; - sourceRoot = "${src.name}/openfortivpn-webview-qt"; + sourceRoot = "${finalAttrs.src.name}/openfortivpn-webview-qt"; nativeBuildInputs = [ qt6Packages.wrapQtAppsHook @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "openfortivpn-webview"; }; -} +}) diff --git a/pkgs/by-name/op/openfortivpn/package.nix b/pkgs/by-name/op/openfortivpn/package.nix index 3bb3e6081f90..1990fb6b7e3a 100644 --- a/pkgs/by-name/op/openfortivpn/package.nix +++ b/pkgs/by-name/op/openfortivpn/package.nix @@ -13,14 +13,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openfortivpn"; version = "1.23.1"; src = fetchFromGitHub { owner = "adrienverge"; repo = "openfortivpn"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Pv9v7e5xPTIrgqldBDtTFxW+aIjbxSeu0sQ9n6HjO9w="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; mainProgram = "openfortivpn"; }; -} +}) diff --git a/pkgs/by-name/op/opengrm-ngram/package.nix b/pkgs/by-name/op/opengrm-ngram/package.nix index 4fead12e27ec..f8371a313f50 100644 --- a/pkgs/by-name/op/opengrm-ngram/package.nix +++ b/pkgs/by-name/op/opengrm-ngram/package.nix @@ -6,12 +6,12 @@ openfst, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opengrm-ngram"; version = "1.3.16"; src = fetchurl { - url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz"; + url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${finalAttrs.version}.tar.gz"; hash = "sha256-pcwP0VVW8H+0Y2Fsmh4WaH4whPPJlE3WyBI4VJfsES4="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ mic92 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/op/openipmi/package.nix b/pkgs/by-name/op/openipmi/package.nix index 110ba72de6a9..99bb16107d7e 100644 --- a/pkgs/by-name/op/openipmi/package.nix +++ b/pkgs/by-name/op/openipmi/package.nix @@ -10,12 +10,12 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "OpenIPMI"; version = "2.0.37"; src = fetchurl { - url = "mirror://sourceforge/openipmi/OpenIPMI-${version}.tar.gz"; + url = "mirror://sourceforge/openipmi/OpenIPMI-${finalAttrs.version}.tar.gz"; sha256 = "sha256-xi049dp99Cmaw6ZSUI6VlTd1JEAYHjTHayrs69fzAbk="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ arezvov ]; }; -} +}) diff --git a/pkgs/by-name/op/openiscsi/package.nix b/pkgs/by-name/op/openiscsi/package.nix index a30c88051c41..742292f28674 100644 --- a/pkgs/by-name/op/openiscsi/package.nix +++ b/pkgs/by-name/op/openiscsi/package.nix @@ -16,14 +16,14 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "open-iscsi"; version = "2.1.11"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "open-iscsi"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Xs2EiNSkRtAQPoagCAKl07VndYKDspGLchxMvsfvTi0="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { zaninime ]; }; -} +}) diff --git a/pkgs/by-name/op/openjade/package.nix b/pkgs/by-name/op/openjade/package.nix index 2991f1606f08..c8e41ecf1bf6 100644 --- a/pkgs/by-name/op/openjade/package.nix +++ b/pkgs/by-name/op/openjade/package.nix @@ -6,12 +6,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openjade"; version = "1.3.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/openjade-${version}.tar.gz"; + url = "mirror://sourceforge/openjade/openjade-${finalAttrs.version}.tar.gz"; sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { homepage = "https://openjade.sourceforge.net/"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/op/openlibm/package.nix b/pkgs/by-name/op/openlibm/package.nix index 09f459ca5fcf..9aad235689c4 100644 --- a/pkgs/by-name/op/openlibm/package.nix +++ b/pkgs/by-name/op/openlibm/package.nix @@ -5,14 +5,14 @@ fixDarwinDylibNames, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openlibm"; version = "0.8.7"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "openlibm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-fSEszCJ1PXkSydTLk8KAyu7zffUrKf+7a1ZDf3Wl/lE="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.ttuegel ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/op/openobex/package.nix b/pkgs/by-name/op/openobex/package.nix index 8f6358e46fab..8571f85d6126 100644 --- a/pkgs/by-name/op/openobex/package.nix +++ b/pkgs/by-name/op/openobex/package.nix @@ -9,12 +9,12 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openobex"; version = "1.7.2"; src = fetchurl { - url = "mirror://sourceforge/openobex/openobex-${version}-Source.tar.gz"; + url = "mirror://sourceforge/openobex/openobex-${finalAttrs.version}-Source.tar.gz"; sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; mainProgram = "obex-check-device"; }; -} +}) diff --git a/pkgs/by-name/op/openonload/package.nix b/pkgs/by-name/op/openonload/package.nix index 2b0a4163e862..6673efd090e8 100644 --- a/pkgs/by-name/op/openonload/package.nix +++ b/pkgs/by-name/op/openonload/package.nix @@ -12,14 +12,14 @@ libmnl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openonload"; version = "9.0.2"; src = fetchFromGitHub { owner = "Xilinx-CNS"; repo = "onload"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-wyvTtOjD6fwuT2OGGhr10F0Q7hXE97mGREhq7Ns14hw="; }; @@ -155,4 +155,4 @@ stdenv.mkDerivation rec { # ARM64 build fails, see https://github.com/Xilinx-CNS/onload/issues/253 platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/op/openorbitaloptimizer/package.nix b/pkgs/by-name/op/openorbitaloptimizer/package.nix index 21fd126ec5ea..ba6b4fa91a73 100644 --- a/pkgs/by-name/op/openorbitaloptimizer/package.nix +++ b/pkgs/by-name/op/openorbitaloptimizer/package.nix @@ -10,14 +10,14 @@ nlohmann_json, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openorbitaloptimizer"; version = "0.2.0"; src = fetchFromGitHub { owner = "susilehtola"; repo = "openorbitaloptimizer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-naZwe56c1wsng4L/Q1waPiACeEiEAMhvzr5XMwC1uoY="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/op/openorienteering-mapper/package.nix b/pkgs/by-name/op/openorienteering-mapper/package.nix index 9efc9ee40e1b..544a91e91c52 100644 --- a/pkgs/by-name/op/openorienteering-mapper/package.nix +++ b/pkgs/by-name/op/openorienteering-mapper/package.nix @@ -14,14 +14,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "OpenOrienteering-Mapper"; version = "0.9.6"; src = fetchFromGitHub { owner = "OpenOrienteering"; repo = "mapper"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-JfjQe7t3F/9/ik7b+6UUbsYIcpkSDxHBgnbQEYyDTMI="; }; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.openorienteering.org/apps/mapper/"; description = "Orienteering mapmaking program"; - changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}"; + changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ mpickering @@ -95,4 +95,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix; mainProgram = "Mapper"; }; -} +}) diff --git a/pkgs/by-name/op/openpace/package.nix b/pkgs/by-name/op/openpace/package.nix index 535a73c84d64..0e0f7936924d 100644 --- a/pkgs/by-name/op/openpace/package.nix +++ b/pkgs/by-name/op/openpace/package.nix @@ -9,14 +9,14 @@ openssl, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openpace"; version = "1.1.3"; src = fetchFromGitHub { owner = "frankmorgner"; repo = "openpace"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KsgCTHvbqxNOcf9HWgXGxagpIjHEcQ5Kryjq71F8XRk="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ vaavaav ]; broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; # help2man }; -} +}) diff --git a/pkgs/by-name/op/openresolv/package.nix b/pkgs/by-name/op/openresolv/package.nix index c8ff669f8805..c924ad4700d6 100644 --- a/pkgs/by-name/op/openresolv/package.nix +++ b/pkgs/by-name/op/openresolv/package.nix @@ -6,14 +6,14 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openresolv"; version = "3.17.0"; src = fetchFromGitHub { owner = "NetworkConfiguration"; repo = "openresolv"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-blWfUXTBPkAYj5o2/lqAfMV4mOHUW1wpPGiUx93Bfyo="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/op/openrussian-cli/package.nix b/pkgs/by-name/op/openrussian-cli/package.nix index cc92d12d38e2..897d97bfaf1d 100644 --- a/pkgs/by-name/op/openrussian-cli/package.nix +++ b/pkgs/by-name/op/openrussian-cli/package.nix @@ -21,14 +21,14 @@ let ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openrussian-cli"; version = "1.0.0"; src = fetchFromGitHub { owner = "rhaberkorn"; repo = "openrussian-cli"; - rev = version; + rev = finalAttrs.version; hash = "sha256-lu13Dd3D4P/7Yol1ixt86BHk86y8DMsbFzfi244+KuY="; }; @@ -93,4 +93,4 @@ stdenv.mkDerivation rec { mainProgram = "openrussian"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/op/opensaml-cpp/package.nix b/pkgs/by-name/op/opensaml-cpp/package.nix index fd54433a0697..04666474979c 100644 --- a/pkgs/by-name/op/opensaml-cpp/package.nix +++ b/pkgs/by-name/op/opensaml-cpp/package.nix @@ -13,13 +13,13 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opensaml-cpp"; version = "3.0.1"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-opensaml.git"; - rev = version; + rev = finalAttrs.version; sha256 = "0ms3sqmwqkrqb92d7jy2hqwnz5yd7cbrz73n321jik0jilrwl5w8"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/op/opensc/package.nix b/pkgs/by-name/op/opensc/package.nix index 1fe90a5082a3..bd4183cec054 100644 --- a/pkgs/by-name/op/opensc/package.nix +++ b/pkgs/by-name/op/opensc/package.nix @@ -17,14 +17,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opensc"; version = "0.26.1"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; - tag = version; + tag = finalAttrs.version; hash = "sha256-H5df+x15fz28IlL/G9zPBxbNBzc+BlDmmgNZVEYQgac="; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.michaeladler ]; }; -} +}) diff --git a/pkgs/by-name/op/openscap/package.nix b/pkgs/by-name/op/openscap/package.nix index 09eecdbd3606..8a72586f1dce 100644 --- a/pkgs/by-name/op/openscap/package.nix +++ b/pkgs/by-name/op/openscap/package.nix @@ -39,14 +39,14 @@ perlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openscap"; version = "1.4.2"; src = fetchFromGitHub { owner = "OpenSCAP"; repo = "openscap"; - rev = version; + rev = finalAttrs.version; hash = "sha256-AOldgYS8qMOLB/Nm2/O0obdDOrefSrubTETb50f3Gv8="; }; @@ -159,10 +159,10 @@ stdenv.mkDerivation rec { meta = { description = "NIST Certified SCAP 1.2 toolkit"; homepage = "https://github.com/OpenSCAP/openscap"; - changelog = "https://github.com/OpenSCAP/openscap/blob/${src.rev}/NEWS"; + changelog = "https://github.com/OpenSCAP/openscap/blob/${finalAttrs.src.rev}/NEWS"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ tochiaha ]; mainProgram = "oscap"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/op/openscenegraph/package.nix b/pkgs/by-name/op/openscenegraph/package.nix index b411ad4beb58..a06eefd84fac 100644 --- a/pkgs/by-name/op/openscenegraph/package.nix +++ b/pkgs/by-name/op/openscenegraph/package.nix @@ -60,14 +60,14 @@ fltk, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openscenegraph"; version = "3.6.5"; src = fetchFromGitHub { owner = "openscenegraph"; repo = "OpenSceneGraph"; - rev = "OpenSceneGraph-${version}"; + rev = "OpenSceneGraph-${finalAttrs.version}"; sha256 = "00i14h82qg3xzcyd8p02wrarnmby3aiwmz0z43l50byc9f8i05n1"; }; @@ -159,4 +159,4 @@ stdenv.mkDerivation rec { wxWindowsException31 ]; }; -} +}) diff --git a/pkgs/by-name/op/openseachest/package.nix b/pkgs/by-name/op/openseachest/package.nix index 3b581cad423d..812e965a8dd6 100644 --- a/pkgs/by-name/op/openseachest/package.nix +++ b/pkgs/by-name/op/openseachest/package.nix @@ -4,14 +4,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openseachest"; version = "25.05.3"; src = fetchFromGitHub { owner = "Seagate"; repo = "openSeaChest"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-huhdRF2K1AEDRX6Jyz8a/OpUEKFmH+FLNr5KHM/4Sk4="; fetchSubmodules = true; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ justinas ]; platforms = with lib.platforms; freebsd ++ linux; }; -} +}) diff --git a/pkgs/by-name/op/opensm/package.nix b/pkgs/by-name/op/opensm/package.nix index d9a7f76fcaec..c2acb5b13f2b 100644 --- a/pkgs/by-name/op/opensm/package.nix +++ b/pkgs/by-name/op/opensm/package.nix @@ -10,14 +10,14 @@ rdma-core, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opensm"; version = "3.3.24"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "opensm"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-/bqo5r9pVt7vg29xaRRO/9k21AMlmoe2327Ot5gVIwc="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.aij ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/op/opensmtpd-filter-dkimsign/package.nix b/pkgs/by-name/op/opensmtpd-filter-dkimsign/package.nix index 63e54618770f..47db824282ce 100644 --- a/pkgs/by-name/op/opensmtpd-filter-dkimsign/package.nix +++ b/pkgs/by-name/op/opensmtpd-filter-dkimsign/package.nix @@ -6,12 +6,12 @@ openssl, mandoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opensmtpd-filter-dkimsign"; version = "0.6"; src = fetchurl { - url = "https://imperialat.at/releases/filter-dkimsign-${version}.tar.gz"; + url = "https://imperialat.at/releases/filter-dkimsign-${finalAttrs.version}.tar.gz"; hash = "sha256-O18NtAuSNg82uKnUx+R4h3e1IBSElTrFWBBkr2AYNsM="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ malte-v ]; }; -} +}) diff --git a/pkgs/by-name/op/opensoundmeter/package.nix b/pkgs/by-name/op/opensoundmeter/package.nix index 98999caa36c9..78bc8edcab1a 100644 --- a/pkgs/by-name/op/opensoundmeter/package.nix +++ b/pkgs/by-name/op/opensoundmeter/package.nix @@ -14,14 +14,14 @@ let qtquickcontrols2 ; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opensoundmeter"; version = "1.5.2"; src = fetchFromGitHub { owner = "psmokotnin"; repo = "osm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-jM9tkfNjPNHcPOG0n7NeohC/O3E6CUspOF3UTkQ2rs8="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace OpenSoundMeter.pro \ - --replace 'APP_GIT_VERSION = ?' 'APP_GIT_VERSION = ${src.rev}' + --replace 'APP_GIT_VERSION = ?' 'APP_GIT_VERSION = ${finalAttrs.src.rev}' ''; nativeBuildInputs = [ @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/op/opensp/package.nix b/pkgs/by-name/op/opensp/package.nix index d376fbe329dd..d012bfa04f33 100644 --- a/pkgs/by-name/op/opensp/package.nix +++ b/pkgs/by-name/op/opensp/package.nix @@ -12,12 +12,12 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opensp"; version = "1.5.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/OpenSP-${version}.tar.gz"; + url = "mirror://sourceforge/openjade/OpenSP-${finalAttrs.version}.tar.gz"; sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p"; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/op/openspecfun/package.nix b/pkgs/by-name/op/openspecfun/package.nix index 122fe6cd2e4a..17150dc037d5 100644 --- a/pkgs/by-name/op/openspecfun/package.nix +++ b/pkgs/by-name/op/openspecfun/package.nix @@ -5,13 +5,13 @@ gfortran, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openspecfun"; version = "0.5.7"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "openspecfun"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-fx9z6bbU2V4x6Pr7/vmlSxkWxZ6qTYuPxnfqKLv08CA="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.ttuegel ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/op/opentimelineio/package.nix b/pkgs/by-name/op/opentimelineio/package.nix index bdb239cb635b..c74781883825 100644 --- a/pkgs/by-name/op/opentimelineio/package.nix +++ b/pkgs/by-name/op/opentimelineio/package.nix @@ -7,14 +7,14 @@ rapidjson, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opentimelineio"; version = "0.18.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenTimelineIO"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-PEqQraLx6wiJecytp37q15VayOn2fvaSlOeLs3qrRqo="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/op/opentsdb/package.nix b/pkgs/by-name/op/opentsdb/package.nix index 01d1a9f07d32..fdc8b1f1f3a3 100644 --- a/pkgs/by-name/op/opentsdb/package.nix +++ b/pkgs/by-name/op/opentsdb/package.nix @@ -266,14 +266,14 @@ let ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opentsdb"; version = "2.4.1"; src = fetchFromGitHub { owner = "OpenTSDB"; repo = "opentsdb"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-899m1H0UCLsI/bnSrNFnnny4MxSw3XBzf7rgDuEajDs="; }; @@ -362,4 +362,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "tsdb"; }; -} +}) diff --git a/pkgs/by-name/op/openttd-nml/package.nix b/pkgs/by-name/op/openttd-nml/package.nix index a0672b15e996..257273eadc2b 100644 --- a/pkgs/by-name/op/openttd-nml/package.nix +++ b/pkgs/by-name/op/openttd-nml/package.nix @@ -2,24 +2,33 @@ lib, fetchFromGitHub, python3, + versionCheckHook, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "openttd-nml"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; src = fetchFromGitHub { owner = "OpenTTD"; repo = "nml"; - tag = version; - hash = "sha256-LZhkyYTtolB9/1ZvwYa+TJJRBIifyuqlMawK7vhPV0k="; + tag = finalAttrs.version; + hash = "sha256-swAkUhduIhcfbAvKsPaJNBXcv8T6GDaxk3KKLLa9GQ8="; }; + postPatch = '' + echo 'version = "${finalAttrs.version}"' > nml/__version__.py + ''; + propagatedBuildInputs = with python3.pkgs; [ pillow ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + meta = { homepage = "http://openttdcoop.org/"; description = "Compiler for OpenTTD NML files"; @@ -27,4 +36,4 @@ python3.pkgs.buildPythonApplication rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ToxicFrog ]; }; -} +}) diff --git a/pkgs/by-name/op/openttd/package.nix b/pkgs/by-name/op/openttd/package.nix index 14a83510f6b0..02d2d813973d 100644 --- a/pkgs/by-name/op/openttd/package.nix +++ b/pkgs/by-name/op/openttd/package.nix @@ -36,12 +36,13 @@ libjack2, makeWrapper, buildPackages, + versionCheckHook, }: let opengfx = fetchzip { - url = "https://cdn.openttd.org/opengfx-releases/7.1/opengfx-7.1-all.zip"; - hash = "sha256-daJ/Qwg/okpmLQkXcCjruIiP8GEwyyp02YWcGQepxzs="; + url = "https://cdn.openttd.org/opengfx-releases/8.0/opengfx-8.0-all.zip"; + hash = "sha256-aqLEZ3EptxBZrYQd1IG6B1rSRJJTGIijKu2NIqpAYRA="; }; opensfx = fetchzip { @@ -68,11 +69,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openttd"; - version = "15.0"; + version = "15.1"; src = fetchzip { url = "https://cdn.openttd.org/openttd-releases/${finalAttrs.version}/openttd-${finalAttrs.version}-source.tar.xz"; - hash = "sha256-J4M0n5dLM04Xtx3WMxWKVgDbo92QjuuJgPbESpwf1e8="; + hash = "sha256-eBtCsbDolcTLpumWi235y4dFnZFkgLfPuTuyMaA+xac="; }; nativeBuildInputs = [ @@ -112,6 +113,9 @@ stdenv.mkDerivation (finalAttrs: { libjack2 ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + strictDeps = true; postPatch = '' diff --git a/pkgs/by-name/op/opentyrian/package.nix b/pkgs/by-name/op/opentyrian/package.nix index d410694241e6..c59e92180b0a 100644 --- a/pkgs/by-name/op/opentyrian/package.nix +++ b/pkgs/by-name/op/opentyrian/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opentyrian"; version = "2.1.20221123"; src = fetchFromGitHub { owner = "opentyrian"; repo = "opentyrian"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-fVcc8v1c9uU72X6afEo4VoMo6YuDECQSwDQ/TQjgwUY="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { # This does not account of Tyrian data. # license = lib.licenses.gpl2; }; -} +}) diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index cf9f78c61252..8868ea132e0d 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -29,14 +29,14 @@ util-linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openvas-scanner"; version = "23.28.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ggmex/BmAVgdE1JNM3kybEmr/uKqrIl8JdSoBnsg+40="; }; @@ -82,10 +82,10 @@ stdenv.mkDerivation rec { meta = { description = "Scanner component for Greenbone Community Edition"; homepage = "https://github.com/greenbone/openvas-scanner"; - changelog = "https://github.com/greenbone/openvas-scanner/blob/${src.rev}/changelog.toml"; + changelog = "https://github.com/greenbone/openvas-scanner/blob/${finalAttrs.src.rev}/changelog.toml"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "openvas-scanner"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/op/openvas-smb/package.nix b/pkgs/by-name/op/openvas-smb/package.nix index 138f88f0c02f..153b7dc330ed 100644 --- a/pkgs/by-name/op/openvas-smb/package.nix +++ b/pkgs/by-name/op/openvas-smb/package.nix @@ -19,14 +19,14 @@ let hash = "sha256-HEZAyUyjWs0N4bRLbW3tHDHCiTBtdCbgY23JsiYsZCA="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openvas-smb"; version = "22.5.10"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-smb"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-H0nG+0DPBQmXVQDVLTEhxhoFeU9ryU5N6qz64+PxV+g="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { mainProgram = "wmic"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/op/openvdb/package.nix b/pkgs/by-name/op/openvdb/package.nix index 7bf6cb0984c1..833b7987339d 100644 --- a/pkgs/by-name/op/openvdb/package.nix +++ b/pkgs/by-name/op/openvdb/package.nix @@ -10,7 +10,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openvdb"; version = "12.1.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openvdb"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-28vrIlruPl1tvw2JhjIAARtord45hqCqnA9UNnu4Z70="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix index 99f4e7e3cb6d..9fdf5f43c9ea 100644 --- a/pkgs/by-name/op/openvswitch/package.nix +++ b/pkgs/by-name/op/openvswitch/package.nix @@ -28,14 +28,14 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = if withDPDK then "openvswitch-dpdk" else "openvswitch"; version = "3.6.1"; src = fetchFromGitHub { owner = "openvswitch"; repo = "ovs"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-I5ISLOu1MMT/mtyH4tcgdFe2zjSsutMWkJiPIbadbQI="; }; @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { }; meta = { - changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; + changelog = "https://www.openvswitch.org/releases/NEWS-${finalAttrs.version}.txt"; description = "Multilayer virtual switch"; longDescription = '' Open vSwitch is a production quality, multilayer virtual switch @@ -174,4 +174,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/op/openwsman/package.nix b/pkgs/by-name/op/openwsman/package.nix index a4dc6377fd8d..2fb657312206 100644 --- a/pkgs/by-name/op/openwsman/package.nix +++ b/pkgs/by-name/op/openwsman/package.nix @@ -10,14 +10,14 @@ sblim-sfcc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openwsman"; version = "2.8.1"; src = fetchFromGitHub { owner = "Openwsman"; repo = "openwsman"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jXsnjnYZ2UiEj3sJDhMuWlopIECKLraqgIV4evw5Tbw="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ deepfire ]; platforms = lib.platforms.linux; # PAM is not available on Darwin }; -} +}) diff --git a/pkgs/by-name/op/openxr-loader/package.nix b/pkgs/by-name/op/openxr-loader/package.nix index 9795bb769665..3b9232e3934a 100644 --- a/pkgs/by-name/op/openxr-loader/package.nix +++ b/pkgs/by-name/op/openxr-loader/package.nix @@ -14,14 +14,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openxr-loader"; version = "1.1.54"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-7aip1ymZqQ7XQottD9jVb7SBPAlGaj6e27tH6aXYc2I="; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.ralith ]; }; -} +}) diff --git a/pkgs/by-name/op/openzone-cursors/package.nix b/pkgs/by-name/op/openzone-cursors/package.nix index 1e06131bfa54..e81ce935c858 100644 --- a/pkgs/by-name/op/openzone-cursors/package.nix +++ b/pkgs/by-name/op/openzone-cursors/package.nix @@ -5,14 +5,14 @@ icon-slicer, xcursorgen, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openzone-cursors"; version = "1.2.9"; src = fetchFromGitHub { owner = "ducakar"; repo = "openzone-cursors"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "02c536mc17ccsrzgma366k3wlm02ivklvr30fafxl981zgghlii4"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ zaninime ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/op/ophcrack/package.nix b/pkgs/by-name/op/ophcrack/package.nix index 57e079c1e273..9ae150020b8c 100644 --- a/pkgs/by-name/op/ophcrack/package.nix +++ b/pkgs/by-name/op/ophcrack/package.nix @@ -9,13 +9,13 @@ expat, enableGui ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ophcrack"; version = "3.8.0"; src = fetchurl { - url = "mirror://sourceforge/ophcrack/${version}/ophcrack-${version}.tar.bz2"; + url = "mirror://sourceforge/ophcrack/${finalAttrs.version}/ophcrack-${finalAttrs.version}.tar.bz2"; hash = "sha256-BIpt9XmDo6WjGsfE7BLfFqpJ5lKilnbZPU75WdUK7uA="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { mainProgram = "ophcrack"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/op/oppai-ng/package.nix b/pkgs/by-name/op/oppai-ng/package.nix index 6ffa07b527ec..a0b7b754e4ef 100644 --- a/pkgs/by-name/op/oppai-ng/package.nix +++ b/pkgs/by-name/op/oppai-ng/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oppai-ng"; version = "4.1.0"; src = fetchFromGitHub { owner = "Francesco149"; repo = "oppai-ng"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-L9eraLOWm1tMImS8bLB9T4Md4VdTSxqI9Bt4r8eqxqs="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { mainProgram = "oppai"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/op/opusfile/package.nix b/pkgs/by-name/op/opusfile/package.nix index 23aad825cf8d..921afa98afd1 100644 --- a/pkgs/by-name/op/opusfile/package.nix +++ b/pkgs/by-name/op/opusfile/package.nix @@ -9,11 +9,11 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opusfile"; version = "0.12"; src = fetchurl { - url = "http://downloads.xiph.org/releases/opus/opusfile-${version}.tar.gz"; + url = "http://downloads.xiph.org/releases/opus/opusfile-${finalAttrs.version}.tar.gz"; sha256 = "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i"; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ taeer ]; }; -} +}) diff --git a/pkgs/by-name/op/opustags/package.nix b/pkgs/by-name/op/opustags/package.nix index 64cd4e9918f2..2ad8c0916199 100644 --- a/pkgs/by-name/op/opustags/package.nix +++ b/pkgs/by-name/op/opustags/package.nix @@ -12,14 +12,14 @@ perlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opustags"; version = "1.10.1"; src = fetchFromGitHub { owner = "fmang"; repo = "opustags"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-0lo+4VMYXGwXUuRxU1xZRxzlUQ4o4n/CDHXDM27FK44="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; mainProgram = "opustags"; }; -} +}) diff --git a/pkgs/by-name/or/or-tools/gscip-scip10.patch b/pkgs/by-name/or/or-tools/gscip-scip10.patch deleted file mode 100644 index 529cb39632bb..000000000000 --- a/pkgs/by-name/or/or-tools/gscip-scip10.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/ortools/gscip/gscip.cc -+++ b/ortools/gscip/gscip.cc -@@ -48,7 +48,13 @@ - #include "scip/cons_indicator.h" - #include "scip/cons_linear.h" - #include "scip/cons_or.h" -+#if SCIP_VERSION_MAJOR >= 10 -+#include "scip/cons_nonlinear.h" -+#define SCIPcreateConsBasicQuadratic SCIPcreateConsBasicQuadraticNonlinear -+#define SCIPcreateConsQuadratic SCIPcreateConsQuadraticNonlinear -+#else - #include "scip/cons_quadratic.h" -+#endif // SCIP_VERSION_MAJOR >= 10 - #include "scip/cons_sos1.h" - #include "scip/cons_sos2.h" diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index eb334bcd0b4d..abe374ea642f 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -3,7 +3,7 @@ lib, callPackage, - abseil-cpp_202505, + abseil-cpp_202508, bzip2, cbc, cmake, @@ -16,7 +16,8 @@ glpk, highs, pkg-config, - protobuf_31, + protobuf_32, + protobuf-matchers, python3, re2, swig, @@ -32,9 +33,14 @@ let # protobuf. Do not un-pin these, even if you're upgrading them to # what might happen to be the latest version at the current moment; # future upgrades *will* break the build. - abseil-cpp' = abseil-cpp_202505; - protobuf' = protobuf_31.override { abseil-cpp = abseil-cpp'; }; - python-protobuf' = python3.pkgs.protobuf5.override { protobuf = protobuf'; }; + abseil-cpp' = abseil-cpp_202508; + gtest' = gtest.override { + withAbseil = true; + abseil-cpp = abseil-cpp'; + }; + protobuf' = protobuf_32.override { abseil-cpp = abseil-cpp'; }; + protobuf-matchers' = protobuf-matchers.override { protobuf = protobuf'; }; + python-protobuf' = python3.pkgs.protobuf6.override { protobuf = protobuf'; }; pybind11' = callPackage ./pybind11-2.13.6.nix { inherit (python3.pkgs) @@ -76,13 +82,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "or-tools"; - version = "9.14"; + version = "9.15"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-FxKe3uY4L33mavwC2aanji3fY9dPqpkwVqi6PNjovSA="; + hash = "sha256-9+tvgP/+/VY6wu7lzTdP4xfiJIgPSLVR9lEdZjQCZkE="; }; patches = [ @@ -94,40 +100,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-BNB3KlgjpWcZtb9e68Jkc/4xC4K0c+Iisw0eS6ltYXE="; }) ./0001-Fix-up-broken-CMake-rules-for-bundled-pybind-stuff.patch - (fetchpatch { - name = "math_opt-only-run-SCIP-tests-if-enabled.patch"; - url = "https://github.com/google/or-tools/commit/b5a2f8ac40dd4bfa4359c35570733171454ec72b.patch"; - hash = "sha256-h96zJkqTtwfBd+m7Lm9r/ks/n8uvY4iSPgxMZe8vtXI="; - }) - # Fix tests on aarch64-linux - # https://github.com/google/or-tools/issues/4746 - (fetchpatch { - url = "https://github.com/google/or-tools/commit/8442c7b1c219b0c8d58ee96d266d81b7c3a19ad2.patch"; - hash = "sha256-HrV9wU3PFMdb3feGt8i5UJNgHuitMRBF9cNrH5RRENQ="; - }) - # Fix compatibility with highs 1.12.0 - # https://github.com/google/or-tools/issues/4911 - (fetchpatch { - url = "https://github.com/google/or-tools/commit/6c7c1e7cb5bab2701e5b3b00c0f8397273654d2b.patch"; - includes = [ "ortools/math_opt/solvers/highs_solver_test.cc" ]; - hash = "sha256-/dFk/F/3/BwH5IwIwNU4Ua+4sROPXYCjO8R6jpoZpgo="; - }) - # Fix compatibility with SCIP 10.0 - # https://github.com/google/or-tools/issues/4912 - (fetchpatch { - url = "https://github.com/google/or-tools/pull/4932.patch"; - includes = [ "ortools/linear_solver/proto_solver/scip_proto_solver.cc" ]; - hash = "sha256-1jw/r3yAjIpq9o8mqAbNorQgmT1E5nt809N+Gb+D9ZI="; - }) - # Compatibility with SCIP 10.0 also needs the following patch adjusted for or-tools 9.14 - # https://github.com/google/or-tools/pull/4932/files#diff-9559febee3c6051bab4def3c102cb78cbf8a57fc2be4058ace32f89436c784a9 - ./gscip-scip10.patch ]; # or-tools normally attempts to build Protobuf for the build platform when # cross-compiling. Instead, just tell it where to find protoc. postPatch = '' echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(BUILD_protobuf_matchers ON)' 'set(BUILD_protobuf_matchers OFF)' '' # Patches from OpenSUSE: # https://build.opensuse.org/projects/science/packages/google-or-tools/files/google-or-tools.spec?expand=1 @@ -147,7 +127,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") (lib.cmakeBool "FETCH_PYTHON_DEPS" false) # not packaged in nixpkgs - (lib.cmakeBool "USE_fuzztest" false) (lib.cmakeBool "USE_GLPK" true) (lib.cmakeBool "USE_SCIP" withScip) (lib.cmakeFeature "Python3_EXECUTABLE" "${python3.pythonOnBuildForHost.interpreter}") @@ -182,8 +161,9 @@ stdenv.mkDerivation (finalAttrs: { eigen glpk gbenchmark - gtest + gtest' highs + protobuf-matchers' python3.pkgs.absl-py pybind11' pybind11-abseil' @@ -222,6 +202,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.hostPlatform.isLinux; preCheck = '' + patchShebangs examples/python export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib ''; diff --git a/pkgs/by-name/or/or-tools/pybind11-protobuf.nix b/pkgs/by-name/or/or-tools/pybind11-protobuf.nix index a93268e9358d..32947bbc038f 100644 --- a/pkgs/by-name/or/or-tools/pybind11-protobuf.nix +++ b/pkgs/by-name/or/or-tools/pybind11-protobuf.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, cmake, - abseil-cpp_202505, + abseil-cpp_202508, protobuf, pybind11, zlib, @@ -36,7 +36,7 @@ buildPythonPackage { nativeBuildInputs = [ cmake ]; buildInputs = [ - abseil-cpp_202505 + abseil-cpp_202508 protobuf pybind11 zlib diff --git a/pkgs/by-name/or/orcania/package.nix b/pkgs/by-name/or/orcania/package.nix index 978c8ccab151..e034e574341f 100644 --- a/pkgs/by-name/or/orcania/package.nix +++ b/pkgs/by-name/or/orcania/package.nix @@ -6,14 +6,14 @@ check, subunit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "orcania"; version = "2.3.3"; src = fetchFromGitHub { owner = "babelouest"; repo = "orcania"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Cz3IE5UrfoWjMxQ/+iR1bLsYxf5DVN+7aJqLBcPjduA="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ johnazoidberg ]; }; -} +}) diff --git a/pkgs/by-name/or/orion/package.nix b/pkgs/by-name/or/orion/package.nix index 3c5dcab90454..f449aef5c875 100644 --- a/pkgs/by-name/or/orion/package.nix +++ b/pkgs/by-name/or/orion/package.nix @@ -5,14 +5,14 @@ gtk-engine-murrine, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "orion"; version = "1.5"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "Orion"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/or/orocos-kdl/package.nix b/pkgs/by-name/or/orocos-kdl/package.nix index fae94aeb5288..97b534072b1f 100644 --- a/pkgs/by-name/or/orocos-kdl/package.nix +++ b/pkgs/by-name/or/orocos-kdl/package.nix @@ -6,19 +6,19 @@ eigen, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "orocos-kdl"; version = "1.5.3"; src = fetchFromGitHub { owner = "orocos"; repo = "orocos_kinematics_dynamics"; - tag = version; + tag = finalAttrs.version; hash = "sha256-4pPU+6uMMYLGq2V46wmg6lHFVhwFXrEg7PfnWGAI2is="; fetchSubmodules = true; # Needed to build Python bindings }; - sourceRoot = "${src.name}/orocos_kdl"; + sourceRoot = "${finalAttrs.src.name}/orocos_kdl"; nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ eigen ]; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lopsided98 ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/os/os-prober/package.nix b/pkgs/by-name/os/os-prober/package.nix index 7f7763048008..f96434477975 100644 --- a/pkgs/by-name/os/os-prober/package.nix +++ b/pkgs/by-name/os/os-prober/package.nix @@ -15,14 +15,14 @@ lvm2, # lvs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.84"; pname = "os-prober"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "os-prober"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-91UTiwg4qIi+aCzAto7tCd5WZFjI15XxR1/hZQ0fUa4="; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ symphorien ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/os/oscar/package.nix b/pkgs/by-name/os/oscar/package.nix index f3bfccc61bf6..ee5806eb40c3 100644 --- a/pkgs/by-name/os/oscar/package.nix +++ b/pkgs/by-name/os/oscar/package.nix @@ -6,14 +6,14 @@ libGLU, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oscar"; version = "1.6.1"; src = fetchFromGitLab { owner = "CrimsonNape"; repo = "OSCAR-code"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-idooSDmozMtf0akhbaQP1aBIv6Ae9UMhMmN1P48u7FE="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { # See https://gitlab.com/pholy/OSCAR-code/-/tree/master/Building. platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/os/osdlyrics/package.nix b/pkgs/by-name/os/osdlyrics/package.nix index 5a2f11ccbd34..9892e8b8639c 100644 --- a/pkgs/by-name/os/osdlyrics/package.nix +++ b/pkgs/by-name/os/osdlyrics/package.nix @@ -18,14 +18,14 @@ runtimeShell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osdlyrics"; version = "0.5.15"; src = fetchFromGitHub { owner = "osdlyrics"; repo = "osdlyrics"; - rev = version; + rev = finalAttrs.version; hash = "sha256-4jEF1LdMwaLNF6zvzAuGW8Iu4dzhrFLutX69LwSjTAI="; }; @@ -93,4 +93,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pedrohlc ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/os/osi/package.nix b/pkgs/by-name/os/osi/package.nix index f542179365ca..5478b81e725d 100644 --- a/pkgs/by-name/os/osi/package.nix +++ b/pkgs/by-name/os/osi/package.nix @@ -14,14 +14,14 @@ cplex, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osi"; version = "0.108.11"; src = fetchFromGitHub { owner = "coin-or"; repo = "Osi"; - rev = "releases/${version}"; + rev = "releases/${finalAttrs.version}"; hash = "sha256-3aTO7JGEOP/RCOZ1X9b68rrtv6T78euf1TYGTjyXSRE="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/os/osmctools/package.nix b/pkgs/by-name/os/osmctools/package.nix index 116f0fdfbfe4..9e84e11d31c7 100644 --- a/pkgs/by-name/os/osmctools/package.nix +++ b/pkgs/by-name/os/osmctools/package.nix @@ -6,14 +6,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmctools"; version = "0.9"; src = fetchFromGitLab { owner = "osm-c-tools"; repo = "osmctools"; - rev = version; + rev = finalAttrs.version; sha256 = "1m8d3r1q1v05pkr8k9czrmb4xjszw6hvgsf3kn9pf0v14gpn4r8f"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/pkgs/by-name/os/osmid/package.nix b/pkgs/by-name/os/osmid/package.nix index a8b84b10c6cd..0c40e5df6095 100644 --- a/pkgs/by-name/os/osmid/package.nix +++ b/pkgs/by-name/os/osmid/package.nix @@ -7,14 +7,14 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmid"; version = "0.8.0"; src = fetchFromGitHub { owner = "llloret"; repo = "osmid"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1s1wsrp6g6wb0y61xzxvaj59mwycrgy52r4h456086zkz10ls6hw"; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ c0deaddict ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix index 82f8a239f51f..8b418a7bd2d4 100644 --- a/pkgs/by-name/os/osmo-bsc/package.nix +++ b/pkgs/by-name/os/osmo-bsc/package.nix @@ -11,19 +11,19 @@ osmo-mgw, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmo-bsc"; version = "1.13.3"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-bsc"; - rev = version; + rev = finalAttrs.version; hash = "sha256-2Go+93h1Z4FV9sESfjwCaee1m4jUq2eO8fxlZAwZVfM="; }; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "osmo-bsc"; }; -} +}) diff --git a/pkgs/by-name/os/osmo-bts/package.nix b/pkgs/by-name/os/osmo-bts/package.nix index 9605c11a9bb5..66b17182a06a 100644 --- a/pkgs/by-name/os/osmo-bts/package.nix +++ b/pkgs/by-name/os/osmo-bts/package.nix @@ -9,19 +9,19 @@ libosmo-netif, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmo-bts"; version = "1.9.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-bts"; - rev = version; + rev = finalAttrs.version; hash = "sha256-SvlkIvdyrXlaSJl+LbHovhIlnxsxpufJCy1wVCZbjWM="; }; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/os/osmo-ggsn/package.nix b/pkgs/by-name/os/osmo-ggsn/package.nix index 0c77a8b75f10..e1cc5ce37c73 100644 --- a/pkgs/by-name/os/osmo-ggsn/package.nix +++ b/pkgs/by-name/os/osmo-ggsn/package.nix @@ -7,19 +7,19 @@ libosmocore, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmo-ggsn"; version = "1.13.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-ggsn"; - rev = version; + rev = finalAttrs.version; hash = "sha256-qsBjoLyMlRgUjhX1tyI/MoHGmww1XUT3OMH4dVZzLU4="; }; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "osmo-ggsn"; }; -} +}) diff --git a/pkgs/by-name/os/osmo-hlr/package.nix b/pkgs/by-name/os/osmo-hlr/package.nix index b60842c69724..a2fdb8b074be 100644 --- a/pkgs/by-name/os/osmo-hlr/package.nix +++ b/pkgs/by-name/os/osmo-hlr/package.nix @@ -9,19 +9,19 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmo-hlr"; version = "1.9.1"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-hlr"; - rev = version; + rev = finalAttrs.version; hash = "sha256-yi4sgcX8WOWz7qw/jGvVCtIYe867uBzLps8gdG6ziOA="; }; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "osmo-hlr"; }; -} +}) diff --git a/pkgs/by-name/os/osmo-mgw/package.nix b/pkgs/by-name/os/osmo-mgw/package.nix index a25754a68783..166b97605bf7 100644 --- a/pkgs/by-name/os/osmo-mgw/package.nix +++ b/pkgs/by-name/os/osmo-mgw/package.nix @@ -9,19 +9,19 @@ libosmoabis, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmo-mgw"; version = "1.14.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-mgw"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Y/98K81US6McNu+JEJtMluJTvsv0DHJiyjMPJz8/35o="; }; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/os/osmo-msc/package.nix b/pkgs/by-name/os/osmo-msc/package.nix index 28dd27f28962..19537c9917e5 100644 --- a/pkgs/by-name/os/osmo-msc/package.nix +++ b/pkgs/by-name/os/osmo-msc/package.nix @@ -14,19 +14,19 @@ lksctp-tools, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmo-msc"; version = "1.14.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-msc"; - rev = version; + rev = finalAttrs.version; hash = "sha256-+Z49TqXLEeCy7Yj0qVg1hPFOD/x+4HnwDZxZoxoUjqI="; }; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/os/osmo-pcu/package.nix b/pkgs/by-name/os/osmo-pcu/package.nix index 0ac1d9e6ab5b..df41294ff887 100644 --- a/pkgs/by-name/os/osmo-pcu/package.nix +++ b/pkgs/by-name/os/osmo-pcu/package.nix @@ -7,19 +7,19 @@ libosmocore, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmo-pcu"; version = "1.5.2"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-pcu"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ibcmR046Go6IAlMClUZFoTc/gpy/q5Mp0hJIx/4tKqo="; }; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/os/osmo-sgsn/package.nix b/pkgs/by-name/os/osmo-sgsn/package.nix index 96f9d7a03c10..3abbc3a01490 100644 --- a/pkgs/by-name/os/osmo-sgsn/package.nix +++ b/pkgs/by-name/os/osmo-sgsn/package.nix @@ -12,19 +12,19 @@ c-ares, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmo-sgsn"; version = "1.13.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-sgsn"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ht8ejeD2whV0Ww5G3coUntLrIp2S0gZBRS6kF7w9KZY="; }; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "osmo-sgsn"; }; -} +}) diff --git a/pkgs/by-name/os/osmo-sip-connector/package.nix b/pkgs/by-name/os/osmo-sip-connector/package.nix index a02714a2ef7d..13d7d5a40393 100644 --- a/pkgs/by-name/os/osmo-sip-connector/package.nix +++ b/pkgs/by-name/os/osmo-sip-connector/package.nix @@ -9,19 +9,19 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmo-sip-connector"; version = "1.7.1"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-sip-connector"; - rev = version; + rev = finalAttrs.version; hash = "sha256-NmjaN28NnAIpMwUHCUS+7LJBwvCp48kyhmHRf6cU5WE="; }; postPatch = '' - echo "${version}" > .tarball-version + echo "${finalAttrs.version}" > .tarball-version ''; nativeBuildInputs = [ @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.markuskowa ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix index f3b57201f121..8d2da8121516 100644 --- a/pkgs/by-name/os/osrm-backend/package.nix +++ b/pkgs/by-name/os/osrm-backend/package.nix @@ -15,14 +15,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osrm-backend"; version = "6.0.0"; src = fetchFromGitHub { owner = "Project-OSRM"; repo = "osrm-backend"; - tag = "V${version}"; + tag = "V${finalAttrs.version}"; hash = "sha256-R2Sx+DbT6gROI8X1fkxqOGbMqgmsnNiw2rUX6gSZuTs="; }; @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://project-osrm.org/"; description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project"; - changelog = "https://github.com/Project-OSRM/osrm-backend/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/Project-OSRM/osrm-backend/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ erictapen ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/os/osslsigncode/package.nix b/pkgs/by-name/os/osslsigncode/package.nix index 0b9d9bc60583..b6f01f87275f 100644 --- a/pkgs/by-name/os/osslsigncode/package.nix +++ b/pkgs/by-name/os/osslsigncode/package.nix @@ -9,14 +9,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osslsigncode"; version = "2.11"; src = fetchFromGitHub { owner = "mtrojnar"; repo = "osslsigncode"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ua/4OouuMWTvfFbdOVVZpf1Z43JoPiptlFl+THaef58="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index df78665df501..f23dabf20bea 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ostree"; - version = "2025.2"; + version = "2025.7"; outputs = [ "out" @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${finalAttrs.version}/libostree-${finalAttrs.version}.tar.xz"; - hash = "sha256-8kSkCMkJmYp3jhJ/zCLBtQK00BPxXyaUj0fMcv/i7vQ="; + hash = "sha256-r40IC5WF5/0fq6jwIpZ+HCaK5i4g7PMu57NkweMHVws="; }; patches = [ diff --git a/pkgs/by-name/ot/otf2bdf/package.nix b/pkgs/by-name/ot/otf2bdf/package.nix index b4734b7ed334..c268b4c97042 100644 --- a/pkgs/by-name/ot/otf2bdf/package.nix +++ b/pkgs/by-name/ot/otf2bdf/package.nix @@ -5,7 +5,7 @@ freetype, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "otf2bdf"; version = "3.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "jirutka"; repo = "otf2bdf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-HK9ZrnwKhhYcBvSl+3RwFD7m/WSaPkGKX6utXnk5k+A="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ hzeller ]; mainProgram = "otf2bdf"; }; -} +}) diff --git a/pkgs/by-name/ot/otpclient/package.nix b/pkgs/by-name/ot/otpclient/package.nix index 148e5c21075e..914ce9bc7b80 100644 --- a/pkgs/by-name/ot/otpclient/package.nix +++ b/pkgs/by-name/ot/otpclient/package.nix @@ -19,14 +19,14 @@ zbar, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "otpclient"; version = "4.2.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = "otpclient"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KGtASCc07NGdjvQ8tIrnQIaEeld9H6z3odytKd8c5aQ="; }; @@ -54,9 +54,9 @@ stdenv.mkDerivation rec { meta = { description = "Highly secure and easy to use OTP client written in C/GTK that supports both TOTP and HOTP"; homepage = "https://github.com/paolostivanin/OTPClient"; - changelog = "https://github.com/paolostivanin/OTPClient/releases/tag/v${version}"; + changelog = "https://github.com/paolostivanin/OTPClient/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ alexbakker ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ot/ott/package.nix b/pkgs/by-name/ot/ott/package.nix index 620fb352727d..1c0880d7f510 100644 --- a/pkgs/by-name/ot/ott/package.nix +++ b/pkgs/by-name/ot/ott/package.nix @@ -7,14 +7,14 @@ opaline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ott"; version = "0.34"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; - rev = version; + rev = finalAttrs.version; hash = "sha256-S6EMQgEBrtXB9hTM7x6irZPsI9c9JHeuCk/9pcpQMNg="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jwiegley ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ou/outils/package.nix b/pkgs/by-name/ou/outils/package.nix index e933be0c1e78..fa6c0117d793 100644 --- a/pkgs/by-name/ou/outils/package.nix +++ b/pkgs/by-name/ou/outils/package.nix @@ -5,14 +5,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "outils"; version = "0.13"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = "outils"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-FokJytwQsbGsryBzyglpb1Hg3wti/CPQTOfIGIz9ThA="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ somasis ]; }; -} +}) diff --git a/pkgs/by-name/ov/overseerr/package.nix b/pkgs/by-name/ov/overseerr/package.nix index b3933754c950..e9331a5c7b6e 100644 --- a/pkgs/by-name/ov/overseerr/package.nix +++ b/pkgs/by-name/ov/overseerr/package.nix @@ -13,19 +13,19 @@ yarnInstallHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "overseerr"; version = "1.34.0"; src = fetchFromGitHub { owner = "sct"; repo = "overseerr"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4332XsupUGjkFo0+4wn2fUyK5/y6EQoPaAuayBH/myk="; }; offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-f30P+/DxDz9uBmdgvaYK4YOAUmVce8MUnNHBXr8/yKc="; }; @@ -63,11 +63,11 @@ stdenv.mkDerivation rec { # FileNotFoundError: [Errno 2] No such file or directory: 'xcodebuild' lib.systems.inspect.patterns.isDarwin ]; - changelog = "https://github.com/sct/overseerr/releases/tag/v${version}"; + changelog = "https://github.com/sct/overseerr/releases/tag/v${finalAttrs.version}"; description = "Request management and media discovery tool for the Plex ecosystem"; homepage = "https://github.com/sct/overseerr"; license = lib.licenses.mit; mainProgram = "overseerr"; maintainers = with lib.maintainers; [ jf-uu ]; }; -} +}) diff --git a/pkgs/by-name/ov/ovh-ttyrec/package.nix b/pkgs/by-name/ov/ovh-ttyrec/package.nix index a1dfb1d7f869..0c9bccfbb33d 100644 --- a/pkgs/by-name/ov/ovh-ttyrec/package.nix +++ b/pkgs/by-name/ov/ovh-ttyrec/package.nix @@ -5,14 +5,14 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ovh-ttyrec"; version = "1.1.7.1"; src = fetchFromGitHub { owner = "ovh"; repo = "ovh-ttyrec"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-VTF9WLwAIWWn+W0sLQaoFBFro+pSXKwcTO6q6MW6JD8="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { zimbatm ]; }; -} +}) diff --git a/pkgs/by-name/ow/owamp/package.nix b/pkgs/by-name/ow/owamp/package.nix index 7027b3929a84..6f4e93480d1b 100644 --- a/pkgs/by-name/ow/owamp/package.nix +++ b/pkgs/by-name/ow/owamp/package.nix @@ -7,14 +7,14 @@ mandoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "owamp"; version = "4.4.6"; src = fetchFromGitHub { owner = "perfsonar"; repo = "owamp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "5o85XSn84nOvNjIzlaZ2R6/TSHpKbWLXTO0FmqWsNMU="; fetchSubmodules = true; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.teto ]; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/by-name/ow/owl-lisp/package.nix b/pkgs/by-name/ow/owl-lisp/package.nix index f1bb3a12d47f..92b3245ab1b8 100644 --- a/pkgs/by-name/ow/owl-lisp/package.nix +++ b/pkgs/by-name/ow/owl-lisp/package.nix @@ -6,14 +6,14 @@ dash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "owl-lisp"; version = "0.2.2"; src = fetchFromGitLab { owner = "owl-lisp"; repo = "owl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ peterhoeg ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/p9/p910nd/package.nix b/pkgs/by-name/p9/p910nd/package.nix index 87f9b613d002..50ca44d1eaca 100644 --- a/pkgs/by-name/p9/p910nd/package.nix +++ b/pkgs/by-name/p9/p910nd/package.nix @@ -5,14 +5,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "p910nd"; version = "0.97"; src = fetchFromGitHub { owner = "kenyapcomau"; repo = "p910nd"; - rev = version; + rev = finalAttrs.version; hash = "sha256-MM4o7d3L3XIRYWJ/KPM2OltlVfVA/BgMuyhJMm/BS3c="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "p910nd"; }; -} +}) diff --git a/pkgs/by-name/pa/pacemaker/package.nix b/pkgs/by-name/pa/pacemaker/package.nix index 4e1f168424da..a9e5a0fc5a8b 100644 --- a/pkgs/by-name/pa/pacemaker/package.nix +++ b/pkgs/by-name/pa/pacemaker/package.nix @@ -28,14 +28,14 @@ ocf-resource-agents, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pacemaker"; version = "3.0.1"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = "pacemaker"; - rev = "Pacemaker-${version}"; + rev = "Pacemaker-${finalAttrs.version}"; sha256 = "sha256-23YkNzqiimLy/KjO+hxVQQ4rUhSEhn5Oc2jUJO/VRo0="; }; @@ -107,4 +107,4 @@ stdenv.mkDerivation rec { astro ]; }; -} +}) diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix index 863ee69a708c..a18e14e37cb7 100644 --- a/pkgs/by-name/pa/pahole/package.nix +++ b/pkgs/by-name/pa/pahole/package.nix @@ -12,11 +12,11 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pahole"; version = "1.31"; src = fetchzip { - url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz"; + url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${finalAttrs.version}.tar.gz"; hash = "sha256-Afy0SysuDbTOa8H3m4hexy12Rmuv2NZL2wHfO4JtKL0="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { martinetd ]; }; -} +}) diff --git a/pkgs/by-name/pa/pam_ccreds/package.nix b/pkgs/by-name/pa/pam_ccreds/package.nix index 07339cb6fab5..bd4aeb03ebb0 100644 --- a/pkgs/by-name/pa/pam_ccreds/package.nix +++ b/pkgs/by-name/pa/pam_ccreds/package.nix @@ -7,12 +7,12 @@ db, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pam_ccreds"; version = "10"; src = fetchurl { - url = "https://www.padl.com/download/pam_ccreds-${version}.tar.gz"; + url = "https://www.padl.com/download/pam_ccreds-${finalAttrs.version}.tar.gz"; sha256 = "1h7zyg1b1h69civyvrj95w22dg0y7lgw3hq4gqkdcg35w1y76fhz"; }; patchPhase = '' @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pa/pam_gnupg/package.nix b/pkgs/by-name/pa/pam_gnupg/package.nix index ffc791801782..84f5157ac83a 100644 --- a/pkgs/by-name/pa/pam_gnupg/package.nix +++ b/pkgs/by-name/pa/pam_gnupg/package.nix @@ -7,14 +7,14 @@ gnupg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pam_gnupg"; version = "0.4"; src = fetchFromGitHub { owner = "cruegge"; repo = "pam-gnupg"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-6I9a841qohA42lhOgZf/hharnjkthuB8lRptPDxUgMI="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/pa/pam_krb5/package.nix b/pkgs/by-name/pa/pam_krb5/package.nix index 3968dd86caf3..68130a880c25 100644 --- a/pkgs/by-name/pa/pam_krb5/package.nix +++ b/pkgs/by-name/pa/pam_krb5/package.nix @@ -6,12 +6,12 @@ libkrb5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pam-krb5"; version = "4.11"; src = fetchurl { - url = "https://archives.eyrie.org/software/kerberos/pam-krb5-${version}.tar.gz"; + url = "https://archives.eyrie.org/software/kerberos/pam-krb5-${finalAttrs.version}.tar.gz"; sha256 = "sha256-UDy+LLGv9L39o7z3+T+U+2ulLCbXCJNOcDmyGC/hCyA="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/pa/pam_mysql/package.nix b/pkgs/by-name/pa/pam_mysql/package.nix index 15d29eb055ff..aba7994007a7 100644 --- a/pkgs/by-name/pa/pam_mysql/package.nix +++ b/pkgs/by-name/pa/pam_mysql/package.nix @@ -12,14 +12,14 @@ libxcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pam_mysql"; version = "1.0.0-beta2"; src = fetchFromGitHub { owner = "NigelCunningham"; repo = "pam-MySQL"; - rev = version; + rev = finalAttrs.version; sha256 = "07acf0hbhkd0kg49gnj4nb5ilnv3v4xx3dsggvzvjg8gi3cjmsap"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ netali ]; }; -} +}) diff --git a/pkgs/by-name/pa/pam_p11/package.nix b/pkgs/by-name/pa/pam_p11/package.nix index 943800559c7d..4c6e1dfde2e9 100644 --- a/pkgs/by-name/pa/pam_p11/package.nix +++ b/pkgs/by-name/pa/pam_p11/package.nix @@ -10,14 +10,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pam_p11"; version = "0.3.1"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pam_p11"; - rev = "pam_p11-${version}"; + rev = "pam_p11-${finalAttrs.version}"; sha256 = "1caidy18rq5zk82d51x8vwidmkhwmanf3qm25x1yrdlbhxv6m7lk"; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ sb0 ]; }; -} +}) diff --git a/pkgs/by-name/pa/pam_rundir/package.nix b/pkgs/by-name/pa/pam_rundir/package.nix index 3fcf4a85d15c..a9acc2818a77 100644 --- a/pkgs/by-name/pa/pam_rundir/package.nix +++ b/pkgs/by-name/pa/pam_rundir/package.nix @@ -4,12 +4,12 @@ fetchurl, pam, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pam_rundir"; version = "1.0.0"; src = fetchurl { - url = "https://jjacky.com/pam_rundir/pam_rundir-${version}.tar.gz"; + url = "https://jjacky.com/pam_rundir/pam_rundir-${finalAttrs.version}.tar.gz"; hash = "sha256-x3m2me0jd3o726h7f2ftOV/pV/PJYTj67kX4eie8wCA="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aanderse ]; }; -} +}) diff --git a/pkgs/by-name/pa/pam_tmpdir/package.nix b/pkgs/by-name/pa/pam_tmpdir/package.nix index 561e0a1c3f00..724b32566279 100644 --- a/pkgs/by-name/pa/pam_tmpdir/package.nix +++ b/pkgs/by-name/pa/pam_tmpdir/package.nix @@ -6,12 +6,12 @@ pam, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pam_tmpdir"; version = "0.09"; src = fetchurl { - url = "http://deb.debian.org/debian/pool/main/p/pam-tmpdir/pam-tmpdir_${version}.tar.gz"; + url = "http://deb.debian.org/debian/pool/main/p/pam-tmpdir/pam-tmpdir_${finalAttrs.version}.tar.gz"; hash = "sha256-MXa1CY6alD83E/Q+MJmsv8NaImWd0pPJKZd/7nbe4J8="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ peterhoeg ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pa/pamixer/package.nix b/pkgs/by-name/pa/pamixer/package.nix index e0315f7097f3..061e9820a7f1 100644 --- a/pkgs/by-name/pa/pamixer/package.nix +++ b/pkgs/by-name/pa/pamixer/package.nix @@ -10,14 +10,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pamixer"; version = "1.6"; src = fetchFromGitHub { owner = "cdemoulins"; repo = "pamixer"; - rev = version; + rev = finalAttrs.version; hash = "sha256-LbRhsW2MiTYWSH6X9Pz9XdJdH9Na0QCO8CFmlzZmDjQ="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "pamixer"; }; -} +}) diff --git a/pkgs/by-name/pa/pamtester/package.nix b/pkgs/by-name/pa/pamtester/package.nix index 56038fab10de..37292cf5b18d 100644 --- a/pkgs/by-name/pa/pamtester/package.nix +++ b/pkgs/by-name/pa/pamtester/package.nix @@ -6,12 +6,12 @@ pam, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pamtester"; version = "0.1.2"; src = fetchurl { - url = "mirror://sourceforge/pamtester/pamtester-${version}.tar.gz"; + url = "mirror://sourceforge/pamtester/pamtester-${finalAttrs.version}.tar.gz"; sha256 = "1mdj1wj0adcnx354fs17928yn2xfr1hj5mfraq282dagi873sqw3"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/pa/pandoc-lua-filters/package.nix b/pkgs/by-name/pa/pandoc-lua-filters/package.nix index a1b69c1fa97c..e18bcc4afefd 100644 --- a/pkgs/by-name/pa/pandoc-lua-filters/package.nix +++ b/pkgs/by-name/pa/pandoc-lua-filters/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pandoc-lua-filters"; version = "2021-11-05"; src = fetchFromGitHub { owner = "pandoc"; repo = "lua-filters"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Y962kdwg2bS3ZoPfsktv4Fy34HUTRhIIuSxPi5ODwWg="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jtojnar ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/pa/panoply/package.nix b/pkgs/by-name/pa/panoply/package.nix index 82b2051379ce..016d2a3a0f21 100644 --- a/pkgs/by-name/pa/panoply/package.nix +++ b/pkgs/by-name/pa/panoply/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.8.1"; + version = "5.9.0"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - hash = "sha256-pdlJGr4zwHiBP9BujALNPBe9m9UIwNQLgOURomxlnjU="; + hash = "sha256-OCxplchCBx5hCbihg4WNu/RrcYBo5Jfdm1VDIr9swRU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pa/papirus-folders/package.nix b/pkgs/by-name/pa/papirus-folders/package.nix index 717b07e04fce..45926349f2e9 100644 --- a/pkgs/by-name/pa/papirus-folders/package.nix +++ b/pkgs/by-name/pa/papirus-folders/package.nix @@ -5,14 +5,14 @@ getent, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "papirus-folders"; version = "1.14.0"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-folders"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-pkzYhE4dNqyl5TvXQqs915QzwZwsXtdAQ+4B29oe9LA="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.aacebedo ]; }; -} +}) diff --git a/pkgs/by-name/pa/pappl/package.nix b/pkgs/by-name/pa/pappl/package.nix index b38308f9eaac..9be4f86eb3e9 100644 --- a/pkgs/by-name/pa/pappl/package.nix +++ b/pkgs/by-name/pa/pappl/package.nix @@ -14,14 +14,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pappl"; version = "1.4.9"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "pappl"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XHFYwl129iD5rKC1P/roFlX+03uFE8ofwQRIEkUuOCc="; }; @@ -63,11 +63,11 @@ stdenv.mkDerivation rec { meta = { description = "C-based framework/library for developing CUPS Printer Applications"; - changelog = "https://github.com/michaelrsweet/pappl/blob/v${version}/CHANGES.md"; + changelog = "https://github.com/michaelrsweet/pappl/blob/v${finalAttrs.version}/CHANGES.md"; mainProgram = "pappl-makeresheader"; homepage = "https://github.com/michaelrsweet/pappl"; license = lib.licenses.asl20; platforms = lib.platforms.linux; # should also work for darwin, but requires additional work maintainers = [ lib.maintainers.NotAShelf ]; }; -} +}) diff --git a/pkgs/by-name/pa/paprefs/package.nix b/pkgs/by-name/pa/paprefs/package.nix index 7f10ded6844e..386212a8a820 100644 --- a/pkgs/by-name/pa/paprefs/package.nix +++ b/pkgs/by-name/pa/paprefs/package.nix @@ -12,12 +12,12 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "paprefs"; version = "1.2"; src = fetchurl { - url = "https://freedesktop.org/software/pulseaudio/paprefs/paprefs-${version}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/paprefs/paprefs-${finalAttrs.version}.tar.xz"; sha256 = "sha256-s/IeQNw5NtFeP/yRD7DAfBS4jowodxW0VqlIwXY49jM="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pa/par/package.nix b/pkgs/by-name/pa/par/package.nix index df610d4705eb..8e8db65ef3de 100644 --- a/pkgs/by-name/pa/par/package.nix +++ b/pkgs/by-name/pa/par/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "par"; version = "1.53.0"; src = fetchurl { - url = "http://www.nicemice.net/par/Par-${version}.tar.gz"; + url = "http://www.nicemice.net/par/Par-${finalAttrs.version}.tar.gz"; sha256 = "sha256-yAnGIOuCtYlVOsVLmJjI2lUZbSYjOdE8BG8r5ErEeAQ="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { # See https://fedoraproject.org/wiki/Licensing/Par for license details license = lib.licenses.free; }; -} +}) diff --git a/pkgs/by-name/pa/par2cmdline-turbo/package.nix b/pkgs/by-name/pa/par2cmdline-turbo/package.nix index 9a34726ebc1e..92fb641e68c4 100644 --- a/pkgs/by-name/pa/par2cmdline-turbo/package.nix +++ b/pkgs/by-name/pa/par2cmdline-turbo/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "par2cmdline-turbo"; version = "1.3.0"; src = fetchFromGitHub { owner = "animetosho"; repo = "par2cmdline-turbo"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ld0oTaf1IZ0U0KMF4sW7RdTmF0CNobxjwomTLQEhpIc="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "par2"; }; -} +}) diff --git a/pkgs/by-name/pa/par2cmdline/package.nix b/pkgs/by-name/pa/par2cmdline/package.nix index cefa528d7813..dcc61de8a37e 100644 --- a/pkgs/by-name/pa/par2cmdline/package.nix +++ b/pkgs/by-name/pa/par2cmdline/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "par2cmdline"; version = "0.8.1"; src = fetchFromGitHub { owner = "Parchive"; repo = "par2cmdline"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "11mx8q29cr0sryd11awab7y4mhqgbamb1ss77rffjj6in8pb4hdk"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/pa/parlatype/package.nix b/pkgs/by-name/pa/parlatype/package.nix index 4eae619b4a06..ecd3e8a1e231 100644 --- a/pkgs/by-name/pa/parlatype/package.nix +++ b/pkgs/by-name/pa/parlatype/package.nix @@ -22,14 +22,14 @@ wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "parlatype"; version = "4.3"; src = fetchFromGitHub { owner = "gkarsay"; repo = "parlatype"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1kjsbwr08k1kzaan555zjk37r3l5qhpgrvjb1p57dnygk2g3hsm2"; }; @@ -91,4 +91,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pa/parse-cli-bin/package.nix b/pkgs/by-name/pa/parse-cli-bin/package.nix index fc0ca060546a..f5fefcaf2ed5 100644 --- a/pkgs/by-name/pa/parse-cli-bin/package.nix +++ b/pkgs/by-name/pa/parse-cli-bin/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "parse-cli-bin"; version = "3.0.5"; src = fetchurl { - url = "https://github.com/ParsePlatform/parse-cli/releases/download/release_${version}/parse_linux"; + url = "https://github.com/ParsePlatform/parse-cli/releases/download/release_${finalAttrs.version}/parse_linux"; sha256 = "1iyfizbbxmr87wjgqiwqds51irgw6l3vm9wn89pc3zpj2zkyvf5h"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { cp "$src" "$out/bin/parse" chmod +x "$out/bin/parse" ''; -} +}) diff --git a/pkgs/by-name/pa/partclone/package.nix b/pkgs/by-name/pa/partclone/package.nix index 238d1ed8ca9d..b916efa8979c 100644 --- a/pkgs/by-name/pa/partclone/package.nix +++ b/pkgs/by-name/pa/partclone/package.nix @@ -11,14 +11,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "partclone"; version = "0.3.38"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-lWnGi8giz7vzdBnuth55h0VMuNyCQaCclRqPJdm0I14="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ marcweber ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pa/partimage/package.nix b/pkgs/by-name/pa/partimage/package.nix index 9875ed28dc2c..860204a046ac 100644 --- a/pkgs/by-name/pa/partimage/package.nix +++ b/pkgs/by-name/pa/partimage/package.nix @@ -12,14 +12,14 @@ libxcrypt, autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "partimage"; version = "0.6.9"; enableParallelBuilding = true; src = fetchurl { - url = "mirror://sourceforge/partimage/partimage-${version}.tar.bz2"; + url = "mirror://sourceforge/partimage/partimage-${finalAttrs.version}.tar.bz2"; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pa/partio/package.nix b/pkgs/by-name/pa/partio/package.nix index f029f6aa557d..821a1472a285 100644 --- a/pkgs/by-name/pa/partio/package.nix +++ b/pkgs/by-name/pa/partio/package.nix @@ -15,14 +15,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "partio"; version = "1.19.0"; src = fetchFromGitHub { owner = "wdas"; repo = "partio"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-p3mpxP0slHIQ75UtNAr5PcSOaSt9UyGR/MyOZ2GoXdU="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.guibou ]; }; -} +}) diff --git a/pkgs/by-name/pa/passff-host/package.nix b/pkgs/by-name/pa/passff-host/package.nix index 6fe05835489e..dc25db3b6aa2 100644 --- a/pkgs/by-name/pa/passff-host/package.nix +++ b/pkgs/by-name/pa/passff-host/package.nix @@ -6,30 +6,30 @@ pass, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "passff-host"; version = "1.2.4"; src = fetchFromGitHub { owner = "passff"; repo = "passff-host"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-P5h0B5ilwp3OVyDHIOQ23Zv4eLjN4jFkdZF293FQnNE="; }; buildInputs = [ python3 ]; - makeFlags = [ "VERSION=${version}" ]; + makeFlags = [ "VERSION=${finalAttrs.version}" ]; patchPhase = '' sed -i 's#COMMAND = "pass"#COMMAND = "${pass}/bin/pass"#' src/passff.py ''; installPhase = '' - substituteInPlace bin/${version}/passff.json \ + substituteInPlace bin/${finalAttrs.version}/passff.json \ --replace PLACEHOLDER $out/share/passff-host/passff.py install -Dt $out/share/passff-host \ - bin/${version}/passff.{py,json} + bin/${finalAttrs.version}/passff.{py,json} nativeMessagingPaths=( /lib/mozilla/native-messaging-hosts @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/pa/pasystray/package.nix b/pkgs/by-name/pa/pasystray/package.nix index 68c9d59176b1..80f45284003c 100644 --- a/pkgs/by-name/pa/pasystray/package.nix +++ b/pkgs/by-name/pa/pasystray/package.nix @@ -15,14 +15,14 @@ gsettings-desktop-schemas, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pasystray"; version = "0.8.2"; src = fetchFromGitHub { owner = "christophgysin"; repo = "pasystray"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-QaTQ8yUviJaFEQaQm2vYAUngqHliKe8TDYqfWt1Nx/0="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "pasystray"; }; -} +}) diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 7a8eb287bec4..dc7469501c34 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-o8+Br3gSpB2FoyXfmn2ZnGLm0zIaPx0mgzlLNdFo9sc="; + hash = "sha256-mln6MVPZRbW2XgTaVAGiK87MkHPPEzFgHaNnacKym8g="; }; - vendorHash = "sha256-lEIBGuRaCkinBN2aQqXgH95Ql7GSCP0bpOsjZLLK6Jo="; + vendorHash = "sha256-nLpS0JbdqFMK2+ycZZC93HWPCS0+k7tyl1pB/T6fPjA="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/pa/patchage/package.nix b/pkgs/by-name/pa/patchage/package.nix index b8f1fccf5a76..c8aec8883951 100644 --- a/pkgs/by-name/pa/patchage/package.nix +++ b/pkgs/by-name/pa/patchage/package.nix @@ -14,14 +14,14 @@ wafHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "patchage"; version = "1.0.6"; src = fetchFromGitLab { owner = "drobilla"; repo = "patchage"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-LzN6RyF/VT4LUVeR0904BnLuNMFZjFTDu9oDIKYG2Yo="; fetchSubmodules = true; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.nico202 ]; mainProgram = "patchage"; }; -} +}) diff --git a/pkgs/by-name/pa/pax-utils/package.nix b/pkgs/by-name/pa/pax-utils/package.nix index b7bb2dc83645..c66a89ada67f 100644 --- a/pkgs/by-name/pa/pax-utils/package.nix +++ b/pkgs/by-name/pa/pax-utils/package.nix @@ -18,13 +18,13 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pax-utils"; version = "1.3.10"; src = fetchgit { url = "https://anongit.gentoo.org/git/proj/pax-utils.git"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-qoFXQ/RqvdjsVhXVZZjWKnE0khak9HjOGi/UrfTLS8M="; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { joachifm ]; }; -} +}) diff --git a/pkgs/by-name/pa/pax/package.nix b/pkgs/by-name/pa/pax/package.nix index b7888f183483..bf38bcd5c4b6 100644 --- a/pkgs/by-name/pa/pax/package.nix +++ b/pkgs/by-name/pa/pax/package.nix @@ -5,12 +5,12 @@ musl-fts, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pax"; version = "20240817"; src = fetchurl { - url = "http://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${version}.tgz"; + url = "http://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${finalAttrs.version}.tgz"; sha256 = "sha256-6VXV06+Xrt4KP0Y6mlm4Po0Qg6rxQutvOIxUmn0YLms="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pb/pbzx/package.nix b/pkgs/by-name/pb/pbzx/package.nix index 5076244d2e4e..a895863821ab 100644 --- a/pkgs/by-name/pb/pbzx/package.nix +++ b/pkgs/by-name/pb/pbzx/package.nix @@ -6,13 +6,13 @@ xar, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pbzx"; version = "1.0.2"; src = fetchFromGitHub { owner = "NiklasRosenstein"; repo = "pbzx"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0bwd7wmnhpz1n5p39mh6asfyccj4cm06hwigslcwbb3pdwmvxc90"; }; patches = [ ./stdin.patch ]; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "pbzx"; }; -} +}) diff --git a/pkgs/by-name/pc/pcapc/package.nix b/pkgs/by-name/pc/pcapc/package.nix index 8cb80bfef0c2..8bfeac8926a3 100644 --- a/pkgs/by-name/pc/pcapc/package.nix +++ b/pkgs/by-name/pc/pcapc/package.nix @@ -5,7 +5,7 @@ libpcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcapc"; version = "1.0.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "post-factum"; repo = "pcapc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-oDg9OSvi9aQsZ2SQm02NKAcppE0w5SGZaI13gdp7gv4="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "pcapc"; }; -} +}) diff --git a/pkgs/by-name/pc/pcapfix/package.nix b/pkgs/by-name/pc/pcapfix/package.nix index 782e8ea760d7..eddc9699c835 100644 --- a/pkgs/by-name/pc/pcapfix/package.nix +++ b/pkgs/by-name/pc/pcapfix/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcapfix"; version = "1.1.7"; src = fetchurl { - url = "https://f00l.de/pcapfix/pcapfix-${version}.tar.gz"; + url = "https://f00l.de/pcapfix/pcapfix-${finalAttrs.version}.tar.gz"; sha256 = "sha256-bL6/b5npdrGrdok5JK65DNh8MWUILRUmTBkz8POz4Ow="; }; @@ -22,4 +22,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "pcapfix"; }; -} +}) diff --git a/pkgs/by-name/pc/pcb2gcode/package.nix b/pkgs/by-name/pc/pcb2gcode/package.nix index 0bbfe545261a..93a5fb1514d3 100644 --- a/pkgs/by-name/pc/pcb2gcode/package.nix +++ b/pkgs/by-name/pc/pcb2gcode/package.nix @@ -11,14 +11,14 @@ librsvg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcb2gcode"; version = "2.5.0"; src = fetchFromGitHub { owner = "pcb2gcode"; repo = "pcb2gcode"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-c5YabBqZn6ilIkF3lifTsYyLZMsZN21jDj1hNu0PRAc="; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace ./Makefile.am \ - --replace '`git describe --dirty --always --tags`' '${version}' + --replace '`git describe --dirty --always --tags`' '${finalAttrs.version}' ''; meta = { @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ kritnich ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pc/pcem/package.nix b/pkgs/by-name/pc/pcem/package.nix index 570ec6d15cec..65e7aec32009 100644 --- a/pkgs/by-name/pc/pcem/package.nix +++ b/pkgs/by-name/pc/pcem/package.nix @@ -15,12 +15,12 @@ withALSA ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcem"; version = "17"; src = fetchzip { - url = "https://pcem-emulator.co.uk/files/PCemV${version}Linux.tar.gz"; + url = "https://pcem-emulator.co.uk/files/PCemV${finalAttrs.version}Linux.tar.gz"; stripRoot = false; sha256 = "067pbnc15h6a4pnnym82klr1w8qwfm6p0pkx93gx06wvwqsxvbdv"; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.terin ]; platforms = lib.platforms.linux ++ lib.platforms.windows; }; -} +}) diff --git a/pkgs/by-name/pc/pcm/package.nix b/pkgs/by-name/pc/pcm/package.nix index f0e4010d52bb..c6df46483e45 100644 --- a/pkgs/by-name/pc/pcm/package.nix +++ b/pkgs/by-name/pc/pcm/package.nix @@ -5,14 +5,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcm"; version = "202509"; src = fetchFromGitHub { owner = "intel"; repo = "pcm"; - rev = version; + rev = finalAttrs.version; hash = "sha256-RIpyh4JN1/ePoSLQPyB3pgx6ifBcpJK+1d9YQcGZed4="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ roosemberth ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/pc/pcmanx-gtk2/package.nix b/pkgs/by-name/pc/pcmanx-gtk2/package.nix index 9e21a31ae0c6..5829245c19ff 100644 --- a/pkgs/by-name/pc/pcmanx-gtk2/package.nix +++ b/pkgs/by-name/pc/pcmanx-gtk2/package.nix @@ -11,14 +11,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcmanx-gtk2"; version = "1.3"; src = fetchFromGitHub { owner = "pcman-bbs"; repo = "pcmanx"; - rev = version; + rev = finalAttrs.version; sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "pcmanx"; }; -} +}) diff --git a/pkgs/by-name/pc/pcmciaUtils/package.nix b/pkgs/by-name/pc/pcmciaUtils/package.nix index 426520c29f32..9bdd4c1ecc11 100644 --- a/pkgs/by-name/pc/pcmciaUtils/package.nix +++ b/pkgs/by-name/pc/pcmciaUtils/package.nix @@ -14,12 +14,12 @@ }: # used to generate postInstall script. # FIXME: should add an option to choose between hotplug and udev. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcmciautils"; version = "018"; src = fetchurl { - url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${version}.tar.gz"; + url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${finalAttrs.version}.tar.gz"; sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk"; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pc/pcmsolver/package.nix b/pkgs/by-name/pc/pcmsolver/package.nix index bd55423f77de..2befb41e6355 100644 --- a/pkgs/by-name/pc/pcmsolver/package.nix +++ b/pkgs/by-name/pc/pcmsolver/package.nix @@ -11,14 +11,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcmsolver"; version = "1.3.0"; src = fetchFromGitHub { owner = "PCMSolver"; repo = "pcmsolver"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0jrxr8z21hjy7ik999hna9rdqy221kbkl3qkb06xw7g80rc9x9yr"; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/pd/pdf2svg/package.nix b/pkgs/by-name/pd/pdf2svg/package.nix index b99dd94f8cbd..ad1b4e895cca 100644 --- a/pkgs/by-name/pd/pdf2svg/package.nix +++ b/pkgs/by-name/pd/pdf2svg/package.nix @@ -9,14 +9,14 @@ poppler, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdf2svg"; version = "0.2.4"; src = fetchFromGitHub { owner = "db9052"; repo = "pdf2svg"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-zME0U+PyENnoLyjo9W2i2MRM00wNmHkYcR2LMEtTbBY="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "pdf2svg"; }; -} +}) diff --git a/pkgs/by-name/pd/pdfcrack/package.nix b/pkgs/by-name/pd/pdfcrack/package.nix index 63ee7f130745..67fbe8cc8f33 100644 --- a/pkgs/by-name/pd/pdfcrack/package.nix +++ b/pkgs/by-name/pd/pdfcrack/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdfcrack"; version = "0.21"; src = fetchurl { - url = "mirror://sourceforge/pdfcrack/pdfcrack/pdfcrack-${version}.tar.gz"; + url = "mirror://sourceforge/pdfcrack/pdfcrack/pdfcrack-${finalAttrs.version}.tar.gz"; hash = "sha256-JvANSvy3C1g5BHvG9i5CUwc6xDe9tSbwHowEsiDpd2I="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ qoelet ]; }; -} +}) diff --git a/pkgs/by-name/pd/pdfmixtool/package.nix b/pkgs/by-name/pd/pdfmixtool/package.nix index 489bc80c7b15..e8efb967babb 100644 --- a/pkgs/by-name/pd/pdfmixtool/package.nix +++ b/pkgs/by-name/pd/pdfmixtool/package.nix @@ -10,14 +10,14 @@ imagemagick, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdfmixtool"; version = "1.2.1"; src = fetchFromGitLab { owner = "scarpetta"; repo = "pdfmixtool"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-UuRTMLlUIyo2RF+XjI229kkE67ybmllIy98p97PjWCE="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ onny ]; }; -} +}) diff --git a/pkgs/by-name/pd/pdfslicer/package.nix b/pkgs/by-name/pd/pdfslicer/package.nix index b8b679d08a84..b2834f28cdcf 100644 --- a/pkgs/by-name/pd/pdfslicer/package.nix +++ b/pkgs/by-name/pd/pdfslicer/package.nix @@ -13,14 +13,14 @@ qpdf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdfslicer"; version = "1.8.8"; src = fetchFromGitHub { owner = "junrrein"; repo = "pdfslicer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; sha256 = "0sja0ddd9c8wjjpzk2ag8q1lxpj09adgmhd7wnsylincqnj2jyls"; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/by-name/pd/pdftag/package.nix b/pkgs/by-name/pd/pdftag/package.nix index 008e12971582..bae1464c9eb9 100644 --- a/pkgs/by-name/pd/pdftag/package.nix +++ b/pkgs/by-name/pd/pdftag/package.nix @@ -11,14 +11,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdftag"; version = "1.0.5"; src = fetchFromGitHub { owner = "arrufat"; repo = "pdftag"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1paj8hs27akzsivn01a30fl3zx5gfn1h89wxg2m72fd806hk0hql"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "pdftag"; }; -} +}) diff --git a/pkgs/by-name/pd/pdnsd/package.nix b/pkgs/by-name/pd/pdnsd/package.nix index 473a434a3901..34d4c93f8272 100644 --- a/pkgs/by-name/pd/pdnsd/package.nix +++ b/pkgs/by-name/pd/pdnsd/package.nix @@ -5,12 +5,12 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdnsd"; version = "1.2.9a-par"; src = fetchurl { - url = "http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-${version}.tar.gz"; + url = "http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-${finalAttrs.version}.tar.gz"; sha256 = "0yragv5zk77a1hfkpnsh17vvsw8b14d6mzfng4bb7i58rb83an5v"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/pd/pdpmake/package.nix b/pkgs/by-name/pd/pdpmake/package.nix index e6971658cfbc..a854bad8ad68 100644 --- a/pkgs/by-name/pd/pdpmake/package.nix +++ b/pkgs/by-name/pd/pdpmake/package.nix @@ -3,14 +3,14 @@ stdenv, fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdpmake"; version = "2.0.4"; src = fetchFromGitHub { owner = "rmyorston"; repo = "pdpmake"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ivRXZxm9RAWSmNfiV7BhVzVFsBKuMMpKjub8ADinYyc="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; badPlatforms = lib.platforms.darwin; # Requires `uimensat` }; -} +}) diff --git a/pkgs/by-name/pe/pe-parse/package.nix b/pkgs/by-name/pe/pe-parse/package.nix index ccbb06f01e71..177a90c0be43 100644 --- a/pkgs/by-name/pe/pe-parse/package.nix +++ b/pkgs/by-name/pe/pe-parse/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pe-parse"; version = "2.1.1"; src = fetchFromGitHub { owner = "trailofbits"; repo = "pe-parse"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-XegSZWRoQg6NEWuTSFI1RMvN3GbpLDrZrloPU2XdK2M="; }; @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { meta = { description = "Principled, lightweight parser for Windows portable executable files"; homepage = "https://github.com/trailofbits/pe-parse"; - changelog = "https://github.com/trailofbits/pe-parse/releases/tag/v${version}"; + changelog = "https://github.com/trailofbits/pe-parse/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ arturcygan ]; mainProgram = "dump-pe"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pe/peek/package.nix b/pkgs/by-name/pe/peek/package.nix index aa45314f3dcd..8635fa6971bb 100644 --- a/pkgs/by-name/pe/peek/package.nix +++ b/pkgs/by-name/pe/peek/package.nix @@ -26,14 +26,14 @@ gifski, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "peek"; version = "1.5.1"; src = fetchFromGitHub { owner = "phw"; repo = "peek"; - rev = version; + rev = finalAttrs.version; sha256 = "1xwlfizga6hvjqq127py8vabaphsny928ar7mwqj9cyqfl6fx41x"; }; @@ -97,4 +97,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "peek"; }; -} +}) diff --git a/pkgs/by-name/pe/pencil/package.nix b/pkgs/by-name/pe/pencil/package.nix index 0c198934c8f6..2df669f31b90 100644 --- a/pkgs/by-name/pe/pencil/package.nix +++ b/pkgs/by-name/pe/pencil/package.nix @@ -75,12 +75,12 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.1.0"; pname = "pencil"; src = fetchurl { - url = "http://pencil.evolus.vn/dl/V${version}.ga/pencil_${version}.ga_amd64.deb"; + url = "http://pencil.evolus.vn/dl/V${finalAttrs.version}.ga/pencil_${finalAttrs.version}.ga_amd64.deb"; sha256 = "01ae54b1a1351b909eb2366c6ec00816e1deba370e58f35601cf7368f10aaba3"; }; @@ -147,4 +147,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pe/petrifoo/package.nix b/pkgs/by-name/pe/petrifoo/package.nix deleted file mode 100644 index 864c1668c47a..000000000000 --- a/pkgs/by-name/pe/petrifoo/package.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, - alsa-lib, - cmake, - gtk2, - libjack2, - gnome2, - libpthreadstubs, - libsamplerate, - libsndfile, - libtool, - libxml2, - pkg-config, - openssl, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "petri-foo"; - version = "0.1.87"; - - src = fetchurl { - url = "mirror://sourceforge/petri-foo/petri-foo-${finalAttrs.version}.tar.bz2"; - sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh"; - }; - - patches = [ - # Pull patch pending upstream inclusion for -fno-common toollchain support: - # https://github.com/petri-foo/Petri-Foo/pull/43 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/petri-foo/Petri-Foo/commit/6a3256c9b619b1fed18ad15063f110e8d91aa6fe.patch"; - sha256 = "05yc4g22iwnd054jmvihrl461yr0cxnghslfrbhan6bac6fcvlal"; - }) - ]; - - # See https://github.com/NixOS/nixpkgs/issues/445447 - postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail \ - "cmake_minimum_required(VERSION 2.6)" \ - "cmake_minimum_required(VERSION 3.10)" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - alsa-lib - gtk2 - libjack2 - gnome2.libgnomecanvas - libpthreadstubs - libsamplerate - libsndfile - libtool - libxml2 - openssl - ]; - - meta = { - description = "MIDI controllable audio sampler"; - longDescription = "a fork of Specimen"; - homepage = "https://petri-foo.sourceforge.net"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - maintainers = [ ]; - mainProgram = "petri-foo"; - }; -}) diff --git a/pkgs/by-name/pg/pg_top/package.nix b/pkgs/by-name/pg/pg_top/package.nix index fe6d351c490a..c10b7be8e8e2 100644 --- a/pkgs/by-name/pg/pg_top/package.nix +++ b/pkgs/by-name/pg/pg_top/package.nix @@ -9,12 +9,12 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pg_top"; version = "4.1.3"; src = fetchurl { - url = "https://pg_top.gitlab.io/source/pg_top-${version}.tar.xz"; + url = "https://pg_top.gitlab.io/source/pg_top-${finalAttrs.version}.tar.xz"; sha256 = "sha256-4El3GmfP5UDJOsDxyU5z/s3JKw0jlMb8EB/hvtywwVs="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; mainProgram = "pg_top"; }; -} +}) diff --git a/pkgs/by-name/pg/pgmodeler/package.nix b/pkgs/by-name/pg/pgmodeler/package.nix index 99a14567c50f..09f306f00ec5 100644 --- a/pkgs/by-name/pg/pgmodeler/package.nix +++ b/pkgs/by-name/pg/pgmodeler/package.nix @@ -11,14 +11,14 @@ qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pgmodeler"; version = "1.2.2"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-gDhH6b+8zFIsosdecUUkwAQMP1HME4EbJZsFyTzvGcE="; }; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { icon = "pgmodeler"; desktopName = "PgModeler"; genericName = "PgModeler"; - comment = meta.description; + comment = finalAttrs.meta.description; categories = [ "Development" ]; startupWMClass = "pgmodeler"; }) @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.esclear ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index 2ccbb8ebe9ec..631743cd187c 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -18,14 +18,14 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pgmoneta"; version = "0.19.1"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; - rev = version; + rev = finalAttrs.version; hash = "sha256-qsKjUFCuxKSc7klB/S2N3TG+jqnS4NW0RZC6e9JQXtA="; }; @@ -54,9 +54,9 @@ stdenv.mkDerivation rec { meta = { description = "Backup / restore solution for PostgreSQL"; homepage = "https://pgmoneta.github.io/"; - changelog = "https://github.com/pgmoneta/pgmoneta/releases/tag/${version}"; + changelog = "https://github.com/pgmoneta/pgmoneta/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pg/pgpdump/package.nix b/pkgs/by-name/pg/pgpdump/package.nix index 0bc0b051f683..8af5a40262ea 100644 --- a/pkgs/by-name/pg/pgpdump/package.nix +++ b/pkgs/by-name/pg/pgpdump/package.nix @@ -8,14 +8,14 @@ bzip2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pgpdump"; version = "0.36"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "pgpdump"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-JKedgHCTDnvLyLR3nGl4XFAaxXDU1TgHrxPMlRFwtBo="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ph/phash/package.nix b/pkgs/by-name/ph/phash/package.nix index 58aa8201da0d..656a89b2e832 100644 --- a/pkgs/by-name/ph/phash/package.nix +++ b/pkgs/by-name/ph/phash/package.nix @@ -7,7 +7,7 @@ imagemagick, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pHash"; version = "0.9.6"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "clearscene"; repo = "pHash"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-frISiZ89ei7XfI5F2nJJehfQZsk0Mlb4n91q/AiZ2vA="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { homepage = "http://www.phash.org"; downloadPage = "https://github.com/clearscene/pHash"; }; -} +}) diff --git a/pkgs/by-name/ph/phd2/package.nix b/pkgs/by-name/ph/phd2/package.nix index cb13ca42d704..75d1fabb98de 100644 --- a/pkgs/by-name/ph/phd2/package.nix +++ b/pkgs/by-name/ph/phd2/package.nix @@ -19,14 +19,14 @@ wxGTK32, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "phd2"; version = "2.6.13"; src = fetchFromGitHub { owner = "OpenPHDGuiding"; repo = "phd2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-GnT/tyk975caqESBSu4mdX5IWGi5O+RljLSd+CwoGWo="; }; @@ -76,11 +76,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://openphdguiding.org/"; description = "Telescope auto-guidance application"; - changelog = "https://github.com/OpenPHDGuiding/phd2/releases/tag/v${version}"; + changelog = "https://github.com/OpenPHDGuiding/phd2/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ returntoreality ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ph/phockup/package.nix b/pkgs/by-name/ph/phockup/package.nix index b3eaf61f0b22..ed80a0727eaa 100644 --- a/pkgs/by-name/ph/phockup/package.nix +++ b/pkgs/by-name/ph/phockup/package.nix @@ -9,14 +9,14 @@ let pythonEnv = python3.withPackages (p: with p; [ tqdm ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "phockup"; version = "1.13.0"; src = fetchFromGitHub { owner = "ivandokov"; repo = "phockup"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-44UjxTbC2XK+NThvesROdd7aGP7zr7g7bQiQZv2TvvM="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ aanderse ]; mainProgram = "phockup"; }; -} +}) diff --git a/pkgs/by-name/ph/phoronix-test-suite/package.nix b/pkgs/by-name/ph/phoronix-test-suite/package.nix index f455c4c9fc1c..d4e1f3bd4a60 100644 --- a/pkgs/by-name/ph/phoronix-test-suite/package.nix +++ b/pkgs/by-name/ph/phoronix-test-suite/package.nix @@ -10,12 +10,12 @@ callPackage, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "phoronix-test-suite"; version = "10.8.4"; src = fetchurl { - url = "https://phoronix-test-suite.com/releases/phoronix-test-suite-${version}.tar.gz"; + url = "https://phoronix-test-suite.com/releases/phoronix-test-suite-${finalAttrs.version}.tar.gz"; sha256 = "sha256-HyCS1TbAoxk+/FPkpQ887mXA7xp40x5UBPHGY//3t/Q="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix; mainProgram = "phoronix-test-suite"; }; -} +}) diff --git a/pkgs/by-name/ph/photoflare/package.nix b/pkgs/by-name/ph/photoflare/package.nix index 87058a9b7476..71cf3bcabbc1 100644 --- a/pkgs/by-name/ph/photoflare/package.nix +++ b/pkgs/by-name/ph/photoflare/package.nix @@ -6,14 +6,14 @@ graphicsmagick, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "photoflare"; version = "1.6.13"; src = fetchFromGitHub { owner = "PhotoFlare"; repo = "photoflare"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-0eAuof/FBro2IKxkJ6JHauW6C96VTPxy7QtfPVzPFi4="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ph/photonvision/package.nix b/pkgs/by-name/ph/photonvision/package.nix index 7251eec1f24a..a4640d733707 100644 --- a/pkgs/by-name/ph/photonvision/package.nix +++ b/pkgs/by-name/ph/photonvision/package.nix @@ -9,18 +9,18 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "photonvision"; version = "2025.2.1"; src = { "x86_64-linux" = fetchurl { - url = "https://github.com/PhotonVision/photonvision/releases/download/v${version}/photonvision-v${version}-linuxx64.jar"; + url = "https://github.com/PhotonVision/photonvision/releases/download/v${finalAttrs.version}/photonvision-v${finalAttrs.version}-linuxx64.jar"; hash = "sha256-yEb6GCt29DjZNDsIqDvF/AiCw3QVMxUFKQM22OlMl7Q="; }; "aarch64-linux" = fetchurl { - url = "https://github.com/PhotonVision/photonvision/releases/download/v${version}/photonvision-v${version}-linuxarm64.jar"; + url = "https://github.com/PhotonVision/photonvision/releases/download/v${finalAttrs.version}/photonvision-v${finalAttrs.version}-linuxarm64.jar"; hash = "sha256-YG9wyh+MCsv/RBdiFvgrF6Fw/6AnN7OEi4ofkMptfT0="; }; } @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { "aarch64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index c2817a7e0a75..0c6df2b3eea4 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -15,12 +15,12 @@ zxing-cpp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "photoqt"; version = "5.1"; src = fetchurl { - url = "https://photoqt.org/downloads/source/photoqt-${version}.tar.gz"; + url = "https://photoqt.org/downloads/source/photoqt-${finalAttrs.version}.tar.gz"; hash = "sha256-GQT0JDuhrtQh9u5R2DBIlYWEHsSJ8cvDp3+0s6I0iHY="; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ph/phototonic/package.nix b/pkgs/by-name/ph/phototonic/package.nix index e7a55e71632f..0e9e0f402afd 100644 --- a/pkgs/by-name/ph/phototonic/package.nix +++ b/pkgs/by-name/ph/phototonic/package.nix @@ -7,14 +7,14 @@ exiv2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "phototonic"; version = "2.1"; src = fetchFromGitHub { owner = "oferkv"; repo = "phototonic"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-BxJgTKblOKIwt88+PT7XZE0mk0t2B4SfsdXpQHttUTM="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ph/physlock/package.nix b/pkgs/by-name/ph/physlock/package.nix index 75a789ab1af3..9df8771e3fdf 100644 --- a/pkgs/by-name/ph/physlock/package.nix +++ b/pkgs/by-name/ph/physlock/package.nix @@ -6,13 +6,13 @@ systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "13"; pname = "physlock"; src = fetchFromGitHub { owner = "muennich"; repo = "physlock"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1mz4xxjip5ldiw9jgfq9zvqb6w10bcjfx6939w1appqg8f521a7s"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pi/picard-tools/package.nix b/pkgs/by-name/pi/picard-tools/package.nix index 2a608100fac0..5d4499cd5c73 100644 --- a/pkgs/by-name/pi/picard-tools/package.nix +++ b/pkgs/by-name/pi/picard-tools/package.nix @@ -6,12 +6,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "picard-tools"; version = "3.4.0"; src = fetchurl { - url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; + url = "https://github.com/broadinstitute/picard/releases/download/${finalAttrs.version}/picard.jar"; sha256 = "sha256-52EowoOIn8WDyd6jOjt0SJdMBn0QLJ41vhUmQtTV+QE="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { mainProgram = "picard"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/pi/picoloop/package.nix b/pkgs/by-name/pi/picoloop/package.nix index 1e5dfee818a3..e8d3366d8ee7 100644 --- a/pkgs/by-name/pi/picoloop/package.nix +++ b/pkgs/by-name/pi/picoloop/package.nix @@ -10,14 +10,14 @@ libjack2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "picoloop"; version = "0.77e"; src = fetchFromGitHub { repo = "picoloop"; owner = "yoyz"; - rev = "picoloop-${version}"; + rev = "picoloop-${finalAttrs.version}"; sha256 = "0i8j8rgyha3ara6d4iis3wcimszf2csxdwrm5yq0wyhg74g7cvjd"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libjack2 ]; - sourceRoot = "${src.name}/picoloop"; + sourceRoot = "${finalAttrs.src.name}/picoloop"; makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ]; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; mainProgram = "picoloop"; }; -} +}) diff --git a/pkgs/by-name/pi/pietrasanta-traceroute/package.nix b/pkgs/by-name/pi/pietrasanta-traceroute/package.nix index 56b06d1dce71..a7f5ee3e11b9 100644 --- a/pkgs/by-name/pi/pietrasanta-traceroute/package.nix +++ b/pkgs/by-name/pi/pietrasanta-traceroute/package.nix @@ -6,7 +6,7 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pietrasanta-traceroute"; version = "0.0.5-unstable-2024-09-06"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { - Enhanced ToS (DSCP/ECN) field report. ''; homepage = "https://github.com/catchpoint/Networking.traceroute/"; - changelog = "https://github.com/catchpoint/Networking.traceroute/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/catchpoint/Networking.traceroute/blob/${finalAttrs.src.rev}/ChangeLog"; license = with lib.licenses; [ gpl2Only lgpl21Only @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/pi/pigz/package.nix b/pkgs/by-name/pi/pigz/package.nix index 2cfdcb3f7ef0..ed6c513cc5f1 100644 --- a/pkgs/by-name/pi/pigz/package.nix +++ b/pkgs/by-name/pi/pigz/package.nix @@ -6,14 +6,14 @@ util-linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pigz"; version = "2.8"; src = fetchFromGitHub { owner = "madler"; repo = "pigz"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-PzdxyO4mCg2jE/oBk1MH+NUdWM95wIIIbncBg71BkmQ="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { license = lib.licenses.zlib; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pi/pinentry-bemenu/package.nix b/pkgs/by-name/pi/pinentry-bemenu/package.nix index 399deca3abba..779551ee3ded 100644 --- a/pkgs/by-name/pi/pinentry-bemenu/package.nix +++ b/pkgs/by-name/pi/pinentry-bemenu/package.nix @@ -11,14 +11,14 @@ bemenu, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pinentry-bemenu"; version = "0.14.0"; src = fetchFromGitHub { owner = "t-8ch"; repo = "pinentry-bemenu"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-kiGUCcQIS58XjE4r0yiK4hJ85Sg5wrtBqeSYcgUKAmo="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "pinentry-bemenu"; }; -} +}) diff --git a/pkgs/by-name/pi/pinentry-rofi/package.nix b/pkgs/by-name/pi/pinentry-rofi/package.nix index 965c7aebdec8..2a82209d349a 100644 --- a/pkgs/by-name/pi/pinentry-rofi/package.nix +++ b/pkgs/by-name/pi/pinentry-rofi/package.nix @@ -12,14 +12,14 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pinentry-rofi"; version = "3.0.0"; src = fetchFromGitHub { owner = "plattfot"; repo = "pinentry-rofi"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-GHpVO8FRphVW0+In7TtB39ewwVLU1EHOeVL05pnZdFQ="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ seqizz ]; mainProgram = "pinentry-rofi"; }; -} +}) diff --git a/pkgs/by-name/pi/pinfo/package.nix b/pkgs/by-name/pi/pinfo/package.nix index a24412e9ae0c..0682e3c4b808 100644 --- a/pkgs/by-name/pi/pinfo/package.nix +++ b/pkgs/by-name/pi/pinfo/package.nix @@ -10,14 +10,14 @@ texinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pinfo"; version = "0.6.13"; src = fetchFromGitHub { owner = "baszoetekouw"; repo = "pinfo"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy"; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fab ]; mainProgram = "pinfo"; }; -} +}) diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix index 570acd4445de..9493de285ec8 100644 --- a/pkgs/by-name/pi/pioneer/package.nix +++ b/pkgs/by-name/pi/pioneer/package.nix @@ -20,14 +20,14 @@ SDL2_image, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pioneer"; version = "20250501"; src = fetchFromGitHub { owner = "pioneerspacesim"; repo = "pioneer"; - rev = version; + rev = finalAttrs.version; hash = "sha256-bQ1JGndHbBM28SuAUybo9msC/nBXu6el1UY41BKJN5A="; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { "i686-linux" ]; }; -} +}) diff --git a/pkgs/by-name/pi/pipectl/package.nix b/pkgs/by-name/pi/pipectl/package.nix index ad8bd958a3f9..c500f6c8af10 100644 --- a/pkgs/by-name/pi/pipectl/package.nix +++ b/pkgs/by-name/pi/pipectl/package.nix @@ -6,14 +6,14 @@ scdoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pipectl"; version = "0.5.1"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "pipectl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-pNBw1ukNaqu40qPXnORUGApYpJ/0EAO9Tq5zAbDe33I="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ synthetica ]; mainProgram = "pipectl"; }; -} +}) diff --git a/pkgs/by-name/pi/piper-phonemize/package.nix b/pkgs/by-name/pi/piper-phonemize/package.nix index f89bb36cbbf6..8776f98b9eb2 100644 --- a/pkgs/by-name/pi/piper-phonemize/package.nix +++ b/pkgs/by-name/pi/piper-phonemize/package.nix @@ -32,14 +32,14 @@ let ]; }); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "piper-phonemize"; version = "2023.11.14-4"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper-phonemize"; - tag = version; + tag = finalAttrs.version; hash = "sha256-pj1DZUhy3XWGn+wNtxKKDWET9gsfofEB0NZ+EEQz9q0="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ hexa ]; }; -} +}) diff --git a/pkgs/by-name/pi/pipes/package.nix b/pkgs/by-name/pi/pipes/package.nix index 3c32276b1593..77aeedd5bc64 100644 --- a/pkgs/by-name/pi/pipes/package.nix +++ b/pkgs/by-name/pi/pipes/package.nix @@ -7,14 +7,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pipes"; version = "1.3.0"; src = fetchFromGitHub { owner = "pipeseroni"; repo = "pipes.sh"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-856OWlnNiGB20571TJg7Ayzcz4r6NqdW5DMDiim09mc="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { mainProgram = "pipes.sh"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pi/pix/package.nix b/pkgs/by-name/pi/pix/package.nix index 0aed654cba65..a34dfd0ff0bd 100644 --- a/pkgs/by-name/pi/pix/package.nix +++ b/pkgs/by-name/pi/pix/package.nix @@ -33,14 +33,14 @@ xapp-symbolic-icons, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pix"; version = "3.4.10"; src = fetchFromGitHub { owner = "linuxmint"; repo = "pix"; - rev = version; + rev = finalAttrs.version; hash = "sha256-IrRE2Bv2+DZMLI48at7npcAd3TSJRuZNzU/YbNK8x3k="; }; @@ -111,4 +111,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/pi/pixd/package.nix b/pkgs/by-name/pi/pixd/package.nix index c3bb33f1b445..d82c13e71de4 100644 --- a/pkgs/by-name/pi/pixd/package.nix +++ b/pkgs/by-name/pi/pixd/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pixd"; version = "1.0.0"; src = fetchFromGitHub { owner = "FireyFly"; repo = "pixd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1vmkbs39mg5vwmkzfcrxqm6p8zr9sj4qdwng9icmyf5k34c34xdg"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "pixd"; }; -} +}) diff --git a/pkgs/by-name/pi/pixiewps/package.nix b/pkgs/by-name/pi/pixiewps/package.nix index d3ea7e824612..9979f74330fe 100644 --- a/pkgs/by-name/pi/pixiewps/package.nix +++ b/pkgs/by-name/pi/pixiewps/package.nix @@ -4,13 +4,13 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pixiewps"; version = "1.4.2"; src = fetchFromGitHub { owner = "wiire-a"; repo = "pixiewps"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-cJ20Gp6YaSdgUXK/ckK5Yv0rGbGXuFMP5zKZG0c4oOY="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "pixiewps"; }; -} +}) diff --git a/pkgs/by-name/pi/pixz/package.nix b/pkgs/by-name/pi/pixz/package.nix index 2bd0c2230f38..5dcdcd49afb2 100644 --- a/pkgs/by-name/pi/pixz/package.nix +++ b/pkgs/by-name/pi/pixz/package.nix @@ -15,7 +15,7 @@ xz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pixz"; version = "1.0.7"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "vasi"; repo = "pixz"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "163axxs22w7pghr786hda22mnlpvmi50hzhfr9axwyyjl9n41qs2"; }; preConfigure = '' @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "pixz"; }; -} +}) diff --git a/pkgs/by-name/pk/pkcs11-provider/package.nix b/pkgs/by-name/pk/pkcs11-provider/package.nix index b74d2043c42d..15b0f2aea972 100644 --- a/pkgs/by-name/pk/pkcs11-provider/package.nix +++ b/pkgs/by-name/pk/pkcs11-provider/package.nix @@ -22,14 +22,14 @@ let pkcs11ProviderPython3 = python3.withPackages (pythonPkgs: with pythonPkgs; [ six ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pkcs11-provider"; version = "1.1"; src = fetchFromGitHub { owner = "latchset"; repo = "pkcs11-provider"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-QXEwDl6pk8G5ba8lD4uYw2QuD3qS/sgd1od8crHct2s="; }; @@ -108,4 +108,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pk/pkgdiff/package.nix b/pkgs/by-name/pk/pkgdiff/package.nix index c77b2e44addc..849204945c81 100644 --- a/pkgs/by-name/pk/pkgdiff/package.nix +++ b/pkgs/by-name/pk/pkgdiff/package.nix @@ -7,14 +7,14 @@ wdiff, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.8"; pname = "pkgdiff"; src = fetchFromGitHub { owner = "lvc"; repo = "pkgdiff"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-/xhORi/ZHC4B2z6UYPOvDzfgov1DcozRjX0K1WYrqXM="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "pkgdiff"; }; -} +}) diff --git a/pkgs/by-name/pk/pktgen/package.nix b/pkgs/by-name/pk/pktgen/package.nix index 029471e5ad00..bfb3aa43a347 100644 --- a/pkgs/by-name/pk/pktgen/package.nix +++ b/pkgs/by-name/pk/pktgen/package.nix @@ -16,14 +16,14 @@ withGtk ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pktgen"; version = "24.10.3"; src = fetchFromGitHub { owner = "pktgen"; repo = "Pktgen-DPDK"; - rev = "pktgen-${version}"; + rev = "pktgen-${finalAttrs.version}"; sha256 = "sha256-6KC1k+LWNSU/mdwcUKjCaq8pGOcO+dFzeXX4PJm0QgE="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.abuibrahim ]; }; -} +}) diff --git a/pkgs/by-name/pl/planarity/package.nix b/pkgs/by-name/pl/planarity/package.nix index 5e7fb49743c4..d0b193919a9f 100644 --- a/pkgs/by-name/pl/planarity/package.nix +++ b/pkgs/by-name/pl/planarity/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "planarity"; version = "4.0.1.0"; src = fetchFromGitHub { owner = "graph-algorithms"; repo = "edge-addition-planarity-suite"; - rev = "Version_${version}"; + rev = "Version_${finalAttrs.version}"; sha256 = "sha256-uSCQSn3LRi3eQynh71fs1xhVIrPcOqVyGzdHAK9xj7E="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix index 185f6ea24a47..09f4c344b1ad 100644 --- a/pkgs/by-name/pl/planify/package.nix +++ b/pkgs/by-name/pl/planify/package.nix @@ -27,14 +27,14 @@ webkitgtk_6_0, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "planify"; version = "4.17.0"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wsjLx5MYLAnYZEAeavvuh0nogpINeklo2VD3EftW+UA="; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "io.github.alainm23.planify"; }; -} +}) diff --git a/pkgs/by-name/pl/planner/package.nix b/pkgs/by-name/pl/planner/package.nix index 4539fa878bda..9415d7c72a88 100644 --- a/pkgs/by-name/pl/planner/package.nix +++ b/pkgs/by-name/pl/planner/package.nix @@ -16,7 +16,7 @@ shared-mime-info, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "planner"; version = "0.14.92"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "planner"; - rev = version; + rev = finalAttrs.version; hash = "sha256-2LmNeyZURVtA52Vosyn44wT8zSaJn8tR+8sPM9atAwM="; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/planner \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/planner-${version}" + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/planner-${finalAttrs.version}" ''; meta = { @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ amiloradovsky ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pl/plano-theme/package.nix b/pkgs/by-name/pl/plano-theme/package.nix index 821092aca516..2176100fa42c 100644 --- a/pkgs/by-name/pl/plano-theme/package.nix +++ b/pkgs/by-name/pl/plano-theme/package.nix @@ -11,14 +11,14 @@ sassc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plano-theme"; version = "4.0"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "plano-theme"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-slGr2nsdKng6zaVDeXWFAWKIxZbcnOLU6RH6wM0293E="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/pl/platformsh/versions.json b/pkgs/by-name/pl/platformsh/versions.json index 8e739632030b..996b8f4fde6a 100644 --- a/pkgs/by-name/pl/platformsh/versions.json +++ b/pkgs/by-name/pl/platformsh/versions.json @@ -1,19 +1,19 @@ { - "version": "5.8.0", + "version": "5.9.0", "darwin-amd64": { - "hash": "sha256-quR9iU0Lqlvc1fvtHZu8/iIPesbEu59JfmwjgK3PEYA=", - "url": "https://github.com/platformsh/cli/releases/download/5.8.0/platform_5.8.0_darwin_all.tar.gz" + "hash": "sha256-wEpH3mA9/EQRYk7WNtNMrgWLFnRwUas1xHEU4W6h9kA=", + "url": "https://github.com/platformsh/cli/releases/download/5.9.0/platform_5.9.0_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-quR9iU0Lqlvc1fvtHZu8/iIPesbEu59JfmwjgK3PEYA=", - "url": "https://github.com/platformsh/cli/releases/download/5.8.0/platform_5.8.0_darwin_all.tar.gz" + "hash": "sha256-wEpH3mA9/EQRYk7WNtNMrgWLFnRwUas1xHEU4W6h9kA=", + "url": "https://github.com/platformsh/cli/releases/download/5.9.0/platform_5.9.0_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-3Uz+2x/QSxEeF+gcxwfv3r1GO8m01SfSVavlIQ/YoNc=", - "url": "https://github.com/platformsh/cli/releases/download/5.8.0/platform_5.8.0_linux_amd64.tar.gz" + "hash": "sha256-zdGGFwlkme+45CCw0PAkcufcTvNm2IMFZ8zHuckc21s=", + "url": "https://github.com/platformsh/cli/releases/download/5.9.0/platform_5.9.0_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-8lFfo5zF6G36jJaNf9dQbVu8WeQWYu7dl4JyzlOrtLI=", - "url": "https://github.com/platformsh/cli/releases/download/5.8.0/platform_5.8.0_linux_arm64.tar.gz" + "hash": "sha256-G2Rv0cF4nxwTwSNAnvW56Ym3/p5DqmM88xg57iVzoPw=", + "url": "https://github.com/platformsh/cli/releases/download/5.9.0/platform_5.9.0_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/pl/playerctl/package.nix b/pkgs/by-name/pl/playerctl/package.nix index 388d12d0457a..e5844afbbe90 100644 --- a/pkgs/by-name/pl/playerctl/package.nix +++ b/pkgs/by-name/pl/playerctl/package.nix @@ -14,14 +14,14 @@ withDocs ? stdenv.hostPlatform.emulatorAvailable buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "playerctl"; version = "2.4.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-OiGKUnsKX0ihDRceZoNkcZcEAnz17h2j2QUOSVcxQEY="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { broken = stdenv.hostPlatform.isDarwin; mainProgram = "playerctl"; }; -} +}) diff --git a/pkgs/by-name/pl/plink-ng/package.nix b/pkgs/by-name/pl/plink-ng/package.nix index a61cb007908c..1608f452dda6 100644 --- a/pkgs/by-name/pl/plink-ng/package.nix +++ b/pkgs/by-name/pl/plink-ng/package.nix @@ -7,14 +7,14 @@ lapack, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plink-ng"; version = "1.90b3"; src = fetchFromGitHub { owner = "chrchang"; repo = "plink-ng"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pl/plocate/package.nix b/pkgs/by-name/pl/plocate/package.nix index 860511689343..9748a7ebb6ad 100644 --- a/pkgs/by-name/pl/plocate/package.nix +++ b/pkgs/by-name/pl/plocate/package.nix @@ -9,13 +9,13 @@ liburing, zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plocate"; version = "1.1.24"; src = fetchgit { url = "https://git.sesse.net/plocate"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-VvHptw/PG2uWflTmGNCj1PXIguXv9Bikz8qj2hRMnaQ="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pl/plog/package.nix b/pkgs/by-name/pl/plog/package.nix index ed93d41b196f..2f63d2e5bb90 100644 --- a/pkgs/by-name/pl/plog/package.nix +++ b/pkgs/by-name/pl/plog/package.nix @@ -5,7 +5,7 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plog"; version = "1.1.11"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "SergiusTheBest"; repo = "plog"; - rev = version; + rev = finalAttrs.version; hash = "sha256-/H7qNL6aPjmFYk0X1sx4CCSZWrAMQgPo8I9X/P50ln0="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { erdnaxe ]; }; -} +}) diff --git a/pkgs/by-name/pl/plotinus/package.nix b/pkgs/by-name/pl/plotinus/package.nix index 8d90a3d12673..d2fb37e285dc 100644 --- a/pkgs/by-name/pl/plotinus/package.nix +++ b/pkgs/by-name/pl/plotinus/package.nix @@ -13,14 +13,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plotinus"; version = "0.2.0"; src = fetchFromGitHub { owner = "p-e-w"; repo = "plotinus"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "19k6f6ivg4ab57m62g6fkg85q9sv049snmzq1fyqnqijggwshxfz"; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { # No COPYING file, but headers in the source code license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/pl/plotutils/package.nix b/pkgs/by-name/pl/plotutils/package.nix index 18f3da2c1bcd..3eb0d52a631d 100644 --- a/pkgs/by-name/pl/plotutils/package.nix +++ b/pkgs/by-name/pl/plotutils/package.nix @@ -11,12 +11,12 @@ # gentoo passes X, this package contains fonts # I'm only interested in making pstoedit convert to svg -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plotutils"; version = "2.6"; src = fetchurl { - url = "mirror://gnu/plotutils/plotutils-${version}.tar.gz"; + url = "mirror://gnu/plotutils/plotutils-${finalAttrs.version}.tar.gz"; sha256 = "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg"; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pl/plowshare/package.nix b/pkgs/by-name/pl/plowshare/package.nix index 76aaff1bbf47..9cdb595d1551 100644 --- a/pkgs/by-name/pl/plowshare/package.nix +++ b/pkgs/by-name/pl/plowshare/package.nix @@ -8,7 +8,7 @@ spidermonkey_140, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plowshare"; version = "2.1.7"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mcrapet"; repo = "plowshare"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-6fQgJZF5IxRSalB6rUpIVqlwhgbhSG8AuI2qTxswGt0="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ aforemny ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pl/plumed/package.nix b/pkgs/by-name/pl/plumed/package.nix index 5bbeda68e847..3f4e158341ec 100644 --- a/pkgs/by-name/pl/plumed/package.nix +++ b/pkgs/by-name/pl/plumed/package.nix @@ -7,14 +7,14 @@ assert !blas.isILP64; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plumed"; version = "2.10.0"; src = fetchFromGitHub { owner = "plumed"; repo = "plumed2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-aFX8u+XNb7LARm1jtzWzIvZE5qHFaudtp45Om1Fridg="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3Only; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/pl/plus42/package.nix b/pkgs/by-name/pl/plus42/package.nix index ea1d53e3c31d..b931c0c1bff0 100644 --- a/pkgs/by-name/pl/plus42/package.nix +++ b/pkgs/by-name/pl/plus42/package.nix @@ -9,12 +9,12 @@ pkg-config, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plus42"; version = "1.3.13"; src = fetchurl { - url = "https://thomasokken.com/plus42/upstream/plus42-upstream-${version}.tgz"; + url = "https://thomasokken.com/plus42/upstream/plus42-upstream-${finalAttrs.version}.tgz"; hash = "sha256-I5SAR6vEufzT2Cgs4RQk8AWDZWm+QOLtHRqaED2DQtA="; }; @@ -117,4 +117,4 @@ stdenv.mkDerivation rec { mainProgram = "plus42dec"; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/pm/pmccabe/package.nix b/pkgs/by-name/pm/pmccabe/package.nix index e0dc87dfc77b..2175fe298ea0 100644 --- a/pkgs/by-name/pm/pmccabe/package.nix +++ b/pkgs/by-name/pm/pmccabe/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pmccabe"; version = "2.6"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/p/pmccabe/pmccabe_${version}.tar.gz"; + url = "http://http.debian.net/debian/pool/main/p/pmccabe/pmccabe_${finalAttrs.version}.tar.gz"; sha256 = "0a3h1b9fb87c82d5fbql5lc4gp338pa5s9i66dhw7zk8jdygx474"; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ peterhoeg ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pm/pmd/package.nix b/pkgs/by-name/pm/pmd/package.nix index b6440a56eeea..d7a1be5c435a 100644 --- a/pkgs/by-name/pm/pmd/package.nix +++ b/pkgs/by-name/pm/pmd/package.nix @@ -7,12 +7,12 @@ jdk8, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pmd"; version = "6.55.0"; src = fetchurl { - url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${version}/pmd-bin-${version}.zip"; + url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${finalAttrs.version}/pmd-bin-${finalAttrs.version}.zip"; hash = "sha256-Iaz5bUPLQNWRyszMHCCmb8eW6t32nqYYEllER7rHoR0="; }; @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { meta = { description = "Extensible cross-language static code analyzer"; homepage = "https://pmd.github.io/"; - changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html"; + changelog = "https://pmd.github.io/pmd-${finalAttrs.version}/pmd_release_notes.html"; platforms = lib.platforms.unix; license = with lib.licenses; [ bsdOriginal asl20 ]; }; -} +}) diff --git a/pkgs/by-name/pm/pmount/package.nix b/pkgs/by-name/pm/pmount/package.nix index 30f3ec0a8c70..ce6fec43aa6b 100644 --- a/pkgs/by-name/pm/pmount/package.nix +++ b/pkgs/by-name/pm/pmount/package.nix @@ -15,12 +15,12 @@ # constraint mention in the configure.ac assert lib.hasSuffix "/" mediaDir; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pmount"; version = "0.9.23"; src = fetchurl { - url = "mirror://debian/pool/main/p/pmount/pmount_${version}.orig.tar.bz2"; + url = "mirror://debian/pool/main/p/pmount/pmount_${finalAttrs.version}.orig.tar.bz2"; sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036"; }; @@ -101,4 +101,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ratakor ]; }; -} +}) diff --git a/pkgs/by-name/pm/pmutils/package.nix b/pkgs/by-name/pm/pmutils/package.nix index f1301f1670b7..ee99c848aefc 100644 --- a/pkgs/by-name/pm/pmutils/package.nix +++ b/pkgs/by-name/pm/pmutils/package.nix @@ -27,12 +27,12 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pm-utils"; version = "1.4.1"; src = fetchurl { - url = "https://pm-utils.freedesktop.org/releases/pm-utils-${version}.tar.gz"; + url = "https://pm-utils.freedesktop.org/releases/pm-utils-${finalAttrs.version}.tar.gz"; sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f"; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pn/pngcheck/package.nix b/pkgs/by-name/pn/pngcheck/package.nix index fb96380cf1a9..161f1b800ecd 100644 --- a/pkgs/by-name/pn/pngcheck/package.nix +++ b/pkgs/by-name/pn/pngcheck/package.nix @@ -6,12 +6,12 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pngcheck"; version = "3.0.2"; src = fetchurl { - url = "mirror://sourceforge/png-mng/pngcheck-${version}.tar.gz"; + url = "mirror://sourceforge/png-mng/pngcheck-${finalAttrs.version}.tar.gz"; sha256 = "sha256-DX4mLyQRb93yhHqM61yS2fXybvtC6f/2PsK7dnYTHKc="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ starcraft66 ]; mainProgram = "pngcheck"; }; -} +}) diff --git a/pkgs/by-name/pn/pngcrush/package.nix b/pkgs/by-name/pn/pngcrush/package.nix index 703d941d6f1f..b893ee2c8deb 100644 --- a/pkgs/by-name/pn/pngcrush/package.nix +++ b/pkgs/by-name/pn/pngcrush/package.nix @@ -6,12 +6,12 @@ libpng, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pngcrush"; version = "1.8.13"; src = fetchurl { - url = "mirror://sourceforge/pmt/pngcrush-${version}-nolib.tar.xz"; + url = "mirror://sourceforge/pmt/pngcrush-${finalAttrs.version}-nolib.tar.xz"; sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; mainProgram = "pngcrush"; }; -} +}) diff --git a/pkgs/by-name/pn/pngnq/package.nix b/pkgs/by-name/pn/pngnq/package.nix index 74fc92ef8c36..31f84b116df1 100644 --- a/pkgs/by-name/pn/pngnq/package.nix +++ b/pkgs/by-name/pn/pngnq/package.nix @@ -7,12 +7,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pngnq"; version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/pngnq/pngnq-${version}.tar.gz"; + url = "mirror://sourceforge/pngnq/pngnq-${finalAttrs.version}.tar.gz"; sha256 = "1qmnnl846agg55i7h4vmrn11lgb8kg6gvs8byqz34bdkjh5gwiy1"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pn/pngoptimizer/package.nix b/pkgs/by-name/pn/pngoptimizer/package.nix index be2220a84c45..8a0e510062a8 100644 --- a/pkgs/by-name/pn/pngoptimizer/package.nix +++ b/pkgs/by-name/pn/pngoptimizer/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pngoptimizer"; version = "2.7"; src = fetchFromGitHub { owner = "hadrien-psydk"; repo = "pngoptimizer"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1hbgf91vzx46grslfdx86smdvm6gs6lq9hpa3bax9xfbsknxi0i7"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ smitop ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/pn/pngpp/package.nix b/pkgs/by-name/pn/pngpp/package.nix index b2952c80f5c5..4202acbff77f 100644 --- a/pkgs/by-name/pn/pngpp/package.nix +++ b/pkgs/by-name/pn/pngpp/package.nix @@ -8,12 +8,12 @@ }: assert docSupport -> doxygen != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pngpp"; version = "0.2.10"; src = fetchurl { - url = "mirror://savannah/pngpp/png++-${version}.tar.gz"; + url = "mirror://savannah/pngpp/png++-${finalAttrs.version}.tar.gz"; sha256 = "1qgf8j25r57wjqlnzdkm8ya5x1bmj6xjvapv8f2visqnmcbg52lr"; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.ramkromberg ]; }; -} +}) diff --git a/pkgs/by-name/pn/pngtoico/package.nix b/pkgs/by-name/pn/pngtoico/package.nix index f4a21fc58e6e..704d2d0a084b 100644 --- a/pkgs/by-name/pn/pngtoico/package.nix +++ b/pkgs/by-name/pn/pngtoico/package.nix @@ -6,12 +6,12 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pngtoico"; version = "1.0"; src = fetchurl { - url = "mirror://kernel/software/graphics/pngtoico/pngtoico-${version}.tar.gz"; + url = "mirror://kernel/software/graphics/pngtoico/pngtoico-${finalAttrs.version}.tar.gz"; sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "pngtoico"; }; -} +}) diff --git a/pkgs/by-name/po/podofo_0_9/package.nix b/pkgs/by-name/po/podofo_0_9/package.nix index 68ffb35cac44..5131b6138d74 100644 --- a/pkgs/by-name/po/podofo_0_9/package.nix +++ b/pkgs/by-name/po/podofo_0_9/package.nix @@ -15,14 +15,14 @@ libidn, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.9.8"; pname = "podofo"; src = fetchFromGitHub { owner = "podofo"; repo = "podofo"; - rev = version; + rev = finalAttrs.version; hash = "sha256-VGsACeCC8xKC1n/ackT576ZU3ZR1LAw8H0l/Q9cH27s="; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { kuflierl ]; }; -} +}) diff --git a/pkgs/by-name/po/poedit/package.nix b/pkgs/by-name/po/poedit/package.nix index a95308f76988..29a207cc5ba3 100644 --- a/pkgs/by-name/po/poedit/package.nix +++ b/pkgs/by-name/po/poedit/package.nix @@ -22,14 +22,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "poedit"; version = "3.6.2"; src = fetchFromGitHub { owner = "vslavik"; repo = "poedit"; - rev = "v${version}-oss"; + rev = "v${finalAttrs.version}-oss"; hash = "sha256-Lb1R7GMB0GeS2xZASR7w4ee33mMEKP9gPabRHkHlIJI="; }; @@ -87,4 +87,4 @@ stdenv.mkDerivation rec { # configure: error: GTK+ build of wxWidgets is required broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/po/poly2tri-c/package.nix b/pkgs/by-name/po/poly2tri-c/package.nix index 6c8993c6c694..af2e560dea09 100644 --- a/pkgs/by-name/po/poly2tri-c/package.nix +++ b/pkgs/by-name/po/poly2tri-c/package.nix @@ -7,7 +7,7 @@ glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "poly2tri-c"; version = "0.1.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "jtojnar"; repo = "poly2tri-c"; - rev = "p2tc-${version}"; + rev = "p2tc-${finalAttrs.version}"; sha256 = "158vm3wqfxs22b74kqc4prlvjny38qqm3kz5wrgasmx0qciwh0g8"; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jtojnar ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/po/polygraph/package.nix b/pkgs/by-name/po/polygraph/package.nix index 31dddf2e20a4..e2d697162543 100644 --- a/pkgs/by-name/po/polygraph/package.nix +++ b/pkgs/by-name/po/polygraph/package.nix @@ -7,12 +7,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "polygraph"; version = "4.13.0"; src = fetchurl { - url = "http://www.web-polygraph.org/downloads/srcs/polygraph-${version}-src.tgz"; + url = "http://www.web-polygraph.org/downloads/srcs/polygraph-${finalAttrs.version}-src.tgz"; sha256 = "1rwzci3n7q33hw3spd79adnclzwgwlxcisc9szzjmcjqhbkcpj1a"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/po/polymake/package.nix b/pkgs/by-name/po/polymake/package.nix index 14bab383ce24..12406b6fde07 100644 --- a/pkgs/by-name/po/polymake/package.nix +++ b/pkgs/by-name/po/polymake/package.nix @@ -25,14 +25,14 @@ # don't have those packages. other missing optional dependencies: # javaview, libnormaliz, scip, soplex, jreality. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "polymake"; version = "4.15"; src = fetchurl { # "The minimal version is a packager friendly version which omits # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality." - url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2"; + url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${finalAttrs.version}-minimal.tar.bz2"; sha256 = "sha256-MOCo+JATz3qaRO2Q2y9pxJvxgQUGZMfmvbhhxhCxvbk="; }; @@ -83,9 +83,9 @@ stdenv.mkDerivation rec { meta = { description = "Software for research in polyhedral geometry"; homepage = "https://www.polymake.org/doku.php"; - changelog = "https://github.com/polymake/polymake/blob/V${version}/ChangeLog"; + changelog = "https://github.com/polymake/polymake/blob/V${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl2Plus; teams = [ lib.teams.sage ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/po/pommed_light/package.nix b/pkgs/by-name/po/pommed_light/package.nix index 0def37b1b7c4..e8d4da322036 100644 --- a/pkgs/by-name/po/pommed_light/package.nix +++ b/pkgs/by-name/po/pommed_light/package.nix @@ -12,14 +12,14 @@ eject, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pommed-light"; version = "1.51lw"; src = fetchFromGitHub { owner = "bytbox"; repo = "pommed-light"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "18fvdwwhcl6s4bpf2f2i389s71c8k4g0yb81am9rdddqmzaw27iy"; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/pkgs/by-name/po/ponymix/package.nix b/pkgs/by-name/po/ponymix/package.nix index 003d500743ab..377c0dbdfd14 100644 --- a/pkgs/by-name/po/ponymix/package.nix +++ b/pkgs/by-name/po/ponymix/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ponymix"; version = "5"; src = fetchFromGitHub { owner = "falconindy"; repo = "ponymix"; - rev = version; + rev = finalAttrs.version; sha256 = "08yp7fprmzm6px5yx2rvzri0l60bra5h59l26pn0k071a37ks1rb"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/po/ponysay/package.nix b/pkgs/by-name/po/ponysay/package.nix index 045d947ea93e..8a821b71dd8f 100644 --- a/pkgs/by-name/po/ponysay/package.nix +++ b/pkgs/by-name/po/ponysay/package.nix @@ -7,7 +7,7 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ponysay"; version = "unstable-2021-03-27"; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bodil ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/po/popt/package.nix b/pkgs/by-name/po/popt/package.nix index dffe05a33b42..4e795937e102 100644 --- a/pkgs/by-name/po/popt/package.nix +++ b/pkgs/by-name/po/popt/package.nix @@ -6,12 +6,12 @@ updateAutotoolsGnuConfigScriptsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "popt"; version = "1.19"; src = fetchurl { - url = "https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/popt-${version}.tar.gz"; + url = "https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/popt-${finalAttrs.version}.tar.gz"; sha256 = "sha256-wlpIOPyOTByKrLi9Yg7bMISj1jv4mH/a08onWMYyQPk="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/po/portaudio/package.nix b/pkgs/by-name/po/portaudio/package.nix index 2dc2b81a0e00..48e6a2883533 100644 --- a/pkgs/by-name/po/portaudio/package.nix +++ b/pkgs/by-name/po/portaudio/package.nix @@ -8,12 +8,12 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "portaudio"; version = "190700_20210406"; src = fetchurl { - url = "https://files.portaudio.com/archives/pa_stable_v${version}.tgz"; + url = "https://files.portaudio.com/archives/pa_stable_v${finalAttrs.version}.tgz"; sha256 = "1vrdrd42jsnffh6rq8ap2c6fr4g9fcld89z649fs06bwqx1bzvs7"; }; @@ -71,4 +71,4 @@ stdenv.mkDerivation rec { passthru = { api_version = 19; }; -} +}) diff --git a/pkgs/by-name/po/portmidi/package.nix b/pkgs/by-name/po/portmidi/package.nix index 534b80a069ce..dddcd354f7da 100644 --- a/pkgs/by-name/po/portmidi/package.nix +++ b/pkgs/by-name/po/portmidi/package.nix @@ -7,14 +7,14 @@ alsa-lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "portmidi"; version = "2.0.7"; src = fetchFromGitHub { owner = "portmidi"; repo = "portmidi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-kmyjOsjLG56Qqrf6DqgOTpt4A4aCMvCI3koiUoKzwrE="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ emilytrau ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix index b97a6e4a6357..8cbd827770bc 100644 --- a/pkgs/by-name/po/postfix/package.nix +++ b/pkgs/by-name/po/postfix/package.nix @@ -72,12 +72,12 @@ let ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "postfix"; version = "3.10.7"; src = fetchurl { - url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz"; + url = "https://de.postfix.org/ftpmirror/official/postfix-${finalAttrs.version}.tar.gz"; hash = "sha256-/NP/cIBq5/CoLntcMB4vT8+mpomi27Oz8bXlIIEVeIo="; }; @@ -191,7 +191,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.postfix.org/"; - changelog = "https://www.postfix.org/announcements/postfix-${version}.html"; + changelog = "https://www.postfix.org/announcements/postfix-${finalAttrs.version}.html"; description = "Fast, easy to administer, and secure mail server"; license = with lib.licenses; [ ipl10 @@ -203,4 +203,4 @@ stdenv.mkDerivation rec { lewo ]; }; -} +}) diff --git a/pkgs/by-name/po/postiats-utilities/package.nix b/pkgs/by-name/po/postiats-utilities/package.nix index a2e223772517..c4483426e120 100644 --- a/pkgs/by-name/po/postiats-utilities/package.nix +++ b/pkgs/by-name/po/postiats-utilities/package.nix @@ -6,13 +6,13 @@ python3Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "postiats-utilities"; version = "2.1.1"; src = fetchFromGitHub { owner = "Hibou57"; repo = "PostiATS-Utilities"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-QeBbv5lwqL2ARjB+RGyBHeuibaxugffBLhC9lYs+5tE="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; -} +}) diff --git a/pkgs/by-name/po/postsrsd/package.nix b/pkgs/by-name/po/postsrsd/package.nix index 6d0440b97384..1721a5018c10 100644 --- a/pkgs/by-name/po/postsrsd/package.nix +++ b/pkgs/by-name/po/postsrsd/package.nix @@ -7,14 +7,14 @@ help2man, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "postsrsd"; version = "2.0.11"; src = fetchFromGitHub { owner = "roehling"; repo = "postsrsd"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-Q7tXCd2Mz3WIGnIrbb8mfgT7fcmtVS4EtF0ztYmEsmM="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/po/potrace/package.nix b/pkgs/by-name/po/potrace/package.nix index 122d60c641ea..d6a37d07d058 100644 --- a/pkgs/by-name/po/potrace/package.nix +++ b/pkgs/by-name/po/potrace/package.nix @@ -5,12 +5,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "potrace"; version = "1.16"; src = fetchurl { - url = "https://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; + url = "https://potrace.sourceforge.net/download/${finalAttrs.version}/potrace-${finalAttrs.version}.tar.gz"; sha256 = "1k3sxgjqq0jnpk9xxys05q32sl5hbf1lbk1gmfxcrmpdgnhli0my"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.pSub ]; license = lib.licenses.gpl2; }; -} +}) diff --git a/pkgs/by-name/po/power-calibrate/package.nix b/pkgs/by-name/po/power-calibrate/package.nix index cb7487fac94e..096fd54ab618 100644 --- a/pkgs/by-name/po/power-calibrate/package.nix +++ b/pkgs/by-name/po/power-calibrate/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "power-calibrate"; version = "0.01.37"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "power-calibrate"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-DZ6rXbhaSNy3TEX+lwv3tyKQ7BXOZ9ycrff/7pF60j0="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/po/poweralertd/package.nix b/pkgs/by-name/po/poweralertd/package.nix index da95cb22871d..8a73ca6e98c0 100644 --- a/pkgs/by-name/po/poweralertd/package.nix +++ b/pkgs/by-name/po/poweralertd/package.nix @@ -9,7 +9,7 @@ systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "poweralertd"; version = "0.3.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = "poweralertd"; - rev = version; + rev = finalAttrs.version; hash = "sha256-WzqThv3Vu8R+g6Bn8EfesRk18rchCvw/UMPwbn9YC80="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ thibautmarty ]; mainProgram = "poweralertd"; }; -} +}) diff --git a/pkgs/by-name/po/powercap/package.nix b/pkgs/by-name/po/powercap/package.nix index d1a6c24a391f..38692932a202 100644 --- a/pkgs/by-name/po/powercap/package.nix +++ b/pkgs/by-name/po/powercap/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "powercap"; version = "0.6.0"; src = fetchFromGitHub { owner = "powercap"; repo = "powercap"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-l+IpFqBnCYUU825++sUPySD/Ku0TEIX2kt+S0Wml6iA="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ rowanG077 ]; }; -} +}) diff --git a/pkgs/by-name/po/powerjoular/package.nix b/pkgs/by-name/po/powerjoular/package.nix index 48384af59469..c2a5fb82db39 100644 --- a/pkgs/by-name/po/powerjoular/package.nix +++ b/pkgs/by-name/po/powerjoular/package.nix @@ -6,14 +6,14 @@ gprbuild, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "powerjoular"; version = "1.1.1"; src = fetchFromGitHub { owner = "joular"; repo = "powerjoular"; - rev = version; + rev = finalAttrs.version; hash = "sha256-+LJwkm/3o8DIbbxxeyOIIK2XZNq8Pg5tAR2BI8lC04c="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/po/powerline-go/package.nix b/pkgs/by-name/po/powerline-go/package.nix index 66c135a8689c..ed1e46aff5fa 100644 --- a/pkgs/by-name/po/powerline-go/package.nix +++ b/pkgs/by-name/po/powerline-go/package.nix @@ -4,25 +4,29 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "powerline-go"; - version = "1.25"; + version = "1.26"; src = fetchFromGitHub { owner = "justjanne"; repo = "powerline-go"; - rev = "v${version}"; - hash = "sha256-DLw/6jnJo0IAh0/Y21mfCLP4GgTFlUGvuwyWJwhzYFU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Hrg55Ot+0SpTjWM1Ulc3EZhV14EbjEF3jRSmMfC9jLw="; }; vendorHash = "sha256-W7Lf9s689oJy4U5sQlkLt3INJwtvzU2pot3EFimp7Jw="; + ldflags = [ + "-X github.com/justjanne/powerline-go/powerline.Version=${finalAttrs.version}" + ]; + meta = { description = "Powerline like prompt for Bash, ZSH and Fish"; homepage = "https://github.com/justjanne/powerline-go"; - changelog = "https://github.com/justjanne/powerline-go/releases/tag/v${version}"; + changelog = "https://github.com/justjanne/powerline-go/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ sifmelcara ]; mainProgram = "powerline-go"; }; -} +}) diff --git a/pkgs/by-name/po/powerstat/package.nix b/pkgs/by-name/po/powerstat/package.nix index 8b9c2dd823ec..ec01a9c0be9d 100644 --- a/pkgs/by-name/po/powerstat/package.nix +++ b/pkgs/by-name/po/powerstat/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "powerstat"; version = "0.04.05"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "powerstat"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-KR+Nzm9uRISNuqqnlTwfQP1jvSK4lAy//zdn7M8HPLk="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ womfoo ]; }; -} +}) diff --git a/pkgs/by-name/pp/ppp/package.nix b/pkgs/by-name/pp/ppp/package.nix index b49ba381d536..a4c577d4c015 100644 --- a/pkgs/by-name/pp/ppp/package.nix +++ b/pkgs/by-name/pp/ppp/package.nix @@ -15,14 +15,14 @@ systemdMinimal, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.5.2"; pname = "ppp"; src = fetchFromGitHub { owner = "ppp-project"; repo = "ppp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NV8U0F8IhHXn0YuVbfFr992ATQZaXA16bb5hBIwm9Gs="; }; @@ -103,4 +103,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ stv0g ]; }; -} +}) diff --git a/pkgs/by-name/pp/pps-tools/package.nix b/pkgs/by-name/pp/pps-tools/package.nix index 625ca80279f5..24efb66526d9 100644 --- a/pkgs/by-name/pp/pps-tools/package.nix +++ b/pkgs/by-name/pp/pps-tools/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pps-tools"; version = "1.0.3"; src = fetchFromGitHub { owner = "redlab-i"; repo = "pps-tools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-eLLFHrCgOQzOtVxlAsZ5X91KK+vZiKMGL7zbQFiIZtI="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ sorki ]; }; -} +}) diff --git a/pkgs/by-name/pr/prettyping/package.nix b/pkgs/by-name/pr/prettyping/package.nix index 4173fb403903..c03d72783e4a 100644 --- a/pkgs/by-name/pr/prettyping/package.nix +++ b/pkgs/by-name/pr/prettyping/package.nix @@ -4,13 +4,13 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "prettyping"; version = "1.1.0"; src = fetchFromGitHub { owner = "denilsonsa"; repo = "prettyping"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-GhsoWnhX9xBnupmmHuKW9DA2KFgIzVbSO0CyR2FpJ74="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qoelet ]; }; -} +}) diff --git a/pkgs/by-name/pr/prevo-tools/package.nix b/pkgs/by-name/pr/prevo-tools/package.nix index ff4759c8d5a7..64205a043532 100644 --- a/pkgs/by-name/pr/prevo-tools/package.nix +++ b/pkgs/by-name/pr/prevo-tools/package.nix @@ -10,14 +10,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "prevo-tools"; version = "0.2"; src = fetchFromGitHub { owner = "bpeel"; repo = "prevodb"; - rev = version; + rev = finalAttrs.version; hash = "sha256-TfgsZidwXewwqGkb31Qv0SrX8wQdPaK7JQA3nB5h2bs="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pr/prime-server/package.nix b/pkgs/by-name/pr/prime-server/package.nix index 0d4c6b28725e..0ec46b18d873 100644 --- a/pkgs/by-name/pr/prime-server/package.nix +++ b/pkgs/by-name/pr/prime-server/package.nix @@ -10,14 +10,14 @@ libsodium, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "prime-server"; version = "0.7.0"; src = fetchFromGitHub { owner = "kevinkreiser"; repo = "prime_server"; - tag = version; + tag = finalAttrs.version; sha256 = "0izmmvi3pvidhlrgfpg4ccblrw6fil3ddxg5cfxsz4qbh399x83w"; fetchSubmodules = true; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.Thra11 ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/pr/procdump/package.nix b/pkgs/by-name/pr/procdump/package.nix index 7cfe672ec757..a1fe660402c8 100644 --- a/pkgs/by-name/pr/procdump/package.nix +++ b/pkgs/by-name/pr/procdump/package.nix @@ -9,14 +9,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "procdump"; version = "1.2"; src = fetchFromGitHub { owner = "Microsoft"; repo = "ProcDump-for-Linux"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-gVswAezHl7E2cBTJEQhPFXhHkzhWVHSpPF8m0s8+ekc="; }; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { installCheckPhase = '' runHook preInstallCheck set +o pipefail - ($out/bin/procdump -h | grep "ProcDump v${version}") || + ($out/bin/procdump -h | grep "ProcDump v${finalAttrs.version}") || (echo "ERROR: ProcDump is not the expected version or does not run properly" ; exit 1) set -o pipefail runHook postInstallCheck @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ c0bw3b ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pr/procmail/package.nix b/pkgs/by-name/pr/procmail/package.nix index 0e24cc7c1ac8..824ef2cb7ae1 100644 --- a/pkgs/by-name/pr/procmail/package.nix +++ b/pkgs/by-name/pr/procmail/package.nix @@ -6,12 +6,12 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "procmail"; version = "3.24"; src = fetchurl { - url = "https://github.com/BuGlessRB/procmail/archive/refs/tags/v${version}.tar.gz"; + url = "https://github.com/BuGlessRB/procmail/archive/refs/tags/v${finalAttrs.version}.tar.gz"; sha256 = "UU6kMzOXg+ld+TIeeUdx5Ih7mCOsVf2yRpcCz2m9OYk="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/pr/prodigal/package.nix b/pkgs/by-name/pr/prodigal/package.nix index 818d00989dae..1641f1dc9d4c 100644 --- a/pkgs/by-name/pr/prodigal/package.nix +++ b/pkgs/by-name/pr/prodigal/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "prodigal"; version = "2.6.3"; src = fetchFromGitHub { repo = "Prodigal"; owner = "hyattpd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1fs1hqk83qjbjhrvhw6ni75zakx5ki1ayy3v6wwkn3xvahc9hi5s"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ luispedro ]; }; -} +}) diff --git a/pkgs/by-name/pr/profetch/package.nix b/pkgs/by-name/pr/profetch/package.nix index 1847951f5d88..2869d4d02a07 100644 --- a/pkgs/by-name/pr/profetch/package.nix +++ b/pkgs/by-name/pr/profetch/package.nix @@ -5,14 +5,14 @@ gprolog, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "profetch"; version = "0.1.7"; src = fetchFromGitHub { owner = "RustemB"; repo = "profetch"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-JsjpPUXMN0jytRS4yzSjrseqHiEQ+YinklG+tIIy+Zo="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.vel ]; mainProgram = "profetch"; }; -} +}) diff --git a/pkgs/by-name/pr/profile-cleaner/package.nix b/pkgs/by-name/pr/profile-cleaner/package.nix index 48b0916e9ac2..f8c9bd840372 100644 --- a/pkgs/by-name/pr/profile-cleaner/package.nix +++ b/pkgs/by-name/pr/profile-cleaner/package.nix @@ -9,14 +9,14 @@ file, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.45"; pname = "profile-cleaner"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-cleaner"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-10e1S+li7SXKJX2lETSdx84GavWqQYQqyLoBIVToTBI="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.devhell ]; mainProgram = "profile-cleaner"; }; -} +}) diff --git a/pkgs/by-name/pr/profile-sync-daemon/package.nix b/pkgs/by-name/pr/profile-sync-daemon/package.nix index 4e7745cb23a3..c5117b370235 100644 --- a/pkgs/by-name/pr/profile-sync-daemon/package.nix +++ b/pkgs/by-name/pr/profile-sync-daemon/package.nix @@ -6,14 +6,14 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "profile-sync-daemon"; version = "6.50"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-sync-daemon"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Wb9YLxuu9i9s/Y6trz5NZDU9WRywe3138cp5Q2gWbxM="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.prikhi ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pr/proggyfonts/package.nix b/pkgs/by-name/pr/proggyfonts/package.nix index 209adc7312c1..9f9d3653e482 100644 --- a/pkgs/by-name/pr/proggyfonts/package.nix +++ b/pkgs/by-name/pr/proggyfonts/package.nix @@ -5,12 +5,12 @@ mkfontscale, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "proggyfonts"; version = "0.1"; src = fetchurl { - url = "https://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-${version}.tar.gz"; + url = "https://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-${finalAttrs.version}.tar.gz"; hash = "sha256-SsLzZdR5icVJNbr5rcCPbagPPtWghbqs2Jxmrtufsa4="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.myrl ]; }; -} +}) diff --git a/pkgs/by-name/pr/progress/package.nix b/pkgs/by-name/pr/progress/package.nix index 4917a581e85d..4db4d4cfa883 100644 --- a/pkgs/by-name/pr/progress/package.nix +++ b/pkgs/by-name/pr/progress/package.nix @@ -7,14 +7,14 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "progress"; version = "0.17"; src = fetchFromGitHub { owner = "Xfennec"; repo = "progress"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-riewkageSZIlwDNMjYep9Pb2q1GJ+WMXazokJGbb4bE="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; mainProgram = "progress"; }; -} +}) diff --git a/pkgs/by-name/pr/proj-datumgrid/package.nix b/pkgs/by-name/pr/proj-datumgrid/package.nix index d802aa21a950..5e7cb6e3ce35 100644 --- a/pkgs/by-name/pr/proj-datumgrid/package.nix +++ b/pkgs/by-name/pr/proj-datumgrid/package.nix @@ -4,18 +4,18 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "proj-datumgrid"; version = "world-1.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "proj-datumgrid"; - rev = version; + rev = finalAttrs.version; sha256 = "132wp77fszx33wann0fjkmi1isxvsb0v9iw0gd9sxapa9h6hf3am"; }; - sourceRoot = "${src.name}/scripts"; + sourceRoot = "${finalAttrs.src.name}/scripts"; buildPhase = '' $CC nad2bin.c -o nad2bin @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { mainProgram = "nad2bin"; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/pr/prometheus-opnsense-exporter/package.nix b/pkgs/by-name/pr/prometheus-opnsense-exporter/package.nix index 000b457cddeb..6997aa43e1d7 100644 --- a/pkgs/by-name/pr/prometheus-opnsense-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-opnsense-exporter/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "prometheus-opnsense-exporter"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { - owner = "athennamind"; + owner = "AthennaMind"; repo = "opnsense-exporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-j16ATUeFqPiPElUqCPwylcujN/qiD9GrrBOXelAbgNs="; + hash = "sha256-k+o7zvCJypzbBdZQWlTosauvdk1E207H75+fjtE/Ckk="; }; ldflags = [ @@ -29,9 +29,9 @@ buildGoModule (finalAttrs: { doInstallCheck = true; meta = { changelog = "https://github.com/AthennaMind/opnsense-exporter/releases/tag/v${finalAttrs.version}"; - homepage = "https://githbub.com/AthennaMind/opnsense-exporter"; + homepage = "https://github.com/AthennaMind/opnsense-exporter"; description = "Prometheus exporter for opnsense firewall appliances"; - license = lib.licenses.mit; + license = lib.licenses.asl20; mainProgram = "opnsense-exporter"; maintainers = with lib.maintainers; [ paepcke ]; }; diff --git a/pkgs/by-name/pr/proot/package.nix b/pkgs/by-name/pr/proot/package.nix index 85f06e549fc8..a0666e33a706 100644 --- a/pkgs/by-name/pr/proot/package.nix +++ b/pkgs/by-name/pr/proot/package.nix @@ -12,14 +12,14 @@ enablePython ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "proot"; version = "5.4.0"; src = fetchFromGitHub { repo = "proot"; owner = "proot-me"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Z9Y7ccWp5KEVuo9xfHcgo58XqYVdFo7ck1jH7cnT2KA="; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "proot"; }; -} +}) diff --git a/pkgs/by-name/pr/protege-distribution/package.nix b/pkgs/by-name/pr/protege-distribution/package.nix index 1b2c2fc5d7ed..066348ddd2fb 100644 --- a/pkgs/by-name/pr/protege-distribution/package.nix +++ b/pkgs/by-name/pr/protege-distribution/package.nix @@ -10,12 +10,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "protege-distribution"; version = "5.6.3"; src = fetchurl { - url = "https://github.com/protegeproject/protege-distribution/releases/download/protege-${version}/Protege-${version}-platform-independent.zip"; + url = "https://github.com/protegeproject/protege-distribution/releases/download/protege-${finalAttrs.version}/Protege-${finalAttrs.version}-platform-independent.zip"; sha256 = "08pr0rn76wcc9bczdf93nlshxbid4z4nyvmaz198hhlq96aqpc3i"; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "run-protege"; }; -} +}) diff --git a/pkgs/by-name/pr/protobuf-matchers/package.nix b/pkgs/by-name/pr/protobuf-matchers/package.nix new file mode 100644 index 000000000000..c245607cee26 --- /dev/null +++ b/pkgs/by-name/pr/protobuf-matchers/package.nix @@ -0,0 +1,46 @@ +{ + cmake, + fetchFromGitHub, + gtest, + lib, + protobuf, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "protobuf-matchers"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "inazarenko"; + repo = "protobuf-matchers"; + tag = "v${finalAttrs.version}"; + hash = "sha256-aIEqmA4JwnGHY80Ehr9tgyxzhAk1nAdiVtPbsI0P0Aw="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'target_include_directories(protobuf-matchers PUBLIC ''${CMAKE_CURRENT_SOURCE_DIR})' \ + 'target_include_directories(protobuf-matchers PUBLIC $ $)' + echo 'target_sources(protobuf-matchers PUBLIC FILE_SET HEADERS + FILES protobuf-matchers/protocol-buffer-matchers.h)' >> CMakeLists.txt + echo 'install(TARGETS protobuf-matchers + FILE_SET HEADERS DESTINATION include)' >> CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + ]; + buildInputs = [ + gtest + protobuf + ]; + + meta = { + description = "Protocol buffer matchers for gMock/gTest"; + homepage = "https://github.com/inazarenko/protobuf-matchers"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ andersk ]; + }; +}) diff --git a/pkgs/by-name/pr/protobufc/package.nix b/pkgs/by-name/pr/protobufc/package.nix index a0dac4db6ca9..b12d395d1a16 100644 --- a/pkgs/by-name/pr/protobufc/package.nix +++ b/pkgs/by-name/pr/protobufc/package.nix @@ -9,14 +9,14 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "protobuf-c"; version = "1.5.2"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bpxk2o5rYLFkx532A3PYyhh2MwVH2Dqf3p/bnNpQV7s="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ nickcao ]; }; -} +}) diff --git a/pkgs/by-name/pr/proverif/package.nix b/pkgs/by-name/pr/proverif/package.nix index a3ca7dd22628..227e851b6592 100644 --- a/pkgs/by-name/pr/proverif/package.nix +++ b/pkgs/by-name/pr/proverif/package.nix @@ -10,12 +10,12 @@ enable_interact ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "proverif"; version = "2.05"; src = fetchurl { - url = "https://bblanche.gitlabpages.inria.fr/proverif/proverif${version}.tar.gz"; + url = "https://bblanche.gitlabpages.inria.fr/proverif/proverif${finalAttrs.version}.tar.gz"; hash = "sha256-SHH1PDKrSgRmmgYMSIa6XZCASWlj+5gKmmLSxCnOq8Q="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { vbgl ]; }; -} +}) diff --git a/pkgs/by-name/pr/proxychains-ng/package.nix b/pkgs/by-name/pr/proxychains-ng/package.nix index c1fe82b2e7f1..aa028434501c 100644 --- a/pkgs/by-name/pr/proxychains-ng/package.nix +++ b/pkgs/by-name/pr/proxychains-ng/package.nix @@ -7,14 +7,14 @@ darwinHookMethod ? "dyld", }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "proxychains-ng"; version = "4.17"; src = fetchFromGitHub { owner = "rofl0r"; repo = "proxychains-ng"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-cHRWPQm6aXsror0z+S2Ddm7w14c1OvEruDublWsvnXs="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "proxychains4"; }; -} +}) diff --git a/pkgs/by-name/pr/proxychains/package.nix b/pkgs/by-name/pr/proxychains/package.nix index 91cc960b0866..c449011a2be8 100644 --- a/pkgs/by-name/pr/proxychains/package.nix +++ b/pkgs/by-name/pr/proxychains/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "proxychains"; version = "4.4.0"; src = fetchFromGitHub { owner = "haad"; repo = "proxychains"; - rev = "proxychains-${version}"; + rev = "proxychains-${finalAttrs.version}"; sha256 = "083xdg6fsn8c2ns93lvy794rixxq8va6jdf99w1z0xi4j7f1nyjw"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "proxychains4"; }; -} +}) diff --git a/pkgs/by-name/pr/proycon-wayout/package.nix b/pkgs/by-name/pr/proycon-wayout/package.nix index 26f341eb82d1..b71c13c8b768 100644 --- a/pkgs/by-name/pr/proycon-wayout/package.nix +++ b/pkgs/by-name/pr/proycon-wayout/package.nix @@ -14,14 +14,14 @@ wayland-scanner, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "proycon-wayout"; version = "0.1.3"; src = fetchFromSourcehut { owner = "~proycon"; repo = "wayout"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-pxHz8y63xX9I425OG0jPvQVx4mAbTYHxVMMkfjZpURo="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wentam ]; mainProgram = "proycon-wayout"; }; -} +}) diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix index 70fa29e767fe..dccb6e831ef5 100644 --- a/pkgs/by-name/pr/prrte/package.nix +++ b/pkgs/by-name/pr/prrte/package.nix @@ -16,14 +16,14 @@ pmix, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "prrte"; version = "3.0.12"; src = fetchFromGitHub { owner = "openpmix"; repo = "prrte"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sOCJc70imSzAqYXz29tOKKETsSHvgMUQmeTHlfnQXj4="; fetchSubmodules = true; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ markuskowa ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ps/pscircle/package.nix b/pkgs/by-name/ps/pscircle/package.nix index ac7320fb2cb2..06b4dde7dbc7 100644 --- a/pkgs/by-name/ps/pscircle/package.nix +++ b/pkgs/by-name/ps/pscircle/package.nix @@ -8,14 +8,14 @@ cairo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pscircle"; version = "1.4.0"; src = fetchFromGitLab { owner = "mildlyparallel"; repo = "pscircle"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-bqbQBNscNfoqXprhoFUnUQO88YQs9xDhD4d3KHamtG0="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.ldesgoui ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ps/psi-notify/package.nix b/pkgs/by-name/ps/psi-notify/package.nix index 00865b372e2e..8e024eaba1e1 100644 --- a/pkgs/by-name/ps/psi-notify/package.nix +++ b/pkgs/by-name/ps/psi-notify/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "psi-notify"; version = "1.3.1"; src = fetchFromGitHub { owner = "cdown"; repo = "psi-notify"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-GhGiSI5r0Ki6+MYNa5jCDyYZEW5R9LDNZ/S8K+6L0jo="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ eduarrrd ]; mainProgram = "psi-notify"; }; -} +}) diff --git a/pkgs/by-name/ps/psmisc/package.nix b/pkgs/by-name/ps/psmisc/package.nix index 02cff9463d16..1631783396f3 100644 --- a/pkgs/by-name/ps/psmisc/package.nix +++ b/pkgs/by-name/ps/psmisc/package.nix @@ -8,14 +8,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "psmisc"; version = "23.7"; src = fetchFromGitLab { owner = "psmisc"; repo = "psmisc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-49YpdIh0DxLHfxos4sw1HUkV0XQBqmm4M9b0T4eN2xI="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ryantm ]; }; -} +}) diff --git a/pkgs/by-name/ps/pspg/package.nix b/pkgs/by-name/ps/pspg/package.nix index c454ab313ea3..8be74b56c532 100644 --- a/pkgs/by-name/ps/pspg/package.nix +++ b/pkgs/by-name/ps/pspg/package.nix @@ -10,14 +10,14 @@ libpq, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pspg"; version = "5.8.15"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-wYGU9vaAgY87RTbOXOGBVV37ZN/+NceXWgoEaY95md4="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.jlesquembre ]; mainProgram = "pspg"; }; -} +}) diff --git a/pkgs/by-name/ps/pstoedit/package.nix b/pkgs/by-name/ps/pstoedit/package.nix index 55d6e5ed724f..69082a5bc9f4 100644 --- a/pkgs/by-name/ps/pstoedit/package.nix +++ b/pkgs/by-name/ps/pstoedit/package.nix @@ -14,12 +14,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pstoedit"; version = "4.02"; src = fetchurl { - url = "mirror://sourceforge/pstoedit/pstoedit-${version}.tar.gz"; + url = "mirror://sourceforge/pstoedit/pstoedit-${finalAttrs.version}.tar.gz"; hash = "sha256-VYi0MtLGsq2YKLRJFepYE/+aOjMSpB+g3kw43ayd9y8="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "pstoedit"; }; -} +}) diff --git a/pkgs/by-name/ps/pstreams/package.nix b/pkgs/by-name/ps/pstreams/package.nix index 7d317026ee98..5fb8582378d1 100644 --- a/pkgs/by-name/ps/pstreams/package.nix +++ b/pkgs/by-name/ps/pstreams/package.nix @@ -4,7 +4,7 @@ fetchgit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "PStreams"; version = "1.0.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { let dot2Underscore = lib.strings.stringAsChars (c: if c == "." then "_" else c); in - "RELEASE_${dot2Underscore version}"; + "RELEASE_${dot2Underscore finalAttrs.version}"; sha256 = "0r8aj0nh5mkf8cvnzl8bdy4nm7i74vs83axxfimcd74kjfn0irys"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.boost; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/pt/ptcollab/package.nix b/pkgs/by-name/pt/ptcollab/package.nix index 6cec5df4641a..aed0c3ebff5f 100644 --- a/pkgs/by-name/pt/ptcollab/package.nix +++ b/pkgs/by-name/pt/ptcollab/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ptcollab"; - version = "0.6.4.10"; + version = "0.6.4.11"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${finalAttrs.version}"; - hash = "sha256-8CllDcbbVXmDyD5jyKVoNq96wqWtfoPM2CEN13KYptQ="; + hash = "sha256-tjsSaKUvswp+/gyJeIJ/cnBrerNMAguzv2mFFLDPaoI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pt/pterm/package.nix b/pkgs/by-name/pt/pterm/package.nix index 6bebf9a4ccac..675ae8a5934a 100644 --- a/pkgs/by-name/pt/pterm/package.nix +++ b/pkgs/by-name/pt/pterm/package.nix @@ -7,7 +7,7 @@ SDL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pterm"; version = "6.0.4"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://www.cyber1.org/download/linux/pterm-${version}.tar.bz2"; + url = "https://www.cyber1.org/download/linux/pterm-${finalAttrs.version}.tar.bz2"; hash = "sha256-0OJvoCOGx/a51Ja7n3fOTeQJEcdyn/GhaJ0NtVCyuC8="; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - env.PTERMVERSION = "${version}"; + env.PTERMVERSION = "${finalAttrs.version}"; installPhase = '' runHook preInstall @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/pt/ptex/package.nix b/pkgs/by-name/pt/ptex/package.nix index 95f084e59067..2b150e7827b9 100644 --- a/pkgs/by-name/pt/ptex/package.nix +++ b/pkgs/by-name/pt/ptex/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ptex"; version = "2.4.2"; src = fetchFromGitHub { owner = "wdas"; repo = "ptex"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-PR1ld9rXmL6BK4llznAsD5PNvi3anFMz2i9NDsG95DQ="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.guibou ]; }; -} +}) diff --git a/pkgs/by-name/pt/ptouch-driver/package.nix b/pkgs/by-name/pt/ptouch-driver/package.nix index f29332253e25..247e217eb69c 100644 --- a/pkgs/by-name/pt/ptouch-driver/package.nix +++ b/pkgs/by-name/pt/ptouch-driver/package.nix @@ -13,14 +13,14 @@ patchPpdFilesHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ptouch-driver"; version = "1.7.1"; src = fetchFromGitHub { owner = "philpem"; repo = "printer-driver-ptouch"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-MVvtfos2ze6uXFg8sEH1UlJ9gg4iq91dLK0k0xuTE1Y="; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ]; meta = { - changelog = "https://github.com/philpem/printer-driver-ptouch/releases/tag/v${version}"; + changelog = "https://github.com/philpem/printer-driver-ptouch/releases/tag/v${finalAttrs.version}"; description = "Printer Driver for Brother P-touch and QL Label Printers"; downloadPage = "https://github.com/philpem/printer-driver-ptouch"; homepage = "https://github.com/philpem/printer-driver-ptouch"; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { for the Brother P-touch and QL label printer families. ''; }; -} +}) diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix index 3ea5cc734695..eac80a6b250c 100644 --- a/pkgs/by-name/pu/publii/package.nix +++ b/pkgs/by-name/pu/publii/package.nix @@ -27,12 +27,12 @@ libxcb, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "publii"; version = "0.47.3"; src = fetchurl { - url = "https://getpublii.com/download/Publii-${version}.deb"; + url = "https://getpublii.com/download/Publii-${finalAttrs.version}.deb"; hash = "sha256-1LzjnN0gmzE4JJdgTOUQ3n/BATg+B5Lfi0yR94TU+XE="; }; @@ -101,11 +101,11 @@ stdenv.mkDerivation rec { quickly and easily; perfect for anyone who wants a fast, secure website in a flash. ''; homepage = "https://getpublii.com"; - changelog = "https://github.com/getpublii/publii/releases/tag/v${version}"; + changelog = "https://github.com/getpublii/publii/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ sebtm ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/pu/pugixml/package.nix b/pkgs/by-name/pu/pugixml/package.nix index 0ef249ec19ea..1fe799dbb7fa 100644 --- a/pkgs/by-name/pu/pugixml/package.nix +++ b/pkgs/by-name/pu/pugixml/package.nix @@ -8,14 +8,14 @@ shared ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pugixml"; version = "1.15"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-t/57lg32KgKPc7qRGQtO/GOwHRqoj78lllSaE/A8Z9Q="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pu/pulsemixer/package.nix b/pkgs/by-name/pu/pulsemixer/package.nix index 901e254a0fc6..214eb2ab70bf 100644 --- a/pkgs/by-name/pu/pulsemixer/package.nix +++ b/pkgs/by-name/pu/pulsemixer/package.nix @@ -6,14 +6,14 @@ libpulseaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pulsemixer"; version = "1.5.1"; src = fetchFromGitHub { owner = "GeorgeFilipkin"; repo = "pulsemixer"; - rev = version; + rev = finalAttrs.version; sha256 = "1jagx9zmz5pfsld8y2rj2kqg6ww9f6vqiawfy3vhqc49x3xx92p4"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "pulsemixer"; }; -} +}) diff --git a/pkgs/by-name/pu/pure-ftpd/package.nix b/pkgs/by-name/pu/pure-ftpd/package.nix index 9c107d7c10ed..46aadf993e3b 100644 --- a/pkgs/by-name/pu/pure-ftpd/package.nix +++ b/pkgs/by-name/pu/pure-ftpd/package.nix @@ -7,12 +7,12 @@ libxcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pure-ftpd"; version = "1.0.52"; src = fetchurl { - url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz"; + url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${finalAttrs.version}.tar.gz"; sha256 = "sha256-ESbzqVhW0IiJ/4lwPLGqnsmSTZOdFU6WkEySDwXcPHQ="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/pu/pure-prompt/package.nix b/pkgs/by-name/pu/pure-prompt/package.nix index 3dd4961c1f02..37a34eae88f9 100644 --- a/pkgs/by-name/pu/pure-prompt/package.nix +++ b/pkgs/by-name/pu/pure-prompt/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pure-prompt"; version = "1.26.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-AZSxP2g6BWoxyiSQH7yzbbbfGcwD8jgnXPPfcYwJUL0="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { pablovsky ]; }; -} +}) diff --git a/pkgs/by-name/pu/puredata/package.nix b/pkgs/by-name/pu/puredata/package.nix index 2aca99971134..e0c85311e5b4 100644 --- a/pkgs/by-name/pu/puredata/package.nix +++ b/pkgs/by-name/pu/puredata/package.nix @@ -14,12 +14,12 @@ portmidi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "puredata"; version = "0.55-2"; src = fetchurl { - url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; + url = "http://msp.ucsd.edu/Software/pd-${finalAttrs.version}.src.tar.gz"; hash = "sha256-EIKX+NHdGQ346LtKSsNIeSrM9wT5ogUtk8uoybi7Wls="; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { mainProgram = "pd"; changelog = "https://msp.puredata.info/Pd_documentation/x5.htm#s1"; }; -} +}) diff --git a/pkgs/by-name/pu/puremapping/package.nix b/pkgs/by-name/pu/puremapping/package.nix index e0727483cee5..c2fac5de9b14 100644 --- a/pkgs/by-name/pu/puremapping/package.nix +++ b/pkgs/by-name/pu/puremapping/package.nix @@ -6,12 +6,12 @@ puredata, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "puremapping"; version = "20160130"; src = fetchurl { - url = "https://www.chnry.net/data/puremapping-${version}-generic.zip"; + url = "https://www.chnry.net/data/puremapping-${finalAttrs.version}-generic.zip"; name = "puremapping"; sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pv/pvsneslib/package.nix b/pkgs/by-name/pv/pvsneslib/package.nix index 23094c2e81cc..e2501bc76f43 100644 --- a/pkgs/by-name/pv/pvsneslib/package.nix +++ b/pkgs/by-name/pv/pvsneslib/package.nix @@ -6,14 +6,14 @@ gcc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pvsneslib"; version = "4.2.0"; src = fetchFromGitHub { owner = "alekmaul"; repo = "pvsneslib"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Cl4+WvjKbq5IPqf7ivVYwBYwDDWWHGNeq4nWXPxsUHw="; fetchSubmodules = true; }; @@ -69,10 +69,10 @@ stdenv.mkDerivation rec { meta = { description = "Free and open source development kit for the Nintendo SNES"; homepage = "https://github.com/alekmaul/pvsneslib"; - changelog = "https://github.com/alekmaul/pvsneslib/releases/tag/${src.rev}"; + changelog = "https://github.com/alekmaul/pvsneslib/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ soyouzpanda ]; mainProgram = "pvsneslib"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/pw/pwgen/package.nix b/pkgs/by-name/pw/pwgen/package.nix index f245964b790f..ae8d6c42187c 100644 --- a/pkgs/by-name/pw/pwgen/package.nix +++ b/pkgs/by-name/pw/pwgen/package.nix @@ -5,14 +5,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pwgen"; version = "2.08"; src = fetchFromGitHub { owner = "tytso"; repo = "pwgen"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1j6c6m9fcy24jn8mk989x49yk765xb26lpr8yhpiaqk206wlss2z"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { mainProgram = "pwgen"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix index 2a62abad8930..9c5dc2e8d9fb 100644 --- a/pkgs/by-name/pw/pwsafe/package.nix +++ b/pkgs/by-name/pw/pwsafe/package.nix @@ -23,14 +23,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pwsafe"; version = "1.23.0"; # do NOT update to 3.x Windows releases src = fetchFromGitHub { owner = "pwsafe"; repo = "pwsafe"; - rev = version; + rev = finalAttrs.version; hash = "sha256-54cwQZi93p32JxxLc2Mql2XbJPvwqA2Rfne5G+5i6eU="; }; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { allowedVersions = "^1\\."; - url = src.gitRepoUrl; + url = finalAttrs.src.gitRepoUrl; }; meta = { @@ -117,4 +117,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.artistic2; }; -} +}) diff --git a/pkgs/by-name/px/pxattr/package.nix b/pkgs/by-name/px/pxattr/package.nix index a3d0fd4e732d..9d08f7b0d58e 100644 --- a/pkgs/by-name/px/pxattr/package.nix +++ b/pkgs/by-name/px/pxattr/package.nix @@ -5,12 +5,12 @@ gcc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pxattr"; version = "2.1.0"; src = fetchurl { - url = "https://www.lesbonscomptes.com/pxattr/pxattr-${version}.tar.gz"; + url = "https://www.lesbonscomptes.com/pxattr/pxattr-${finalAttrs.version}.tar.gz"; sha256 = "1dwcqc5z7gzma1zhis2md49bj2nq7m6jimh4zlx9szw6svisz56z"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "pxattr"; }; -} +}) diff --git a/pkgs/by-name/px/pxder/package.nix b/pkgs/by-name/px/pxder/package.nix index e01b261ae781..18339ff79127 100644 --- a/pkgs/by-name/px/pxder/package.nix +++ b/pkgs/by-name/px/pxder/package.nix @@ -9,19 +9,19 @@ nodejs, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pxder"; version = "2.12.8"; src = fetchFromGitHub { owner = "Tsuk1ko"; repo = "pxder"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-+WZbs10+id+nohTZzLjEofb6k8PMGd73YhY3FUTXx5Q="; }; offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-++MqWIUntXQwOYpgAJ3nhAtZ5nxmEreioVHQokYkw7w="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ vanilla ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/py/py3c/package.nix b/pkgs/by-name/py/py3c/package.nix index df4d6f52f9b0..88fa45e914f1 100644 --- a/pkgs/by-name/py/py3c/package.nix +++ b/pkgs/by-name/py/py3c/package.nix @@ -5,14 +5,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "py3c"; version = "1.4"; src = fetchFromGitHub { owner = "encukou"; repo = "py3c"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-v8+0J56sZVbGdBlOotObUa10/zFMTvfXdMYRsKhyZaY="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix index 7ccda48d2900..1b9b75b9d0fd 100644 --- a/pkgs/by-name/py/pyenv/package.nix +++ b/pkgs/by-name/py/pyenv/package.nix @@ -5,14 +5,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pyenv"; version = "2.6.14"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-yE/D7ycD5IKZltSBUaH41Vg8xptosnJ9Py7SkCch36g="; }; @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { meta = { description = "Simple Python version management"; homepage = "https://github.com/pyenv/pyenv"; - changelog = "https://github.com/pyenv/pyenv/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/pyenv/pyenv/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; platforms = lib.platforms.all; mainProgram = "pyenv"; }; -} +}) diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix index 01d038ea440f..1336a849cd8c 100644 --- a/pkgs/by-name/py/pyradio/package.nix +++ b/pkgs/by-name/py/pyradio/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.3.11.22"; + version = "0.9.3.11.25"; pyproject = true; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; tag = version; - hash = "sha256-JUVlaKKprgnGiZzZ0J6VSePrSdCWuWQzhuTTiCeB12U="; + hash = "sha256-+0anoFhbADIMAMBQUqDfI7liui+7sDgUtG9+ZwFg+nI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/py/pyroscope/package.nix b/pkgs/by-name/py/pyroscope/package.nix index 4e99c54b8bb5..181ff06ec0b9 100644 --- a/pkgs/by-name/py/pyroscope/package.nix +++ b/pkgs/by-name/py/pyroscope/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "pyroscope"; - version = "1.18.0"; + version = "pyroscope-1.18.1"; src = fetchFromGitHub { owner = "grafana"; diff --git a/pkgs/by-name/qa/qastools/package.nix b/pkgs/by-name/qa/qastools/package.nix index d979cc07ecea..c0c5d672a959 100644 --- a/pkgs/by-name/qa/qastools/package.nix +++ b/pkgs/by-name/qa/qastools/package.nix @@ -8,14 +8,14 @@ qt6Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qastools"; version = "1.4.0"; src = fetchFromGitLab { owner = "sebholt"; repo = "qastools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-mJjhM1y50f44kvxMidM7uqlkkXx1sbJC21vIMEDenoU="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/qc/qcomicbook/package.nix b/pkgs/by-name/qc/qcomicbook/package.nix index 293097a56af8..7f4092abd86a 100644 --- a/pkgs/by-name/qc/qcomicbook/package.nix +++ b/pkgs/by-name/qc/qcomicbook/package.nix @@ -8,14 +8,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qcomicbook"; version = "0.9.1"; src = fetchFromGitHub { owner = "stolowski"; repo = "QComicBook"; - rev = version; + rev = finalAttrs.version; sha256 = "1b769lp6gfwds4jb2g7ymhdm9c06zg57zpyz3zpdb40w07zfsjzv"; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ greydot ]; }; -} +}) diff --git a/pkgs/by-name/qd/qdelay/package.nix b/pkgs/by-name/qd/qdelay/package.nix index 356578b372c2..d0240b9d0087 100644 --- a/pkgs/by-name/qd/qdelay/package.nix +++ b/pkgs/by-name/qd/qdelay/package.nix @@ -16,18 +16,21 @@ libXrandr, libXtst, writableTmpDirAsHomeHook, + + buildVST3 ? true, + buildLV2 ? stdenv.isLinux, }: stdenv.mkDerivation (finalAttrs: { pname = "qdelay"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "tiagolr"; repo = "qdelay"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Pnta6KyvOPKsKp9wfofc6BnBGJdV7Of6tFeTgaCTu7c="; + hash = "sha256-URBbXopXB3pm5vJ9Afa9H3upYdfqgT/NhujgPL54NV4="; }; nativeBuildInputs = [ @@ -56,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "COPY_PLUGIN_AFTER_BUILD" false) - (lib.cmakeFeature "BUILD_STANDALONE" "OFF") + + (lib.cmakeBool "BUILD_STANDALONE" false) + (lib.cmakeBool "BUILD_VST3" buildVST3) + (lib.cmakeBool "BUILD_LV2" buildLV2) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" @@ -76,10 +82,17 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/vst3 $out/lib/lv2 + pushd QDelay_artefacts/Release + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + cp -r VST3/QDelay.vst3 $out/lib/vst3 + ''} - cp -r "QDelay_artefacts/Release/LV2/QDelay.lv2" $out/lib/lv2 - cp -r "QDelay_artefacts/Release/VST3/QDelay.vst3" $out/lib/vst3 + ${lib.optionalString buildLV2 '' + mkdir -p $out/lib/lv2 + cp -r LV2/QDelay.lv2 $out/lib/lv2 + ''} + popd runHook postInstall ''; @@ -89,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tiagolr/qdelay"; changelog = "https://github.com/tiagolr/qdelay/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ magnetophon ]; + maintainers = with lib.maintainers; [ + magnetophon + mrtnvgr + ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/qd/qdigidoc/package.nix b/pkgs/by-name/qd/qdigidoc/package.nix index 84544041ec30..a536029a9465 100644 --- a/pkgs/by-name/qd/qdigidoc/package.nix +++ b/pkgs/by-name/qd/qdigidoc/package.nix @@ -14,14 +14,14 @@ qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qdigidoc"; version = "4.9.1"; src = fetchFromGitHub { owner = "open-eid"; repo = "DigiDoc4-Client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-sp+qlWtsMZHyoG0OVKbhalgak5KIx7C7Rpp0PbKVxK8="; fetchSubmodules = true; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { mmahut ]; }; -} +}) diff --git a/pkgs/by-name/qd/qdirstat/package.nix b/pkgs/by-name/qd/qdirstat/package.nix index 488b55963aa0..b57191d3321b 100644 --- a/pkgs/by-name/qd/qdirstat/package.nix +++ b/pkgs/by-name/qd/qdirstat/package.nix @@ -11,14 +11,14 @@ util-linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qdirstat"; version = "1.9"; src = fetchFromGitHub { owner = "shundhammer"; repo = "qdirstat"; - rev = version; + rev = finalAttrs.version; hash = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "qdirstat"; }; -} +}) diff --git a/pkgs/by-name/qd/qdmr/package.nix b/pkgs/by-name/qd/qdmr/package.nix index d6312618c09e..19da04d327f3 100644 --- a/pkgs/by-name/qd/qdmr/package.nix +++ b/pkgs/by-name/qd/qdmr/package.nix @@ -16,14 +16,14 @@ let inherit (stdenv.hostPlatform) isLinux; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qdmr"; version = "0.13.3"; src = fetchFromGitHub { owner = "hmatuschek"; repo = "qdmr"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Nw5B0vbYlGkH/8SAAT4DdTp2qiiLst3hWV4n6uF7oUo="; }; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString isLinux '' mkdir -p "$out/etc/udev/rules.d" - cp ${src}/dist/99-qdmr.rules $out/etc/udev/rules.d/ + cp ${finalAttrs.src}/dist/99-qdmr.rules $out/etc/udev/rules.d/ ''; doInstallCheck = true; @@ -83,4 +83,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/qg/qgrep/package.nix b/pkgs/by-name/qg/qgrep/package.nix index 6038d609749b..3cdaa280fe8e 100644 --- a/pkgs/by-name/qg/qgrep/package.nix +++ b/pkgs/by-name/qg/qgrep/package.nix @@ -5,14 +5,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qgrep"; version = "1.3"; src = fetchFromGitHub { owner = "zeux"; repo = "qgrep"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-TeXOzfb1Nu6hz9l6dXGZY+xboscPapKm0Z264hv1Aww="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.yrashk ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/qh/qhull/package.nix b/pkgs/by-name/qh/qhull/package.nix index 4d552f5934e8..cebecb161c1f 100644 --- a/pkgs/by-name/qh/qhull/package.nix +++ b/pkgs/by-name/qh/qhull/package.nix @@ -6,14 +6,14 @@ fixDarwinDylibNames, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qhull"; version = "2020.2"; src = fetchFromGitHub { owner = "qhull"; repo = "qhull"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-djUO3qzY8ch29AuhY3Bn1ajxWZ4/W70icWVrxWRAxRc="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/qj/qjournalctl/package.nix b/pkgs/by-name/qj/qjournalctl/package.nix index 46c49939f155..2855cc16074f 100644 --- a/pkgs/by-name/qj/qjournalctl/package.nix +++ b/pkgs/by-name/qj/qjournalctl/package.nix @@ -7,14 +7,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qjournalctl"; version = "0.6.4"; src = fetchFromGitHub { owner = "pentix"; repo = "qjournalctl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-anNNzqjbIaQI+MAwwMwzy6v4SKqi4u9F5IbFBErm4q8="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ romildo ]; }; -} +}) diff --git a/pkgs/by-name/ql/qlog/package.nix b/pkgs/by-name/ql/qlog/package.nix index d33a0520ece6..ad2751b95dd7 100644 --- a/pkgs/by-name/ql/qlog/package.nix +++ b/pkgs/by-name/ql/qlog/package.nix @@ -9,14 +9,14 @@ qt6Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qlog"; version = "0.46.1"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0oMkD13M81DZY1yHW6mPWr7QMuCsxSqGYw/TMghDKd0="; fetchSubmodules = true; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/qm/qm-dsp/package.nix b/pkgs/by-name/qm/qm-dsp/package.nix index 84edf328a77f..d1a40ccf04e5 100644 --- a/pkgs/by-name/qm/qm-dsp/package.nix +++ b/pkgs/by-name/qm/qm-dsp/package.nix @@ -6,14 +6,14 @@ kissfft, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qm-dsp"; version = "1.7.1"; src = fetchFromGitHub { owner = "c4dm"; repo = "qm-dsp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1vkb1xr2hjcaw88gig7rknlwsx01lm0w94d2z0rk5vz9ih4fslvv"; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/qm/qmidiarp/package.nix b/pkgs/by-name/qm/qmidiarp/package.nix index 44cf84e0dd8c..c41f3f60c2a2 100644 --- a/pkgs/by-name/qm/qmidiarp/package.nix +++ b/pkgs/by-name/qm/qmidiarp/package.nix @@ -10,14 +10,14 @@ libjack2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qmidiarp"; version = "0.7.1"; src = fetchgit { url = "https://git.code.sf.net/p/qmidiarp/code"; sha256 = "sha256-xTDI1QtgOOMexzFKvYWhlfpXv8uXaoD4o+G6XF8/Cw8="; - rev = "qmidiarp-${version}"; + rev = "qmidiarp-${finalAttrs.version}"; }; nativeBuildInputs = [ @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ sjfloat ]; }; -} +}) diff --git a/pkgs/by-name/qm/qmk-udev-rules/package.nix b/pkgs/by-name/qm/qmk-udev-rules/package.nix index 95a9f117e287..a724a0e1daf0 100644 --- a/pkgs/by-name/qm/qmk-udev-rules/package.nix +++ b/pkgs/by-name/qm/qmk-udev-rules/package.nix @@ -8,14 +8,14 @@ ## Usage # In NixOS, set hardware.keyboard.qmk.enable = true; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qmk-udev-rules"; version = "0.27.13"; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Zs508OQ0RYCg0f9wqR+VXUmVvhP/jCA3piwRq2ZpR84="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/pkgs/by-name/qm/qmqtt/package.nix b/pkgs/by-name/qm/qmqtt/package.nix index 6be416d7470e..cf6298e9173d 100644 --- a/pkgs/by-name/qm/qmqtt/package.nix +++ b/pkgs/by-name/qm/qmqtt/package.nix @@ -6,14 +6,14 @@ qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qmqtt"; version = "1.0.4"; src = fetchFromGitHub { owner = "emqx"; repo = "qmqtt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-cIzBnJdMFY25cWf1rBoRQx1G0/5S32igF8vcte+nyHI="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ hexa ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/qo/qosmic/package.nix b/pkgs/by-name/qo/qosmic/package.nix index f82563299276..0a88fe0ae549 100644 --- a/pkgs/by-name/qo/qosmic/package.nix +++ b/pkgs/by-name/qo/qosmic/package.nix @@ -12,14 +12,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qosmic"; version = "1.6.0"; src = fetchFromGitHub { owner = "bitsed"; repo = "qosmic"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "13nw1mkdib14430r21mj352v62vi546vf184vyhxm7yjjygyra1w"; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.raboof ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/qp/qperf/package.nix b/pkgs/by-name/qp/qperf/package.nix index e4400af6bfb9..5d49bc4c658b 100644 --- a/pkgs/by-name/qp/qperf/package.nix +++ b/pkgs/by-name/qp/qperf/package.nix @@ -9,14 +9,14 @@ rdma-core, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qperf"; version = "0.4.11"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "qperf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-x9l8xqwMDHlXRZpWt3XiqN5xyCTV5rk8jp/ClRPPECI="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ edwtjo ]; }; -} +}) diff --git a/pkgs/by-name/qp/qprint/package.nix b/pkgs/by-name/qp/qprint/package.nix index 8dba3ab67ce4..01cebd4ebd79 100644 --- a/pkgs/by-name/qp/qprint/package.nix +++ b/pkgs/by-name/qp/qprint/package.nix @@ -4,12 +4,12 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qprint"; version = "1.1"; src = fetchurl { - url = "https://www.fourmilab.ch/webtools/qprint/qprint-${version}.tar.gz"; + url = "https://www.fourmilab.ch/webtools/qprint/qprint-${finalAttrs.version}.tar.gz"; sha256 = "1701cnb1nl84rmcpxzq11w4cyj4385jh3gx4aqxznwf8a4fwmagz"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/qq/qqwing/package.nix b/pkgs/by-name/qq/qqwing/package.nix index 9f1713bae679..aab857a0ec38 100644 --- a/pkgs/by-name/qq/qqwing/package.nix +++ b/pkgs/by-name/qq/qqwing/package.nix @@ -8,14 +8,14 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qqwing"; version = "1.3.4"; src = fetchFromGitHub { owner = "stephenostermiller"; repo = "qqwing"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MYHPANQk4aUuDqUNxWPbqw45vweZ2bBcUcMTyEjcAOM="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nickcao ]; mainProgram = "qqwing"; }; -} +}) diff --git a/pkgs/by-name/qr/qrq/package.nix b/pkgs/by-name/qr/qrq/package.nix index 283eaba711b4..192e815a136d 100644 --- a/pkgs/by-name/qr/qrq/package.nix +++ b/pkgs/by-name/qr/qrq/package.nix @@ -6,18 +6,18 @@ pulseaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qrq"; version = "0.3.5"; src = fetchFromGitHub { owner = "dj1yfk"; repo = "qrq"; - rev = "qrq-${version}"; + rev = "qrq-${finalAttrs.version}"; hash = "sha256-uuETGbv5qm0Z+45+kK66SBHhQ0Puu6I5z+TWIh3iR2g="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; buildInputs = [ ncurses @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { meta = { description = "High Speed Morse trainer - mirror of https://git.fkurz.net/dj1yfk/qrq"; homepage = "https://github.com/dj1yfk/qrq"; - changelog = "https://github.com/dj1yfk/qrq/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/dj1yfk/qrq/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ pkharvey ]; mainProgram = "qrq"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/qt/qtox/package.nix b/pkgs/by-name/qt/qtox/package.nix index a252e2321217..75c5eacc3f23 100644 --- a/pkgs/by-name/qt/qtox/package.nix +++ b/pkgs/by-name/qt/qtox/package.nix @@ -23,14 +23,14 @@ sqlcipher, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qtox"; version = "1.18.3"; src = fetchFromGitHub { owner = "TokTok"; repo = "qTox"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-5pH39NsJdt4+ldlbpkvA0n/X/LkEUEv4UL1K/W3BqmM="; }; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isDarwin [ perl ]; cmakeFlags = [ - "-DGIT_DESCRIBE=v${version}" + "-DGIT_DESCRIBE=v${finalAttrs.version}" "-DTIMESTAMP=1" ]; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix index d980c4ca344e..570bb729c9d5 100644 --- a/pkgs/by-name/qt/qtractor/package.nix +++ b/pkgs/by-name/qt/qtractor/package.nix @@ -28,12 +28,12 @@ suil, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qtractor"; version = "1.5.8"; src = fetchurl { - url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz"; + url = "mirror://sourceforge/qtractor/qtractor-${finalAttrs.version}.tar.gz"; hash = "sha256-nHN+bEfshFHBpmQLuQxffI7BcKigYpj3HzsFjGWlLtQ="; }; @@ -74,10 +74,10 @@ stdenv.mkDerivation rec { meta = { description = "Audio/MIDI multi-track sequencer"; homepage = "https://qtractor.sourceforge.io"; - changelog = "https://github.com/rncbc/qtractor/blob/v${version}/ChangeLog"; + changelog = "https://github.com/rncbc/qtractor/blob/v${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl2Plus; mainProgram = "qtractor"; maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/qt/qtrvsim/package.nix b/pkgs/by-name/qt/qtrvsim/package.nix index a818776564d1..62c90926d54b 100644 --- a/pkgs/by-name/qt/qtrvsim/package.nix +++ b/pkgs/by-name/qt/qtrvsim/package.nix @@ -6,14 +6,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "QtRVSim"; version = "0.9.8"; src = fetchFromGitHub { owner = "cvut"; repo = "qtrvsim"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-+EpPDA2+mBTdQjq6i9TN11yeXqvJA28JtmdNihM1a/U="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jdupak ]; mainProgram = "qtrvsim_gui"; }; -} +}) diff --git a/pkgs/by-name/qu/quadrafuzz/package.nix b/pkgs/by-name/qu/quadrafuzz/package.nix index c79cf0cff795..fc3bb84bd2a0 100644 --- a/pkgs/by-name/qu/quadrafuzz/package.nix +++ b/pkgs/by-name/qu/quadrafuzz/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "quadrafuzz"; version = "0.1.1"; src = fetchFromGitHub { owner = "jpcima"; repo = "quadrafuzz"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1kjsf7il9krihwlrq08gk2xvil4b4q5zd87nnm103hby2w7ws7z1"; fetchSubmodules = true; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/qu/quantomatic/package.nix b/pkgs/by-name/qu/quantomatic/package.nix index cfda62774a97..ecaf9d1d9ac8 100644 --- a/pkgs/by-name/qu/quantomatic/package.nix +++ b/pkgs/by-name/qu/quantomatic/package.nix @@ -6,12 +6,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "quantomatic"; version = "0.7"; src = fetchurl { - url = "https://github.com/Quantomatic/quantomatic/releases/download/v${version}/Quantomatic-v${version}.jar"; + url = "https://github.com/Quantomatic/quantomatic/releases/download/v${finalAttrs.version}/Quantomatic-v${finalAttrs.version}.jar"; sha256 = "04dd5p73a7plb4l4x2balam8j7mxs8df06rjkalxycrr1id52q4r"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nickhu ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/qu/quantumminigolf/package.nix b/pkgs/by-name/qu/quantumminigolf/package.nix index 9f067e500756..a4ff2644e2a7 100644 --- a/pkgs/by-name/qu/quantumminigolf/package.nix +++ b/pkgs/by-name/qu/quantumminigolf/package.nix @@ -8,12 +8,12 @@ SDL_ttf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "quantumminigolf"; version = "1.1.1"; src = fetchurl { - url = "mirror://sourceforge/project/quantumminigolf/quantumminigolf/${version}/quantumminigolf-${version}.src.tar.gz"; + url = "mirror://sourceforge/project/quantumminigolf/quantumminigolf/${finalAttrs.version}/quantumminigolf-${finalAttrs.version}.src.tar.gz"; sha256 = "sha256-Y3LUGk6pAuNGVOYkc0WYDbgJFtwJJn+aLRHmCKY7W5k="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { # never built on aarch64-linux since first introduction in nixpkgs broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; -} +}) diff --git a/pkgs/by-name/qu/qucsator-rf/package.nix b/pkgs/by-name/qu/qucsator-rf/package.nix index 01570a16ff4b..c6712b77777d 100644 --- a/pkgs/by-name/qu/qucsator-rf/package.nix +++ b/pkgs/by-name/qu/qucsator-rf/package.nix @@ -11,14 +11,14 @@ withAdms ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qucsator-rf"; version = "1.0.7"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucsator_rf"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ZH26+FOiBaf20Od9HVHMG8ey0z6XKBnmzUyCjAKB0eM="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ thomaslepoix ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/qu/quich/package.nix b/pkgs/by-name/qu/quich/package.nix index 116c5eb481b8..8d2761a1958e 100644 --- a/pkgs/by-name/qu/quich/package.nix +++ b/pkgs/by-name/qu/quich/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "quich"; version = "4.0.0"; src = fetchFromGitHub { owner = "Usbac"; repo = "quich"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-4gsSjLZ7Z4ErNqe86Fy5IrzLMfvDyY18sE0yBnj9bvM="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "quich"; }; -} +}) diff --git a/pkgs/by-name/qu/quickfix/package.nix b/pkgs/by-name/qu/quickfix/package.nix index 799dda16c7b0..c20e239939c7 100644 --- a/pkgs/by-name/qu/quickfix/package.nix +++ b/pkgs/by-name/qu/quickfix/package.nix @@ -8,14 +8,14 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "quickfix"; version = "1.15.1"; src = fetchFromGitHub { owner = "quickfix"; repo = "quickfix"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1fgpwgvyw992mbiawgza34427aakn5zrik3sjld0i924a9d17qwg"; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { license = lib.licenses.free; # similar to BSD 4-clause broken = stdenv.hostPlatform.isAarch64; }; -} +}) diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix index 889c7d2b052b..26e9f5fc2ce4 100644 --- a/pkgs/by-name/qu/quickjs-ng/package.nix +++ b/pkgs/by-name/qu/quickjs-ng/package.nix @@ -2,6 +2,7 @@ lib, cmake, fetchFromGitHub, + fetchpatch, stdenv, testers, texinfo, @@ -18,6 +19,24 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Mb0YyxTWU6a8HFTVBmlJ5yGEDmjKXHqTSszAvb8Y01U="; }; + patches = [ + # CVE-2026-1145: Fix heap buffer overflow in js_typed_array_constructor_ta + # https://github.com/quickjs-ng/quickjs/issues/1305 + (fetchpatch { + name = "CVE-2026-1145.patch"; + url = "https://github.com/quickjs-ng/quickjs/commit/53aebe66170d545bb6265906fe4324e4477de8b4.patch"; + hash = "sha256-PObMEqIush07mQ7YcoFUJ3rXitOlEU0tCsgVi6P2zW0="; + }) + # CVE-2026-1144: Fix OOB access in atomic ops + # https://github.com/quickjs-ng/quickjs/issues/1301 + # https://github.com/quickjs-ng/quickjs/issues/1302 + (fetchpatch { + name = "CVE-2026-1144.patch"; + url = "https://github.com/quickjs-ng/quickjs/commit/ea3e9d77454e8fc9cb3ef3c504e9c16af5a80141.patch"; + hash = "sha256-ph6U+Mz7gxR4RWEtc+XU5fO6qjApQTqqW5dzwnOqTdc="; + }) + ]; + outputs = [ "out" "bin" diff --git a/pkgs/by-name/qu/quickjs/package.nix b/pkgs/by-name/qu/quickjs/package.nix index 753362a301d6..e471f16b0d15 100644 --- a/pkgs/by-name/qu/quickjs/package.nix +++ b/pkgs/by-name/qu/quickjs/package.nix @@ -121,5 +121,10 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ ]; mainProgram = "qjs"; platforms = lib.platforms.all; + # Pending upstream fix: https://github.com/bellard/quickjs/pull/483 + knownVulnerabilities = [ + "CVE-2026-1144" + "CVE-2026-1145" + ]; }; }) diff --git a/pkgs/by-name/qu/quickmem/package.nix b/pkgs/by-name/qu/quickmem/package.nix index 26060b60a041..02711099f5f8 100644 --- a/pkgs/by-name/qu/quickmem/package.nix +++ b/pkgs/by-name/qu/quickmem/package.nix @@ -9,14 +9,14 @@ arpa2cm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "quickmem"; version = "0.3.0"; src = fetchFromGitLab { owner = "arpa2"; repo = "Quick-MEM"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ leungbk ]; }; -} +}) diff --git a/pkgs/by-name/qu/qusb2snes/package.nix b/pkgs/by-name/qu/qusb2snes/package.nix index 7d1b74825860..0c8c31de5183 100644 --- a/pkgs/by-name/qu/qusb2snes/package.nix +++ b/pkgs/by-name/qu/qusb2snes/package.nix @@ -6,14 +6,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qusb2snes"; version = "0.7.35"; src = fetchFromGitHub { owner = "Skarsnik"; repo = "QUsb2snes"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-521L4awWr4L2W12vAZUMheq4plXUXKYo4d3S6AfHgPA="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { mainProgram = "QUsb2Snes"; maintainers = with lib.maintainers; [ alexland7219 ]; }; -} +}) diff --git a/pkgs/by-name/r2/r2mod_cli/package.nix b/pkgs/by-name/r2/r2mod_cli/package.nix index 2c5bbc119f24..d14bdca74aa3 100644 --- a/pkgs/by-name/r2/r2mod_cli/package.nix +++ b/pkgs/by-name/r2/r2mod_cli/package.nix @@ -8,12 +8,12 @@ fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "r2mod_cli"; version = "1.3.3"; src = fetchzip { - url = "https://thunderstore.io/package/download/Foldex/r2mod_cli/${version}/"; + url = "https://thunderstore.io/package/download/Foldex/r2mod_cli/${finalAttrs.version}/"; hash = "sha256-J7ybNZa44/H+AjQ7L949I3iClXoDwinl/ITMK/QsTR0="; extension = "zip"; stripRoot = false; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { mainProgram = "r2mod"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ra/racer/package.nix b/pkgs/by-name/ra/racer/package.nix index 828ac2f48a2c..aaac0946f428 100644 --- a/pkgs/by-name/ra/racer/package.nix +++ b/pkgs/by-name/ra/racer/package.nix @@ -7,19 +7,19 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "racer"; version = "1.1"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "http://hippo.nipax.cz/src/racer-${version}.tar.gz"; + url = "http://hippo.nipax.cz/src/racer-${finalAttrs.version}.tar.gz"; sha256 = "0fll1qkqfcjq87k0jzsilcw701z92lfxn2y5ga1n038772lymxl9"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://hippo.nipax.cz/src/racer-${version}.64.tar.gz"; + url = "https://hippo.nipax.cz/src/racer-${finalAttrs.version}.64.tar.gz"; sha256 = "0rjy3gmlhwfkb9zs58j0mc0dar0livwpbc19r6zw5r2k6r7xdan0"; } else @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ra/radamsa/package.nix b/pkgs/by-name/ra/radamsa/package.nix index e12901f55613..6280a7151b69 100644 --- a/pkgs/by-name/ra/radamsa/package.nix +++ b/pkgs/by-name/ra/radamsa/package.nix @@ -20,14 +20,14 @@ let hash = "sha256-OT04EGun8nKR6D55bMx8xj20dSFwxI7zP/8sdeFZAHQ="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "radamsa"; version = "0.7"; src = fetchFromGitLab { owner = "akihe"; repo = "radamsa"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-cwTE+8mZujuVbm8vOpqGWCAYMwrWUXzLP7k3y7UoKtU="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ra/radcli/package.nix b/pkgs/by-name/ra/radcli/package.nix index e0d9d2109584..63cf2fc20432 100644 --- a/pkgs/by-name/ra/radcli/package.nix +++ b/pkgs/by-name/ra/radcli/package.nix @@ -11,19 +11,19 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "radcli"; version = "1.4.0"; src = fetchFromGitHub { owner = "radcli"; repo = "radcli"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YnZkFYTiU2VNKxuP+JTnH64XYTB/+imeMKN1mZN9VCQ="; }; postUnpack = '' - touch ${src.name}/config.rpath + touch ${finalAttrs.src.name}/config.rpath ''; nativeBuildInputs = [ @@ -42,10 +42,10 @@ stdenv.mkDerivation rec { meta = { description = "Simple RADIUS client library"; homepage = "https://github.com/radcli/radcli"; - changelog = "https://github.com/radcli/radcli/blob/${version}/NEWS"; + changelog = "https://github.com/radcli/radcli/blob/${finalAttrs.version}/NEWS"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; mainProgram = "radcli"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ra/radeontop/package.nix b/pkgs/by-name/ra/radeontop/package.nix index 9e1cc20d0f3d..1a7f199974bf 100644 --- a/pkgs/by-name/ra/radeontop/package.nix +++ b/pkgs/by-name/ra/radeontop/package.nix @@ -11,13 +11,13 @@ libxcb, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "radeontop"; version = "1.4"; src = fetchFromGitHub { sha256 = "0kwqddidr45s1blp0h8r8h1dd1p50l516yb6mb4s6zsc827xzgg3"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; repo = "radeontop"; owner = "clbr"; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patchPhase = '' - substituteInPlace getver.sh --replace ver=unknown ver=${version} + substituteInPlace getver.sh --replace ver=unknown ver=${finalAttrs.version} substituteInPlace Makefile --replace pkg-config "$PKG_CONFIG" ''; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/ra/radsecproxy/package.nix b/pkgs/by-name/ra/radsecproxy/package.nix index 5b32115c3fc5..a894ce2a174d 100644 --- a/pkgs/by-name/ra/radsecproxy/package.nix +++ b/pkgs/by-name/ra/radsecproxy/package.nix @@ -7,14 +7,14 @@ nettle, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "radsecproxy"; version = "1.11.2"; src = fetchFromGitHub { owner = "radsecproxy"; repo = "radsecproxy"; - tag = version; + tag = finalAttrs.version; hash = "sha256-E7nU6NgCmwRzX5j1Zyx/LTztjLqYJKv+3VU6UE0HhZA="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/ra/raft-cowsql/package.nix b/pkgs/by-name/ra/raft-cowsql/package.nix index 574f3730801a..9a0be05e32e0 100644 --- a/pkgs/by-name/ra/raft-cowsql/package.nix +++ b/pkgs/by-name/ra/raft-cowsql/package.nix @@ -10,14 +10,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "raft-cowsql"; version = "0.22.1"; src = fetchFromGitHub { owner = "cowsql"; repo = "raft"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aGw/ATu8Xdjfqa0qWg8Sld9PKCmQsMtZhuNBwagER7M="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.lxc ]; }; -} +}) diff --git a/pkgs/by-name/ra/ramfetch/package.nix b/pkgs/by-name/ra/ramfetch/package.nix index d8d1de5c6678..7efd07c1022e 100644 --- a/pkgs/by-name/ra/ramfetch/package.nix +++ b/pkgs/by-name/ra/ramfetch/package.nix @@ -4,13 +4,13 @@ fetchgit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { name = "ramfetch"; version = "1.1.0a"; src = fetchgit { url = "https://codeberg.org/jahway603/ramfetch.git"; - rev = version; + rev = finalAttrs.version; hash = "sha256-sUreZ6zm+a1N77OZszjnpS4mmo5wL1dhNGVldJCGoag="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.markbeep ]; mainProgram = "ramfetch"; }; -} +}) diff --git a/pkgs/by-name/ra/randomx/package.nix b/pkgs/by-name/ra/randomx/package.nix index 16846d48dd20..ccbf1d7e129b 100644 --- a/pkgs/by-name/ra/randomx/package.nix +++ b/pkgs/by-name/ra/randomx/package.nix @@ -5,7 +5,7 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "randomX"; version = "1.2.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "tevador"; repo = "randomX"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-dfImzwbEfJQcaPZCoWypHiI6dishVRdqS/r+n3tfjvM="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ra/rang/package.nix b/pkgs/by-name/ra/rang/package.nix index 91e4c573ed1a..03ef47a729c7 100644 --- a/pkgs/by-name/ra/rang/package.nix +++ b/pkgs/by-name/ra/rang/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rang"; version = "3.2"; src = fetchFromGitHub { owner = "agauniyal"; repo = "rang"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NK7jB5ijcu9OObmfLgiWxlJi4cVAhr7p6m9HKf+5TnQ="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.unlicense; maintainers = [ lib.maintainers.HaoZeke ]; }; -} +}) diff --git a/pkgs/by-name/ra/range-v3/package.nix b/pkgs/by-name/ra/range-v3/package.nix index 218eada86da9..076bab2b21d2 100644 --- a/pkgs/by-name/ra/range-v3/package.nix +++ b/pkgs/by-name/ra/range-v3/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "range-v3"; version = "0.12.0"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; - rev = version; + rev = finalAttrs.version; hash = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU="; }; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { meta = { description = "Experimental range library for C++11/14/17"; homepage = "https://github.com/ericniebler/range-v3"; - changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}"; + changelog = "https://github.com/ericniebler/range-v3/releases/tag/${finalAttrs.version}"; license = lib.licenses.boost; platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ra/rankwidth/package.nix b/pkgs/by-name/ra/rankwidth/package.nix index 7db3822a8760..c54a997198d9 100644 --- a/pkgs/by-name/ra/rankwidth/package.nix +++ b/pkgs/by-name/ra/rankwidth/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rankwidth"; version = "0.10"; src = fetchurl { - url = "mirror://sourceforge/rankwidth/rw-${version}.tar.gz"; + url = "mirror://sourceforge/rankwidth/rw-${finalAttrs.version}.tar.gz"; hash = "sha256-iajtNkiTrBtwq3ChUuPn2zzzSLtpCYqm27lpY535J9s="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ra/rapidyaml/package.nix b/pkgs/by-name/ra/rapidyaml/package.nix index 77ee130962e0..471685c83020 100644 --- a/pkgs/by-name/ra/rapidyaml/package.nix +++ b/pkgs/by-name/ra/rapidyaml/package.nix @@ -6,7 +6,7 @@ git, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rapidyaml"; version = "0.10.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "biojppm"; repo = "rapidyaml"; fetchSubmodules = true; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-r19PBS35mvAK2RoZGXaw6UU9EuEXVoUK6BV6cJnPyUs="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ra/raspa/package.nix b/pkgs/by-name/ra/raspa/package.nix index e7ca7ef1605b..e8589739f396 100644 --- a/pkgs/by-name/ra/raspa/package.nix +++ b/pkgs/by-name/ra/raspa/package.nix @@ -11,14 +11,14 @@ raspa, raspa-data, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "raspa"; version = "2.0.47"; src = fetchFromGitHub { owner = "iRASPA"; repo = "RASPA2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-i8Y+pejiOuyPNJto+/0CmRoAnMljCrnDFx8qDh4I/68="; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ShamrockLee ]; mainProgram = "simulate"; }; -} +}) diff --git a/pkgs/by-name/ra/ratmen/package.nix b/pkgs/by-name/ra/ratmen/package.nix index f4c1ac637b51..22be3abf673b 100644 --- a/pkgs/by-name/ra/ratmen/package.nix +++ b/pkgs/by-name/ra/ratmen/package.nix @@ -7,11 +7,11 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ratmen"; version = "2.2.3"; src = fetchurl { - url = "http://www.update.uu.se/~zrajm/programs/ratmen/ratmen-${version}.tar.gz"; + url = "http://www.update.uu.se/~zrajm/programs/ratmen/ratmen-${finalAttrs.version}.tar.gz"; sha256 = "0gnfqhnch9x8jhr87gvdjcp1wsqhchfjilpnqcwx5j0nlqyz6wi6"; }; buildInputs = [ @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/"; mainProgram = "ratmen"; }; -} +}) diff --git a/pkgs/by-name/ra/ratools/package.nix b/pkgs/by-name/ra/ratools/package.nix index 2a823ea75d8f..6d768ad14304 100644 --- a/pkgs/by-name/ra/ratools/package.nix +++ b/pkgs/by-name/ra/ratools/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ratools"; version = "0.6.2"; src = fetchFromGitHub { owner = "danrl"; repo = "ratools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "07m45bn9lzgbfihmxic23wqp73nxg5ihrvkigr450jq6gzvgwawq"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.fpletz ]; }; -} +}) diff --git a/pkgs/by-name/ra/rauc/package.nix b/pkgs/by-name/ra/rauc/package.nix index 7116fc3791f5..ac51d39444d5 100644 --- a/pkgs/by-name/ra/rauc/package.nix +++ b/pkgs/by-name/ra/rauc/package.nix @@ -18,14 +18,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rauc"; version = "1.15.1"; src = fetchFromGitHub { owner = "rauc"; repo = "rauc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-aGJj1Vm1gznZBnoGkfbJlhGAUrP5JAMgEL8L+8UL9LY="; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "rauc"; }; -} +}) diff --git a/pkgs/by-name/ra/raxml/package.nix b/pkgs/by-name/ra/raxml/package.nix index f07f9836e0d1..7527e858d3dd 100644 --- a/pkgs/by-name/ra/raxml/package.nix +++ b/pkgs/by-name/ra/raxml/package.nix @@ -6,14 +6,14 @@ mpi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "RAxML${lib.optionalString useMpi "-mpi"}"; version = "8.2.13"; src = fetchFromGitHub { owner = "stamatak"; repo = "standard-RAxML"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-w+Eqi0GhVira1H6ZnMNeZGBMzDjiGT7JSFpQEVXONyk="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix index a82b725c6cc9..ac07681663c9 100644 --- a/pkgs/by-name/rb/rbdoom-3-bfg/package.nix +++ b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix @@ -14,14 +14,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rbdoom-3-bfg"; version = "1.6.0"; src = fetchFromGitHub { owner = "RobertBeckebans"; repo = "rbdoom-3-bfg"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9BZEFO+e5IG6hv9+QI9OJecQ84rLTWBDz4k0GU6SeDE="; fetchSubmodules = true; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ Zaechus ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/rc/rclone-browser/package.nix b/pkgs/by-name/rc/rclone-browser/package.nix index ddb7109bda79..17c8cce1173f 100644 --- a/pkgs/by-name/rc/rclone-browser/package.nix +++ b/pkgs/by-name/rc/rclone-browser/package.nix @@ -7,14 +7,14 @@ qt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rclone-browser"; version = "1.8.0"; src = fetchFromGitHub { owner = "kapitainsky"; repo = "RcloneBrowser"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Y0QFzpvAV01k9fYN5iMpxd8A+ThLePDtxdG7eX2bk5E="; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt5.qtbase ]; meta = { - changelog = "https://github.com/kapitainsky/RcloneBrowser/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/kapitainsky/RcloneBrowser/blob/${finalAttrs.src.tag}/CHANGELOG.md"; homepage = "https://github.com/kapitainsky/RcloneBrowser"; description = "Graphical Frontend to Rclone written in Qt"; mainProgram = "rclone-browser"; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/by-name/rc/rclone-ui/package.nix b/pkgs/by-name/rc/rclone-ui/package.nix index 883f053356fe..ca6dcb86d3d7 100644 --- a/pkgs/by-name/rc/rclone-ui/package.nix +++ b/pkgs/by-name/rc/rclone-ui/package.nix @@ -20,26 +20,26 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rclone-ui"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitHub { owner = "rclone-ui"; repo = "rclone-ui"; tag = "v${finalAttrs.version}"; - hash = "sha256-CQnjwbmVpCTvt9FSmQhYmU+0y+jSsR7bFBbeoZu16a4="; + hash = "sha256-GKOIS/kp1zfBu1/goH3zjQGrvs6opS4Sghpgc60xn0s="; }; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; forceGitDeps = true; - hash = "sha256-zGgW/WikSVBE1goJ3zTf0ijBUghb+MlzMI+OxiLvzfY="; + hash = "sha256-uvtYyAE68atl933dhgpwBipO01xecSCMKsrv9NdSEhk="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-nQhZuG3CxoLZwBSbA8I/Ft6HRkdb/5CRrpF6423lsFo="; + cargoHash = "sha256-1RxgcRM0Qs/bMj8mVLFZXD1Y8L+JZnc4BTmD5Y609Sk="; # Disable tauri bundle updater, can be removed when #389107 is merged patches = [ ./remove_updater.patch ]; diff --git a/pkgs/by-name/rc/rcm/package.nix b/pkgs/by-name/rc/rcm/package.nix index 2d69d794e10e..f86f1bd7d32d 100644 --- a/pkgs/by-name/rc/rcm/package.nix +++ b/pkgs/by-name/rc/rcm/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rcm"; version = "1.3.6"; src = fetchurl { - url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz"; + url = "https://thoughtbot.github.io/rcm/dist/rcm-${finalAttrs.version}.tar.gz"; sha256 = "sha256-9P37xFHR+1dkUxKQogKgqHH2uBujwBprdsSUNchQgKU="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/rc/rcon/package.nix b/pkgs/by-name/rc/rcon/package.nix index 32f7fc0a63d9..2ac7ad475d0d 100644 --- a/pkgs/by-name/rc/rcon/package.nix +++ b/pkgs/by-name/rc/rcon/package.nix @@ -10,14 +10,14 @@ pcre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rcon"; version = "0.6"; src = fetchFromGitHub { owner = "n0la"; repo = "rcon"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-bHm6JeWmpg42VZQXikHl+BMx9zimRLBQWemTqOxyLhw="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; mainProgram = "rcon"; }; -} +}) diff --git a/pkgs/by-name/rd/rdpgw/go-sum.patch b/pkgs/by-name/rd/rdpgw/go-sum.patch new file mode 100644 index 000000000000..afa5cee0bdf3 --- /dev/null +++ b/pkgs/by-name/rd/rdpgw/go-sum.patch @@ -0,0 +1,182 @@ +From 366c6bc12d1066fcf3729ff26e1efae270ca5435 Mon Sep 17 00:00:00 2001 +From: Fabian Affolter +Date: Thu, 29 Jan 2026 18:51:10 +0100 +Subject: [PATCH] Add go.sum + +--- + go.sum | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 166 insertions(+) + create mode 100644 go.sum + +diff --git a/go.sum b/go.sum +new file mode 100644 +index 0000000..4eb7713 +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,166 @@ ++github.com/andrewheberle/rdpsign v1.1.0 h1:MsbKC4bh+3SPLLE7LOgbzlAWRDaL+dT3BDwrZL/QW/o= ++github.com/andrewheberle/rdpsign v1.1.0/go.mod h1:TnJi7wVC0y+EhpEBpgoeX1kH+ZY3wlX58eX9J4h4AqU= ++github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= ++github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= ++github.com/bolkedebruin/gokrb5/v8 v8.5.0 h1:EfrRNnWRdBDYdZv3LbPTd3X1LxOILD0bIhj1A/5pCbk= ++github.com/bolkedebruin/gokrb5/v8 v8.5.0/go.mod h1:OCqMOcExydL6RpWJuTZBNu9p4XC4VHQF9xbstR84PnQ= ++github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= ++github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= ++github.com/coreos/go-oidc/v3 v3.9.0 h1:0J/ogVOd4y8P0f0xUh8l9t07xRP/d8tccvjHl2dcsSo= ++github.com/coreos/go-oidc/v3 v3.9.0/go.mod h1:rTKz2PYwftcrtoCzV5g5kvfJoWcm0Mk8AF8y1iAQro4= ++github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= ++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= ++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= ++github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= ++github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= ++github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= ++github.com/go-jose/go-jose/v3 v3.0.4 h1:Wp5HA7bLQcKnf6YYao/4kpRpVMp/yf6+pJKV8WFSaNY= ++github.com/go-jose/go-jose/v3 v3.0.4/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= ++github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE= ++github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA= ++github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= ++github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= ++github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= ++github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= ++github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= ++github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= ++github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= ++github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= ++github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= ++github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= ++github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= ++github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= ++github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= ++github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA= ++github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= ++github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY= ++github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ= ++github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= ++github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= ++github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= ++github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= ++github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= ++github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= ++github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= ++github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= ++github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= ++github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg= ++github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= ++github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= ++github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= ++github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= ++github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= ++github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= ++github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= ++github.com/knadh/koanf/parsers/yaml v0.1.0 h1:ZZ8/iGfRLvKSaMEECEBPM1HQslrZADk8fP1XFUxVI5w= ++github.com/knadh/koanf/parsers/yaml v0.1.0/go.mod h1:cvbUDC7AL23pImuQP0oRw/hPuccrNBS2bps8asS0CwY= ++github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= ++github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= ++github.com/knadh/koanf/providers/env v0.1.0 h1:LqKteXqfOWyx5Ab9VfGHmjY9BvRXi+clwyZozgVRiKg= ++github.com/knadh/koanf/providers/env v0.1.0/go.mod h1:RE8K9GbACJkeEnkl8L/Qcj8p4ZyPXZIQ191HJi44ZaQ= ++github.com/knadh/koanf/providers/file v0.1.0 h1:fs6U7nrV58d3CFAFh8VTde8TM262ObYf3ODrc//Lp+c= ++github.com/knadh/koanf/providers/file v0.1.0/go.mod h1:rjJ/nHQl64iYCtAW2QQnF0eSmDEX/YZ/eNFj5yR6BvA= ++github.com/knadh/koanf/v2 v2.1.0 h1:eh4QmHHBuU8BybfIJ8mB8K8gsGCD/AUQTdwGq/GzId8= ++github.com/knadh/koanf/v2 v2.1.0/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= ++github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= ++github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= ++github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= ++github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= ++github.com/m7913d/go-ntlm v0.0.1 h1:yLB0TIanTCf+eYllzKDbvGGwoCoxflemjduAcruZKx0= ++github.com/m7913d/go-ntlm v0.0.1/go.mod h1:2Tebo9gwEGobV67Bvb5LT6D3T4W9RWDoPaiObTluqXM= ++github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= ++github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= ++github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= ++github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= ++github.com/msteinert/pam/v2 v2.0.0 h1:jnObb8MT6jvMbmrUQO5J/puTUjxy7Av+55zVJRJsCyE= ++github.com/msteinert/pam/v2 v2.0.0/go.mod h1:KT28NNIcDFf3PcBmNI2mIGO4zZJ+9RSs/At2PB3IDVc= ++github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= ++github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= ++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= ++github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= ++github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= ++github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= ++github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= ++github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= ++github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= ++github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= ++github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= ++github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= ++github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA= ++github.com/spf13/afero v1.14.0/go.mod h1:acJQ8t0ohCGuMN3O+Pv0V0hgMxNYDlvdk+VTfyZmbYo= ++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= ++github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= ++github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= ++github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= ++github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= ++github.com/thought-machine/go-flags v1.6.3 h1:AGA+iy7EP7ia/e46jzrmJV3oJhznESq7kNEILunmP8w= ++github.com/thought-machine/go-flags v1.6.3/go.mod h1:+r2g8uGwgGM7IGZzmMS97mKBFLDbW6vgFO1jxp0rDmg= ++github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= ++golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= ++golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= ++golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= ++golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= ++golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= ++golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= ++golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= ++golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= ++golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= ++golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= ++golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= ++golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= ++golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= ++golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M= ++golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= ++golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= ++golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= ++golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= ++golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= ++golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= ++golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= ++golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= ++golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= ++golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= ++golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= ++golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= ++golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= ++golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= ++golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= ++golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= ++golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= ++golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= ++golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= ++golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= ++golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= ++golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= ++google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c h1:lfpJ/2rWPa/kJgxyyXM8PrNnfCzcmxJ265mADgwmvLI= ++google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= ++google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= ++google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= ++google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= ++google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= ++gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= ++gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= ++gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= ++gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pkgs/by-name/rd/rdpgw/package.nix b/pkgs/by-name/rd/rdpgw/package.nix new file mode 100644 index 000000000000..c235f884e233 --- /dev/null +++ b/pkgs/by-name/rd/rdpgw/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + pam, + pkg-config, +}: + +buildGoModule (finalAttrs: { + pname = "rdpgw"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "bolkedebruin"; + repo = "rdpgw"; + tag = "v${finalAttrs.version}"; + hash = "sha256-V0TmRo0MBYrpyn7kmazU93prMOvkkI5/x15P7gV88lA="; + }; + + patches = [ ./go-sum.patch ]; + + vendorHash = "sha256-KH3c8IAFkXCDLleRTiTnXx+q6LpLl6oTswwmLZPUUSI="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ pam ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Remote Desktop Gateway"; + homepage = "https://github.com/bolkedebruin/rdpgw"; + changelog = "https://github.com/bolkedebruin/rdpgw/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "rdpgw"; + }; +}) diff --git a/pkgs/by-name/re/re-flex/package.nix b/pkgs/by-name/re/re-flex/package.nix index 1955bf3f5713..8df40cb74b4f 100644 --- a/pkgs/by-name/re/re-flex/package.nix +++ b/pkgs/by-name/re/re-flex/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "re-flex"; version = "6.0.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-p04o2e7Dxx7N6ByCwERz4hKz+vfTIuuZ//AoWSC1qao="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ prrlvr ]; mainProgram = "reflex"; }; -} +}) diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix index e5c119b9572f..f29c7db1f6ab 100644 --- a/pkgs/by-name/re/re2c/package.nix +++ b/pkgs/by-name/re/re2c/package.nix @@ -12,14 +12,14 @@ spamassassin, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "re2c"; version = "4.4"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; - rev = version; + rev = finalAttrs.version; hash = "sha256-/uQOcbK63le1FsGM7RF8NDRGMk4fs2g+u3hBGX2rBv4="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/re/readosm/package.nix b/pkgs/by-name/re/readosm/package.nix index 300e0af2e314..a54a9c4ff961 100644 --- a/pkgs/by-name/re/readosm/package.nix +++ b/pkgs/by-name/re/readosm/package.nix @@ -7,12 +7,12 @@ validatePkgConfig, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "readosm"; version = "1.1.0a"; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/readosm-${version}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/readosm-${finalAttrs.version}.tar.gz"; hash = "sha256-23wFHSVs7H7NTDd1q5vIINpaS/cv/U6fQLkR15dw8UU="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/re/readstat/package.nix b/pkgs/by-name/re/readstat/package.nix index f1861768ce6e..bdcfdd89e329 100644 --- a/pkgs/by-name/re/readstat/package.nix +++ b/pkgs/by-name/re/readstat/package.nix @@ -8,14 +8,14 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "readstat"; version = "1.1.9"; src = fetchFromGitHub { owner = "WizardMac"; repo = "ReadStat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-4lRJgZPB2gfaQ9fQKvDDpGhy1eDNT/nT1QmeZlCmCis="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ swflint ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/re/reaverwps-t6x/package.nix b/pkgs/by-name/re/reaverwps-t6x/package.nix index 2102c0684703..8bc6038da9bf 100644 --- a/pkgs/by-name/re/reaverwps-t6x/package.nix +++ b/pkgs/by-name/re/reaverwps-t6x/package.nix @@ -7,14 +7,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "reaver-wps-t6x"; version = "1.6.6"; src = fetchFromGitHub { owner = "t6x"; repo = "reaver-wps-fork-t6x"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-7g4ZRkyu0TIOUw68dSPP4RyIRyeq1GgUMYFVSQB8/1I="; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pixiewps ]; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; meta = { description = "Online and offline brute force attack against WPS"; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ nico202 ]; }; -} +}) diff --git a/pkgs/by-name/re/recoverjpeg/package.nix b/pkgs/by-name/re/recoverjpeg/package.nix index c9a005f52c65..cf2c3e04c95e 100644 --- a/pkgs/by-name/re/recoverjpeg/package.nix +++ b/pkgs/by-name/re/recoverjpeg/package.nix @@ -8,12 +8,12 @@ imagemagick, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "recoverjpeg"; version = "2.6.3"; src = fetchurl { - url = "https://www.rfc1149.net/download/recoverjpeg/recoverjpeg-${version}.tar.gz"; + url = "https://www.rfc1149.net/download/recoverjpeg/recoverjpeg-${finalAttrs.version}.tar.gz"; sha256 = "009jgxi8lvdp00dwfj0n4x5yqrf64x00xdkpxpwgl2v8wcqn56fv"; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dotlambda ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/re/recutils/package.nix b/pkgs/by-name/re/recutils/package.nix index 25b0971775a8..544089b2d46e 100644 --- a/pkgs/by-name/re/recutils/package.nix +++ b/pkgs/by-name/re/recutils/package.nix @@ -18,12 +18,12 @@ bash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "recutils"; version = "1.9"; src = fetchurl { - url = "mirror://gnu/recutils/recutils-${version}.tar.gz"; + url = "mirror://gnu/recutils/recutils-${finalAttrs.version}.tar.gz"; hash = "sha256-YwFZKwAgwUtFZ1fvXUNNSfYCe45fOkmdEzYvIFxIbg4="; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/re/redeclipse/package.nix b/pkgs/by-name/re/redeclipse/package.nix index 1d541dbce89f..d8fc4d1c33ae 100644 --- a/pkgs/by-name/re/redeclipse/package.nix +++ b/pkgs/by-name/re/redeclipse/package.nix @@ -14,12 +14,12 @@ SDL2_mixer, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "redeclipse"; version = "2.0.0"; src = fetchurl { - url = "https://github.com/redeclipse/base/releases/download/v${version}/redeclipse_${version}_nix.tar.bz2"; + url = "https://github.com/redeclipse/base/releases/download/v${finalAttrs.version}/redeclipse_${finalAttrs.version}_nix.tar.bz2"; sha256 = "143i713ggbk607qr4n39pi0pn8d93x9x6fcbh8rc51jb9qhi8p5i"; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; hydraPlatforms = [ ]; }; -} +}) diff --git a/pkgs/by-name/re/redir/package.nix b/pkgs/by-name/re/redir/package.nix index f69650db085e..e14335e0eb0f 100644 --- a/pkgs/by-name/re/redir/package.nix +++ b/pkgs/by-name/re/redir/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "redir"; version = "3.3"; src = fetchFromGitHub { owner = "troglobit"; repo = "redir"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "13n401i3q0xwpfgr21y47kgihi057wbh59xlsna8b8zpm973qny1"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "redir"; }; -} +}) diff --git a/pkgs/by-name/re/redo-apenwarr/package.nix b/pkgs/by-name/re/redo-apenwarr/package.nix index d146fb7c30cf..adbb56107b22 100644 --- a/pkgs/by-name/re/redo-apenwarr/package.nix +++ b/pkgs/by-name/re/redo-apenwarr/package.nix @@ -10,7 +10,7 @@ gnumake42, doCheck ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "redo-apenwarr"; version = "0.42d"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub rec { owner = "apenwarr"; repo = "redo"; - rev = "${repo}-${version}"; + rev = "${repo}-${finalAttrs.version}"; sha256 = "/QIMXpVhVLAIJa3LiOlRKzbUztIWZygkWZUKN4Nrh+M="; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = python3.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/re/redo-c/package.nix b/pkgs/by-name/re/redo-c/package.nix index 6b4c9329154e..ad0e7f3179c1 100644 --- a/pkgs/by-name/re/redo-c/package.nix +++ b/pkgs/by-name/re/redo-c/package.nix @@ -3,14 +3,14 @@ stdenv, fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "redo-c"; version = "0.3"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = "redo-c"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-oZcaBgESIaD7/SUBE7luh7axucKTEzXPVkQAQs2NCXE="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ ck3d ]; }; -} +}) diff --git a/pkgs/by-name/re/redoflacs/package.nix b/pkgs/by-name/re/redoflacs/package.nix index 7e7b26342ccf..09307e68392b 100644 --- a/pkgs/by-name/re/redoflacs/package.nix +++ b/pkgs/by-name/re/redoflacs/package.nix @@ -8,7 +8,7 @@ sox, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "redoflacs"; version = "0.30.20190903"; @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { meta = { description = "Parallel BASH commandline FLAC compressor, verifier, organizer, analyzer, and retagger"; mainProgram = "redoflacs"; - homepage = src.meta.homepage; + homepage = finalAttrs.src.meta.homepage; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ peterhoeg ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/re/redsocks/package.nix b/pkgs/by-name/re/redsocks/package.nix index fcd4ccc66b3d..aafbf4845353 100644 --- a/pkgs/by-name/re/redsocks/package.nix +++ b/pkgs/by-name/re/redsocks/package.nix @@ -5,14 +5,14 @@ libevent, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "redsocks"; version = "0.5"; src = fetchFromGitHub { owner = "darkk"; repo = "redsocks"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "170cpvvivb6y2kwsqj9ppx5brgds9gkn8mixrnvj8z9c15xhvplm"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "redsocks"; }; -} +}) diff --git a/pkgs/by-name/re/redstore/package.nix b/pkgs/by-name/re/redstore/package.nix index 56f4b21ee8f6..f78fa7e98365 100644 --- a/pkgs/by-name/re/redstore/package.nix +++ b/pkgs/by-name/re/redstore/package.nix @@ -10,12 +10,12 @@ librdf_rasqal, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "redstore"; version = "0.5.4"; src = fetchurl { - url = "https://www.aelius.com/njh/redstore/redstore-${version}.tar.gz"; + url = "https://www.aelius.com/njh/redstore/redstore-${finalAttrs.version}.tar.gz"; sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ freebsd ++ gnu; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/re/redwax-tool/package.nix b/pkgs/by-name/re/redwax-tool/package.nix index 5b2bd16ca61d..7653092fb9e5 100644 --- a/pkgs/by-name/re/redwax-tool/package.nix +++ b/pkgs/by-name/re/redwax-tool/package.nix @@ -16,12 +16,12 @@ aprutil, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "redwax-tool"; version = "1.0.0"; src = fetchurl { - url = "https://archive.redwax.eu/dist/rt/redwax-tool-${version}/redwax-tool-${version}.tar.gz"; + url = "https://archive.redwax.eu/dist/rt/redwax-tool-${finalAttrs.version}/redwax-tool-${finalAttrs.version}.tar.gz"; hash = "sha256-KIVr0FnCmZUuxenXCvAlLxQVQJ5XndAidVaiGevENoM="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ astro ]; }; -} +}) diff --git a/pkgs/by-name/re/reevr/package.nix b/pkgs/by-name/re/reevr/package.nix index fcb5ad389792..33576e1ccabf 100644 --- a/pkgs/by-name/re/reevr/package.nix +++ b/pkgs/by-name/re/reevr/package.nix @@ -16,6 +16,9 @@ libXrandr, libXtst, writableTmpDirAsHomeHook, + + buildVST3 ? true, + buildLV2 ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "COPY_PLUGIN_AFTER_BUILD" false) - (lib.cmakeFeature "BUILD_STANDALONE" "OFF") + + (lib.cmakeBool "BUILD_STANDALONE" false) + (lib.cmakeBool "BUILD_VST3" buildVST3) + (lib.cmakeBool "BUILD_LV2" buildLV2) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeFeature "CMAKE_OSX_ARCHITECTURES" "${stdenv.hostPlatform.darwinArch}") @@ -76,10 +82,17 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/vst3 $out/lib/lv2 + pushd REEVR_artefacts/Release + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + cp -r VST3/REEV-R.vst3 $out/lib/vst3 + ''} - cp -r "REEVR_artefacts/Release/LV2/REEV-R.lv2" $out/lib/lv2 - cp -r "REEVR_artefacts/Release/VST3/REEV-R.vst3" $out/lib/vst3 + ${lib.optionalString buildLV2 '' + mkdir -p $out/lib/lv2 + cp -r LV2/REEV-R.lv2 $out/lib/lv2 + ''} + popd runHook postInstall ''; @@ -89,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tiagolr/reevr"; changelog = "https://github.com/tiagolr/reevr/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ magnetophon ]; + maintainers = with lib.maintainers; [ + magnetophon + mrtnvgr + ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/re/refind/package.nix b/pkgs/by-name/re/refind/package.nix index ba6e214f863c..eced9eb6dcad 100644 --- a/pkgs/by-name/re/refind/package.nix +++ b/pkgs/by-name/re/refind/package.nix @@ -37,12 +37,12 @@ let ; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "refind"; version = "0.14.2"; src = fetchurl { - url = "mirror://sourceforge/project/refind/${version}/refind-src-${version}.tar.gz"; + url = "mirror://sourceforge/project/refind/${finalAttrs.version}/refind-src-${finalAttrs.version}.tar.gz"; hash = "sha256-99k86A2na4bFZygeoiW2qHkHzob/dyM8k1elIsEVyPA="; }; @@ -196,4 +196,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/re/regextester/package.nix b/pkgs/by-name/re/regextester/package.nix index 7a037994ac5f..c3ae4dc1647e 100644 --- a/pkgs/by-name/re/regextester/package.nix +++ b/pkgs/by-name/re/regextester/package.nix @@ -18,14 +18,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "regextester"; version = "1.1.1"; src = fetchFromGitHub { owner = "artemanufrij"; repo = "regextester"; - rev = version; + rev = finalAttrs.version; hash = "sha256-5+gU8DeB99w2h/4vMal2eHkR0305dmRYiY6fsLZzlnc="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/re/regina/package.nix b/pkgs/by-name/re/regina/package.nix index 43b9516a800d..d4020f4b107d 100644 --- a/pkgs/by-name/re/regina/package.nix +++ b/pkgs/by-name/re/regina/package.nix @@ -5,12 +5,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "regina-rexx"; version = "3.9.7"; src = fetchurl { - url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/regina-rexx-${version}.tar.gz"; + url = "mirror://sourceforge/regina-rexx/regina-rexx/${finalAttrs.version}/regina-rexx-${finalAttrs.version}.tar.gz"; hash = "sha256-8TcB69VC500PyDsqeHaoErB9IeQ0ACde1lsayGAgS9Q="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.lgpl2; }; -} +}) diff --git a/pkgs/by-name/re/regpg/package.nix b/pkgs/by-name/re/regpg/package.nix index 76fa7ed313c7..d0911553da73 100644 --- a/pkgs/by-name/re/regpg/package.nix +++ b/pkgs/by-name/re/regpg/package.nix @@ -10,14 +10,14 @@ let perlEnv = perl.withPackages (p: with p; [ TextMarkdown ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "regpg"; version = "1.11"; src = fetchFromGitHub { owner = "fanf2"; repo = "regpg"; - rev = "regpg-${version}"; + rev = "regpg-${finalAttrs.version}"; sha256 = "2ea99950804078190e1cc2a76d4740e3fdd5395a9043db3f3fe86bf2477d3a7d"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { substituteInPlace ./Makefile \ --replace 'util/markdown.pl' 'perl util/markdown.pl' substituteInPlace util/insert-here.pl \ - --replace 'qx(git describe)' '"regpg-${version}"' + --replace 'qx(git describe)' '"regpg-${finalAttrs.version}"' ''; dontConfigure = true; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ _0xC45 ]; }; -} +}) diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix index 4f3d06a33229..dbbbc6971899 100644 --- a/pkgs/by-name/re/rehex/package.nix +++ b/pkgs/by-name/re/rehex/package.nix @@ -18,14 +18,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rehex"; version = "0.63.4"; src = fetchFromGitHub { owner = "solemnwarning"; repo = "rehex"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Iy87iEadK9fXApeYpJbG0jV437wGJxlOoiJLfaUTkVs="; }; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { engineering, and everything else. ''; homepage = "https://github.com/solemnwarning/rehex"; - changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt"; + changelog = "https://github.com/solemnwarning/rehex/raw/${finalAttrs.version}/CHANGES.txt"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ markus1189 @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "rehex"; }; -} +}) diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index fca7d602a190..a3724181fe3e 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2026.01.19.00"; + version = "2026.01.26.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-c5O1oJ4DEhOHU9b/nHj+TqTFkFRtPuh79wqzGSBP95w="; + hash = "sha256-jUyb8fzzk1TzTe4pBXlZTByesdlDGJc2Q5L5pmHn9bw="; }; - cargoHash = "sha256-oCB8hV9+ZGiJ7SllVzZhq0Bg6eMua5njYJV+Mb6UpP0="; + cargoHash = "sha256-CZcbEFZpZonp8iGI/DklPpAvaCoaS+LGMO8F/6NryBY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/remarkable-toolchain/package.nix b/pkgs/by-name/re/remarkable-toolchain/package.nix index ba029d3196bc..e96c4075d863 100644 --- a/pkgs/by-name/re/remarkable-toolchain/package.nix +++ b/pkgs/by-name/re/remarkable-toolchain/package.nix @@ -8,12 +8,12 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "remarkable-toolchain"; version = "3.1.2"; src = fetchurl { - url = "https://storage.googleapis.com/remarkable-codex-toolchain/codex-x86_64-cortexa9hf-neon-rm10x-toolchain-${version}.sh"; + url = "https://storage.googleapis.com/remarkable-codex-toolchain/codex-x86_64-cortexa9hf-neon-rm10x-toolchain-${finalAttrs.version}.sh"; sha256 = "sha256-ocODUUx2pgmqxMk8J+D+OvqlSHBSay6YzcqnxC9n59w="; executable = true; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/re/remarkable2-toolchain/package.nix b/pkgs/by-name/re/remarkable2-toolchain/package.nix index 1b5d7125e9aa..0a339418c3e3 100644 --- a/pkgs/by-name/re/remarkable2-toolchain/package.nix +++ b/pkgs/by-name/re/remarkable2-toolchain/package.nix @@ -8,12 +8,12 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "remarkable2-toolchain"; version = "3.1.2"; src = fetchurl { - url = "https://storage.googleapis.com/remarkable-codex-toolchain/codex-x86_64-cortexa7hf-neon-rm11x-toolchain-${version}.sh"; + url = "https://storage.googleapis.com/remarkable-codex-toolchain/codex-x86_64-cortexa7hf-neon-rm11x-toolchain-${finalAttrs.version}.sh"; sha256 = "sha256-JKMDRbkvoxwHiTm/o4JdLn3Mm2Ld1LyxTnCCwvnxk4c="; executable = true; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ tadfisher ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/re/renameutils/package.nix b/pkgs/by-name/re/renameutils/package.nix index 8dfafc645538..21c8679f3c1e 100644 --- a/pkgs/by-name/re/renameutils/package.nix +++ b/pkgs/by-name/re/renameutils/package.nix @@ -6,12 +6,12 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "renameutils"; version = "0.12.0"; src = fetchurl { - url = "mirror://savannah/renameutils/renameutils-${version}.tar.gz"; + url = "mirror://savannah/renameutils/renameutils-${finalAttrs.version}.tar.gz"; sha256 = "18xlkr56jdyajjihcmfqlyyanzyiqqlzbhrm6695mkvw081g1lnb"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index aa6d3cdbc192..1b9bf92e8b3c 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, makeWrapper, - nodejs_22, + nodejs_24, pnpm_10, fetchPnpmDeps, pnpmConfigHook, @@ -15,7 +15,7 @@ yq-go, }: let - nodejs = nodejs_22; + nodejs = nodejs_24; in stdenv.mkDerivation (finalAttrs: { pname = "renovate"; @@ -62,8 +62,9 @@ stdenv.mkDerivation (finalAttrs: { find -name 'node_modules' -type d -exec rm -rf {} \; || true pnpm install --offline --prod --ignore-scripts '' - # The optional dependency re2 is not built by pnpm and needs to be built manually. + # The optional dependencies re2 and better-sqlite3 are not built by pnpm and need to be built manually. # If re2 is not built, you will get an annoying warning when you run renovate. + # better-sqlite3 is required. + '' pushd node_modules/.pnpm/re2*/node_modules/re2 @@ -72,6 +73,13 @@ stdenv.mkDerivation (finalAttrs: { ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} export npm_config_nodedir=${nodejs} npm run rebuild + rm -rf build/Release/{obj.target,.deps} vendor + + popd + + pushd node_modules/.pnpm/better-sqlite3*/node_modules/better-sqlite3 + npm run build-release + rm -rf build/Release/{obj.target,sqlite3.a,.deps} deps popd diff --git a/pkgs/by-name/re/rep/package.nix b/pkgs/by-name/re/rep/package.nix index 96d50d92800f..053a92b14746 100644 --- a/pkgs/by-name/re/rep/package.nix +++ b/pkgs/by-name/re/rep/package.nix @@ -5,14 +5,14 @@ asciidoc-full, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rep"; version = "0.2.2"; src = fetchFromGitHub { owner = "eraserhd"; repo = "rep"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "pqmISVm3rYGxRuwKieVpRwXE8ufWnBHEA6h2hrob51s="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.eraserhd ]; }; -} +}) diff --git a/pkgs/by-name/re/replace/package.nix b/pkgs/by-name/re/replace/package.nix index a23e44279622..0030d562f921 100644 --- a/pkgs/by-name/re/replace/package.nix +++ b/pkgs/by-name/re/replace/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "replace"; version = "2.24"; src = fetchurl { - url = "http://hpux.connect.org.uk/ftp/hpux/Users/replace-${version}/replace-${version}-src-11.31.tar.gz"; + url = "http://hpux.connect.org.uk/ftp/hpux/Users/replace-${finalAttrs.version}/replace-${finalAttrs.version}-src-11.31.tar.gz"; sha256 = "18hkwhaz25s6209n5mpx9hmkyznlzygqj488p2l7nvp9zrlxb9sf"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { mainProgram = "replace-literal"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/re/reproc/package.nix b/pkgs/by-name/re/reproc/package.nix index bc5b2437c449..c18cc04decb5 100644 --- a/pkgs/by-name/re/reproc/package.nix +++ b/pkgs/by-name/re/reproc/package.nix @@ -6,14 +6,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "reproc"; version = "14.2.4"; src = fetchFromGitHub { owner = "DaanDeMeyer"; repo = "reproc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-LWzBeKhE7cSiZsK8xWzoTdrOcPiU/zEkmi40WiFytic="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/re/repseek/package.nix b/pkgs/by-name/re/repseek/package.nix index 013b4ca2b104..a571b7502e2c 100644 --- a/pkgs/by-name/re/repseek/package.nix +++ b/pkgs/by-name/re/repseek/package.nix @@ -4,11 +4,11 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "repseek"; version = "9Sep2014"; src = fetchurl { - url = "https://bioinfo.mnhn.fr/abi/public/RepSeek/RepSeek.${version}.tgz"; + url = "https://bioinfo.mnhn.fr/abi/public/RepSeek/RepSeek.${finalAttrs.version}.tgz"; sha256 = "1jiknji3ivrv7zmrfbf2mccfpdwhin3lfxfsciaqwf69b3sda8nf"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; }; -} +}) diff --git a/pkgs/by-name/re/reptyr/package.nix b/pkgs/by-name/re/reptyr/package.nix index 88b1b6f2e283..b7567f2e7b93 100644 --- a/pkgs/by-name/re/reptyr/package.nix +++ b/pkgs/by-name/re/reptyr/package.nix @@ -8,14 +8,14 @@ let python = python3.withPackages (p: [ p.pexpect ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.10.0"; pname = "reptyr"; src = fetchFromGitHub { owner = "nelhage"; repo = "reptyr"; - rev = "reptyr-${version}"; + rev = "reptyr-${finalAttrs.version}"; sha256 = "sha256-jlO/ykrwGJkgKiPxfRQEX4TSksrbPQhkQs+QddwqaQ4="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { mainProgram = "reptyr"; homepage = "https://github.com/nelhage/reptyr"; }; -} +}) diff --git a/pkgs/by-name/re/reredirect/package.nix b/pkgs/by-name/re/reredirect/package.nix index b0fe3430743e..90bb734e7a90 100644 --- a/pkgs/by-name/re/reredirect/package.nix +++ b/pkgs/by-name/re/reredirect/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "reredirect"; version = "0.3"; src = fetchFromGitHub { owner = "jerome-pouiller"; repo = "reredirect"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-RHRamDo7afnJ4DlOVAqM8lQAC60YESGSMKa8Io2vcX0="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/re/resolv_wrapper/package.nix b/pkgs/by-name/re/resolv_wrapper/package.nix index e75d94762730..251946380e1c 100644 --- a/pkgs/by-name/re/resolv_wrapper/package.nix +++ b/pkgs/by-name/re/resolv_wrapper/package.nix @@ -6,12 +6,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "resolv_wrapper"; version = "1.1.8"; src = fetchurl { - url = "mirror://samba/cwrap/resolv_wrapper-${version}.tar.gz"; + url = "mirror://samba/cwrap/resolv_wrapper-${finalAttrs.version}.tar.gz"; sha256 = "sha256-+8MPd9o+EuzU72bM9at34LdEkwzNiQYkBAgvkoqOwuA="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix index b599876df361..fd1b0e708ab7 100644 --- a/pkgs/by-name/re/resterm/package.nix +++ b/pkgs/by-name/re/resterm/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "resterm"; - version = "0.19.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "unkn0wn-root"; repo = "resterm"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-vpFwiVLF3ekPgjxTEl4UlY/oGK03prHRtt15k5i+M6I="; + sha256 = "sha256-30iof50NA2wXMpRsgHbUhYyEx7Gzb/mPkKvLLf2yUQ8="; }; vendorHash = "sha256-E/Y4kW5xy7YamUP5bxFmDCAK6RqiqGN7DpEPG1MaCHc="; diff --git a/pkgs/by-name/re/restream/package.nix b/pkgs/by-name/re/restream/package.nix index 1ca0d51d0a72..1a01f58222e5 100644 --- a/pkgs/by-name/re/restream/package.nix +++ b/pkgs/by-name/re/restream/package.nix @@ -8,14 +8,14 @@ netcat, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "restream"; version = "1.3.1"; src = fetchFromGitHub { owner = "rien"; repo = "restream"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-AXHKOfdIM3LsHF6u3M/lMhhcuPZADoEal7de3zlx7L4="; }; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -D ${src}/restream.arm.static $out/libexec/restream.arm.static - install -D ${src}/reStream.sh $out/bin/restream + install -D ${finalAttrs.src}/restream.arm.static $out/libexec/restream.arm.static + install -D ${finalAttrs.src}/reStream.sh $out/bin/restream runHook postInstall ''; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.cpcloud ]; }; -} +}) diff --git a/pkgs/by-name/re/retroarch-bare/package.nix b/pkgs/by-name/re/retroarch-bare/package.nix index fc4f1e9f3ecf..d7ec227c467e 100644 --- a/pkgs/by-name/re/retroarch-bare/package.nix +++ b/pkgs/by-name/re/retroarch-bare/package.nix @@ -57,7 +57,7 @@ let runtimeLibs = lib.optional withVulkan vulkan-loader ++ lib.optional withGamemode (lib.getLib gamemode); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "retroarch-bare"; version = "1.22.2"; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { owner = "libretro"; repo = "RetroArch"; hash = "sha256-+3jgoh6OVbPzW5/nCvpB1CRgkMTBxLkYMm6UV16/cfU="; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; }; nativeBuildInputs = [ @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { description = "Multi-platform emulator frontend for libretro cores"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; - changelog = "https://github.com/libretro/RetroArch/blob/v${version}/CHANGES.md"; + changelog = "https://github.com/libretro/RetroArch/blob/v${finalAttrs.version}/CHANGES.md"; maintainers = with lib.maintainers; [ kolbycrouch ]; @@ -191,4 +191,4 @@ stdenv.mkDerivation rec { # https://github.com/libretro/RetroArch/blob/71eb74d256cb4dc5b8b43991aec74980547c5069/.gitlab-ci.yml#L330 broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/re/revanced-cli/package.nix b/pkgs/by-name/re/revanced-cli/package.nix index 44752dd5e55c..f260c2e80c13 100644 --- a/pkgs/by-name/re/revanced-cli/package.nix +++ b/pkgs/by-name/re/revanced-cli/package.nix @@ -6,12 +6,12 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "revanced-cli"; version = "5.0.1"; src = fetchurl { - url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar"; + url = "https://github.com/revanced/revanced-cli/releases/download/v${finalAttrs.version}/revanced-cli-${finalAttrs.version}-all.jar"; hash = "sha256-tq+DSWAPVupR2W1Jqk0vKI4ox5zWSTSbpwyLcs4EXa8="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jopejoe1 ]; mainProgram = "revanced-cli"; }; -} +}) diff --git a/pkgs/by-name/rf/rfdump/package.nix b/pkgs/by-name/rf/rfdump/package.nix index de56661d8e0f..bbaa4e2da755 100644 --- a/pkgs/by-name/rf/rfdump/package.nix +++ b/pkgs/by-name/rf/rfdump/package.nix @@ -11,12 +11,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rfdump"; version = "1.6"; src = fetchurl { - url = "https://www.rfdump.org/dl/rfdump-${version}.tar.bz2"; + url = "https://www.rfdump.org/dl/rfdump-${finalAttrs.version}.tar.bz2"; hash = "sha256-fbEmh7i3ug5GCeyJ2wT45bbDq0ZEOv8yH+MOJwzER4U="; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { mainProgram = "rfdump"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/rg/rgbds/package.nix b/pkgs/by-name/rg/rgbds/package.nix index 3d6a7c8a551f..5a005cb82c9d 100644 --- a/pkgs/by-name/rg/rgbds/package.nix +++ b/pkgs/by-name/rg/rgbds/package.nix @@ -8,13 +8,13 @@ libpng, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rgbds"; version = "0.9.4"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-PFnU6vWfwvtnB93J+PcxZk000hbHnbe7GR+HCvH26dg="; }; nativeBuildInputs = [ @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/rh/rhvoice/package.nix b/pkgs/by-name/rh/rhvoice/package.nix index d030ed1dee04..ae54561acdce 100644 --- a/pkgs/by-name/rh/rhvoice/package.nix +++ b/pkgs/by-name/rh/rhvoice/package.nix @@ -11,14 +11,14 @@ speechd-minimal, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rhvoice"; version = "1.16.5"; src = fetchFromGitHub { owner = "RHVoice"; repo = "RHVoice"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-4l4S4MUnVGN/El1BBuZvzPPcavUefjMyBk1hk0ux7zo="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; all; mainProgram = "RHVoice-test"; }; -} +}) diff --git a/pkgs/by-name/ri/riemann_c_client/package.nix b/pkgs/by-name/ri/riemann_c_client/package.nix index 3220829f8498..ec82a124948f 100644 --- a/pkgs/by-name/ri/riemann_c_client/package.nix +++ b/pkgs/by-name/ri/riemann_c_client/package.nix @@ -15,7 +15,7 @@ json_c, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "riemann-c-client"; version = "2.2.2"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { domain = "git.madhouse-project.org"; owner = "algernon"; repo = "riemann-c-client"; - rev = "riemann-c-client-${version}"; + rev = "riemann-c-client-${finalAttrs.version}"; hash = "sha256-l9iUDhagODi58FDT9vEb90tsiIcrcMmGYCmH3ML3RCM="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { license = lib.licenses.eupl12; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ri/ries/package.nix b/pkgs/by-name/ri/ries/package.nix index d94835916aa3..ee46a6399694 100644 --- a/pkgs/by-name/ri/ries/package.nix +++ b/pkgs/by-name/ri/ries/package.nix @@ -3,13 +3,13 @@ stdenv, fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ries"; version = "2018.04.11-1"; # upstream does not provide a stable link src = fetchzip { - url = "https://salsa.debian.org/debian/ries/-/archive/debian/${version}/ries-debian-${version}.zip"; + url = "https://salsa.debian.org/debian/ries/-/archive/debian/${finalAttrs.version}/ries-debian-${finalAttrs.version}.zip"; sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842"; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ symphorien ]; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/ri/rig/package.nix b/pkgs/by-name/ri/rig/package.nix index f2b5cddca373..a8a08bb40106 100644 --- a/pkgs/by-name/ri/rig/package.nix +++ b/pkgs/by-name/ri/rig/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.11"; pname = "rig"; src = fetchurl { - url = "https://ayera.dl.sourceforge.net/project/rig/rig/${version}/rig-${version}.tar.gz"; + url = "https://ayera.dl.sourceforge.net/project/rig/rig/${finalAttrs.version}/rig-${finalAttrs.version}.tar.gz"; sha256 = "1f3snysjqqlpk2kgvm5p2icrj4lsdymccmn3igkc2f60smqckgq0"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; all; mainProgram = "rig"; }; -} +}) diff --git a/pkgs/by-name/ri/rime-latex/package.nix b/pkgs/by-name/ri/rime-latex/package.nix new file mode 100644 index 000000000000..3f9ac9a86cdb --- /dev/null +++ b/pkgs/by-name/ri/rime-latex/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "rime-latex"; + version = "0-unstable-2025-04-04"; + + src = fetchFromGitHub { + owner = "shenlebantongying"; + repo = "rime_latex"; + rev = "858f2abc645f0e459e468e98122470ce20b16b30"; + hash = "sha256-i8Rgze+tQhbE+nl+JSj09ILXeUvf6MOS9Eqsuqis1n0="; + }; + + installPhase = '' + runHook preInstall + + rm -rf README.md .git* LICENSE .script + + mkdir -p $out/share + cp -r . $out/share/rime-data + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Typing LaTeX math symbols in RIME"; + longDescription = '' + Typing LaTeX math symbols in RIME. + + Add those lines to `default.custom.yaml`: + + ```yaml + patch: + schema_list: + - schema: latex + ``` + + Press `\` key then input latex symbol's name: `\lambda` will automatically become `λ`. + ''; + homepage = "https://github.com/shenlebantongying/rime_latex"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ rc-zb ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ri/rinetd/package.nix b/pkgs/by-name/ri/rinetd/package.nix index 7f8b1a3f6f5a..fb5afc2ff524 100644 --- a/pkgs/by-name/ri/rinetd/package.nix +++ b/pkgs/by-name/ri/rinetd/package.nix @@ -7,14 +7,14 @@ testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rinetd"; version = "0.73"; src = fetchFromGitHub { owner = "samhocevar"; repo = "rinetd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-W8PLGd3RwmBTh1kw3k8+ZfP6AzRhZORCkxZzQ9ZbPN4="; }; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { meta = { description = "TCP/UDP port redirector"; homepage = "https://github.com/samhocevar/rinetd"; - changelog = "https://github.com/samhocevar/rinetd/blob/${src.rev}/CHANGES.md"; + changelog = "https://github.com/samhocevar/rinetd/blob/${finalAttrs.src.rev}/CHANGES.md"; license = lib.licenses.gpl2Plus; maintainers = [ ]; mainProgram = "rinetd"; }; -} +}) diff --git a/pkgs/by-name/ri/riot-redis/package.nix b/pkgs/by-name/ri/riot-redis/package.nix index 1eacee3f216d..3a5c3dbfdc4f 100644 --- a/pkgs/by-name/ri/riot-redis/package.nix +++ b/pkgs/by-name/ri/riot-redis/package.nix @@ -6,12 +6,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "riot-redis"; version = "2.19.0"; src = fetchzip { - url = "https://github.com/redis-developer/riot/releases/download/v${version}/riot-redis-${version}.zip"; + url = "https://github.com/redis-developer/riot/releases/download/v${finalAttrs.version}/riot-redis-${finalAttrs.version}.zip"; sha256 = "sha256-q2ZqFVdjg5HSH4kiwoC1W+a8VgHNxBgNeMaw5n97isc="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ wesnel ]; }; -} +}) diff --git a/pkgs/by-name/ri/ripes/package.nix b/pkgs/by-name/ri/ripes/package.nix index 73fee5e3ea6e..2417682f0591 100644 --- a/pkgs/by-name/ri/ripes/package.nix +++ b/pkgs/by-name/ri/ripes/package.nix @@ -10,7 +10,7 @@ unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ripes"; # Pulling unstable version as latest stable does not build against gcc-13. version = "2.2.6-unstable-2024-04-04"; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { install -D Ripes $out/bin/Ripes '' + '' - cp -r ${src}/appdir/usr/share $out/share + cp -r ${finalAttrs.src}/appdir/usr/share $out/share runHook postInstall ''; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { mainProgram = "Ripes"; maintainers = with lib.maintainers; [ wineee ]; }; -} +}) diff --git a/pkgs/by-name/ri/river-tag-overlay/package.nix b/pkgs/by-name/ri/river-tag-overlay/package.nix index e6aeb86d4867..69d950312bb5 100644 --- a/pkgs/by-name/ri/river-tag-overlay/package.nix +++ b/pkgs/by-name/ri/river-tag-overlay/package.nix @@ -9,14 +9,14 @@ wayland-scanner, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "river-tag-overlay"; version = "1.0.0"; src = fetchFromSourcehut { owner = "~leon_plickat"; repo = "river-tag-overlay"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-hLyXdLi/ldvwPJ1oQQsH5wgflQJuXu6vhYw/qdKAV9E="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "river-tag-overlay"; }; -} +}) diff --git a/pkgs/by-name/rl/rlog/package.nix b/pkgs/by-name/rl/rlog/package.nix index 22e2d659e244..16a131c4c47a 100644 --- a/pkgs/by-name/rl/rlog/package.nix +++ b/pkgs/by-name/rl/rlog/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rlog"; version = "1.4"; src = fetchurl { - url = "http://rlog.googlecode.com/files/rlog-${version}.tar.gz"; + url = "http://rlog.googlecode.com/files/rlog-${finalAttrs.version}.tar.gz"; sha256 = "0y9zg0pd7vmnskwac1qdyzl282z7kb01nmn57lsg2mjdxgnywf59"; }; @@ -19,4 +19,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.lgpl3; }; -} +}) diff --git a/pkgs/by-name/rm/rmate-sh/package.nix b/pkgs/by-name/rm/rmate-sh/package.nix index 462852d41087..cfb137e8592d 100644 --- a/pkgs/by-name/rm/rmate-sh/package.nix +++ b/pkgs/by-name/rm/rmate-sh/package.nix @@ -7,14 +7,14 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rmate"; version = "1.0.2"; src = fetchFromGitHub { owner = "aurora"; repo = "rmate"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fmK6h9bqZ0zO3HWfZvPdYuZ6i/0HZ1CA3FUnkS+E9ns="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pbsds ]; mainProgram = "rmate"; }; -} +}) diff --git a/pkgs/by-name/rm/rmount/package.nix b/pkgs/by-name/rm/rmount/package.nix index 4a2ffea04bc2..de159685a31e 100644 --- a/pkgs/by-name/rm/rmount/package.nix +++ b/pkgs/by-name/rm/rmount/package.nix @@ -9,13 +9,13 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rmount"; version = "1.1.0"; src = fetchFromGitHub { - rev = "v${version}"; + rev = "v${finalAttrs.version}"; owner = "Luis-Hebendanz"; repo = "rmount"; sha256 = "0j1ayncw1nnmgna7vyx44vwinh4ah1b0l5y8agc7i4s8clbvy3h0"; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; installPhase = '' - install -D ${src}/rmount.man $out/share/man/man1/rmount.1 - install -D ${src}/rmount.bash $out/bin/rmount - install -D ${src}/config.json $out/share/config.json + install -D ${finalAttrs.src}/rmount.man $out/share/man/man1/rmount.1 + install -D ${finalAttrs.src}/rmount.bash $out/bin/rmount + install -D ${finalAttrs.src}/config.json $out/share/config.json wrapProgram $out/bin/rmount --prefix PATH : ${ lib.makeBinPath [ @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "rmount"; }; -} +}) diff --git a/pkgs/by-name/rm/rmw/package.nix b/pkgs/by-name/rm/rmw/package.nix index 4aae0d64e475..0953af70a504 100644 --- a/pkgs/by-name/rm/rmw/package.nix +++ b/pkgs/by-name/rm/rmw/package.nix @@ -10,14 +10,14 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rmw"; version = "0.9.4"; src = fetchFromGitHub { owner = "theimpossibleastronaut"; repo = "rmw"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/bE9fFjn3mPfUbtsB6bXfQAxUtbtuZiT4pevi5RCQA4="; fetchSubmodules = true; }; @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { meta = { description = "Trashcan/ recycle bin utility for the command line"; homepage = "https://github.com/theimpossibleastronaut/rmw"; - changelog = "https://github.com/theimpossibleastronaut/rmw/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/theimpossibleastronaut/rmw/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ dit7ya ]; mainProgram = "rmw"; }; -} +}) diff --git a/pkgs/by-name/rn/rng-tools/package.nix b/pkgs/by-name/rn/rng-tools/package.nix index 66ab63aec361..05138f765422 100644 --- a/pkgs/by-name/rn/rng-tools/package.nix +++ b/pkgs/by-name/rn/rng-tools/package.nix @@ -25,14 +25,14 @@ withQrypt ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rng-tools"; version = "6.17"; src = fetchFromGitHub { owner = "nhorman"; repo = "rng-tools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-wqJvLvxmNG2nb5P525w25Y8byUUJi24QIHNJomCKeG8="; }; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { meta = { description = "Random number generator daemon"; homepage = "https://github.com/nhorman/rng-tools"; - changelog = "https://github.com/nhorman/rng-tools/releases/tag/v${version}"; + changelog = "https://github.com/nhorman/rng-tools/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ @@ -113,4 +113,4 @@ stdenv.mkDerivation rec { c0bw3b ]; }; -} +}) diff --git a/pkgs/by-name/rn/rnm/package.nix b/pkgs/by-name/rn/rnm/package.nix index e028f5e7f6ee..23f69f186ba8 100644 --- a/pkgs/by-name/rn/rnm/package.nix +++ b/pkgs/by-name/rn/rnm/package.nix @@ -7,14 +7,14 @@ pcre2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rnm"; version = "4.0.9"; src = fetchFromGitHub { owner = "neurobin"; repo = "rnm"; - tag = version; + tag = finalAttrs.version; hash = "sha256-cMWIxRuL7UCDjGr26+mfEYBPRA/dxEt0Us5qU92TelY="; }; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://neurobin.org/projects/softwares/unix/rnm/"; description = "Bulk rename utility"; - changelog = "https://github.com/neurobin/rnm/blob/${version}/ChangeLog"; + changelog = "https://github.com/neurobin/rnm/blob/${finalAttrs.version}/ChangeLog"; platforms = lib.platforms.all; license = lib.licenses.gpl3Only; mainProgram = "rnm"; }; -} +}) diff --git a/pkgs/by-name/rn/rnnoise-plugin/package.nix b/pkgs/by-name/rn/rnnoise-plugin/package.nix index a9138481c50c..5816fda5f7cc 100644 --- a/pkgs/by-name/rn/rnnoise-plugin/package.nix +++ b/pkgs/by-name/rn/rnnoise-plugin/package.nix @@ -11,7 +11,7 @@ libxrandr, libx11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rnnoise-plugin"; version = "1.10"; outputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "werman"; repo = "noise-suppression-for-voice"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-sfwHd5Fl2DIoGuPDjELrPp5KpApZJKzQikCJmCzhtY8="; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { sciencentistguy ]; }; -} +}) diff --git a/pkgs/by-name/rn/rnv/package.nix b/pkgs/by-name/rn/rnv/package.nix index e875b8ee542f..f277593a5f78 100644 --- a/pkgs/by-name/rn/rnv/package.nix +++ b/pkgs/by-name/rn/rnv/package.nix @@ -5,12 +5,12 @@ expat, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rnv"; version = "1.7.11"; src = fetchurl { - url = "mirror://sourceforge/rnv/rnv-${version}.tar.xz"; + url = "mirror://sourceforge/rnv/rnv-${finalAttrs.version}.tar.xz"; sha256 = "1rlxrkkkp8b5j6lyvnd9z1d85grmwwmdggkxq6yl226nwkqj1faa"; }; @@ -22,4 +22,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ro/robin-map/package.nix b/pkgs/by-name/ro/robin-map/package.nix index 1e69644c4ff4..33b05b30ee28 100644 --- a/pkgs/by-name/ro/robin-map/package.nix +++ b/pkgs/by-name/ro/robin-map/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "robin-map"; version = "1.4.0"; src = fetchFromGitHub { owner = "Tessil"; repo = "robin-map"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Hkgxiq2i0TuqMK/bI5OMOn3LkmSE40NimDjK1FBZpsA="; }; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = { description = "C++ implementation of a fast hash map and hash set using robin hood hashing"; homepage = "https://github.com/Tessil/robin-map"; - changelog = "https://github.com/Tessil/robin-map/releases/tag/v${version}"; + changelog = "https://github.com/Tessil/robin-map/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ro/roc-toolkit/package.nix b/pkgs/by-name/ro/roc-toolkit/package.nix index c710c774bcdc..268ddd4bb1f6 100644 --- a/pkgs/by-name/ro/roc-toolkit/package.nix +++ b/pkgs/by-name/ro/roc-toolkit/package.nix @@ -22,7 +22,7 @@ libsndfile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "roc-toolkit"; version = "0.4.0"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "roc-streaming"; repo = "roc-toolkit"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-53irDq803dTg0YqtC1SOXmYNGypSMAEK+9HJ65pR5PA="; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bgamari ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ro/rockbox-utility/package.nix b/pkgs/by-name/ro/rockbox-utility/package.nix index 78588f173249..8bc62b444fed 100644 --- a/pkgs/by-name/ro/rockbox-utility/package.nix +++ b/pkgs/by-name/ro/rockbox-utility/package.nix @@ -12,12 +12,12 @@ espeak ? null, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rockbox-utility"; version = "1.5.1"; src = fetchurl { - url = "https://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2"; + url = "https://download.rockbox.org/rbutil/source/RockboxUtility-v${finalAttrs.version}-src.tar.bz2"; hash = "sha256-guNO11a0d30RexPEAAQGIgV9W17zgTjZ/LNz/oUn4HM="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { mainProgram = "RockboxUtility"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ro/rofi-calc/package.nix b/pkgs/by-name/ro/rofi-calc/package.nix index 0e95bea10435..d98dd2311d0f 100644 --- a/pkgs/by-name/ro/rofi-calc/package.nix +++ b/pkgs/by-name/ro/rofi-calc/package.nix @@ -13,14 +13,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rofi-calc"; version = "2.5.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "rofi-calc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/UKOyJfCsV/+kZDndHZmrPdE2MjVlQWSiWQRIUPGz/I="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ albakham ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/ro/rofi-file-browser/package.nix b/pkgs/by-name/ro/rofi-file-browser/package.nix index a11e376845ec..e44272831c91 100644 --- a/pkgs/by-name/ro/rofi-file-browser/package.nix +++ b/pkgs/by-name/ro/rofi-file-browser/package.nix @@ -8,14 +8,14 @@ gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rofi-file-browser-extended"; version = "1.3.1"; src = fetchFromGitHub { owner = "marvinkreis"; repo = "rofi-file-browser-extended"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UEFv0skFzWhgFkmz1h8uV1ygW977zNq1Dw8VAawqUgw="; fetchSubmodules = true; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { jluttine ]; }; -} +}) diff --git a/pkgs/by-name/ro/rofi-power-menu/package.nix b/pkgs/by-name/ro/rofi-power-menu/package.nix index ef79772cdbba..1d1219cc31f7 100644 --- a/pkgs/by-name/ro/rofi-power-menu/package.nix +++ b/pkgs/by-name/ro/rofi-power-menu/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rofi-power-menu"; version = "3.1.0"; src = fetchFromGitHub { owner = "jluttine"; repo = "rofi-power-menu"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-VPCfmCTr6ADNT7MW4jiqLI/lvTjlAu1QrCAugiD0toU="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "rofi-power-menu"; }; -} +}) diff --git a/pkgs/by-name/ro/rofi-pulse-select/package.nix b/pkgs/by-name/ro/rofi-pulse-select/package.nix index 5068665b48b1..3230457b85b4 100644 --- a/pkgs/by-name/ro/rofi-pulse-select/package.nix +++ b/pkgs/by-name/ro/rofi-pulse-select/package.nix @@ -7,14 +7,14 @@ rofi-unwrapped, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rofi-pulse-select"; version = "0.2.0"; src = fetchFromGitLab { owner = "DamienCassou"; repo = "rofi-pulse-select"; - rev = version; + rev = finalAttrs.version; sha256 = "1405v0bh2m8ip9c23l95i8iq2gfrpanc6f4dz17nysdcff2ay2p3"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ DamienCassou ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ro/rofi-vpn/package.nix b/pkgs/by-name/ro/rofi-vpn/package.nix index cce0532f4a21..ed853594fc63 100644 --- a/pkgs/by-name/ro/rofi-vpn/package.nix +++ b/pkgs/by-name/ro/rofi-vpn/package.nix @@ -7,14 +7,14 @@ rofi-unwrapped, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rofi-vpn"; version = "0.2.0"; src = fetchFromGitLab { owner = "DamienCassou"; repo = "rofi-vpn"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "04jcfb2jy8yyrk4mg68krwh3zb5qcyj1aq1bwk96fhybrq9k2hhp"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "rofi-vpn"; }; -} +}) diff --git a/pkgs/by-name/ro/rootbar/package.nix b/pkgs/by-name/ro/rootbar/package.nix index 9b0fc884bef4..64099d166d76 100644 --- a/pkgs/by-name/ro/rootbar/package.nix +++ b/pkgs/by-name/ro/rootbar/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc14Stdenv, fetchhg, pkg-config, meson, @@ -12,14 +12,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation { +gcc14Stdenv.mkDerivation { pname = "rootbar"; - version = "unstable-2020-11-13"; + version = "unstable-2024-08-07"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/rootbar"; - rev = "a018e10cfc5e"; - sha256 = "sha256-t6oDIYCVaCxaYy4bS1vxESaFDNxsx5JQLQK77eVuafE="; + rev = "36333af9fd8d"; + sha256 = "sha256-CpORCSJyHZhcK14EhjxoPt/h0026NU5J/kicL1dX96o="; }; nativeBuildInputs = [ @@ -38,15 +38,15 @@ stdenv.mkDerivation { meta = { homepage = "https://hg.sr.ht/~scoopta/rootbar"; - description = "Bar for Wayland WMs"; + description = "Bar for wlroots-based Wayland compositors"; mainProgram = "rootbar"; longDescription = '' - Root Bar is a bar for wlroots based wayland compositors such as sway and - was designed to address the lack of good bars for wayland. + Root Bar is a bar for wlroots-based Wayland compositors such as Sway and + was designed to address the lack of good bars for Wayland. ''; license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; + broken = gcc14Stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ro/rosie/package.nix b/pkgs/by-name/ro/rosie/package.nix index 48aaf35dfb68..0c59aa6f755d 100644 --- a/pkgs/by-name/ro/rosie/package.nix +++ b/pkgs/by-name/ro/rosie/package.nix @@ -5,7 +5,7 @@ libbsd, readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rosie"; version = "1.4.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postUnpack = '' # The Makefile calls git to update submodules, unless this file exists - touch ${src.name}/submodules/~~present~~ + touch ${finalAttrs.src.name}/submodules/~~present~~ ''; preConfigure = '' @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ kovirobi ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/ro/roswell/package.nix b/pkgs/by-name/ro/roswell/package.nix index 45230de608aa..9d545119ac26 100644 --- a/pkgs/by-name/ro/roswell/package.nix +++ b/pkgs/by-name/ro/roswell/package.nix @@ -9,14 +9,14 @@ sbcl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "roswell"; version = "24.10.115"; src = fetchFromGitHub { owner = "roswell"; repo = "roswell"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-2aYA1AzRPXaM82Sh+dMiQJcOAD0rzwV09VyLy0oS6as="; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ hiro98 ]; platforms = lib.platforms.unix; homepage = "https://github.com/roswell/roswell"; - changelog = "https://github.com/roswell/roswell/blob/v${version}/ChangeLog"; + changelog = "https://github.com/roswell/roswell/blob/v${finalAttrs.version}/ChangeLog"; mainProgram = "ros"; }; -} +}) diff --git a/pkgs/by-name/ro/roundup/package.nix b/pkgs/by-name/ro/roundup/package.nix index 0a6b079bfa54..86673e1cef06 100644 --- a/pkgs/by-name/ro/roundup/package.nix +++ b/pkgs/by-name/ro/roundup/package.nix @@ -6,14 +6,14 @@ shocco, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "roundup"; version = "0.0.6"; src = fetchFromGitHub { owner = "bmizerany"; repo = "roundup"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0nxaqmbv8mdvq9wcaqxk6k5mr31i68jzxf1wxa6pp7xp4prwdc9z"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "roundup"; }; -} +}) diff --git a/pkgs/by-name/ro/routino/package.nix b/pkgs/by-name/ro/routino/package.nix index be17d1137b3e..1eca5a57a1f9 100644 --- a/pkgs/by-name/ro/routino/package.nix +++ b/pkgs/by-name/ro/routino/package.nix @@ -8,12 +8,12 @@ bzip2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "routino"; version = "3.4.3"; src = fetchurl { - url = "https://routino.org/download/routino-${version}.tgz"; + url = "https://routino.org/download/routino-${finalAttrs.version}.tgz"; hash = "sha256-TroGfTLJfKk4itbpfA9aPBDUiCk2ckDXjFE3XYzBHlQ="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dotlambda ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/ro/rox-filer/package.nix b/pkgs/by-name/ro/rox-filer/package.nix index e79eaa30b111..6a71a3a856eb 100644 --- a/pkgs/by-name/ro/rox-filer/package.nix +++ b/pkgs/by-name/ro/rox-filer/package.nix @@ -11,12 +11,12 @@ shared-mime-info, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rox-filer"; version = "2.11"; src = fetchurl { - url = "mirror://sourceforge/rox/rox-filer-${version}.tar.bz2"; + url = "mirror://sourceforge/rox/rox-filer-${finalAttrs.version}.tar.bz2"; sha256 = "a929bd32ee18ef7a2ed48b971574574592c42e34ae09f36604bf663d7c101ba8"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; # go to the source directory after unpacking the sources - sourceRoot = "rox-filer-${version}/ROX-Filer"; + sourceRoot = "rox-filer-${finalAttrs.version}/ROX-Filer"; # account for 'setSourceRoot' offset patchFlags = [ "-p2" ]; @@ -105,4 +105,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eleanor ]; }; -} +}) diff --git a/pkgs/by-name/rp/rp/package.nix b/pkgs/by-name/rp/rp/package.nix index a27e0680a4bc..a300fd46173b 100644 --- a/pkgs/by-name/rp/rp/package.nix +++ b/pkgs/by-name/rp/rp/package.nix @@ -5,7 +5,7 @@ cmake, ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rp"; version = "2.1.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { rev = "a60f8117443e421bb572df890341b5a0f982c267"; hash = "sha256-lkyuV+yC3NTsdipyJkoxgh1N8/+15N15nQpjItUgyb0="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; installPhase = '' mkdir -p $out/bin @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "rp"; }; -} +}) diff --git a/pkgs/by-name/rp/rpcsvc-proto/package.nix b/pkgs/by-name/rp/rpcsvc-proto/package.nix index 1fd700d039d7..299172ab5949 100644 --- a/pkgs/by-name/rp/rpcsvc-proto/package.nix +++ b/pkgs/by-name/rp/rpcsvc-proto/package.nix @@ -8,14 +8,14 @@ targetPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rpcsvc-proto"; version = "1.4.4"; src = fetchFromGitHub { owner = "thkukuk"; repo = "rpcsvc-proto"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-DEXzSSmjMeMsr1PoU/ljaY+6b4COUU2Z8MJkGImsgzk="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ma27 ]; mainProgram = "rpcgen"; }; -} +}) diff --git a/pkgs/by-name/rp/rpiboot/package.nix b/pkgs/by-name/rp/rpiboot/package.nix index 27818d4ad7a3..767cc479f12d 100644 --- a/pkgs/by-name/rp/rpiboot/package.nix +++ b/pkgs/by-name/rp/rpiboot/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rpiboot"; version = "20250908-162618-bookworm"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "usbboot"; - tag = version; + tag = finalAttrs.version; hash = "sha256-BJOm8VBEbrUasYwuV8NqwmsolJzmaqIaxYqj9EkU5hc="; fetchSubmodules = true; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/raspberrypi/usbboot"; - changelog = "https://github.com/raspberrypi/usbboot/blob/${version}/debian/changelog"; + changelog = "https://github.com/raspberrypi/usbboot/blob/${finalAttrs.version}/debian/changelog"; description = "Utility to boot a Raspberry Pi CM/CM3/CM4/Zero over USB"; mainProgram = "rpiboot"; license = lib.licenses.asl20; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { "x86_64-darwin" ]; }; -} +}) diff --git a/pkgs/by-name/rp/rpm-ostree/package.nix b/pkgs/by-name/rp/rpm-ostree/package.nix index 8f6e7d9e940d..f700f0963bdd 100644 --- a/pkgs/by-name/rp/rpm-ostree/package.nix +++ b/pkgs/by-name/rp/rpm-ostree/package.nix @@ -40,7 +40,7 @@ cppunit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rpm-ostree"; version = "2024.8"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://github.com/coreos/rpm-ostree/releases/download/v${version}/rpm-ostree-${version}.tar.xz"; + url = "https://github.com/coreos/rpm-ostree/releases/download/v${finalAttrs.version}/rpm-ostree-${finalAttrs.version}.tar.xz"; hash = "sha256-6aCGP3SJ0DegmhiQkiqBr733C5vuDGTjLMaxNtai3G0="; }; @@ -129,4 +129,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "rpm-ostree"; }; -} +}) diff --git a/pkgs/by-name/rr/rrdtool/package.nix b/pkgs/by-name/rr/rrdtool/package.nix index a01fa89b7436..7f568be2d314 100644 --- a/pkgs/by-name/rr/rrdtool/package.nix +++ b/pkgs/by-name/rr/rrdtool/package.nix @@ -15,14 +15,14 @@ }: perl.pkgs.toPerlModule ( - stdenv.mkDerivation rec { + stdenv.mkDerivation (finalAttrs: { pname = "rrdtool"; version = "1.9.0"; src = fetchFromGitHub { owner = "oetiker"; repo = "rrdtool-1.x"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-CPbSu1mosNlfj2nqiNVH14a5C5njkfvJM8ix3X3aP8E="; }; @@ -62,5 +62,5 @@ perl.pkgs.toPerlModule ( platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ pSub ]; }; - } + }) ) diff --git a/pkgs/by-name/rs/rsbep/package.nix b/pkgs/by-name/rs/rsbep/package.nix index ada9a9991005..90e200748c9c 100644 --- a/pkgs/by-name/rs/rsbep/package.nix +++ b/pkgs/by-name/rs/rsbep/package.nix @@ -6,14 +6,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rsbep"; version = "0.2.0"; src = fetchFromGitHub { owner = "ttsiodras"; repo = "rsbep-backup"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0is4jgil3wdqbvx9h66xcyzbqy84ndyydnnay2g9k81a4mcz4dns"; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.erikarvstedt ]; }; -} +}) diff --git a/pkgs/by-name/rs/rset/package.nix b/pkgs/by-name/rs/rset/package.nix index b25a613cd61d..a3f5b3807f1d 100644 --- a/pkgs/by-name/rs/rset/package.nix +++ b/pkgs/by-name/rs/rset/package.nix @@ -7,14 +7,14 @@ gnutar, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rset"; version = "3.2"; src = fetchFromGitHub { owner = "eradman"; repo = "rset"; - tag = version; + tag = finalAttrs.version; hash = "sha256-b797R79aMopiPApTJ4Q3SP2MRjqCcNNO9BIxtuiNZks="; }; @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://scriptedconfiguration.org/"; description = "Configure systems using any scripting language"; - changelog = "https://github.com/eradman/rset/raw/${version}/NEWS"; + changelog = "https://github.com/eradman/rset/raw/${finalAttrs.version}/NEWS"; license = lib.licenses.isc; platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/rs/rsgain/package.nix b/pkgs/by-name/rs/rsgain/package.nix index 3581e2d011c5..d0db34bd3771 100644 --- a/pkgs/by-name/rs/rsgain/package.nix +++ b/pkgs/by-name/rs/rsgain/package.nix @@ -12,14 +12,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rsgain"; version = "3.6"; src = fetchFromGitHub { owner = "complexlogic"; repo = "rsgain"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-dqvaPLVpNnbN2W0TOphS7QU6MDh5pxFJoUDGvkat164="; }; @@ -40,9 +40,9 @@ stdenv.mkDerivation rec { description = "Simple, but powerful ReplayGain 2.0 tagging utility"; mainProgram = "rsgain"; homepage = "https://github.com/complexlogic/rsgain"; - changelog = "https://github.com/complexlogic/rsgain/blob/v${version}/CHANGELOG"; + changelog = "https://github.com/complexlogic/rsgain/blob/v${finalAttrs.version}/CHANGELOG"; license = lib.licenses.bsd2; platforms = lib.platforms.all; maintainers = [ lib.maintainers.felipeqq2 ]; }; -} +}) diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix index 311316fbe4d7..a8ace2820b3c 100644 --- a/pkgs/by-name/rs/rspamd/package.nix +++ b/pkgs/by-name/rs/rspamd/package.nix @@ -37,14 +37,14 @@ assert withHyperscan -> stdenv.hostPlatform.isx86_64; assert (!withHyperscan) || (!withVectorscan); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rspamd"; version = "3.14.2"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; - rev = version; + rev = finalAttrs.version; hash = "sha256-XpCdjS6c9nLi1ngeSPBldmK3HmMFfDNW+tNpxdrUoKg="; }; @@ -115,4 +115,4 @@ stdenv.mkDerivation rec { ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/rs/rss-bridge/package.nix b/pkgs/by-name/rs/rss-bridge/package.nix index df2f6f67cc8b..9646e3c62078 100644 --- a/pkgs/by-name/rs/rss-bridge/package.nix +++ b/pkgs/by-name/rs/rss-bridge/package.nix @@ -6,14 +6,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rss-bridge"; version = "2025-08-05"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-SH5iYsdvGD51j+2xqaG51VDtb35m1v9MR0+yLE1eyWo="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix index d77797846d5d..7a81947d0d2d 100644 --- a/pkgs/by-name/rs/rssguard/package.nix +++ b/pkgs/by-name/rs/rssguard/package.nix @@ -8,14 +8,14 @@ wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rssguard"; version = "4.8.6"; src = fetchFromGitHub { owner = "martinrotter"; repo = "rssguard"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-2gwzk23t9WRHrXlASzba9HQRijHjH0nfWsBjMcqgq68="; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { for ownCloud/Nextcloud. ''; homepage = "https://github.com/martinrotter/rssguard"; - changelog = "https://github.com/martinrotter/rssguard/releases/tag/${version}"; + changelog = "https://github.com/martinrotter/rssguard/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { tebriel ]; }; -} +}) diff --git a/pkgs/by-name/rt/rt/package.nix b/pkgs/by-name/rt/rt/package.nix index 11b172178f93..71e4ab7b5841 100644 --- a/pkgs/by-name/rt/rt/package.nix +++ b/pkgs/by-name/rt/rt/package.nix @@ -11,13 +11,13 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rt"; version = "5.0.8"; src = fetchFromGitHub { repo = "rt"; - rev = "rt-${version}"; + rev = "rt-${finalAttrs.version}"; owner = "bestpractical"; hash = "sha256-4/iC1PjLgLAp7XWTafe8HW3bTkDWWQxtSEIOs8wluzE="; }; @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { ]; preAutoreconf = '' - echo rt-${version} > .tag + echo rt-${finalAttrs.version} > .tag ''; preConfigure = '' appendToVar configureFlags "--with-web-user=$UID" @@ -178,4 +178,4 @@ stdenv.mkDerivation rec { meta = { platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/rt/rtaudio_5/package.nix b/pkgs/by-name/rt/rtaudio_5/package.nix index dd142e55f2d1..54fdcb5fb57d 100644 --- a/pkgs/by-name/rt/rtaudio_5/package.nix +++ b/pkgs/by-name/rt/rtaudio_5/package.nix @@ -14,7 +14,7 @@ coreaudioSupport ? stdenv.hostPlatform.isDarwin, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtaudio"; version = "5.2.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "thestk"; repo = "rtaudio"; - rev = version; + rev = finalAttrs.version; sha256 = "0xvahlfj3ysgsjsp53q81hayzw7f99n1g214gh7dwdr52kv2l987"; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/rt/rtklib-ex/package.nix b/pkgs/by-name/rt/rtklib-ex/package.nix index f996f266b3ea..4856f21706de 100644 --- a/pkgs/by-name/rt/rtklib-ex/package.nix +++ b/pkgs/by-name/rt/rtklib-ex/package.nix @@ -9,14 +9,14 @@ qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtklib-ex"; version = "2.5.0"; src = fetchFromGitHub { owner = "rtklibexplorer"; repo = "RTKLIB"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-j00VEQvxOiAc3EQX3x2b3RxYkbtvCZ17ugnW6b6ChWU="; }; @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { meta = { description = "Open Source Program Package for GNSS Positioning"; homepage = "https://rtkexplorer.com"; - changelog = "https://github.com/rtklibexplorer/RTKLIB/releases/tag/${src.tag}"; + changelog = "https://github.com/rtklibexplorer/RTKLIB/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.skaphi ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/rt/rtl_433/package.nix b/pkgs/by-name/rt/rtl_433/package.nix index 0f41d4cc03d8..c9020146272d 100644 --- a/pkgs/by-name/rt/rtl_433/package.nix +++ b/pkgs/by-name/rt/rtl_433/package.nix @@ -9,14 +9,14 @@ soapysdr-with-plugins, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "25.12"; pname = "rtl_433"; src = fetchFromGitHub { owner = "merbanan"; repo = "rtl_433"; - rev = version; + rev = finalAttrs.version; hash = "sha256-VDNXLx6OUBQkflKFHp1LP8N5g15o6vYg3P9XWgIoYIg="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "rtl_433"; }; -} +}) diff --git a/pkgs/by-name/rt/rtptools/package.nix b/pkgs/by-name/rt/rtptools/package.nix index 2eb78c0a80bc..60833fd61bd5 100644 --- a/pkgs/by-name/rt/rtptools/package.nix +++ b/pkgs/by-name/rt/rtptools/package.nix @@ -3,11 +3,11 @@ lib, fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtptools"; version = "1.22"; src = fetchurl { - url = "http://www.cs.columbia.edu/irt/software/rtptools/download/rtptools-${version}.tar.gz"; + url = "http://www.cs.columbia.edu/irt/software/rtptools/download/rtptools-${finalAttrs.version}.tar.gz"; sha256 = "0a4c0vmhxibfc58rrxpbav2bsk546chkg50ir4h3i57v4fjb4xic"; }; meta = { @@ -17,4 +17,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.bsd3; }; -} +}) diff --git a/pkgs/by-name/rt/rtrlib/package.nix b/pkgs/by-name/rt/rtrlib/package.nix index 9cdc18e1a38b..2eaed397be80 100644 --- a/pkgs/by-name/rt/rtrlib/package.nix +++ b/pkgs/by-name/rt/rtrlib/package.nix @@ -7,14 +7,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtrlib"; version = "0.8.0"; src = fetchFromGitHub { repo = "rtrlib"; owner = "rtrlib"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ISb4ojcDvXY/88GbFMrA5V5+SGE6CmE5D+pokDTwotQ="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ Anillc ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/rt/rttr/package.nix b/pkgs/by-name/rt/rttr/package.nix index 587802081912..8dee7aa7b6b8 100644 --- a/pkgs/by-name/rt/rttr/package.nix +++ b/pkgs/by-name/rt/rttr/package.nix @@ -6,14 +6,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rttr"; version = "0.9.6"; src = fetchFromGitHub { owner = "rttrorg"; repo = "rttr"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1yxad8sj40wi75hny8w6imrsx8wjasjmsipnlq559n4b6kl84ijp"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ru/rubberband/package.nix b/pkgs/by-name/ru/rubberband/package.nix index d10f562ca04b..28dc12e0a317 100644 --- a/pkgs/by-name/ru/rubberband/package.nix +++ b/pkgs/by-name/ru/rubberband/package.nix @@ -14,12 +14,12 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rubberband"; version = "4.0.0"; src = fetchurl { - url = "https://breakfastquay.com/files/releases/rubberband-${version}.tar.bz2"; + url = "https://breakfastquay.com/files/releases/rubberband-${finalAttrs.version}.tar.bz2"; hash = "sha256-rwUDE+5jvBizWy4GTl3OBbJ2qvbRqiuKgs7R/i+AKOk="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ru/rubiks/package.nix b/pkgs/by-name/ru/rubiks/package.nix index 1ffc36f1ada9..791ad3f494a4 100644 --- a/pkgs/by-name/ru/rubiks/package.nix +++ b/pkgs/by-name/ru/rubiks/package.nix @@ -7,12 +7,12 @@ dos2unix, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rubiks"; version = "20070912"; src = fetchurl { - url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2"; + url = "mirror://sageupstream/rubiks/rubiks-${finalAttrs.version}.tar.bz2"; sha256 = "0zdmkb0j1kyspdpsszzb2k3279xij79jkx0dxd9f3ix1yyyg3yfq"; }; @@ -111,4 +111,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ru/rubyripper/package.nix b/pkgs/by-name/ru/rubyripper/package.nix index 92d7c0e5455b..e1359f5b84be 100644 --- a/pkgs/by-name/ru/rubyripper/package.nix +++ b/pkgs/by-name/ru/rubyripper/package.nix @@ -8,14 +8,14 @@ ruby, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.8.0rc3"; pname = "rubyripper"; src = fetchFromGitHub { owner = "bleskodev"; repo = "rubyripper"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1qfwv8bgc9pyfh3d40bvyr9n7sjc2na61481693wwww640lm0f9f"; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; homepage = "https://github.com/bleskodev/rubyripper"; }; -} +}) diff --git a/pkgs/by-name/ru/rund/package.nix b/pkgs/by-name/ru/rund/package.nix index e56afa8a2d10..d69e2af7b36d 100644 --- a/pkgs/by-name/ru/rund/package.nix +++ b/pkgs/by-name/ru/rund/package.nix @@ -8,14 +8,14 @@ assert dcompiler != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rund"; version = "1.0.0"; src = fetchFromGitHub { owner = "dragon-lang"; repo = "rund"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "10x6f1nn294r5qnpacrpcbp348dndz5fv4nz6ih55c61ckpkvgcf"; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jonathanmarler ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ru/runzip/package.nix b/pkgs/by-name/ru/runzip/package.nix index fecd659c7563..1beae9283ca6 100644 --- a/pkgs/by-name/ru/runzip/package.nix +++ b/pkgs/by-name/ru/runzip/package.nix @@ -7,7 +7,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.4"; pname = "runzip"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "vlm"; repo = "zip-fix-filename-encoding"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0l5zbb5hswxczigvyal877j0aiq3fc01j3gv88bvy7ikyvw3lc07"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "runzip"; }; -} +}) diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index 2303b4838817..e3f2bc16bab9 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2026-01-19"; + version = "2026-01-26"; cargoHash = "sha256-0eVrWPe/S4lwwmgk8T76tAenEfFri9Y8PtRpGJ6b7BQ="; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-sJMJ64vN2LaeMJ8C8daD/rmOzqsrTpwVAaykL/J+BG0="; + hash = "sha256-sPt2PMeN1rhczLfbrOKK1tOx8UmA4KkhpPkokO0YAMc="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/rv/rvvm/package.nix b/pkgs/by-name/rv/rvvm/package.nix index ebc981f56965..4ab1cdbb7cf8 100644 --- a/pkgs/by-name/rv/rvvm/package.nix +++ b/pkgs/by-name/rv/rvvm/package.nix @@ -24,14 +24,14 @@ assert lib.assertMsg ( stdenv.hostPlatform.isDarwin -> !enableX11 ) "macOS supports only SDL GUI backend"; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rvvm"; version = "0.6"; src = fetchFromGitHub { owner = "LekKit"; repo = "RVVM"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-5nSlKyWDAx0EeKFzzwP5+99XuJz9BHXEF1WNkRMLa9U="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ kamillaova ]; mainProgram = "rvvm"; }; -} +}) diff --git a/pkgs/by-name/rw/rw/package.nix b/pkgs/by-name/rw/rw/package.nix index ec36ff41beaf..7ec6ff99a962 100644 --- a/pkgs/by-name/rw/rw/package.nix +++ b/pkgs/by-name/rw/rw/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rw"; version = "1.0"; src = fetchurl { - url = "https://sortix.org/rw/release/rw-portable-${version}.tar.gz"; + url = "https://sortix.org/rw/release/rw-portable-${finalAttrs.version}.tar.gz"; # Use hash provided by upstream sha256 = "50009730e36991dfe579716f91f4f616f5ba05ffb7bf69c03d41bf305ed93b6d"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "rw"; }; -} +}) diff --git a/pkgs/by-name/rw/rwc/package.nix b/pkgs/by-name/rw/rwc/package.nix index 557a6d5d63c9..597885ca7d53 100644 --- a/pkgs/by-name/rw/rwc/package.nix +++ b/pkgs/by-name/rw/rwc/package.nix @@ -4,14 +4,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rwc"; version = "0.3"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = "rwc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-rB20XKprd8jPwvXYdjIEr3/8ygPGCDAgLKbHfw0EgPk="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ somasis ]; mainProgram = "rwc"; }; -} +}) diff --git a/pkgs/by-name/ry/ryzenadj/package.nix b/pkgs/by-name/ry/ryzenadj/package.nix index 167649c5932d..10966b3f5b29 100644 --- a/pkgs/by-name/ry/ryzenadj/package.nix +++ b/pkgs/by-name/ry/ryzenadj/package.nix @@ -5,14 +5,14 @@ pciutils, cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ryzenadj"; version = "0.17.0"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-28ld8htm3DewTSV3WTG4dFOcX4JAEUMK9rq4AAm1/zY="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ rhendric ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/rz/rzip/package.nix b/pkgs/by-name/rz/rzip/package.nix index f6f65efcb15e..f66dc02292bc 100644 --- a/pkgs/by-name/rz/rzip/package.nix +++ b/pkgs/by-name/rz/rzip/package.nix @@ -7,12 +7,12 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rzip"; version = "2.1"; src = fetchurl { - url = "mirror://samba/rzip/rzip-${version}.tar.gz"; + url = "mirror://samba/rzip/rzip-${finalAttrs.version}.tar.gz"; sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "rzip"; }; -} +}) diff --git a/pkgs/by-name/s-/s-tar/package.nix b/pkgs/by-name/s-/s-tar/package.nix index 13cfb3dbefd1..e48fb7b1cdeb 100644 --- a/pkgs/by-name/s-/s-tar/package.nix +++ b/pkgs/by-name/s-/s-tar/package.nix @@ -4,11 +4,11 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "s-tar"; version = "1.6"; src = fetchurl { - url = "mirror://sourceforge/s-tar/star-${version}.tar.bz2"; + url = "mirror://sourceforge/s-tar/star-${finalAttrs.version}.tar.bz2"; sha256 = "0xpp8gf0ghwdgncdwx17fpadxislwrj48gcm42851hz6p8p6c60v"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.wucke13 ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix index 5843929f3edb..bf2d157eb017 100644 --- a/pkgs/by-name/s2/s2n-tls/package.nix +++ b/pkgs/by-name/s2/s2n-tls/package.nix @@ -7,14 +7,14 @@ nix, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "s2n-tls"; version = "1.5.27"; src = fetchFromGitHub { owner = "aws"; repo = "s2n-tls"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-aJRw1a/XJivNZS3NkZ4U6nC12+wY/aoNv33mbAzNl0k="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/s2/s2png/package.nix b/pkgs/by-name/s2/s2png/package.nix index e3b5c6cad0ef..cb6d617e80ad 100644 --- a/pkgs/by-name/s2/s2png/package.nix +++ b/pkgs/by-name/s2/s2png/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "s2png"; version = "0.7.2"; src = fetchFromGitHub { owner = "dbohdan"; repo = "s2png"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0y3crfm0jqprgxamlly713cka2x1bp6z63p1lw9wh4wc37kpira6"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "s2png"; }; -} +}) diff --git a/pkgs/by-name/s3/s3fs/package.nix b/pkgs/by-name/s3/s3fs/package.nix index db21c9a425dd..90efb7f25982 100644 --- a/pkgs/by-name/s3/s3fs/package.nix +++ b/pkgs/by-name/s3/s3fs/package.nix @@ -10,14 +10,14 @@ fuse, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "s3fs-fuse"; version = "1.95"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-wHszw3S+fuZRwTvJy+FkxQTR2BAvr8H924Wd4/C5heE="; }; @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { meta = { description = "Mount an S3 bucket as filesystem through FUSE"; homepage = "https://github.com/s3fs-fuse/s3fs-fuse"; - changelog = "https://github.com/s3fs-fuse/s3fs-fuse/raw/v${version}/ChangeLog"; + changelog = "https://github.com/s3fs-fuse/s3fs-fuse/raw/v${finalAttrs.version}/ChangeLog"; maintainers = [ ]; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 01b48689760a..b2363341fe81 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.7-unstable-2026-01-22"; + version = "11.7-unstable-2026-01-29"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "583c1eeb8e154b4c87f095a146cfde91b0c7570c"; - hash = "sha256-+rgYv8D4w/xK/UgZzO+YZU1VgaaDR9fXcz0bheygrt0="; + rev = "a678284efb835ff74b5ef31f515f6ee0803c7bdd"; + hash = "sha256-zDzIhbko8FbGUnQSs6H2A9ryu/MOo1GTFLplhPH6QRU="; }; buildInputs = diff --git a/pkgs/by-name/s9/s9fes/package.nix b/pkgs/by-name/s9/s9fes/package.nix index 2c68995682f3..3a2cb857c5c0 100644 --- a/pkgs/by-name/s9/s9fes/package.nix +++ b/pkgs/by-name/s9/s9fes/package.nix @@ -10,12 +10,12 @@ let isCrossCompiling = stdenv.hostPlatform != stdenv.buildPlatform; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "s9fes"; version = "20181205"; src = fetchurl { - url = "https://www.t3x.org/s9fes/s9fes-${version}.tgz"; + url = "https://www.t3x.org/s9fes/s9fes-${finalAttrs.version}.tgz"; sha256 = "sha256-Lp/akaDy3q4FmIE6x0fj9ae/SOD7tdsmzy2xdcCh13o="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sa/sacc/package.nix b/pkgs/by-name/sa/sacc/package.nix index 0ff053d51719..8eeef45a7e82 100644 --- a/pkgs/by-name/sa/sacc/package.nix +++ b/pkgs/by-name/sa/sacc/package.nix @@ -7,12 +7,12 @@ patches ? [ ], # allow users to easily override config.def.h }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sacc"; version = "1.07"; src = fetchurl { - url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tar.gz"; + url = "ftp://bitreich.org/releases/sacc/sacc-${finalAttrs.version}.tar.gz"; hash = "sha256-LdEeZH+JWb7iEEzikAXaxG0N5GMPxjgTId4THLgdU2w="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.sternenseemann ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sa/safecopy/package.nix b/pkgs/by-name/sa/safecopy/package.nix index 530f596a5435..92e1e87f4cc2 100644 --- a/pkgs/by-name/sa/safecopy/package.nix +++ b/pkgs/by-name/sa/safecopy/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "safecopy"; version = "1.7"; src = fetchurl { - url = "mirror://sourceforge/project/safecopy/safecopy/safecopy-${version}/safecopy-${version}.tar.gz"; + url = "mirror://sourceforge/project/safecopy/safecopy/safecopy-${finalAttrs.version}/safecopy-${finalAttrs.version}.tar.gz"; sha256 = "1zf4kk9r8za9pn4hzy1y3j02vrhl1rxfk5adyfq0w0k48xfyvys2"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "safecopy"; }; -} +}) diff --git a/pkgs/by-name/sa/sage/README.md b/pkgs/by-name/sa/sage/README.md index 80e09a0d8616..c510ee29b601 100644 --- a/pkgs/by-name/sa/sage/README.md +++ b/pkgs/by-name/sa/sage/README.md @@ -29,7 +29,7 @@ Then make the needed changes and generate a patch with `git diff`: [user@localhost ~]$ git diff -u > /path/to/nixpkgs/pkgs/by-name/sa/sage/patches/name-of-patch.patch ``` -Now just add the patch to `sage-src.nix` and test your changes. If they fix the problem, submit a PR upstream (refer to sages [Developer's Guide](http://doc.sagemath.org/html/en/developer/index.html) for further details). +Now just add the patch to `sage-src.nix` and test your changes. If they fix the problem, submit a PR upstream (refer to Sage's [Developer's Guide](http://doc.sagemath.org/html/en/developer/index.html) for further details). - pin the package version in `default.nix` and add a note that explains why that is necessary. diff --git a/pkgs/by-name/sa/sagetex/package.nix b/pkgs/by-name/sa/sagetex/package.nix index b593a23efc60..d79c6b0ea40a 100644 --- a/pkgs/by-name/sa/sagetex/package.nix +++ b/pkgs/by-name/sa/sagetex/package.nix @@ -6,14 +6,14 @@ texliveBasic, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sagetex"; version = "3.6.1"; src = fetchFromGitHub { owner = "sagemath"; repo = "sagetex"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-OfhbXHbGI+DaDHqZCOGiSHJPHjGuT7ZqSEjKweloW38="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ alexnortung ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sa/sailsd/package.nix b/pkgs/by-name/sa/sailsd/package.nix index a678cf047390..f8245fb6e6aa 100644 --- a/pkgs/by-name/sa/sailsd/package.nix +++ b/pkgs/by-name/sa/sailsd/package.nix @@ -14,13 +14,13 @@ let sha256 = "06rcxkwgms9sxqr1swnnc4jnvgs0iahm4cksd475yd1bp5p1gq6j"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.3.0"; pname = "sailsd"; src = fetchFromGitHub { owner = "sails-simulator"; repo = "sailsd"; - rev = version; + rev = finalAttrs.version; sha256 = "1s4nlffp683binbdxwwzbsci61kbjylbcr1jf44sv1h1r5d5js05"; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "sailsd"; }; -} +}) diff --git a/pkgs/by-name/sa/saldl/package.nix b/pkgs/by-name/sa/saldl/package.nix index 60454f32a45d..aaf90382b3f8 100644 --- a/pkgs/by-name/sa/saldl/package.nix +++ b/pkgs/by-name/sa/saldl/package.nix @@ -15,14 +15,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "saldl"; version = "41"; src = fetchFromGitHub { owner = "saldl"; repo = "saldl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-PAX2MUyBWWU8kGkaeoCJteidgszh7ipwDJbrLXzVsn0="; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; wafConfigureFlags = [ - "--saldl-version ${version}" + "--saldl-version ${finalAttrs.version}" "--no-werror" ]; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "saldl"; }; -} +}) diff --git a/pkgs/by-name/sa/saldo/package.nix b/pkgs/by-name/sa/saldo/package.nix index d745890b300b..7a862b8c8725 100644 --- a/pkgs/by-name/sa/saldo/package.nix +++ b/pkgs/by-name/sa/saldo/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitLab, python3, - appstream-glib, + appstream, blueprint-compiler, desktop-file-utils, glib, @@ -20,14 +20,14 @@ python3.pkgs.buildPythonApplication rec { pname = "saldo"; - version = "0.8.3"; + version = "0.8.4"; pyproject = false; src = fetchFromGitLab { owner = "tabos"; repo = "saldo"; tag = version; - hash = "sha256-ItdEse9ab5spvxcWn1FTAl7ppfjohRr0CXI4ImiSe+g="; + hash = "sha256-QOhHDbXq+QHq6XV/ejt5+Si1bXRZZxLjsRlWVw7Zsuk="; }; postPatch = '' @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { ''; nativeBuildInputs = [ - appstream-glib # for appstream-util + appstream # for appstreamcli blueprint-compiler desktop-file-utils # for desktop-file-validate glib # for glib-compile-resources @@ -65,6 +65,7 @@ python3.pkgs.buildPythonApplication rec { passthru.updateScript = gitUpdater { }; meta = { + changelog = "https://gitlab.com/tabos/saldo/-/blob/${src.tag}/NEWS"; description = "Banking application for small screens"; homepage = "https://www.tabos.org/projects/saldo/"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/by-name/sa/sam-ba/package.nix b/pkgs/by-name/sa/sam-ba/package.nix index d8f9d9f31937..76be850b494f 100644 --- a/pkgs/by-name/sa/sam-ba/package.nix +++ b/pkgs/by-name/sa/sam-ba/package.nix @@ -9,12 +9,12 @@ autoPatchelfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.5"; pname = "sam-ba"; src = fetchzip { - url = "https://ww1.microchip.com/downloads/en/DeviceDoc/sam-ba_${version}-linux_x86_64.tar.gz"; + url = "https://ww1.microchip.com/downloads/en/DeviceDoc/sam-ba_${finalAttrs.version}-linux_x86_64.tar.gz"; sha256 = "1k0nbgyc98z94nphm2q7s82b274clfnayf4a2kv93l5594rzdbp1"; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/sa/sambamba/package.nix b/pkgs/by-name/sa/sambamba/package.nix index a35f48ac0be9..4645d99b16af 100644 --- a/pkgs/by-name/sa/sambamba/package.nix +++ b/pkgs/by-name/sa/sambamba/package.nix @@ -9,14 +9,14 @@ lz4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sambamba"; version = "1.0.1"; src = fetchFromGitHub { owner = "biod"; repo = "sambamba"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3O9bHGpMuCgdR2Wm7Dv1VUjMT1QTn8K1hdwgjvwhFDw="; fetchSubmodules = true; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm755 bin/sambamba-${version} $out/bin/sambamba + install -Dm755 bin/sambamba-${finalAttrs.version} $out/bin/sambamba runHook postInstall ''; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { license = with lib.licenses; gpl2; platforms = lib.platforms.x86_64; }; -} +}) diff --git a/pkgs/by-name/sa/samblaster/package.nix b/pkgs/by-name/sa/samblaster/package.nix index aa45b3f7a573..4032f76d9e5b 100644 --- a/pkgs/by-name/sa/samblaster/package.nix +++ b/pkgs/by-name/sa/samblaster/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "samblaster"; version = "0.1.26"; src = fetchFromGitHub { owner = "GregoryFaust"; repo = "samblaster"; - rev = "v.${version}"; + rev = "v.${finalAttrs.version}"; sha256 = "0g24fq5hplnfgqkh3xqpg3lgx3wmxwnh9c7m6yw7pbi40lmgl1jv"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/GregoryFaust/samblaster"; platforms = lib.platforms.x86_64; }; -} +}) diff --git a/pkgs/by-name/sa/samplicator/package.nix b/pkgs/by-name/sa/samplicator/package.nix index 92d0c1cd362a..e6915b46bffe 100644 --- a/pkgs/by-name/sa/samplicator/package.nix +++ b/pkgs/by-name/sa/samplicator/package.nix @@ -5,7 +5,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "samplicator"; version = "1.3.8rc1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sleinen"; repo = "samplicator"; - rev = version; + rev = finalAttrs.version; sha256 = "0fv5vldmwd6qrdv2wkk946dk9rn9nrv3c84ldvvqqn1spxfzgirm"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { mainProgram = "samplicate"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sa/samurai/package.nix b/pkgs/by-name/sa/samurai/package.nix index 02a5b537bf57..ba1e533f2918 100644 --- a/pkgs/by-name/sa/samurai/package.nix +++ b/pkgs/by-name/sa/samurai/package.nix @@ -5,14 +5,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "samurai"; version = "1.2"; src = fetchFromGitHub { owner = "michaelforney"; repo = "samurai"; - rev = version; + rev = finalAttrs.version; hash = "sha256-RPY3MFlnSDBZ5LOkdWnMiR/CZIBdqIFo9uLU+SAKPBI="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { mainProgram = "samu"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sa/sane-airscan/package.nix b/pkgs/by-name/sa/sane-airscan/package.nix index 3ec28ebf9d60..717c0f25acfe 100644 --- a/pkgs/by-name/sa/sane-airscan/package.nix +++ b/pkgs/by-name/sa/sane-airscan/package.nix @@ -13,7 +13,7 @@ gnutls, sane-backends, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sane-airscan"; version = "0.99.36"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "alexpevzner"; repo = "sane-airscan"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-vpTUZVD5ONcQeDnjPmQDY9Qf/bmDqZMnxA+I8ALOB7Y="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ zaninime ]; }; -} +}) diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix index b1ebdf489812..861843b659e2 100644 --- a/pkgs/by-name/sa/sanjuuni/package.nix +++ b/pkgs/by-name/sa/sanjuuni/package.nix @@ -11,14 +11,14 @@ callPackage, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sanjuuni"; version = "0.5"; src = fetchFromGitHub { owner = "MCJack123"; repo = "sanjuuni"; - rev = version; + rev = finalAttrs.version; hash = "sha256-wJRPD4OWOTPiyDr9dYseRA7BI942HPfHONVJGTc/+wU="; }; @@ -55,10 +55,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/MCJack123/sanjuuni"; description = "Command-line tool that converts images and videos into a format that can be displayed in ComputerCraft"; - changelog = "https://github.com/MCJack123/sanjuuni/releases/tag/${version}"; + changelog = "https://github.com/MCJack123/sanjuuni/releases/tag/${finalAttrs.version}"; maintainers = [ lib.maintainers.tomodachi94 ]; license = lib.licenses.gpl2Plus; broken = stdenv.hostPlatform.isDarwin; mainProgram = "sanjuuni"; }; -} +}) diff --git a/pkgs/by-name/sa/sanoid/package.nix b/pkgs/by-name/sa/sanoid/package.nix index 005e4beff922..85d0465139ef 100644 --- a/pkgs/by-name/sa/sanoid/package.nix +++ b/pkgs/by-name/sa/sanoid/package.nix @@ -16,14 +16,14 @@ pigz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sanoid"; version = "2.3.0"; src = fetchFromGitHub { owner = "jimsalterjrs"; repo = "sanoid"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-s6MP3x4qSuuiJKq2V2oLAXp6zaMSqKRCs5O9UMSgcvE="; }; @@ -101,4 +101,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sa/sassc/package.nix b/pkgs/by-name/sa/sassc/package.nix index 3a7f86c64c81..42ce1fc188d5 100644 --- a/pkgs/by-name/sa/sassc/package.nix +++ b/pkgs/by-name/sa/sassc/package.nix @@ -6,19 +6,19 @@ libsass, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sassc"; version = "3.6.2"; # also check libsass for updates src = fetchFromGitHub { owner = "sass"; repo = "sassc"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-jcs3+orRqKt9C3c2FTdeaj4H2rBP74lW3HF8CHSm7lQ="; }; postPatch = '' - export SASSC_VERSION=${version} + export SASSC_VERSION=${finalAttrs.version} ''; nativeBuildInputs = [ autoreconfHook ]; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sa/savvycan/package.nix b/pkgs/by-name/sa/savvycan/package.nix index 6af038f35404..7a80a6ca32a8 100644 --- a/pkgs/by-name/sa/savvycan/package.nix +++ b/pkgs/by-name/sa/savvycan/package.nix @@ -5,14 +5,14 @@ qt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "savvycan"; version = "220"; src = fetchFromGitHub { owner = "collin80"; repo = "SavvyCAN"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-Du6Pc0JePdJNwBaWKKjTMWOmKCnk6Azojh8IJ7I+ngY="; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "QT based cross platform canbus tool"; homepage = "https://savvycan.com/"; - changelog = "https://github.com/collin80/SavvyCAN/releases/tag/${version}"; + changelog = "https://github.com/collin80/SavvyCAN/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ simoneruffini ]; platforms = lib.platforms.all; license = lib.licenses.mit; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { it! ''; }; -} +}) diff --git a/pkgs/by-name/sb/sbs/package.nix b/pkgs/by-name/sb/sbs/package.nix index 9fa22dc475b4..6351ad032b61 100644 --- a/pkgs/by-name/sb/sbs/package.nix +++ b/pkgs/by-name/sb/sbs/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sbs"; version = "1.0.0"; src = fetchFromGitHub { owner = "onur-ozkan"; repo = "sbs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Zgu9W/3LwHF/fyaPlxmV/2LdxilO1tU0JY/esLnJVGY="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ onur-ozkan ]; mainProgram = "sbs"; }; -} +}) diff --git a/pkgs/by-name/sb/sbsigntool/package.nix b/pkgs/by-name/sb/sbsigntool/package.nix index 6dcb4fd79b3d..e0b8a4451fd7 100644 --- a/pkgs/by-name/sb/sbsigntool/package.nix +++ b/pkgs/by-name/sb/sbsigntool/package.nix @@ -12,13 +12,13 @@ libbfd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sbsigntool"; version = "0.9.5"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-5DInWgl1gThjjfGOsts1H1s1GbMCkd0gjbmG3gA3Fhg="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { ]; # Broken on i686 license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/sc/sc-im/package.nix b/pkgs/by-name/sc/sc-im/package.nix index 85be1b7cc149..a2cf49714f40 100644 --- a/pkgs/by-name/sc/sc-im/package.nix +++ b/pkgs/by-name/sc/sc-im/package.nix @@ -15,18 +15,18 @@ xlsSupport ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sc-im"; version = "0.8.5"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-V2XwzZwn+plMxQuTCYxbeTaqdud69z77oMDDDi+7Jw0="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; nativeBuildInputs = [ makeWrapper @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { ''; meta = { - changelog = "https://github.com/andmarti1424/sc-im/blob/${src.rev}/CHANGES"; + changelog = "https://github.com/andmarti1424/sc-im/blob/${finalAttrs.src.rev}/CHANGES"; homepage = "https://github.com/andmarti1424/sc-im"; description = "Ncurses spreadsheet program for terminal"; license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sc/scd2html/package.nix b/pkgs/by-name/sc/scd2html/package.nix index a1da25c536b2..b49b56396ad1 100644 --- a/pkgs/by-name/sc/scd2html/package.nix +++ b/pkgs/by-name/sc/scd2html/package.nix @@ -5,14 +5,14 @@ scdoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scd2html"; version = "1.0.0"; src = fetchFromSourcehut { owner = "~bitfehler"; repo = "scd2html"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-oZSHv5n/WOrvy77tC94Z8pYugLpHkcv7U1PrzR+8fHM="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "scd2html"; }; -} +}) diff --git a/pkgs/by-name/sc/scheme-bytestructures/package.nix b/pkgs/by-name/sc/scheme-bytestructures/package.nix index 3edcbdb45186..554884eba061 100644 --- a/pkgs/by-name/sc/scheme-bytestructures/package.nix +++ b/pkgs/by-name/sc/scheme-bytestructures/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scheme-bytestructures"; version = "2.0.2"; src = fetchFromGitHub { owner = "TaylanUB"; repo = "scheme-bytestructures"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-7FK1dXD1Qz6fFYjNUtHMaDGaezHLVaDvdgOboNNw0Lc="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ethancedwards8 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sc/scheme48/package.nix b/pkgs/by-name/sc/scheme48/package.nix index e220d3bc0f50..8eb8d4bc0376 100644 --- a/pkgs/by-name/sc/scheme48/package.nix +++ b/pkgs/by-name/sc/scheme48/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scheme48"; version = "1.9.3"; src = fetchurl { - url = "https://s48.org/${version}/scheme48-${version}.tgz"; + url = "https://s48.org/${finalAttrs.version}/scheme48-${finalAttrs.version}.tgz"; sha256 = "bvWp8/yhQRCw+DG0WAHRH5vftnmdl2qhLk+ICdrzkEw="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.siraben ]; }; -} +}) diff --git a/pkgs/by-name/sc/schemes/package.nix b/pkgs/by-name/sc/schemes/package.nix index ef9ed41bf55f..4a48a06e69cd 100644 --- a/pkgs/by-name/sc/schemes/package.nix +++ b/pkgs/by-name/sc/schemes/package.nix @@ -15,7 +15,7 @@ wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "schemes"; version = "46.0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "schemes"; - rev = version; + rev = finalAttrs.version; hash = "sha256-m82jR958f1g/4gSJ4NbNa4fwxVseH399Z8JpWr7tLh8="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ _0xMRTT ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sc/schismtracker/package.nix b/pkgs/by-name/sc/schismtracker/package.nix index 20aebff2afff..7d41e00cb0ac 100644 --- a/pkgs/by-name/sc/schismtracker/package.nix +++ b/pkgs/by-name/sc/schismtracker/package.nix @@ -13,14 +13,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "schismtracker"; version = "20251014"; src = fetchFromGitHub { owner = "schismtracker"; repo = "schismtracker"; - tag = version; + tag = finalAttrs.version; hash = "sha256-N1wCOR7Su3PllzrffkwB6LfhZlol1/4dVegySzJlH28="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # in this assert: https://github.com/schismtracker/schismtracker/blob/a106b57e0f809b95d9e8bcf5a3975d27e0681b5a/schism/version.c#L112 postPatch = '' substituteInPlace configure.ac \ - --replace-fail 'git log' 'echo ${version} #' + --replace-fail 'git log' 'echo ${finalAttrs.version} #' ''; configureFlags = [ @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ftrvxmtrx ]; mainProgram = "schismtracker"; }; -} +}) diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix index e5a9dbc3edd2..82aa2fdeca4f 100644 --- a/pkgs/by-name/sc/scipopt-papilo/package.nix +++ b/pkgs/by-name/sc/scipopt-papilo/package.nix @@ -10,14 +10,14 @@ gfortran, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scipopt-papilo"; version = "3.0.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "papilo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oxuXv/xWQiApxrrVdH3aEUOp40Em6kCz/DJXXpCxdzs="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/scipopt/papilo"; mainProgram = "papilo"; }; -} +}) diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix index 94380ed902da..1f3413e0f8fa 100644 --- a/pkgs/by-name/sc/scipopt-scip/package.nix +++ b/pkgs/by-name/sc/scipopt-scip/package.nix @@ -18,14 +18,14 @@ enableZimpl ? (!stdenv.hostPlatform.isDarwin), }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scipopt-scip"; version = "10.0.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "scip"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KW7N2ORspzkaR/gdU//p38BV4GyuhoSIVb6q9RTrCYQ="; }; @@ -53,10 +53,10 @@ stdenv.mkDerivation rec { meta = { maintainers = with lib.maintainers; [ fettgoenner ]; - changelog = "https://scipopt.org/doc-${version}/html/RN${lib.versions.major version}.php"; + changelog = "https://scipopt.org/doc-${finalAttrs.version}/html/RN${lib.versions.major finalAttrs.version}.php"; description = "Solving Constraint Integer Programs"; license = lib.licenses.asl20; homepage = "https://github.com/scipopt/scip"; mainProgram = "scip"; }; -} +}) diff --git a/pkgs/by-name/sc/scipopt-zimpl/package.nix b/pkgs/by-name/sc/scipopt-zimpl/package.nix index 0158254fded4..cb9d82e4466b 100644 --- a/pkgs/by-name/sc/scipopt-zimpl/package.nix +++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix @@ -9,14 +9,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scipopt-zimpl"; version = "3.7.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "zimpl"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ataepqBfdA7CgqPhbw+Xy7PC3VZTLcSrF2/xnFyx+YI="; }; @@ -71,4 +71,4 @@ stdenv.mkDerivation rec { homepage = "https://zimpl.zib.de"; mainProgram = "zimpl"; }; -} +}) diff --git a/pkgs/by-name/sc/scorched3d/package.nix b/pkgs/by-name/sc/scorched3d/package.nix index 2d838bbbb789..0df07831a439 100644 --- a/pkgs/by-name/sc/scorched3d/package.nix +++ b/pkgs/by-name/sc/scorched3d/package.nix @@ -20,11 +20,11 @@ libpng, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "44"; pname = "scorched3d"; src = fetchurl { - url = "mirror://sourceforge/scorched3d/Scorched3D-${version}-src.tar.gz"; + url = "mirror://sourceforge/scorched3d/Scorched3D-${finalAttrs.version}-src.tar.gz"; sha256 = "1fldi9pn7cz6hc9h70pacgb7sbykzcac44yp3pkhn0qh4axj10qw"; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; # maybe more maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/sc/scowl/package.nix b/pkgs/by-name/sc/scowl/package.nix index cc129a42c888..6b998c40f7cc 100644 --- a/pkgs/by-name/sc/scowl/package.nix +++ b/pkgs/by-name/sc/scowl/package.nix @@ -11,14 +11,14 @@ singleWordlist ? null, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scowl"; version = "2020.12.07"; src = fetchFromGitHub { owner = "en-wl"; repo = "wordlist"; - rev = "rel-${version}"; + rev = "rel-${finalAttrs.version}"; sha256 = "sha256-J61jhpnZcXMnoGlSuSCrKDZnnyp3Snjr+fUpTVKX64g="; }; @@ -127,4 +127,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; homepage = "http://wordlist.aspell.net/"; }; -} +}) diff --git a/pkgs/by-name/sc/scream/package.nix b/pkgs/by-name/sc/scream/package.nix index 0ee05bc91698..f65485c7f68c 100644 --- a/pkgs/by-name/sc/scream/package.nix +++ b/pkgs/by-name/sc/scream/package.nix @@ -16,14 +16,14 @@ libpcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scream"; version = "4.0"; src = fetchFromGitHub { owner = "duncanthrax"; repo = "scream"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-lP5mdNhZjkEVjgQUEsisPy+KXUqsE6xj6dFWcgD+VGM="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { mainProgram = "scream"; maintainers = with lib.maintainers; [ arcnmx ]; }; -} +}) diff --git a/pkgs/by-name/sc/screen-message/package.nix b/pkgs/by-name/sc/screen-message/package.nix index 2d5eb30aecae..9599ab7d5381 100644 --- a/pkgs/by-name/sc/screen-message/package.nix +++ b/pkgs/by-name/sc/screen-message/package.nix @@ -7,14 +7,14 @@ gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "screen-message"; version = "0.29"; src = fetchFromGitHub { owner = "nomeata"; repo = "screen-message"; - rev = version; + rev = finalAttrs.version; hash = "sha256-fwKle+aXZuiNo5ksrigj7BGLv2fUILN2GluHHZ6co6s="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { mainProgram = "sm"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sc/screen/package.nix b/pkgs/by-name/sc/screen/package.nix index adb4ec1ec482..8d77c5e6eac8 100644 --- a/pkgs/by-name/sc/screen/package.nix +++ b/pkgs/by-name/sc/screen/package.nix @@ -4,17 +4,18 @@ fetchurl, fetchpatch, autoreconfHook, + texinfo, ncurses, libxcrypt, pam ? null, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "screen"; version = "5.0.1"; src = fetchurl { - url = "mirror://gnu/screen/screen-${version}.tar.gz"; + url = "mirror://gnu/screen/screen-${finalAttrs.version}.tar.gz"; hash = "sha256-La429Ns3n/zRS2kVlrpuwYrDqeIrxHrCOXiatYQJhp0="; }; @@ -24,6 +25,25 @@ stdenv.mkDerivation rec { stripLen = 1; hash = "sha256-q3jQQrzweLf2T/V5X9iL4ZZK342QEXLG5fZTaMOB4tY="; }) + # Following 3 commits fix screen.info file issues + (fetchpatch { + name = "screen.info-1st.patch"; + url = "https://cgit.git.savannah.gnu.org/cgit/screen.git/patch/?id=7333452aa52d61a170b1fc199869ea6059849058"; + stripLen = 1; + hash = "sha256-fYkljMNefDJtf+uA9qPotQEOxwhlQj0nZfTszhl/oik="; + }) + (fetchpatch { + name = "screen.info-2nd.patch"; + url = "https://cgit.git.savannah.gnu.org/cgit/screen.git/patch/?id=6790fb8e1931783646c07a364657fadb5c9d1e63"; + stripLen = 1; + hash = "sha256-+fRPfCbJKYUW/ZE6C63xB2WEtTv6KPi8waXLt9N+AuU="; + }) + (fetchpatch { + name = "screen.info-3rd.patch"; + url = "https://cgit.git.savannah.gnu.org/cgit/screen.git/patch/?id=94c3e1fd81826ce3b677d49f7a452e6fe77ed63b"; + stripLen = 1; + hash = "sha256-Wq4Bx5wCqsOWtrfUON5wTuhpBH8JxyoOiHHfDT2CsHw="; + }) ]; configureFlags = [ @@ -36,6 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook + texinfo ]; buildInputs = [ ncurses @@ -43,6 +64,12 @@ stdenv.mkDerivation rec { pam ]; + outputs = [ + "out" + "info" + "man" + ]; + meta = { homepage = "https://www.gnu.org/software/screen/"; description = "Window manager that multiplexes a physical terminal"; @@ -73,4 +100,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/sc/screenfetch/package.nix b/pkgs/by-name/sc/screenfetch/package.nix index 8aaef982dcfb..323f4cd0cbf1 100644 --- a/pkgs/by-name/sc/screenfetch/package.nix +++ b/pkgs/by-name/sc/screenfetch/package.nix @@ -46,14 +46,14 @@ let ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "screenfetch"; version = "3.9.9"; src = fetchFromGitHub { owner = "KittyKatt"; repo = "screenFetch"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-UNZMCLXhH4wDV0/fGWsB+KAi6aJVuPs6zpWXIQAqnjo="; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "screenfetch"; }; -} +}) diff --git a/pkgs/by-name/sc/scriptaculous/package.nix b/pkgs/by-name/sc/scriptaculous/package.nix index 1ce5cebff52a..1d7d13497e29 100644 --- a/pkgs/by-name/sc/scriptaculous/package.nix +++ b/pkgs/by-name/sc/scriptaculous/package.nix @@ -5,12 +5,12 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scriptaculous"; version = "1.9.0"; src = fetchurl { - url = "https://script.aculo.us/dist/scriptaculous-js-${version}.zip"; + url = "https://script.aculo.us/dist/scriptaculous-js-${finalAttrs.version}.zip"; sha256 = "1xpnk3cq8n07lxd69k5jxh48s21zh41ihq10z4a6lcnk238rp8qz"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ das_j ]; }; -} +}) diff --git a/pkgs/by-name/sc/scrot/package.nix b/pkgs/by-name/sc/scrot/package.nix index 16421fcc8a52..581caa05678a 100644 --- a/pkgs/by-name/sc/scrot/package.nix +++ b/pkgs/by-name/sc/scrot/package.nix @@ -14,14 +14,14 @@ libbsd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scrot"; version = "1.12.1"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = "scrot"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ExZH+bjpEvdbSYM8OhV+cyn4j+0YrHp5/b+HsHKAHCA="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; license = lib.licenses.mitAdvertising; }; -} +}) diff --git a/pkgs/by-name/sc/scrub/package.nix b/pkgs/by-name/sc/scrub/package.nix index 7f5223a31672..24c9341999bc 100644 --- a/pkgs/by-name/sc/scrub/package.nix +++ b/pkgs/by-name/sc/scrub/package.nix @@ -7,14 +7,14 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scrub"; version = "2.6.1"; src = fetchFromGitHub { owner = "chaos"; repo = "scrub"; - rev = version; + rev = finalAttrs.version; sha256 = "0ndcri2ddzqlsxvy1b607ajyd4dxpiagzx331yyi7hf3ijph129f"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "scrub"; }; -} +}) diff --git a/pkgs/by-name/sd/sdate/package.nix b/pkgs/by-name/sd/sdate/package.nix index 1cac34651800..068d3bacb1bf 100644 --- a/pkgs/by-name/sd/sdate/package.nix +++ b/pkgs/by-name/sd/sdate/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sdate"; version = "0.7"; src = fetchFromGitHub { owner = "ChristophBerg"; repo = "sdate"; - rev = version; + rev = finalAttrs.version; hash = "sha256-jkwe+bSBa0p1Xzfetsdpw0RYw/gSRxnY2jBOzC5HtJ8="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "sdate"; }; -} +}) diff --git a/pkgs/by-name/sd/sdcv/package.nix b/pkgs/by-name/sd/sdcv/package.nix index 9f4781dfbbca..5fc3ce0d999d 100644 --- a/pkgs/by-name/sd/sdcv/package.nix +++ b/pkgs/by-name/sd/sdcv/package.nix @@ -9,14 +9,14 @@ readline, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sdcv"; version = "0.5.5"; src = fetchFromGitHub { owner = "Dushistov"; repo = "sdcv"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-EyvljVXhOsdxIYOGTzD+T16nvW7/RNx3DuQ2OdhjXJ4="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "sdcv"; }; -} +}) diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index c6ea00e34271..1ea626fb90d9 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2026-01-19"; + version = "0-unstable-2026-01-28"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "07a5c6b80262a208200573186eb5d5ac2518e89d"; - hash = "sha256-Lz55pKQ5vT3kAAziOKzT5q8GCVHO/GOZ8fOC8BHoMJA="; + rev = "fc25a0299e8dcb7a8fc072864297c71f71d6f3d7"; + hash = "sha256-lR/SBVLjb9KvXogd46hSEuKY5Z0NmhDdnLwhf1IWhQ0="; }; dontBuild = true; diff --git a/pkgs/by-name/sd/sdlpop/package.nix b/pkgs/by-name/sd/sdlpop/package.nix index 6a82b4ad16ab..070405981d03 100644 --- a/pkgs/by-name/sd/sdlpop/package.nix +++ b/pkgs/by-name/sd/sdlpop/package.nix @@ -10,14 +10,14 @@ SDL2_image, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sdlpop"; version = "1.23"; src = fetchFromGitHub { owner = "NagyD"; repo = "SDLPoP"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-UI7NfOC/+druRYL5g2AhIjTPEq4ta1qEThcxgyrFjHY="; }; @@ -82,10 +82,10 @@ stdenv.mkDerivation rec { meta = { description = "Open-source port of Prince of Persia"; homepage = "https://github.com/NagyD/SDLPoP"; - changelog = "https://github.com/NagyD/SDLPoP/blob/v${version}/doc/ChangeLog.txt"; + changelog = "https://github.com/NagyD/SDLPoP/blob/v${finalAttrs.version}/doc/ChangeLog.txt"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ iblech ]; platforms = lib.platforms.unix; mainProgram = "prince"; }; -} +}) diff --git a/pkgs/by-name/se/seafile-client/package.nix b/pkgs/by-name/se/seafile-client/package.nix index da54eda7264a..07a6bf03666e 100644 --- a/pkgs/by-name/se/seafile-client/package.nix +++ b/pkgs/by-name/se/seafile-client/package.nix @@ -13,14 +13,14 @@ withShibboleth ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "seafile-client"; version = "9.0.15"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BV1+9/+ryZB1BQyRJ5JaIU6bbOi4h8vt+V+FQIfUJp8="; }; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/haiwen/seafile-client"; - changelog = "https://github.com/haiwen/seafile-client/releases/tag/${src.tag}"; + changelog = "https://github.com/haiwen/seafile-client/releases/tag/${finalAttrs.src.tag}"; description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = lib.licenses.asl20; platforms = lib.platforms.linux; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "seafile-applet"; }; -} +}) diff --git a/pkgs/by-name/se/seafile-shared/package.nix b/pkgs/by-name/se/seafile-shared/package.nix index 16c3bfe5ef42..64b3ccfe34f4 100644 --- a/pkgs/by-name/se/seafile-shared/package.nix +++ b/pkgs/by-name/se/seafile-shared/package.nix @@ -15,14 +15,14 @@ libwebsockets, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "seafile-shared"; version = "9.0.15"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-mWIOk8O3vlg7Sm/5ZQUB5nOgi8/pEczCGQ94p0km/GI="; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { schmittlauch ]; }; -} +}) diff --git a/pkgs/by-name/se/seahorse/package.nix b/pkgs/by-name/se/seahorse/package.nix index 2fc83e64a54a..ae0ee5bcd2a0 100644 --- a/pkgs/by-name/se/seahorse/package.nix +++ b/pkgs/by-name/se/seahorse/package.nix @@ -29,12 +29,12 @@ libhandy, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "seahorse"; version = "47.0.1"; src = fetchurl { - url = "mirror://gnome/sources/seahorse/${lib.versions.major version}/seahorse-${version}.tar.xz"; + url = "mirror://gnome/sources/seahorse/${lib.versions.major finalAttrs.version}/seahorse-${finalAttrs.version}.tar.xz"; hash = "sha256-nBkX5KYff+u3h4Sc42znF/znBsNGiAuZHQVtVNrbysw="; }; @@ -124,4 +124,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/se/seamly2d/package.nix b/pkgs/by-name/se/seamly2d/package.nix index bbfc260e16d6..1084c0b480b5 100644 --- a/pkgs/by-name/se/seamly2d/package.nix +++ b/pkgs/by-name/se/seamly2d/package.nix @@ -18,14 +18,14 @@ let qtPython = python3.withPackages (pkgs: with pkgs; [ pyqt5 ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "seamly2d"; version = "2025.8.4.217"; src = fetchFromGitHub { owner = "FashionFreedom"; repo = "Seamly2D"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PaGYpGZJGXPXJdfkS0siXGKxhSSdGCzDxAYdGv/lPvA="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ WhittlesJr ]; }; -} +}) diff --git a/pkgs/by-name/se/seasocks/package.nix b/pkgs/by-name/se/seasocks/package.nix index 6dd9101aff56..a4a9f034f4df 100644 --- a/pkgs/by-name/se/seasocks/package.nix +++ b/pkgs/by-name/se/seasocks/package.nix @@ -8,14 +8,14 @@ catch2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "seasocks"; version = "1.4.6"; src = fetchFromGitHub { owner = "mattgodbolt"; repo = "seasocks"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-R1McxZm2qsUoggFGfL587g+8eQf7si56xVkR8B8nehQ="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ fredeb ]; }; -} +}) diff --git a/pkgs/by-name/se/seaview/package.nix b/pkgs/by-name/se/seaview/package.nix index c940c7555f12..3a53a9e2d3f9 100644 --- a/pkgs/by-name/se/seaview/package.nix +++ b/pkgs/by-name/se/seaview/package.nix @@ -7,12 +7,12 @@ libjpeg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "5.1"; pname = "seaview"; src = fetchurl { - url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz"; + url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${finalAttrs.version}.tar.gz"; sha256 = "sha256-tL9YQB4wgUOCyCWxOkw+6oyinDFO1cSh9DRZt47W+Ys="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.iimog ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/se/sec/package.nix b/pkgs/by-name/se/sec/package.nix index 96c9192eacf6..08295da107c5 100644 --- a/pkgs/by-name/se/sec/package.nix +++ b/pkgs/by-name/se/sec/package.nix @@ -5,14 +5,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sec"; version = "2.9.3"; src = fetchFromGitHub { owner = "simple-evcorr"; repo = "sec"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-iK2v/qCWw4jdSEpx6cwSB98n5iFmbCyJH0lIpUG8pAU="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "sec"; }; -} +}) diff --git a/pkgs/by-name/se/secp256k1/package.nix b/pkgs/by-name/se/secp256k1/package.nix index 9f8b070b1e8d..657882187b53 100644 --- a/pkgs/by-name/se/secp256k1/package.nix +++ b/pkgs/by-name/se/secp256k1/package.nix @@ -5,7 +5,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "secp256k1"; version = "0.6.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-pCSNUSrPyN/lLYZm7zK/b9LICkThXOr6JAyFvHZSPW0="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; all; }; -} +}) diff --git a/pkgs/by-name/se/sedutil/package.nix b/pkgs/by-name/se/sedutil/package.nix index 99e0f70c9022..c348c7dad06a 100644 --- a/pkgs/by-name/se/sedutil/package.nix +++ b/pkgs/by-name/se/sedutil/package.nix @@ -7,14 +7,14 @@ libnvme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sedutil"; version = "1.49.13"; src = fetchFromGitHub { owner = "Drive-Trust-Alliance"; repo = "sedutil"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bSeTbpeecufXNZKNb5A0gWYF3qkBc2fSmNTZxkDW+Vc="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "sedutil-cli"; }; -} +}) diff --git a/pkgs/by-name/se/semver-tool/package.nix b/pkgs/by-name/se/semver-tool/package.nix index 650f23b14638..6b8fef22e845 100644 --- a/pkgs/by-name/se/semver-tool/package.nix +++ b/pkgs/by-name/se/semver-tool/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "semver-tool"; version = "3.4.0"; src = fetchFromGitHub { owner = "fsaintjacques"; repo = "semver-tool"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-BnHuiCxE0VjzMWFTEMunQ9mkebQKIKbbMxZVfBUO57Y="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.qyliss ]; mainProgram = "semver"; }; -} +}) diff --git a/pkgs/by-name/se/sensible-utils/package.nix b/pkgs/by-name/se/sensible-utils/package.nix index 151c401c0517..9315369fb4f9 100644 --- a/pkgs/by-name/se/sensible-utils/package.nix +++ b/pkgs/by-name/se/sensible-utils/package.nix @@ -5,7 +5,7 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sensible-utils"; version = "0.0.26"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "debian"; repo = "sensible-utils"; - rev = "debian/${version}"; + rev = "debian/${finalAttrs.version}"; sha256 = "sha256-vxzCICkF3KDBe+IIZ63JMiZmfHOllHf1Xtw/vWaimc8="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pbek ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/se/sent/package.nix b/pkgs/by-name/se/sent/package.nix index 1c061378a1db..ff3126ed55e9 100644 --- a/pkgs/by-name/se/sent/package.nix +++ b/pkgs/by-name/se/sent/package.nix @@ -9,12 +9,12 @@ patches ? [ ], }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sent"; version = "1"; src = fetchurl { - url = "https://dl.suckless.org/tools/sent-${version}.tar.gz"; + url = "https://dl.suckless.org/tools/sent-${finalAttrs.version}.tar.gz"; sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/se/sentencepiece/package.nix b/pkgs/by-name/se/sentencepiece/package.nix index b6fbb72b18ee..ee962005ea80 100644 --- a/pkgs/by-name/se/sentencepiece/package.nix +++ b/pkgs/by-name/se/sentencepiece/package.nix @@ -8,14 +8,14 @@ withGPerfTools ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sentencepiece"; version = "0.2.1"; src = fetchFromGitHub { owner = "google"; repo = "sentencepiece"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-q0JgMxoD9PLqr6zKmOdrK2A+9RXVDub6xy7NOapS+vs="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ pashashocky ]; }; -} +}) diff --git a/pkgs/by-name/se/sequeler/package.nix b/pkgs/by-name/se/sequeler/package.nix index 52b5d2a656c5..dcc580a8720c 100644 --- a/pkgs/by-name/se/sequeler/package.nix +++ b/pkgs/by-name/se/sequeler/package.nix @@ -28,14 +28,14 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sequeler"; version = "0.9.0"; src = fetchFromGitHub { owner = "ellie-commons"; repo = "sequeler"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dFmR5SfzT/1UVwcnB3Y3kB1h0DapwN/2/KQAHiMpk/8="; }; @@ -83,4 +83,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "io.github.ellie_commons.sequeler"; }; -} +}) diff --git a/pkgs/by-name/se/ser2net/package.nix b/pkgs/by-name/se/ser2net/package.nix index b81e92f5bc95..03ea731c0db4 100644 --- a/pkgs/by-name/se/ser2net/package.nix +++ b/pkgs/by-name/se/ser2net/package.nix @@ -9,14 +9,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ser2net"; version = "4.6.6"; src = fetchFromGitHub { owner = "cminyard"; repo = "ser2net"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-TL6btl8Q8hpIBfzHdJ+TLdF+r9zQRLytzVx810R7yYI="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "ser2net"; }; -} +}) diff --git a/pkgs/by-name/se/serialdv/package.nix b/pkgs/by-name/se/serialdv/package.nix index d146f8c68ff6..5ceba2aa2830 100644 --- a/pkgs/by-name/se/serialdv/package.nix +++ b/pkgs/by-name/se/serialdv/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "serialdv"; version = "1.1.5"; src = fetchFromGitHub { owner = "f4exb"; repo = "serialdv"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-uswddoIpTXqsvjM2/ygdud9jZHTemLn9Dlv9FBXXKow="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ alkeryn ]; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/se/setroot/package.nix b/pkgs/by-name/se/setroot/package.nix index f88b53bbce2d..f259291d4346 100644 --- a/pkgs/by-name/se/setroot/package.nix +++ b/pkgs/by-name/se/setroot/package.nix @@ -10,14 +10,14 @@ libXinerama, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.0.2"; pname = "setroot"; src = fetchFromGitHub { owner = "ttzhou"; repo = "setroot"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0w95828v0splk7bj5kfacp4pq6wxpyamvyjmahyvn5hc3ycq21mq"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "setroot"; }; -} +}) diff --git a/pkgs/by-name/se/seturgent/package.nix b/pkgs/by-name/se/seturgent/package.nix index bd335a5d64dc..a5fab4bf1366 100644 --- a/pkgs/by-name/se/seturgent/package.nix +++ b/pkgs/by-name/se/seturgent/package.nix @@ -6,13 +6,13 @@ xorgproto, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "seturgent"; version = "1.5"; src = fetchgit { url = "git://git.codemadness.org/seturgent"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-XW7ms0BVCf1/fuL3PJ970t6sHkmMY1iLYXfS9R60JX0="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { homepage = "https://codemadness.org/seturgent-set-urgency-hints-for-x-applications.html"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/se/seyren/package.nix b/pkgs/by-name/se/seyren/package.nix index 4ecb0925b1af..d36bf1469e4a 100644 --- a/pkgs/by-name/se/seyren/package.nix +++ b/pkgs/by-name/se/seyren/package.nix @@ -6,12 +6,12 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "seyren"; version = "1.5.0"; src = fetchurl { - url = "https://github.com/scobal/seyren/releases/download/${version}/seyren-${version}.jar"; + url = "https://github.com/scobal/seyren/releases/download/${finalAttrs.version}/seyren-${finalAttrs.version}.jar"; sha256 = "1fixij04n8hgmaj8kw8i6vclwyd6n94x0n6ify73ynm6dfv8g37x"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.offline ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sf/sfrotz/package.nix b/pkgs/by-name/sf/sfrotz/package.nix index f4d234e2b767..65f2359513ec 100644 --- a/pkgs/by-name/sf/sfrotz/package.nix +++ b/pkgs/by-name/sf/sfrotz/package.nix @@ -16,7 +16,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sfrotz"; version = "2.54"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { domain = "gitlab.com"; owner = "DavidGriffith"; repo = "frotz"; - rev = version; + rev = finalAttrs.version; hash = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8="; }; @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { from individual files. ''; homepage = "https://davidgriffith.gitlab.io/frotz/"; - changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS"; + changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${finalAttrs.version}/NEWS"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ddelabru ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sf/sfsexp/package.nix b/pkgs/by-name/sf/sfsexp/package.nix index 3891ef3f0bec..8674fc096e46 100644 --- a/pkgs/by-name/sf/sfsexp/package.nix +++ b/pkgs/by-name/sf/sfsexp/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sfsexp"; version = "1.4.1"; src = fetchFromGitHub { owner = "mjsottile"; repo = "sfsexp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-uAk/8Emf23J0D3D5+eUEpWLY2fIvdQ7a80eGe9i1WQ8="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sg/sgdboop/package.nix b/pkgs/by-name/sg/sgdboop/package.nix index d967136b8041..bdec0922001c 100644 --- a/pkgs/by-name/sg/sgdboop/package.nix +++ b/pkgs/by-name/sg/sgdboop/package.nix @@ -6,14 +6,14 @@ pkg-config, wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sgdboop"; version = "1.3.1"; src = fetchFromGitHub { owner = "SteamGridDB"; repo = "SGDBoop"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FpVQQo2N/qV+cFhYZ1FVm+xlPHSVMH4L+irnQEMlUQs="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { mainProgram = "SGDBoop"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix index 136bb5bc3474..3be23a08d598 100644 --- a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix +++ b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix @@ -34,14 +34,14 @@ let }) ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "azure-dcap-client"; version = "1.12.3"; src = fetchFromGitHub { owner = "microsoft"; repo = "azure-dcap-client"; - rev = version; + rev = finalAttrs.version; hash = "sha256-zTDaICsSPXctgFRCZBiZwXV9dLk2pFL9kp5a8FkiTZA="; }; @@ -95,4 +95,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; license = [ lib.licenses.mit ]; }; -} +}) diff --git a/pkgs/by-name/sh/sha1collisiondetection/package.nix b/pkgs/by-name/sh/sha1collisiondetection/package.nix index a07ec16e491a..907f662b3666 100644 --- a/pkgs/by-name/sh/sha1collisiondetection/package.nix +++ b/pkgs/by-name/sh/sha1collisiondetection/package.nix @@ -6,14 +6,14 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sha1collisiondetection"; version = "1.0.3"; src = fetchFromGitHub { owner = "cr-marcstevens"; repo = "sha1collisiondetection"; - rev = "stable-v${version}"; + rev = "stable-v${finalAttrs.version}"; sha256 = "0xn31hkkqs0kj9203rzx6w4nr0lq8fnrlm5i76g0px3q4v2dzw1s"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; mainProgram = "sha1dcsum"; }; -} +}) diff --git a/pkgs/by-name/sh/shaarli/package.nix b/pkgs/by-name/sh/shaarli/package.nix index 44a7c63d0983..6389a3c4597b 100644 --- a/pkgs/by-name/sh/shaarli/package.nix +++ b/pkgs/by-name/sh/shaarli/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shaarli"; version = "0.16.0"; src = fetchurl { - url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; + url = "https://github.com/shaarli/Shaarli/releases/download/v${finalAttrs.version}/shaarli-v${finalAttrs.version}-full.tar.gz"; sha256 = "sha256-e/iZ+SPMt6HphEbLY2hM7pnvXHxsCOYZoXyGpA5FMtg="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sh/shadcn/package.nix b/pkgs/by-name/sh/shadcn/package.nix index 915dc71f8e0b..dd8f3cda6e82 100644 --- a/pkgs/by-name/sh/shadcn/package.nix +++ b/pkgs/by-name/sh/shadcn/package.nix @@ -12,13 +12,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "shadcn"; - version = "2.0.3"; + version = "3.7.0"; src = fetchFromGitHub { owner = "shadcn-ui"; repo = "ui"; rev = "shadcn@${finalAttrs.version}"; - hash = "sha256-OBLKCj+v5KgYslJGuwLgJHjgcrxLPiiyO5/ucrJ14Ws="; + hash = "sha256-9dlSAEkl6NgZGT2noVEfstt8TbIy0Fz+/s5L+MWpblg="; }; pnpmWorkspaces = [ "shadcn" ]; @@ -30,8 +30,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmWorkspaces ; pnpm = pnpm_9; - fetcherVersion = 1; - hash = "sha256-/80LJm65ZRqyfhsNqGl83bsI2wjgVkvrA6Ij4v8rtoQ="; + fetcherVersion = 2; + hash = "sha256-clTcaTar7m2jEX9cMPtSPeBtt17LaMzlwlLXhPKc+kk="; }; nativeBuildInputs = [ @@ -56,7 +56,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp -r {packages,node_modules} $out/lib # cleanup - rm -r $out/lib/packages/{cli,shadcn/src} find $out/lib/packages/shadcn -name '*.ts' -delete makeWrapper ${lib.getExe nodejs} $out/bin/shadcn \ diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix index bba887da5c71..7e4ef2aec05a 100644 --- a/pkgs/by-name/sh/shairport-sync/package.nix +++ b/pkgs/by-name/sh/shairport-sync/package.nix @@ -51,14 +51,14 @@ let inherit (lib) optional optionals; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shairport-sync"; version = "4.3.7"; src = fetchFromGitHub { repo = "shairport-sync"; owner = "mikebrady"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bfOgUeUCxQeCmKKBlvIXptM5lJxgZiH4lOhLJSNih8g="; }; @@ -149,4 +149,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sh/shared-mime-info/package.nix b/pkgs/by-name/sh/shared-mime-info/package.nix index 396742594ec9..51521a613d37 100644 --- a/pkgs/by-name/sh/shared-mime-info/package.nix +++ b/pkgs/by-name/sh/shared-mime-info/package.nix @@ -11,7 +11,7 @@ shared-mime-info, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shared-mime-info"; version = "2.4"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "xdg"; repo = "shared-mime-info"; - rev = version; + rev = finalAttrs.version; hash = "sha256-5eyMkfSBUOD7p8woIYTgz5C/L8uQMXyr0fhL0l23VMA="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.freedesktop ]; mainProgram = "update-mime-database"; }; -} +}) diff --git a/pkgs/by-name/sh/sharutils/package.nix b/pkgs/by-name/sh/sharutils/package.nix index 8128c520b1f2..6cd02137908d 100644 --- a/pkgs/by-name/sh/sharutils/package.nix +++ b/pkgs/by-name/sh/sharutils/package.nix @@ -9,12 +9,12 @@ updateAutotoolsGnuConfigScriptsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sharutils"; version = "4.15.2"; src = fetchurl { - url = "mirror://gnu/sharutils/sharutils-${version}.tar.xz"; + url = "mirror://gnu/sharutils/sharutils-${finalAttrs.version}.tar.xz"; sha256 = "16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b"; }; @@ -108,4 +108,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sh/shellspec/package.nix b/pkgs/by-name/sh/shellspec/package.nix index b8865a877c3f..dfd0fc586c74 100644 --- a/pkgs/by-name/sh/shellspec/package.nix +++ b/pkgs/by-name/sh/shellspec/package.nix @@ -5,14 +5,14 @@ bash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shellspec"; version = "0.28.1"; src = fetchFromGitHub { owner = "shellspec"; repo = "shellspec"; - rev = version; + rev = finalAttrs.version; sha256 = "1ib5qp29f2fmivwnv6hq35qhvdxz42xgjlkvy0i3qn758riyqf46"; }; @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { meta = { description = "Full-featured BDD unit testing framework for bash, ksh, zsh, dash and all POSIX shells"; homepage = "https://shellspec.info/"; - changelog = "https://github.com/shellspec/shellspec/releases/tag/${version}"; + changelog = "https://github.com/shellspec/shellspec/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ j0hax ]; platforms = lib.platforms.unix; mainProgram = "shellspec"; }; -} +}) diff --git a/pkgs/by-name/sh/shepherd/package.nix b/pkgs/by-name/sh/shepherd/package.nix index 6f6313ea0035..f4fbd6810b17 100644 --- a/pkgs/by-name/sh/shepherd/package.nix +++ b/pkgs/by-name/sh/shepherd/package.nix @@ -9,19 +9,19 @@ yarn, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shepherd"; version = "1.16.0"; src = fetchFromGitHub { owner = "NerdWalletOSS"; repo = "shepherd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-LY8Vde4YpGuKnQ5UnSOpsQDY7AOyZRziUrfZb5dRiX4="; }; offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-tJXJ8ePr5ArAV+0JcuJsTo/B2PUcgsXfZrSDCpna/9k="; }; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ''; meta = { - changelog = "https://github.com/NerdWalletOSS/shepherd/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/NerdWalletOSS/shepherd/blob/${finalAttrs.src.rev}/CHANGELOG.md"; description = "Utility for applying code changes across many repositories"; homepage = "https://github.com/NerdWalletOSS/shepherd"; license = lib.licenses.asl20; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dbirks ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sh/sherpa/package.nix b/pkgs/by-name/sh/sherpa/package.nix index 8b79450dad1a..bbb66ba611e7 100644 --- a/pkgs/by-name/sh/sherpa/package.nix +++ b/pkgs/by-name/sh/sherpa/package.nix @@ -11,14 +11,14 @@ autoPatchelfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sherpa"; version = "3.0.3"; src = fetchFromGitLab { owner = "sherpa-team"; repo = "sherpa"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bh5C0BYbuAkbPrp27P0oD0yoxd53ViRtmpUKfN7kZ90="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; -} +}) diff --git a/pkgs/by-name/sh/shfm/package.nix b/pkgs/by-name/sh/shfm/package.nix index bbadca6dd4be..5a9d528bc8ef 100644 --- a/pkgs/by-name/sh/shfm/package.nix +++ b/pkgs/by-name/sh/shfm/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shfm"; version = "0.4.2"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "shfm"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ilVrUFfyzOZgjbBTqlHA9hLaTHw1xHFo1Y/tjXygNEs="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "shfm"; }; -} +}) diff --git a/pkgs/by-name/sh/shhmsg/package.nix b/pkgs/by-name/sh/shhmsg/package.nix index 89e598aee916..4b6ce1ada94e 100644 --- a/pkgs/by-name/sh/shhmsg/package.nix +++ b/pkgs/by-name/sh/shhmsg/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shhmsg"; version = "1.4.2"; src = fetchurl { - url = "https://shh.thathost.com/pub-unix/files/shhmsg-${version}.tar.gz"; + url = "https://shh.thathost.com/pub-unix/files/shhmsg-${finalAttrs.version}.tar.gz"; sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { license = lib.licenses.artistic1; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sh/shibboleth-sp/package.nix b/pkgs/by-name/sh/shibboleth-sp/package.nix index 85ac2fc242ef..fcbc58e4bafe 100644 --- a/pkgs/by-name/sh/shibboleth-sp/package.nix +++ b/pkgs/by-name/sh/shibboleth-sp/package.nix @@ -15,13 +15,13 @@ xml-tooling-c, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shibboleth-sp"; version = "3.0.4.1"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-sp.git"; - rev = version; + rev = finalAttrs.version; sha256 = "1qb4dbz5gk10b9w1rf6f4vv7c2wb3a8bfzif6yiaq96ilqad7gdr"; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/sh/shim-unsigned/package.nix b/pkgs/by-name/sh/shim-unsigned/package.nix index bfff7fa6314c..96ded033bea1 100644 --- a/pkgs/by-name/sh/shim-unsigned/package.nix +++ b/pkgs/by-name/sh/shim-unsigned/package.nix @@ -19,14 +19,14 @@ let } .${system} or throwSystem; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shim"; version = "16.1"; src = fetchFromGitHub { owner = "rhboot"; repo = "shim"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qHZfr7ncJOsb1Cijlp6eJSMzxa34H1h4lACqceOzg+s="; fetchSubmodules = true; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { raitobezarius ]; }; -} +}) diff --git a/pkgs/by-name/sh/shipments/package.nix b/pkgs/by-name/sh/shipments/package.nix index 9d8a9a66a4e2..e8c73b77bf9f 100644 --- a/pkgs/by-name/sh/shipments/package.nix +++ b/pkgs/by-name/sh/shipments/package.nix @@ -13,14 +13,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shipments"; version = "0.3.0"; src = fetchFromSourcehut { owner = "~martijnbraam"; repo = "shipments"; - rev = version; + rev = finalAttrs.version; hash = "sha256-8wX1s5mPCdMINIQP4m5q5StKqxY6CGBBxIxyQAvU7Pc="; }; @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { description = "Postal package tracking application"; mainProgram = "shipments"; homepage = "https://sr.ht/~martijnbraam/shipments/"; - changelog = "https://git.sr.ht/~martijnbraam/shipments/refs/${version}"; + changelog = "https://git.sr.ht/~martijnbraam/shipments/refs/${finalAttrs.version}"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ michaelgrahamevans ]; }; -} +}) diff --git a/pkgs/by-name/sh/shmig/package.nix b/pkgs/by-name/sh/shmig/package.nix index ab1e66873696..2bc206288dfe 100644 --- a/pkgs/by-name/sh/shmig/package.nix +++ b/pkgs/by-name/sh/shmig/package.nix @@ -14,14 +14,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shmig"; version = "1.0.0"; src = fetchFromGitHub { owner = "mbucc"; repo = "shmig"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "15ry1d51d6dlzzzhck2x57wrq48vs4n9pp20bv2sz6nk92fva5l5"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/sh/shocco/package.nix b/pkgs/by-name/sh/shocco/package.nix index c2579ab20d22..3c9a982b864a 100644 --- a/pkgs/by-name/sh/shocco/package.nix +++ b/pkgs/by-name/sh/shocco/package.nix @@ -6,14 +6,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shocco"; version = "1.0"; src = fetchFromGitHub { owner = "rtomayko"; repo = "shocco"; - rev = version; + rev = finalAttrs.version; sha256 = "1nkwcw9fqf4vyrwidqi6by7nrmainkjqkirkz3yxmzk6kzwr38mi"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/by-name/sh/shod/package.nix b/pkgs/by-name/sh/shod/package.nix index 9014ca63bc45..9e43feef04a0 100644 --- a/pkgs/by-name/sh/shod/package.nix +++ b/pkgs/by-name/sh/shod/package.nix @@ -12,14 +12,14 @@ conf ? null, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shod"; version = "2.6.2"; src = fetchFromGitHub { owner = "phillbush"; repo = "shod"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-0bKp1BTIdYVBDVdeGnTVo76UtBxa4UbXLZihdjHS/og="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sh/shorewall/package.nix b/pkgs/by-name/sh/shorewall/package.nix index 4b01a613186a..e8daaf16586d 100644 --- a/pkgs/by-name/sh/shorewall/package.nix +++ b/pkgs/by-name/sh/shorewall/package.nix @@ -21,21 +21,21 @@ let "${gnused}/bin" ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shorewall"; version = "5.2.8"; srcs = [ (fetchurl { - url = "https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-core-${version}.tar.bz2"; + url = "https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-core-${finalAttrs.version}.tar.bz2"; hash = "sha256-OZlrlpeiAXlHBJrT8DyyeOj5Of+SSyu0vyoLwXxZmI4="; }) (fetchurl { - url = "https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-${version}.tar.bz2"; + url = "https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-${finalAttrs.version}.tar.bz2"; hash = "sha256-+7WrSS7TcuqvAoF8xzD4LEmoHFpfXO5LyPG86EbyMG0="; }) (fetchurl { - url = "https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall6-${version}.tar.bz2"; + url = "https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall6-${finalAttrs.version}.tar.bz2"; hash = "sha256-6Cw6lTi2VIGVOY3DnIOwG89m61oigUyRWpJLmtwIjNE="; }) ]; @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { patchShebangs . # Remove hardcoded PATH - sed -i shorewall-core-${version}/lib.cli \ + sed -i shorewall-core-${finalAttrs.version}/lib.cli \ -e '/^ *PATH=.*/d' ''; configurePhase = '' - shorewall-core-${version}/configure \ + shorewall-core-${finalAttrs.version}/configure \ HOST=linux \ PREFIX=$out \ CONFDIR=\$PREFIX/etc-example \ @@ -80,13 +80,13 @@ stdenv.mkDerivation rec { ''; installPhase = '' export DESTDIR=/ - shorewall-core-${version}/install.sh + shorewall-core-${finalAttrs.version}/install.sh - ln -s ../shorewall-core-${version}/shorewallrc shorewall-${version}/ - shorewall-${version}/install.sh + ln -s ../shorewall-core-${finalAttrs.version}/shorewallrc shorewall-${finalAttrs.version}/ + shorewall-${finalAttrs.version}/install.sh - ln -s ../shorewall-core-${version}/shorewallrc shorewall6-${version}/ - shorewall6-${version}/install.sh + ln -s ../shorewall-core-${finalAttrs.version}/shorewallrc shorewall6-${finalAttrs.version}/ + shorewall6-${finalAttrs.version}/install.sh # Patch the example shorewall{,6}.conf in case it is included # in services.shorewall{,6}.configs @@ -123,4 +123,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix index 53e736581b8c..22d1a9bafc11 100644 --- a/pkgs/by-name/sh/showmethekey/package.nix +++ b/pkgs/by-name/sh/showmethekey/package.nix @@ -14,14 +14,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "showmethekey"; version = "1.19.0"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "showmethekey"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jQRckUqLe9sshi3SJqpFwSsy5H0Gp17kkcCdslwg6cM="; }; @@ -44,9 +44,9 @@ stdenv.mkDerivation rec { meta = { description = "Show keys you typed on screen"; homepage = "https://showmethekey.alynx.one/"; - changelog = "https://github.com/AlynxZhou/showmethekey/releases/tag/v${version}"; + changelog = "https://github.com/AlynxZhou/showmethekey/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ocfox ]; }; -} +}) diff --git a/pkgs/by-name/sh/shtns/package.nix b/pkgs/by-name/sh/shtns/package.nix index 34a5e6fd84fd..92e694a7d05b 100644 --- a/pkgs/by-name/sh/shtns/package.nix +++ b/pkgs/by-name/sh/shtns/package.nix @@ -5,13 +5,13 @@ fftw, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shtns"; version = "3.5.1"; src = fetchgit { url = "https://bitbucket.org/nschaeff/shtns"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1ajrplhv7a2dvb3cn3n638281w0bzdcydvvwbg64awbjg622mdpd"; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bzizou ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sh/shutter/package.nix b/pkgs/by-name/sh/shutter/package.nix index 8486719d875b..8a8efe811e9e 100644 --- a/pkgs/by-name/sh/shutter/package.nix +++ b/pkgs/by-name/sh/shutter/package.nix @@ -62,14 +62,14 @@ let XMLTwig ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shutter"; version = "0.99.6"; src = fetchFromGitHub { owner = "shutter-project"; repo = "shutter"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-2wRPmTpFfgU8xW9Fyn1+TMowcKm3pukT1ck06IWPiGo="; }; @@ -110,4 +110,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/si/sic/package.nix b/pkgs/by-name/si/sic/package.nix index 0edf706b0fb6..a7a0acddff43 100644 --- a/pkgs/by-name/si/sic/package.nix +++ b/pkgs/by-name/si/sic/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sic"; version = "1.3"; src = fetchurl { - url = "https://dl.suckless.org/tools/sic-${version}.tar.gz"; + url = "https://dl.suckless.org/tools/sic-${finalAttrs.version}.tar.gz"; hash = "sha256-MEePqz68dfLrXQjLtbL+3K9IkRbnWi3XGX4+nHM9ZdI="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/si/sickgear/package.nix b/pkgs/by-name/si/sickgear/package.nix index 250fc5ff1ac1..4833009b7d4b 100644 --- a/pkgs/by-name/si/sickgear/package.nix +++ b/pkgs/by-name/si/sickgear/package.nix @@ -15,14 +15,14 @@ let ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sickgear"; version = "3.33.2"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; - rev = "release_${version}"; + rev = "release_${finalAttrs.version}"; hash = "sha256-8cynBaVbFDI1hNwP03crkOf8Av+NCWr0xJLsZJpHLGs="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/SickGear/SickGear"; maintainers = with lib.maintainers; [ rembo10 ]; }; -} +}) diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/by-name/si/siesta/package.nix similarity index 88% rename from pkgs/applications/science/chemistry/siesta/default.nix rename to pkgs/by-name/si/siesta/package.nix index 348fdaee60f4..36a6c07e3b82 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/by-name/si/siesta/package.nix @@ -13,11 +13,12 @@ readline, ninja, elpa, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "siesta"; - version = "5.2.2"; + version = "5.4.1"; src = fetchFromGitLab { owner = "siesta-project"; @@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit mpi; + updateScript = nix-update-script { }; }; nativeBuildInputs = [ @@ -59,14 +61,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = false; # Started making trouble with gcc-11 - preBuild = '' - # See https://gitlab.com/siesta-project/siesta/-/commit/a10bf1628e7141ba263841889c3503c263de1582 - # This may be fixed in the next release. - makeFlagsArray=( - FFLAGS="-fallow-argument-mismatch" - ) - '' - + ( + preBuild = if useMpi then '' makeFlagsArray+=( @@ -80,8 +75,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlagsArray+=( COMP_LIBS="" LIBS="-lblas -llapack" ); - '' - ); + ''; meta = { description = "First-principles materials simulation code using DFT"; diff --git a/pkgs/by-name/si/sieve-connect/package.nix b/pkgs/by-name/si/sieve-connect/package.nix index ca4e11bd13f8..dde0d2719c53 100644 --- a/pkgs/by-name/si/sieve-connect/package.nix +++ b/pkgs/by-name/si/sieve-connect/package.nix @@ -7,14 +7,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sieve-connect"; version = "0.90"; src = fetchFromGitHub { owner = "philpennock"; repo = "sieve-connect"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1ghvfa5ifa68b6imh85bkmy00r93c5f9hs6d039axb73gmma580p"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Fixes failing build when not building in git repo mkdir .git touch .git/HEAD - echo "${version}" > versionfile + echo "${finalAttrs.version}" > versionfile echo "$(date +%Y-%m-%d)" > datefile ''; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ das_j ]; mainProgram = "sieve-connect"; }; -} +}) diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix index c4621c07690c..a5193e073d88 100644 --- a/pkgs/by-name/si/sigil/package.nix +++ b/pkgs/by-name/si/sigil/package.nix @@ -10,14 +10,14 @@ qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sigil"; version = "2.7.0"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; - tag = version; + tag = finalAttrs.version; hash = "sha256-cKnWAVLScPZYNAFOiXaoHSXMl3YNOh6zmEryILaOR4w="; }; @@ -91,4 +91,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; mainProgram = "sigil"; }; -} +}) diff --git a/pkgs/by-name/si/siglo/package.nix b/pkgs/by-name/si/siglo/package.nix index 5e75a8057335..51ecd6aa55a7 100644 --- a/pkgs/by-name/si/siglo/package.nix +++ b/pkgs/by-name/si/siglo/package.nix @@ -12,14 +12,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "siglo"; version = "0.9.9"; src = fetchFromGitHub { owner = "theironrobin"; repo = "siglo"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-4jKsRpzuyHH31LXndC3Ua4TYcI0G0v9qqe0cbvLuCDA="; }; @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { description = "GTK app to sync InfiniTime watch with PinePhone"; mainProgram = "siglo"; homepage = "https://github.com/theironrobin/siglo"; - changelog = "https://github.com/theironrobin/siglo/releases/tag/v${version}"; + changelog = "https://github.com/theironrobin/siglo/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mpl20; maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix index 4fd493934f35..54b8400f40bf 100644 --- a/pkgs/by-name/si/signal-desktop-bin/generic.nix +++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix @@ -101,7 +101,7 @@ let hash = "sha256-eVoMWY0WLJpKriPyGIxge4ybwZEst9hDgkWfjekaOuE="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { inherit pname version; # Please backport all updates to the stable channel. @@ -219,7 +219,7 @@ stdenv.mkDerivation rec { # Symlink to bin mkdir -p $out/bin - ln -s "$out/lib/signal-desktop/signal-desktop" $out/bin/${meta.mainProgram} + ln -s "$out/lib/signal-desktop/signal-desktop" $out/bin/${finalAttrs.meta.mainProgram} # Create required symlinks: ln -s libGLESv2.so "$out/lib/signal-desktop/libGLESv2.so.2" @@ -264,7 +264,7 @@ stdenv.mkDerivation rec { # Fix the desktop link substituteInPlace $out/share/applications/signal-desktop.desktop \ - --replace-fail "/${bindir}/signal-desktop" ${meta.mainProgram} + --replace-fail "/${bindir}/signal-desktop" ${finalAttrs.meta.mainProgram} mv $out/share/applications/signal{-desktop,}.desktop @@ -286,7 +286,7 @@ stdenv.mkDerivation rec { "Signal Android" or "Signal iOS" app. ''; homepage = "https://signal.org/"; - changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; + changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${finalAttrs.version}"; license = [ lib.licenses.agpl3Only @@ -313,4 +313,4 @@ stdenv.mkDerivation rec { ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -} +}) diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index ab6305a1bff5..372c2dea4433 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -24,23 +24,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.86.9"; + version = "0.86.12"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-WQdaE9RqRn0/DldUC8FgLALagVGit0Cd3n90t0nEgUs="; + hash = "sha256-XVq1fvhUF0WqSs1lJRCBRuhOW4idY6Nm21UdX4/6TE8="; }; - cargoHash = "sha256-2vIEBQmMBLppk4/t8mvR1n2K/YWUtUaxNl9SpUCNVM8="; + cargoHash = "sha256-vat7vjL9HDY/m7CLUJNpU3NZ79nCVHxLO5tEtaEDBnE="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-a7TNY+oe7bBLE5D3WYn75Su7RK/xl6UEkv7sosc/TBU="; + hash = "sha256-O2dMH45YfPlwgqYtQK7HGBgAtfePb6YIrnwqbGIGcnA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index e5e639216a48..944c358ad9c1 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -54,13 +54,13 @@ let ''; }); - version = "7.86.0"; + version = "7.87.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-TnblDCYUhwvnKiq3klMRw0+bj4hKPrwmEDzCGSLyt8I="; + hash = "sha256-7Pb8CCCibs/T3Cjx4+Tx1U5Fb4mmbb6P3zmLZ/+zoxc="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -147,15 +147,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 1; hash = if withAppleEmojis then - "sha256-EqDHhfpdnj4ZhTVnmVmyiRjTUIGX5fpdAsxqRY/tzQI=" + "sha256-NWzGyoj1BafRe9LxLkhpWWjGaT0gfQGHnxYDMpvRLYE=" else - "sha256-Vfs1/J3R6O0Ct4gAPO/mVCwr6EaMBpltOImPrRHLkFM="; + "sha256-XZ0XivOvZ4yormMgLK5vtV63t4CtNaZ1l0eexTUbbPg="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1769033121; + SOURCE_DATE_EPOCH = 1769636497; }; preBuild = '' diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index dba9823cff51..1f0f43d907db 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ringrtc"; - version = "2.61.0"; + version = "2.62.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "ringrtc"; tag = "v${finalAttrs.version}"; - hash = "sha256-84QqCfz+NKVLr2FAEDSFAvCm4RhHhq+174M2rxD/D0s="; + hash = "sha256-wNtaN6z+Q7zVzaoeoUUDr6+syxKi6gcdhtJ1c2XrhgM="; }; - cargoHash = "sha256-LpYjNXc/HzV3OYSIyCxDTlL3UZYbOiRkPCBeIqW2hB8="; + cargoHash = "sha256-zB5Xt5NeKUIa4W2MZrltINXyvm0+UXs6Fm0gm1MGRD0="; preConfigure = '' # Check for matching webrtc version diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json index 6b824925c682..36529a592cd7 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json +++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json @@ -1,10 +1,10 @@ { "src": { "args": { - "hash": "sha256-M9cwhO7CbaqdffJgFguKkX1WN0q1m/INpb/+B4km15c=", + "hash": "sha256-TmiD7c4pIqjaN9pMSUJMJggSKNbRcsz13Y8YnRjw4t0=", "owner": "signalapp", "repo": "webrtc", - "tag": "7444a" + "tag": "7444c" }, "fetcher": "fetchFromGitHub" }, diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 4eef7f0b3e08..205e0e3970bc 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -12,14 +12,14 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "signalbackup-tools"; version = "20260118-1"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3pwIRhTpYk3Vq0C4BNHle7/6QWrEuo0/hMqFRH6zw6A="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.malo ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix index 7e107359aac1..1b61b17bf5f8 100644 --- a/pkgs/by-name/si/signaturepdf/package.nix +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -11,14 +11,14 @@ ghostscript, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "signaturepdf"; version = "1.9.2"; src = fetchFromGitHub { owner = "24eme"; repo = "signaturepdf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-hQPYS3SskakS+8S2gIjoXojDgIET20nz4ig9+VRv8TM="; }; @@ -59,9 +59,9 @@ stdenv.mkDerivation rec { description = "Web software for signing PDFs and also organize pages, edit metadata and compress pdf"; mainProgram = "signaturepdf"; homepage = "https://pdf.24eme.fr/"; - changelog = "https://github.com/24eme/signaturepdf/releases/tag/v${version}"; + changelog = "https://github.com/24eme/signaturepdf/releases/tag/v${finalAttrs.version}"; license = lib.licenses.agpl3Only; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ DamienCassou ]; }; -} +}) diff --git a/pkgs/by-name/si/signify/package.nix b/pkgs/by-name/si/signify/package.nix index fb1f8f6cc99f..22c68623fbd5 100644 --- a/pkgs/by-name/si/signify/package.nix +++ b/pkgs/by-name/si/signify/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "signify"; version = "32"; src = fetchFromGitHub { owner = "aperezdc"; repo = "signify"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-y2A+Szt451CmaWOc2Y2vBSwSgziJsSnTjNClbdyxG2U="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.rlupton20 ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/si/signing-party/package.nix b/pkgs/by-name/si/signing-party/package.nix index e67171bf673e..c402993a0326 100644 --- a/pkgs/by-name/si/signing-party/package.nix +++ b/pkgs/by-name/si/signing-party/package.nix @@ -39,7 +39,7 @@ let TypeTiny ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "signing-party"; version = "2.12"; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "signing-party-team"; repo = "signing-party"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-hUlMClx/TRmnC2Ah6MIsNGpZGI/KmgWt2z4XzbIAnag="; }; @@ -310,4 +310,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/si/sigslot/package.nix b/pkgs/by-name/si/sigslot/package.nix index 7b8a3b1e586c..3a0edf178ef6 100644 --- a/pkgs/by-name/si/sigslot/package.nix +++ b/pkgs/by-name/si/sigslot/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sigslot"; version = "1.2.3"; src = fetchFromGitHub { owner = "palacaze"; repo = "sigslot"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-8JBZ6Xid/uAOfiPKgJKetpj/oBb8lRLPgjkMnrfTKaM="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ azahi ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/si/sil-q/package.nix b/pkgs/by-name/si/sil-q/package.nix index b8ab1befd925..e9224b6ccbbe 100644 --- a/pkgs/by-name/si/sil-q/package.nix +++ b/pkgs/by-name/si/sil-q/package.nix @@ -18,14 +18,14 @@ let chmod +w -R "$ANGBAND_PATH" ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sil-q"; version = "1.5.0"; src = fetchFromGitHub { owner = "sil-quirk"; repo = "sil-q"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-v/sWhPWF9cCKD8N0RHpwzChMM1t9G2yrMDmi1cZxdOs="; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; # Makefile(s) and config are not top-level - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' # allow usage of ANGBAND_PATH @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { cp sil $out/bin/sil-q wrapProgram $out/bin/sil-q \ --run "export ANGBAND_PATH=\$HOME/.sil-q" \ - --run "${setup} ${src}/lib" + --run "${setup} ${finalAttrs.src}/lib" runHook postInstall ''; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.kenran ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/si/sil/package.nix b/pkgs/by-name/si/sil/package.nix index 9e72ff583a82..b9848cedb3b1 100644 --- a/pkgs/by-name/si/sil/package.nix +++ b/pkgs/by-name/si/sil/package.nix @@ -22,7 +22,7 @@ let chmod +w -R "$ANGBAND_PATH" ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "Sil"; version = "1.3.0"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libXmu ]; - sourceRoot = "${src.name}/Sil/src"; + sourceRoot = "${finalAttrs.src.name}/Sil/src"; makefile = "Makefile.std"; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { # lib directory anyway, so we might as well give everyone a copy wrapProgram $out/bin/sil \ --run "export ANGBAND_PATH=\$HOME/.sil" \ - --run "${setup} ${src}/Sil/lib" + --run "${setup} ${finalAttrs.src}/Sil/lib" runHook postInstall ''; @@ -103,4 +103,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "sil"; }; -} +}) diff --git a/pkgs/by-name/si/silver-searcher/package.nix b/pkgs/by-name/si/silver-searcher/package.nix index 3545925c2362..87151fd393e2 100644 --- a/pkgs/by-name/si/silver-searcher/package.nix +++ b/pkgs/by-name/si/silver-searcher/package.nix @@ -9,14 +9,14 @@ xz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "silver-searcher"; version = "2.2.0"; src = fetchFromGitHub { owner = "ggreer"; repo = "the_silver_searcher"; - rev = version; + rev = finalAttrs.version; sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix index 1cf764508965..8aba1e37f2ef 100644 --- a/pkgs/by-name/si/simde/package.nix +++ b/pkgs/by-name/si/simde/package.nix @@ -6,14 +6,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "simde"; version = "0.8.2"; src = fetchFromGitHub { owner = "simd-everywhere"; repo = "simde"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-igjDHCpKXy6EbA9Mf6peL4OTVRPYTV0Y2jbgYQuWMT4="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { ] ); }; -} +}) diff --git a/pkgs/by-name/si/simg2img/package.nix b/pkgs/by-name/si/simg2img/package.nix index b270bfc71695..e328865f8bd0 100644 --- a/pkgs/by-name/si/simg2img/package.nix +++ b/pkgs/by-name/si/simg2img/package.nix @@ -5,14 +5,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "simg2img"; version = "1.1.5"; src = fetchFromGitHub { owner = "anestisb"; repo = "android-simg2img"; - rev = version; + rev = finalAttrs.version; hash = "sha256-sNHdSbms35YnENASFEG+VMLJGkV/JAlQUVMquDrePDc="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { arkivm ]; }; -} +}) diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix index ceb75ffa3579..e19359c316e5 100644 --- a/pkgs/by-name/si/simgear/package.nix +++ b/pkgs/by-name/si/simgear/package.nix @@ -30,14 +30,14 @@ let version = "2024.1.4"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "simgear"; inherit version; src = fetchFromGitLab { owner = "flightgear"; repo = "simgear"; - tag = version; + tag = finalAttrs.version; hash = "sha256-WJI15egN1H+EAIaFuI3svYCvM0xzsIGcIPsZgLsvBc0="; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.lgpl2; }; -} +}) diff --git a/pkgs/by-name/si/simple-mtpfs/package.nix b/pkgs/by-name/si/simple-mtpfs/package.nix index 3bb880d024f2..6cbb753e16f1 100644 --- a/pkgs/by-name/si/simple-mtpfs/package.nix +++ b/pkgs/by-name/si/simple-mtpfs/package.nix @@ -8,14 +8,14 @@ fuse, libmtp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "simple-mtpfs"; version = "0.4.0"; src = fetchFromGitHub { owner = "phatina"; repo = "simple-mtpfs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-vAqi2owa4LJK7y7S7TwkPAqDxzyHrZZBTu0MBwMT0gI="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ laalsaas ]; mainProgram = "simple-mtpfs"; }; -} +}) diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index 215b758c5119..1a21766547ee 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -24,12 +24,12 @@ gobject-introspection, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "simple-scan"; version = "49.1"; src = fetchurl { - url = "mirror://gnome/sources/simple-scan/${lib.versions.major version}/simple-scan-${version}.tar.xz"; + url = "mirror://gnome/sources/simple-scan/${lib.versions.major finalAttrs.version}/simple-scan-${finalAttrs.version}.tar.xz"; hash = "sha256-mujUFR7K+VhF65+ZtDbVecg48s8Cdj+6O8A3gCUb4zQ="; }; @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { interface is well tested. ''; homepage = "https://gitlab.gnome.org/GNOME/simple-scan"; - changelog = "https://gitlab.gnome.org/GNOME/simple-scan/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/simple-scan/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.gpl3Plus; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/si/simpleTpmPk11/package.nix b/pkgs/by-name/si/simpleTpmPk11/package.nix index 1cf508ac2405..8f27b09bac2c 100644 --- a/pkgs/by-name/si/simpleTpmPk11/package.nix +++ b/pkgs/by-name/si/simpleTpmPk11/package.nix @@ -9,14 +9,14 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "simple-tpm-pk11"; version = "0.07"; src = fetchFromGitHub { owner = "ThomasHabets"; repo = "simple-tpm-pk11"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-wJ0U4ZNg60+XJTSAMs9gaMTWVePE5dfv5cZWDqwnSlY="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/si/sispmctl/package.nix b/pkgs/by-name/si/sispmctl/package.nix index 5346ba0cba77..77d6f4665324 100644 --- a/pkgs/by-name/si/sispmctl/package.nix +++ b/pkgs/by-name/si/sispmctl/package.nix @@ -6,12 +6,12 @@ libusb-compat-0_1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sispmctl"; version = "4.12"; src = fetchurl { - url = "mirror://sourceforge/sispmctl/sispmctl-${version}.tar.gz"; + url = "mirror://sourceforge/sispmctl/sispmctl-${finalAttrs.version}.tar.gz"; hash = "sha256-51eGOkg42m4cpypXrcWspvxH/73ccqaQUtir10PVcII="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers._9R ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index a2dcd0d0dd7e..de55564b2df3 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -36,20 +36,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.5.4-dev4"; + version = "3.5.4"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-ECBk4qzRCzRzgTYawHkvuStiz2DCYx3GXfjoKAWyiys="; + hash = "sha256-uiI8cB/bi6P4PByOBUGK4d2DUelACThC+e5rBFv35ow="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-9hLvphgyZGkn3PYrjnPa7NPLqkLsTdNtBa2JUMtj8Wo="; + vendorHash = "sha256-SQ7QBtPwQaQgp6S54dnwfV44SLos1QY5NotnpEz4OPY="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-/h8tHSJGsqjFXp/qpxOqoHmsEiuRXvIWBLRalTdXVi4="; + hash = "sha256-DxMeZqFqR5vybwEiYzYhYMn7S3P/boHrOXkS+57Yrz4="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/sk/skktools/package.nix b/pkgs/by-name/sk/skktools/package.nix index 816b60adbcfe..e051b94313cb 100644 --- a/pkgs/by-name/sk/skktools/package.nix +++ b/pkgs/by-name/sk/skktools/package.nix @@ -16,17 +16,17 @@ # dependencies on a Ruby interpreter etc. # - We for the moment do not package them to keep the dependencies slim. # Probably, shall package the newer tools as skktools-extra in the future. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "skktools"; version = "1.3.4"; src = fetchFromGitHub { owner = "skk-dev"; repo = "skktools"; - rev = "skktools-${lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "skktools-${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; sha256 = "1zway8jsm18279xq8zlpr84iqiw373x3v0ysay74n9bjqxbl234a"; }; # # See "12.2. Package naming" - # name = "skktools-unstable-${version}"; + # name = "skktools-unstable-${finalAttrs.version}"; # version = "2017-03-05"; # src = fetchFromGitHub { # owner = "skk-dev"; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ yuriaisaka ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/sk/skrooge/package.nix b/pkgs/by-name/sk/skrooge/package.nix index 4edc713ca9f2..9bbdcffd80b0 100644 --- a/pkgs/by-name/sk/skrooge/package.nix +++ b/pkgs/by-name/sk/skrooge/package.nix @@ -11,12 +11,12 @@ kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "skrooge"; version = "25.10.0"; src = fetchurl { - url = "mirror://kde/stable/skrooge/skrooge-${version}.tar.xz"; + url = "mirror://kde/stable/skrooge/skrooge-${finalAttrs.version}.tar.xz"; hash = "sha256-kECWi5/q2reBOs9DrubOz5Vol3AkA7lXzOLtbgx2HlE="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ joko ]; homepage = "https://skrooge.org/"; }; -} +}) diff --git a/pkgs/by-name/sl/sl/package.nix b/pkgs/by-name/sl/sl/package.nix index 26ca88312452..bf4503495d65 100644 --- a/pkgs/by-name/sl/sl/package.nix +++ b/pkgs/by-name/sl/sl/package.nix @@ -5,14 +5,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sl"; version = "5.05"; src = fetchFromGitHub { owner = "eyJhb"; repo = "sl"; - rev = version; + rev = finalAttrs.version; sha256 = "11a1rdgb8wagikhxgm81g80g5qsl59mv4qgsval3isykqh8729bj"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "sl"; }; -} +}) diff --git a/pkgs/by-name/sl/slack-cli/package.nix b/pkgs/by-name/sl/slack-cli/package.nix index 49e1543e1a25..36bbe1bdd64c 100644 --- a/pkgs/by-name/sl/slack-cli/package.nix +++ b/pkgs/by-name/sl/slack-cli/package.nix @@ -17,14 +17,14 @@ runtimeShell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slack-cli"; version = "0.18.0"; src = fetchFromGitHub { owner = "rockymadden"; repo = "slack-cli"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "022yr3cpfg0v7cxi62zzk08vp0l3w851qpfh6amyfgjiynnfyddl"; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { mainProgram = "slack"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sl/slirp4netns/package.nix b/pkgs/by-name/sl/slirp4netns/package.nix index bf0b1f1111dd..4bda7a4afcdc 100644 --- a/pkgs/by-name/sl/slirp4netns/package.nix +++ b/pkgs/by-name/sl/slirp4netns/package.nix @@ -11,14 +11,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slirp4netns"; version = "1.3.3"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-dPhUr9GdujTpUsnfvZDp8eOBQwlzqwtwziII2QWD4JA="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "slirp4netns"; }; -} +}) diff --git a/pkgs/by-name/sl/slowhttptest/package.nix b/pkgs/by-name/sl/slowhttptest/package.nix index f4577f359c1f..07e00b6d829c 100644 --- a/pkgs/by-name/sl/slowhttptest/package.nix +++ b/pkgs/by-name/sl/slowhttptest/package.nix @@ -5,14 +5,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slowhttptest"; version = "1.9.0"; src = fetchFromGitHub { owner = "shekyan"; repo = "slowhttptest"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-rIvd3LykVAbDXtFWZ1EQ+QKeALzqwK6pq7In0BsCOFo="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fab ]; mainProgram = "slowhttptest"; }; -} +}) diff --git a/pkgs/by-name/sl/slsnif/package.nix b/pkgs/by-name/sl/slsnif/package.nix index 579cd311b803..a15778e15b26 100644 --- a/pkgs/by-name/sl/slsnif/package.nix +++ b/pkgs/by-name/sl/slsnif/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slsnif"; version = "0.4.4"; src = fetchurl { - url = "mirror://sourceforge/slsnif/slsnif-${version}.tar.gz"; + url = "mirror://sourceforge/slsnif/slsnif-${finalAttrs.version}.tar.gz"; sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii"; }; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "slsnif"; }; -} +}) diff --git a/pkgs/by-name/sl/slurm-nm/package.nix b/pkgs/by-name/sl/slurm-nm/package.nix index f7706830ed35..46af6dc59b9a 100644 --- a/pkgs/by-name/sl/slurm-nm/package.nix +++ b/pkgs/by-name/sl/slurm-nm/package.nix @@ -8,14 +8,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slurm-nm"; version = "0.4.4"; src = fetchFromGitHub { owner = "mattthias"; repo = "slurm"; - rev = "upstream/${version}"; + rev = "upstream/${finalAttrs.version}"; hash = "sha256-w77SIXFctMwwNw9cQm0HQaEaMs/5NXQjn1LpvkpCCB8="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ mikaelfangel ]; mainProgram = "slurm"; }; -} +}) diff --git a/pkgs/by-name/sl/slurm-spank-stunnel/package.nix b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix index 21c8d77b67ea..9f9faf653a5f 100644 --- a/pkgs/by-name/sl/slurm-spank-stunnel/package.nix +++ b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix @@ -5,14 +5,14 @@ slurm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slurm-spank-stunnel"; version = "0.2.2"; src = fetchFromGitHub { owner = "stanford-rc"; repo = "slurm-spank-stunnel"; - rev = version; + rev = finalAttrs.version; sha256 = "15cpd49ccvzsmmr3gk8svm2nz461rvs4ybczckyf4yla0xzp06gj"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/sl/slurm-spank-x11/package.nix b/pkgs/by-name/sl/slurm-spank-x11/package.nix index f2840a47794b..381b9aaf88c2 100644 --- a/pkgs/by-name/sl/slurm-spank-x11/package.nix +++ b/pkgs/by-name/sl/slurm-spank-x11/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, slurm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slurm-spank-x11"; version = "0.2.5"; src = fetchFromGitHub { owner = "hautreux"; repo = "slurm-spank-x11"; - rev = version; + rev = finalAttrs.version; sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/sm/smartdeblur/package.nix b/pkgs/by-name/sm/smartdeblur/package.nix index c8a363b3598f..47c3db4b3e49 100644 --- a/pkgs/by-name/sm/smartdeblur/package.nix +++ b/pkgs/by-name/sm/smartdeblur/package.nix @@ -6,7 +6,7 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smartdeblur"; version = "0-unstable-2018-10-29"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "151vdd5ld0clw0vgp0fvp2gp2ybwpx9g43dad9fvbvwkg60izs87"; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; nativeBuildInputs = [ libsForQt5.qmake @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sm/smartdns/package.nix b/pkgs/by-name/sm/smartdns/package.nix index 5a6de79256ab..e9e260daceca 100644 --- a/pkgs/by-name/sm/smartdns/package.nix +++ b/pkgs/by-name/sm/smartdns/package.nix @@ -7,14 +7,14 @@ smartdns, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smartdns"; version = "47"; src = fetchFromGitHub { owner = "pymumu"; repo = "smartdns"; - rev = "Release${version}"; + rev = "Release${finalAttrs.version}"; hash = "sha256-8OK1OV3Jvj/5nUOxnWTTQAa1Qe3RGxNwJhYEZ7O1RIE="; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}/lib/systemd/system" "RUNSTATEDIR=/run" # by default it is the build time... weird... https://github.com/pymumu/smartdns/search?q=ver - "VER=${version}" + "VER=${finalAttrs.version}" ]; installFlags = [ "SYSCONFDIR=${placeholder "out"}/etc" ]; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "smartdns"; }; -} +}) diff --git a/pkgs/by-name/sm/smarty3-i18n/package.nix b/pkgs/by-name/sm/smarty3-i18n/package.nix index 74c673529c61..55629df7288c 100644 --- a/pkgs/by-name/sm/smarty3-i18n/package.nix +++ b/pkgs/by-name/sm/smarty3-i18n/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smarty-i18n"; version = "1.0"; src = fetchFromGitHub { owner = "kikimosha"; repo = "smarty3-i18n"; - rev = version; + rev = finalAttrs.version; sha256 = "0rjxq4wka73ayna3hb5dxc5pgc8bw8p5fy507yc6cv2pl4h4nji2"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ das_j ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sm/smarty3/package.nix b/pkgs/by-name/sm/smarty3/package.nix index ca1dec8f9b06..5d249ce1515a 100644 --- a/pkgs/by-name/sm/smarty3/package.nix +++ b/pkgs/by-name/sm/smarty3/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smarty3"; version = "3.1.48"; src = fetchFromGitHub { owner = "smarty-php"; repo = "smarty"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-QGhccIJ7BZTWGF+n8rmB1RCVyJKID95NW6Yb2VvqqGQ="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ das_j ]; }; -} +}) diff --git a/pkgs/by-name/sm/smcroute/package.nix b/pkgs/by-name/sm/smcroute/package.nix index 379b6dd69cb6..01b8b4243fc9 100644 --- a/pkgs/by-name/sm/smcroute/package.nix +++ b/pkgs/by-name/sm/smcroute/package.nix @@ -7,14 +7,14 @@ libcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smcroute"; version = "2.5.7"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-b1FsaDw5wAZkOwc6Y7TsMwyfxIRQ2rNUTK+knEzOn7w="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fpletz ]; platforms = with lib.platforms; (linux ++ freebsd ++ netbsd ++ openbsd); }; -} +}) diff --git a/pkgs/by-name/sm/smem/package.nix b/pkgs/by-name/sm/smem/package.nix index beb89c1bda6a..e71a2e166195 100644 --- a/pkgs/by-name/sm/smem/package.nix +++ b/pkgs/by-name/sm/smem/package.nix @@ -5,12 +5,12 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smem"; version = "1.5"; src = fetchurl { - url = "https://selenic.com/repo/smem/archive/${version}.tar.bz2"; + url = "https://selenic.com/repo/smem/archive/${finalAttrs.version}.tar.bz2"; sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/sm/smemstat/package.nix b/pkgs/by-name/sm/smemstat/package.nix index afc09c25ef3f..5554335899a4 100644 --- a/pkgs/by-name/sm/smemstat/package.nix +++ b/pkgs/by-name/sm/smemstat/package.nix @@ -5,14 +5,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smemstat"; version = "0.02.13"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "smemstat"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-wxgw5tPdZAhhISbay8BwoL5zxZJV4WstDpOtv9umf54="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ womfoo ]; }; -} +}) diff --git a/pkgs/by-name/sm/smenu/package.nix b/pkgs/by-name/sm/smenu/package.nix index aaa25a7dcc73..22b9a0c8c133 100644 --- a/pkgs/by-name/sm/smenu/package.nix +++ b/pkgs/by-name/sm/smenu/package.nix @@ -5,14 +5,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.5.0"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-nTQe6sCMHGRW7Djpv33xY8nL4a7ZyC9YM7PGOvmpuSM="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "smenu"; }; -} +}) diff --git a/pkgs/by-name/sm/smlpkg/package.nix b/pkgs/by-name/sm/smlpkg/package.nix index da017487e997..5f9123f7a528 100644 --- a/pkgs/by-name/sm/smlpkg/package.nix +++ b/pkgs/by-name/sm/smlpkg/package.nix @@ -6,14 +6,14 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smlpkg"; version = "0.1.7"; src = fetchFromGitHub { owner = "diku-dk"; repo = "smlpkg"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-zdWObV/W6fmQ6bFznEVEtp95D8t2YZd45sIC15XQwYM="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ athas ]; mainProgram = "smlpkg"; }; -} +}) diff --git a/pkgs/by-name/sm/smokeping/package.nix b/pkgs/by-name/sm/smokeping/package.nix index d5156d3f696b..ee3fb085f4f7 100644 --- a/pkgs/by-name/sm/smokeping/package.nix +++ b/pkgs/by-name/sm/smokeping/package.nix @@ -10,12 +10,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smokeping"; version = "2.9.0"; src = fetchurl { - url = "https://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz"; + url = "https://oss.oetiker.ch/smokeping/pub/smokeping-${finalAttrs.version}.tar.gz"; hash = "sha256-8b41v8zCuhyfdfdtIisptXAk7+icW1ZLhsGjfOLR3bE="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/sm/smooth/package.nix b/pkgs/by-name/sm/smooth/package.nix index ef5ccaf4056b..4dc52138fd3d 100644 --- a/pkgs/by-name/sm/smooth/package.nix +++ b/pkgs/by-name/sm/smooth/package.nix @@ -17,14 +17,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smooth"; version = "0.9.10"; src = fetchFromGitHub { owner = "enzo1982"; repo = "smooth"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-J2Do1iAbE1GBC8co/4nxOzeGJQiPRc+21fgMDpzKX+A="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { homepage = "http://www.smooth-project.org/"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sm/smpeg/package.nix b/pkgs/by-name/sm/smpeg/package.nix index 10ef5b9574cf..c25a0c09ad77 100644 --- a/pkgs/by-name/sm/smpeg/package.nix +++ b/pkgs/by-name/sm/smpeg/package.nix @@ -15,14 +15,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smpeg"; version = "0.4.5"; src = fetchFromGitHub { owner = "icculus"; repo = "smpeg"; - rev = "release_${builtins.replaceStrings [ "." ] [ "_" ] version}"; + rev = "release_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; sha256 = "sha256-nq/i7cFGpJXIuTwN/ScLMX7FN8NMdgdsRM9xOD3uycs="; }; @@ -101,4 +101,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sm/smu/package.nix b/pkgs/by-name/sm/smu/package.nix index 04b9df550040..e41ef3a50d3c 100644 --- a/pkgs/by-name/sm/smu/package.nix +++ b/pkgs/by-name/sm/smu/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smu"; version = "1.5"; src = fetchFromGitHub { owner = "Gottox"; repo = "smu"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1jm7lhnzjx4q7gcwlkvsbffcy0zppywyh50d71ami6dnq182vvcc"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ oxzi ]; }; -} +}) diff --git a/pkgs/by-name/sn/snabb/package.nix b/pkgs/by-name/sn/snabb/package.nix index f9a8fa47bb51..4287d431a54b 100644 --- a/pkgs/by-name/sn/snabb/package.nix +++ b/pkgs/by-name/sn/snabb/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snabb"; version = "2024.08"; src = fetchFromGitHub { owner = "snabbco"; repo = "snabb"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-2ULkzNeyEkXFdd8BUEcY5wZswh8Z4s4ONqSQbeWK2Qs="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.lukego ]; mainProgram = "snabb"; }; -} +}) diff --git a/pkgs/by-name/sn/snake4/package.nix b/pkgs/by-name/sn/snake4/package.nix index 53a8c232c93e..ea21703e65a3 100644 --- a/pkgs/by-name/sn/snake4/package.nix +++ b/pkgs/by-name/sn/snake4/package.nix @@ -11,12 +11,12 @@ libx11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snake4"; version = "1.0.14"; src = fetchurl { - url = "https://shh.thathost.com/pub-unix/files/snake4-${version}.tar.gz"; + url = "https://shh.thathost.com/pub-unix/files/snake4-${finalAttrs.version}.tar.gz"; sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { license = lib.licenses.artistic1; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index ab13b3b9a014..82bfaa81312a 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "9.15.0"; + version = "9.16.0"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake"; tag = "v${version}"; - hash = "sha256-wkx19shtDWs/9E3Dg22YG1G3RCzMx4STLQm1gYUK1wk="; + hash = "sha256-Sj9YnPmj7Fn1+8sIO7IYnuj6vDwxUnn+JDg+DbbgbSI="; }; postPatch = '' diff --git a/pkgs/by-name/sn/snap7/package.nix b/pkgs/by-name/sn/snap7/package.nix index b7b4c1f432db..193be499b004 100644 --- a/pkgs/by-name/sn/snap7/package.nix +++ b/pkgs/by-name/sn/snap7/package.nix @@ -5,17 +5,17 @@ p7zip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snap7"; version = "1.4.2"; src = fetchzip { - url = "mirror://sourceforge/snap7/${version}/snap7-full-${version}.7z"; + url = "mirror://sourceforge/snap7/${finalAttrs.version}/snap7-full-${finalAttrs.version}.7z"; sha256 = "1n5gs8bwb6g9vfllf3x12r5yzqzapmlq1bmc6hl854b8vkg30y8c"; postFetch = '' ${p7zip}/bin/7z x $downloadedFile mkdir $out - cp -r snap7-full-${version}/* $out/ + cp -r snap7-full-${finalAttrs.version}/* $out/ ''; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sn/snapraid/package.nix b/pkgs/by-name/sn/snapraid/package.nix index dc9e35aca1ff..8123503a3c6d 100644 --- a/pkgs/by-name/sn/snapraid/package.nix +++ b/pkgs/by-name/sn/snapraid/package.nix @@ -7,18 +7,18 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snapraid"; version = "12.4"; src = fetchFromGitHub { owner = "amadvance"; repo = "snapraid"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7guTRH9AZCsQYyWLpws19/sEe9GVFop21GYPzXCK6Fg="; }; - VERSION = version; + VERSION = finalAttrs.version; doCheck = true; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "snapraid"; }; -} +}) diff --git a/pkgs/by-name/sn/snd/package.nix b/pkgs/by-name/sn/snd/package.nix index 140231f348dc..a150e002ae55 100644 --- a/pkgs/by-name/sn/snd/package.nix +++ b/pkgs/by-name/sn/snd/package.nix @@ -13,12 +13,12 @@ libxext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snd"; version = "25.8"; src = fetchurl { - url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; + url = "mirror://sourceforge/snd/snd-${finalAttrs.version}.tar.gz"; hash = "sha256-ha8f7vBRUNEHXc0/E0L714jPFDVhMSCluKPrrdQYOTM="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "snd"; }; -} +}) diff --git a/pkgs/by-name/sn/sndpeek/package.nix b/pkgs/by-name/sn/sndpeek/package.nix index b92fc1c562b3..947e127f5323 100644 --- a/pkgs/by-name/sn/sndpeek/package.nix +++ b/pkgs/by-name/sn/sndpeek/package.nix @@ -13,15 +13,15 @@ libXi, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sndpeek"; version = "1.4"; src = fetchurl { - url = "https://soundlab.cs.princeton.edu/software/sndpeek/files/sndpeek-${version}.tgz"; + url = "https://soundlab.cs.princeton.edu/software/sndpeek/files/sndpeek-${finalAttrs.version}.tgz"; sha256 = "2d86cf74854fa00dcdc05a35dd92bc4cf6115e87102b17023be5cba9ead8eedf"; }; - sourceRoot = "sndpeek-${version}/src/sndpeek"; + sourceRoot = "sndpeek-${finalAttrs.version}/src/sndpeek"; # this patch adds -lpthread to the list of libraries, without it a # symbol-not-found-error is thrown @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.laikq ]; mainProgram = "sndpeek"; }; -} +}) diff --git a/pkgs/by-name/sn/sngrep/package.nix b/pkgs/by-name/sn/sngrep/package.nix index e8e6bf103d04..67eb2b6ff149 100644 --- a/pkgs/by-name/sn/sngrep/package.nix +++ b/pkgs/by-name/sn/sngrep/package.nix @@ -10,14 +10,14 @@ pcre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sngrep"; version = "1.8.2"; src = fetchFromGitHub { owner = "irontec"; repo = "sngrep"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-nvuT//FWJAa6DzmjBsBW9s2p1M+6Zs4cVmpK4dVemnE="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ jorise ]; }; -} +}) diff --git a/pkgs/by-name/sn/snippetexpanderx/package.nix b/pkgs/by-name/sn/snippetexpanderx/package.nix index f460b97e231a..3d812fb27b51 100644 --- a/pkgs/by-name/sn/snippetexpanderx/package.nix +++ b/pkgs/by-name/sn/snippetexpanderx/package.nix @@ -16,12 +16,12 @@ snippetexpanderd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { inherit (snippetexpanderd) src version; pname = "snippetexpanderx"; - sourceRoot = "${src.name}/cmd/snippetexpanderx"; + sourceRoot = "${finalAttrs.src.name}/cmd/snippetexpanderx"; nativeBuildInputs = [ pkg-config @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { snippetexpanderd ]; - makeFlags = [ "VERSION=${src.rev}" ]; + makeFlags = [ "VERSION=${finalAttrs.src.rev}" ]; installPhase = '' runHook preInstall @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "snippetexpanderx"; }; -} +}) diff --git a/pkgs/by-name/sn/snippetpixie/package.nix b/pkgs/by-name/sn/snippetpixie/package.nix index e4bbde3ba65f..869b32bc06f2 100644 --- a/pkgs/by-name/sn/snippetpixie/package.nix +++ b/pkgs/by-name/sn/snippetpixie/package.nix @@ -24,14 +24,14 @@ libxtst, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snippetpixie"; version = "1.5.3"; src = fetchFromGitHub { owner = "bytepixie"; repo = "snippetpixie"; - rev = version; + rev = finalAttrs.version; sha256 = "0gs3d9hdywg4vcfbp4qfcagfjqalfgw9xpvywg4pw1cm3rzbdqmz"; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "com.github.bytepixie.snippetpixie"; }; -} +}) diff --git a/pkgs/by-name/sn/snixembed/package.nix b/pkgs/by-name/sn/snixembed/package.nix index 25910bc4fc40..3b5d7b9548ba 100644 --- a/pkgs/by-name/sn/snixembed/package.nix +++ b/pkgs/by-name/sn/snixembed/package.nix @@ -8,14 +8,14 @@ vala, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snixembed"; version = "0.3.3"; src = fetchFromSourcehut { owner = "~steef"; repo = "snixembed"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-co32Xlklg6KVyi+xEoDJ6TeN28V+wCSx73phwnl/05E="; }; @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { meta = { description = "Proxy StatusNotifierItems as XEmbedded systemtray-spec icons"; homepage = "https://git.sr.ht/~steef/snixembed"; - changelog = "https://git.sr.ht/~steef/snixembed/refs/${version}"; + changelog = "https://git.sr.ht/~steef/snixembed/refs/${finalAttrs.version}"; license = lib.licenses.isc; platforms = lib.platforms.unix; maintainers = [ ]; mainProgram = "snixembed"; }; -} +}) diff --git a/pkgs/by-name/sn/snmpcheck/package.nix b/pkgs/by-name/sn/snmpcheck/package.nix index 3834b96dd421..70187ae0b091 100644 --- a/pkgs/by-name/sn/snmpcheck/package.nix +++ b/pkgs/by-name/sn/snmpcheck/package.nix @@ -8,11 +8,11 @@ let rubyEnv = ruby.withPackages (ps: [ ps.snmp ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snmpcheck"; version = "1.9"; src = fetchurl { - url = "http://www.nothink.org/codes/snmpcheck/snmpcheck-${version}.rb"; + url = "http://www.nothink.org/codes/snmpcheck/snmpcheck-${finalAttrs.version}.rb"; sha256 = "sha256-9xkLqbgxU1uykx+M9QsbPAH8OI/Cqn9uw6ALe23Lbq0="; executable = true; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; mainProgram = "snmp-check"; }; -} +}) diff --git a/pkgs/by-name/sn/snobol4/package.nix b/pkgs/by-name/sn/snobol4/package.nix index 0fbd618f3a1d..fae8a6652efe 100644 --- a/pkgs/by-name/sn/snobol4/package.nix +++ b/pkgs/by-name/sn/snobol4/package.nix @@ -15,15 +15,15 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snobol4"; version = "2.3.3"; src = fetchurl { urls = [ - "https://ftp.regressive.org/snobol4/snobol4-${version}.tar.gz" + "https://ftp.regressive.org/snobol4/snobol4-${finalAttrs.version}.tar.gz" # fallback for when the current version is moved to the old folder - "https://ftp.regressive.org/snobol4/old/snobol4-${version}.tar.gz" + "https://ftp.regressive.org/snobol4/old/snobol4-${finalAttrs.version}.tar.gz" ]; hash = "sha256-v9UwcdaSg3dvWydk94ZdNUuJ03JWmFShiHjln1c4jtI="; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ xworld21 ]; }; -} +}) diff --git a/pkgs/by-name/sn/snooze/package.nix b/pkgs/by-name/sn/snooze/package.nix index 6ae458cbf08b..f49604c270c9 100644 --- a/pkgs/by-name/sn/snooze/package.nix +++ b/pkgs/by-name/sn/snooze/package.nix @@ -3,13 +3,13 @@ stdenv, fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snooze"; version = "0.5.1"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = "snooze"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ghWQ/bslWJCcsQ8OqS3MHZiiuGzbgzat6mkG2avSbEk="; }; makeFlags = [ @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "snooze"; }; -} +}) diff --git a/pkgs/by-name/sn/snore/package.nix b/pkgs/by-name/sn/snore/package.nix index 255c3a82a907..6c3fa848f596 100644 --- a/pkgs/by-name/sn/snore/package.nix +++ b/pkgs/by-name/sn/snore/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.3.1"; pname = "snore"; src = fetchFromGitHub { owner = "clamiax"; repo = "snore"; - tag = version; + tag = finalAttrs.version; hash = "sha256-bKPGSePzp4XEZFY0QQr37fm3R1v3hLD6FeySFd7zNJc="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "snore"; }; -} +}) diff --git a/pkgs/by-name/sn/snow/package.nix b/pkgs/by-name/sn/snow/package.nix index 9c1babda2aac..07c49e00f0ee 100644 --- a/pkgs/by-name/sn/snow/package.nix +++ b/pkgs/by-name/sn/snow/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snow"; version = "20130616"; src = fetchurl { - url = "https://web.archive.org/web/20200304125913if_/http://darkside.com.au/snow/snow-${version}.tar.gz"; + url = "https://web.archive.org/web/20200304125913if_/http://darkside.com.au/snow/snow-${finalAttrs.version}.tar.gz"; sha256 = "0r9q45y55z4i0askkxmxrx0jr1620ypd870vz0hx2a6n9skimdy0"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/so/soapui/package.nix b/pkgs/by-name/so/soapui/package.nix index 6ee3650bfa7b..8bd17651b58a 100644 --- a/pkgs/by-name/so/soapui/package.nix +++ b/pkgs/by-name/so/soapui/package.nix @@ -7,12 +7,12 @@ makeWrapper, nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "soapui"; version = "5.9.1"; src = fetchurl { - url = "https://dl.eviware.com/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz"; + url = "https://dl.eviware.com/soapuios/${finalAttrs.version}/SoapUI-${finalAttrs.version}-linux-bin.tar.gz"; sha256 = "sha256-VlI6TcesavKOpKf/R8S6IubepkthArFf8Jmi7YUGHjs="; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patches = [ # Adjust java path to point to derivation paths - (writeText "soapui-${version}.patch" '' + (writeText "soapui-${finalAttrs.version}.patch" '' --- a/bin/soapui.sh +++ b/bin/soapui.sh @@ -50,7 +50,7 @@ @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; # we don't fetch the dmg yet mainProgram = "soapui"; }; -} +}) diff --git a/pkgs/by-name/so/soapyairspy/package.nix b/pkgs/by-name/so/soapyairspy/package.nix index 2b8289a7879f..44e2bfd29958 100644 --- a/pkgs/by-name/so/soapyairspy/package.nix +++ b/pkgs/by-name/so/soapyairspy/package.nix @@ -8,14 +8,14 @@ soapysdr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "soapyairspy"; version = "0.2.0"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyAirspy"; - rev = "soapy-airspy-${version}"; + rev = "soapy-airspy-${finalAttrs.version}"; sha256 = "0g23yybnmq0pg2m8m7dbhif8lw0hdsmnnjym93fdyxfk5iln7fsc"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ markuskowa ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/so/soapyaudio/package.nix b/pkgs/by-name/so/soapyaudio/package.nix index fdc31102196d..506ce71dbd88 100644 --- a/pkgs/by-name/so/soapyaudio/package.nix +++ b/pkgs/by-name/so/soapyaudio/package.nix @@ -14,14 +14,14 @@ soapysdr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "soapyaudio"; version = "0.1.1"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyAudio"; - rev = "soapy-audio-${version}"; + rev = "soapy-audio-${finalAttrs.version}"; sha256 = "0minlsc1lvmqm20vn5hb4im7pz8qwklfy7sbr2xr73xkrbqdahc0"; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ numinit ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/so/socket_wrapper/package.nix b/pkgs/by-name/so/socket_wrapper/package.nix index 1ed965501a12..1eb299ecd7c3 100644 --- a/pkgs/by-name/so/socket_wrapper/package.nix +++ b/pkgs/by-name/so/socket_wrapper/package.nix @@ -6,12 +6,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "socket_wrapper"; version = "1.5.1"; src = fetchurl { - url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz"; + url = "mirror://samba/cwrap/socket_wrapper-${finalAttrs.version}.tar.gz"; sha256 = "sha256-miEZA+G3BeORbMUJ0MbV8PjftutYf0SOEdjiAJtHdaU="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/so/sockperf/package.nix b/pkgs/by-name/so/sockperf/package.nix index ca481a31d1c7..129b861d3902 100644 --- a/pkgs/by-name/so/sockperf/package.nix +++ b/pkgs/by-name/so/sockperf/package.nix @@ -8,14 +8,14 @@ enableTest ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sockperf"; version = "3.10"; src = fetchFromGitHub { owner = "Mellanox"; repo = "sockperf"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-VvxL/bcn69uL7CBpDu4qwbKZwlC4N/kNeRX4k3UzxPI="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "sockperf"; }; -} +}) diff --git a/pkgs/by-name/so/softhsm/package.nix b/pkgs/by-name/so/softhsm/package.nix index a048dff80619..14d1174463a4 100644 --- a/pkgs/by-name/so/softhsm/package.nix +++ b/pkgs/by-name/so/softhsm/package.nix @@ -7,7 +7,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "softhsm"; version = "2.6.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "softhsm"; repo = "SoftHSMv2"; - rev = "${version}"; + rev = "${finalAttrs.version}"; hash = "sha256-sx0ceVY795JbtKbQGAVFllB9UJfTdgd242d6c+s1tBw="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix index 66a33eca2d60..3c9a551458e9 100644 --- a/pkgs/by-name/so/solanum/package.nix +++ b/pkgs/by-name/so/solanum/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "solanum"; - version = "0-unstable-2026-01-22"; + version = "0-unstable-2026-01-27"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = "solanum"; - rev = "fd89d4e837fe2e98cb273c340ddf4762ce1eb070"; - hash = "sha256-QMGbNCWbg6ODZHVM+A2hwm/okIXGYULCS2nZrGX2xco="; + rev = "852bef71f56d206aa224231589849c4c9be81867"; + hash = "sha256-hPlWOHplf6mOMmSX5DWY8kw6YNskTE6YYVqEmGsrnxs="; }; patches = [ diff --git a/pkgs/by-name/so/sollya/package.nix b/pkgs/by-name/so/sollya/package.nix index 9dc898b36eb6..bb43e4a2984f 100644 --- a/pkgs/by-name/so/sollya/package.nix +++ b/pkgs/by-name/so/sollya/package.nix @@ -9,12 +9,12 @@ fplll, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sollya"; version = "8.0"; src = fetchurl { - url = "https://www.sollya.org/releases/sollya-${version}/sollya-${version}.tar.gz"; + url = "https://www.sollya.org/releases/sollya-${finalAttrs.version}/sollya-${finalAttrs.version}.tar.gz"; sha256 = "sha256-WNc0+aL8jmczwR+W0t+aslvvJNccQBIw4p8KEzmoEZI="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ wegank ]; }; -} +}) diff --git a/pkgs/by-name/so/solvespace/package.nix b/pkgs/by-name/so/solvespace/package.nix index b42755b4347b..bb4700682213 100644 --- a/pkgs/by-name/so/solvespace/package.nix +++ b/pkgs/by-name/so/solvespace/package.nix @@ -32,14 +32,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "solvespace"; version = "3.2"; src = fetchFromGitHub { owner = "solvespace"; repo = "solvespace"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-+ZSAC7wDOaN51RjbSAqaQOp10JzxSME3g0ln4VdkwcA="; fetchSubmodules = true; }; @@ -104,6 +104,6 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.edef ]; platforms = lib.platforms.linux; homepage = "https://solvespace.com"; - changelog = "https://github.com/solvespace/solvespace/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/solvespace/solvespace/raw/v${finalAttrs.version}/CHANGELOG.md"; }; -} +}) diff --git a/pkgs/by-name/so/somafm-cli/package.nix b/pkgs/by-name/so/somafm-cli/package.nix index 79bbb6a1feb1..bee083179b58 100644 --- a/pkgs/by-name/so/somafm-cli/package.nix +++ b/pkgs/by-name/so/somafm-cli/package.nix @@ -8,14 +8,14 @@ mpv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "somafm-cli"; version = "0.3.1"; src = fetchFromGitHub { owner = "rockymadden"; repo = "somafm-cli"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1h5p9qsczgfr450sklh2vkllcpzb7nicbs8ciyvkavh3d7hds0yy"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "somafm"; }; -} +}) diff --git a/pkgs/by-name/so/somebar/package.nix b/pkgs/by-name/so/somebar/package.nix index 484cf1a296b7..97f314bb7ddc 100644 --- a/pkgs/by-name/so/somebar/package.nix +++ b/pkgs/by-name/so/somebar/package.nix @@ -17,14 +17,14 @@ let configFile = if lib.isDerivation conf || builtins.isPath conf then conf else "src/config.def.hpp"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "somebar"; version = "1.0.3"; src = fetchFromSourcehut { owner = "~raphi"; repo = "somebar"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-PBxCy1dZrOL1nmhVDQozvF0XL79uKMhhERGNpPPzaRU="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "somebar"; }; -} +}) diff --git a/pkgs/by-name/so/sonivox/package.nix b/pkgs/by-name/so/sonivox/package.nix index 073e0b39780b..304ff3555675 100644 --- a/pkgs/by-name/so/sonivox/package.nix +++ b/pkgs/by-name/so/sonivox/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sonivox"; version = "4.0.0"; src = fetchFromGitHub { owner = "EmbeddedSynth"; repo = "sonivox"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eOC/7R45X93Q9KKnP+/fyPMESOVyTnzpqnLHnDQwLnQ="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.wegank ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/so/sony-headphones-client/package.nix b/pkgs/by-name/so/sony-headphones-client/package.nix index c0e6b8f0b084..b4a5f8f348d0 100644 --- a/pkgs/by-name/so/sony-headphones-client/package.nix +++ b/pkgs/by-name/so/sony-headphones-client/package.nix @@ -14,14 +14,14 @@ copyDesktopItems, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SonyHeadphonesClient"; version = "1.3.2"; src = fetchFromGitHub { owner = "Plutoberth"; repo = "SonyHeadphonesClient"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vhI97KheKzr87exCh4xNN7NDefcagdMu1tWSt67vLiU="; fetchSubmodules = true; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { imgui ]; - sourceRoot = "${src.name}/Client"; + sourceRoot = "${finalAttrs.src.name}/Client"; cmakeFlags = [ "-Wno-dev" ]; @@ -89,4 +89,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "SonyHeadphonesClient"; }; -} +}) diff --git a/pkgs/by-name/so/sopwith/package.nix b/pkgs/by-name/so/sopwith/package.nix index c24ec4e48704..5a9247e6e33d 100644 --- a/pkgs/by-name/so/sopwith/package.nix +++ b/pkgs/by-name/so/sopwith/package.nix @@ -9,14 +9,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sopwith"; version = "2.8.0"; src = fetchFromGitHub { owner = "fragglet"; repo = "sdl-sopwith"; - tag = "sdl-sopwith-${version}"; + tag = "sdl-sopwith-${finalAttrs.version}"; hash = "sha256-s7npLid3GYZArQmctSwOu8zeC+mSfTiiiOaOEa9dcrg="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ evilbulgarian ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/so/sorcer/package.nix b/pkgs/by-name/so/sorcer/package.nix index e0f739c01175..40f8128e1cc4 100644 --- a/pkgs/by-name/so/sorcer/package.nix +++ b/pkgs/by-name/so/sorcer/package.nix @@ -11,14 +11,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sorcer"; version = "1.1.3"; src = fetchFromGitHub { owner = "openAVproductions"; repo = "openAV-Sorcer"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp"; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/so/sord/package.nix b/pkgs/by-name/so/sord/package.nix index 18d112657ae1..75f9e48de010 100644 --- a/pkgs/by-name/so/sord/package.nix +++ b/pkgs/by-name/so/sord/package.nix @@ -12,7 +12,7 @@ zix, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sord"; version = "0.16.20"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { domain = "gitlab.com"; owner = "drobilla"; repo = "sord"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+f3dxhcxVoub+KeI5c5/J87SVvAawrm5cZgo2qogdRM="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/so/sorted-grep/package.nix b/pkgs/by-name/so/sorted-grep/package.nix index ef3da0ccc89f..ffbcfe2a9751 100644 --- a/pkgs/by-name/so/sorted-grep/package.nix +++ b/pkgs/by-name/so/sorted-grep/package.nix @@ -4,12 +4,12 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sorted-grep"; version = "1.0"; src = fetchurl { - url = "mirror://sourceforge/sgrep/sgrep-${version}.tgz"; + url = "mirror://sourceforge/sgrep/sgrep-${finalAttrs.version}.tgz"; hash = "sha256-3F7cXrZnB38YwE1sHYm/CIGKmG+1c0QU+Pk3Y53a0T4="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ivan ]; }; -} +}) diff --git a/pkgs/by-name/so/sortmerna/package.nix b/pkgs/by-name/so/sortmerna/package.nix index 9c19c90c6d17..18269b941cc4 100644 --- a/pkgs/by-name/so/sortmerna/package.nix +++ b/pkgs/by-name/so/sortmerna/package.nix @@ -18,14 +18,14 @@ let hash = "sha256-MkhlDme6ZwKPuRINhfpv7cxliI2GU3RmTfC6O0ke/IQ="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sortmerna"; version = "4.3.7"; src = fetchFromGitHub { owner = "sortmerna"; repo = "sortmerna"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oxwZBkeW3usEcJE1XLu1UigKsgOsljwGFTpb7U3845I="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ luispedro ]; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/so/souffle/package.nix b/pkgs/by-name/so/souffle/package.nix index fe8a1b828c44..c222f3864ee8 100644 --- a/pkgs/by-name/so/souffle/package.nix +++ b/pkgs/by-name/so/souffle/package.nix @@ -26,14 +26,14 @@ let python3 ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "souffle"; version = "2.5"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-Umfeb1pGAeK5K3QDRD/labC6IJLsPPJ73ycsAV4yPNM="; }; @@ -108,4 +108,4 @@ stdenv.mkDerivation rec { ]; license = lib.licenses.upl; }; -} +}) diff --git a/pkgs/by-name/so/soundmodem/matFix.patch b/pkgs/by-name/so/soundmodem/matFix.patch deleted file mode 100644 index 55436cda3d41..000000000000 --- a/pkgs/by-name/so/soundmodem/matFix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/matlib/mat.hh 2003-01-06 23:47:26.000000000 +0100 -+++ b/matlib/mat.copy.hh 2021-01-06 10:05:34.332415179 +0100 -@@ -91,7 +91,7 @@ - memcpy(c, r, d1 * d3 * sizeof(c[0])); - } - --template void mdet(const T *c, unsigned int d) -+template int mdet(const T *c, unsigned int d) - { - T *c2; - unsigned int i, j, k, l; diff --git a/pkgs/by-name/so/soundmodem/package.nix b/pkgs/by-name/so/soundmodem/package.nix deleted file mode 100644 index 63bdfebc6ec2..000000000000 --- a/pkgs/by-name/so/soundmodem/package.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - alsa-lib, - audiofile, - gtk2, - libxml2, - copyDesktopItems, - makeDesktopItem, -}: - -stdenv.mkDerivation rec { - pname = "soundmodem"; - version = "0.20"; - - src = fetchurl { - url = "https://archive.org/download/soundmodem-${version}/soundmodem-${version}.tar.gz"; - sha256 = "156l3wjnh5rcisxb42kcmlf74swf679v4xnj09zy5j74rd4h721z"; - }; - - nativeBuildInputs = [ - pkg-config - copyDesktopItems - ]; - buildInputs = [ - alsa-lib - audiofile - gtk2 - libxml2 - ]; - - patches = [ ./matFix.patch ]; - - doCheck = true; - - desktopItems = [ - (makeDesktopItem { - name = "SoundmodemConfig"; - exec = "soundmodemconfig"; - desktopName = "SoundModemConfig"; - comment = "Audio based modem for ham radio supporting ax.25"; - categories = [ "Audio" ]; - }) - ]; - - meta = { - description = "Audio based modem for ham radio supporting ax.25"; - longDescription = '' - This software allows a standard PC soundcard to be used as a packet radio "modem". The whole processing is done on the main processor CPU. - Unlike previous packet radio modem software, this new release offers several new benefits: - - Now uses standard operating system sound drivers (OSS/Free under Linux, /dev/audio under Solaris and DirectSound under Windows), thus runs on all soundcards for which drivers for the desired operating system are available. - - No fixed relationship between bitrate, sampling rate, and modem parameters. Modems may be parametrized, and multiple modems may even run on the same audio channel! - - Usermode solution allows the use of MMX, VIS, Floating point and other media instruction sets to speed up computation. - - Cross platform builds from a single source code provides ubiquitous availability. - ''; - #homepage = "http://gna.org/projects/soundmodem"; # official, but "Connection refused" - homepage = "http://soundmodem.vk4msl.id.au/"; - downloadPage = "https://archive.org/download/${pname}-${version}/${pname}-${version}.tar.gz"; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ ymarkus ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/by-name/so/soundtouch/package.nix b/pkgs/by-name/so/soundtouch/package.nix index 2fb380a97d17..8bb777fe0b9c 100644 --- a/pkgs/by-name/so/soundtouch/package.nix +++ b/pkgs/by-name/so/soundtouch/package.nix @@ -7,7 +7,7 @@ libtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "soundtouch"; version = "2.4.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "soundtouch"; repo = "soundtouch"; - rev = version; + rev = finalAttrs.version; hash = "sha256-7JUBAFURKtPCZrcKqL1rOLdsYMd7kGe7wY0JUl2XPvw="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { mainProgram = "soundstretch"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/so/soxr/package.nix b/pkgs/by-name/so/soxr/package.nix index 962e3ccff578..d53700e391c2 100644 --- a/pkgs/by-name/so/soxr/package.nix +++ b/pkgs/by-name/so/soxr/package.nix @@ -5,12 +5,12 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "soxr"; version = "0.1.3"; src = fetchurl { - url = "mirror://sourceforge/soxr/soxr-${version}-Source.tar.xz"; + url = "mirror://sourceforge/soxr/soxr-${finalAttrs.version}-Source.tar.xz"; sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di"; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix index 6e25e5f9de5f..0b518a318a2b 100644 --- a/pkgs/by-name/sp/spaceFM/package.nix +++ b/pkgs/by-name/sp/spaceFM/package.nix @@ -19,14 +19,14 @@ udisks, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spacefm"; version = "1.0.6"; src = fetchFromGitHub { owner = "IgnorantGuru"; repo = "spacefm"; - rev = version; + rev = finalAttrs.version; sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx"; }; @@ -100,4 +100,4 @@ stdenv.mkDerivation rec { obadz ]; }; -} +}) diff --git a/pkgs/by-name/sp/spacevim/package.nix b/pkgs/by-name/sp/spacevim/package.nix index 94935f624fff..eee05b1cf28e 100644 --- a/pkgs/by-name/sp/spacevim/package.nix +++ b/pkgs/by-name/sp/spacevim/package.nix @@ -21,13 +21,13 @@ let cp ${format.generate "init.toml" spacevim_config} $out/init.toml ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spacevim"; version = "2.4.0"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-qiNadhQJjU9RY14X8+pd4Ul+NLoNqbxuh3Kenw1dHDc="; }; @@ -79,4 +79,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "spacevim"; }; -} +}) diff --git a/pkgs/by-name/sp/span-lite/package.nix b/pkgs/by-name/sp/span-lite/package.nix index 50940924f3ab..542f8868dc59 100644 --- a/pkgs/by-name/sp/span-lite/package.nix +++ b/pkgs/by-name/sp/span-lite/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "span-lite"; version = "0.11.0"; src = fetchFromGitHub { owner = "martinmoene"; repo = "span-lite"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-BYRSdGzIvrOjPXxeabMj4tPFmQ0wfq7y+zJf6BD/bTw="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ icewind1991 ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sp/sparsehash/package.nix b/pkgs/by-name/sp/sparsehash/package.nix index 029ca2e6f88d..002ba03fc1a4 100644 --- a/pkgs/by-name/sp/sparsehash/package.nix +++ b/pkgs/by-name/sp/sparsehash/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sparsehash"; version = "2.0.4"; src = fetchFromGitHub { owner = "sparsehash"; repo = "sparsehash"; - rev = "sparsehash-${version}"; + rev = "sparsehash-${finalAttrs.version}"; sha256 = "1pf1cjvcjdmb9cd6gcazz64x0cd2ndpwh6ql2hqpypjv725xwxy7"; }; @@ -22,4 +22,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/sp/spectra/package.nix b/pkgs/by-name/sp/spectra/package.nix index fff116fa16b9..fb3163f5095d 100644 --- a/pkgs/by-name/sp/spectra/package.nix +++ b/pkgs/by-name/sp/spectra/package.nix @@ -6,14 +6,14 @@ eigen, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spectra"; version = "1.2.0"; src = fetchFromGitHub { owner = "yixuan"; repo = "spectra"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-lfbOwnTP3GrN/1N/tyMXZrtEHIxAq3EjuHS8M+I87to="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ vonfry ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sp/spectre-cli/package.nix b/pkgs/by-name/sp/spectre-cli/package.nix index 3b188a1e72aa..3a3c9c4f0082 100644 --- a/pkgs/by-name/sp/spectre-cli/package.nix +++ b/pkgs/by-name/sp/spectre-cli/package.nix @@ -10,7 +10,7 @@ jq, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spectre-cli"; version = "unstable-2022-02-05"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - echo "${version}" > VERSION + echo "${finalAttrs.version}" > VERSION # The default buildPhase wants to create a ´build´ dir so we rename the build script to stop conflicts. mv build build.sh @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { mainProgram = "spectre"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sp/spectrojack/package.nix b/pkgs/by-name/sp/spectrojack/package.nix deleted file mode 100644 index f31420ac81eb..000000000000 --- a/pkgs/by-name/sp/spectrojack/package.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - libjack2, - fftwFloat, - gtk2, -}: - -stdenv.mkDerivation rec { - pname = "spectrojack"; - version = "0.4.1"; - - src = fetchurl { - url = "http://sed.free.fr/spectrojack/${pname}-${version}.tar.gz"; - sha256 = "1kiwx0kag7kq7rhg0bvckfm8r7pqmbk76ppa39cq2980jb5v8rfp"; - }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libjack2 - fftwFloat - gtk2 - ]; - configurePhase = '' - runHook preConfigure - - sed -i 's/.*home.*/#&/' ./Makefile - substituteInPlace ./Makefile \ - --replace "/usr/share" "$out/usr/share" - - runHook postConfigure - ''; - installPhase = '' - install -Dm755 spectrojack $out/bin/spectrojack - install -Dm644 spectrojack_icon.svg $out/usr/share/spectrojack/icon.svg - install -Dm644 -t $out/usr/share/spectrojack/colormaps colormaps/* - ''; - - meta = { - description = "Little spectrogram/audiogram/sonogram/whatever for JACK"; - homepage = "http://sed.free.fr/spectrojack"; - license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ sleexyz ]; - platforms = with lib.platforms; linux; - mainProgram = "spectrojack"; - }; -} diff --git a/pkgs/by-name/sp/speech-tools/package.nix b/pkgs/by-name/sp/speech-tools/package.nix index 5c11f21d2f51..0ca6112566f7 100644 --- a/pkgs/by-name/sp/speech-tools/package.nix +++ b/pkgs/by-name/sp/speech-tools/package.nix @@ -7,12 +7,12 @@ alsa-lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "speech_tools"; version = "2.5.0"; src = fetchurl { - url = "http://www.festvox.org/packed/festival/${lib.versions.majorMinor version}/speech_tools-${version}-release.tar.gz"; + url = "http://www.festvox.org/packed/festival/${lib.versions.majorMinor finalAttrs.version}/speech_tools-${finalAttrs.version}-release.tar.gz"; sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4"; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { downloadPage = "http://www.festvox.org/packed/festival/"; }; }; -} +}) diff --git a/pkgs/by-name/sp/speed-dreams/package.nix b/pkgs/by-name/sp/speed-dreams/package.nix index 1446841b7871..cae6668477f7 100644 --- a/pkgs/by-name/sp/speed-dreams/package.nix +++ b/pkgs/by-name/sp/speed-dreams/package.nix @@ -75,17 +75,17 @@ let runtimeLibPath = lib.makeLibraryPath runtimeLibs; libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.4.2"; pname = "speed-dreams"; src = fetchgit { url = "https://forge.a-lec.org/speed-dreams/speed-dreams-code.git"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ZY/0tf0wFbepEUNqpaBA4qgkWDij/joqPtbiF/48oN4="; fetchSubmodules = true; }; - NIX_CFLAGS_COMPILE = "-I${src}/src/libs/tgf -I${src}/src/libs/tgfdata -I${src}/src/interfaces -I${src}/src/libs/math -I${src}/src/libs/portability"; + NIX_CFLAGS_COMPILE = "-I${finalAttrs.src}/src/libs/tgf -I${finalAttrs.src}/src/libs/tgfdata -I${finalAttrs.src}/src/interfaces -I${finalAttrs.src}/src/libs/math -I${finalAttrs.src}/src/libs/portability"; patches = [ ./darwin-gl-compat.patch @@ -170,4 +170,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "speed-dreams"; }; -} +}) diff --git a/pkgs/by-name/sp/speedread/package.nix b/pkgs/by-name/sp/speedread/package.nix index 4bd4b43884f0..a03368cdb878 100644 --- a/pkgs/by-name/sp/speedread/package.nix +++ b/pkgs/by-name/sp/speedread/package.nix @@ -5,7 +5,7 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "speedread"; version = "unstable-2016-09-21"; @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { reading points. This allows reading text at a much more rapid pace than usual as the eye can stay fixed on a single place. ''; - homepage = src.meta.homepage; + homepage = finalAttrs.src.meta.homepage; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.oxij ]; mainProgram = "speedread"; }; -} +}) diff --git a/pkgs/by-name/sp/spfft/package.nix b/pkgs/by-name/sp/spfft/package.nix index f7023ec931be..c112b5a02804 100644 --- a/pkgs/by-name/sp/spfft/package.nix +++ b/pkgs/by-name/sp/spfft/package.nix @@ -26,14 +26,14 @@ assert builtins.elem gpuBackend [ "rocm" ]; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SpFFT"; version = "1.1.1"; src = fetchFromGitHub { owner = "eth-cscs"; repo = "SpFFT"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Qc/omdRv7dW9NJUOczMZJKhc+Z/sXeIxv3SbpegAGdU="; }; @@ -80,4 +80,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.sheepforce ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sp/sphinxsearch/package.nix b/pkgs/by-name/sp/sphinxsearch/package.nix index 395b07b76a32..8be034f42a33 100644 --- a/pkgs/by-name/sp/sphinxsearch/package.nix +++ b/pkgs/by-name/sp/sphinxsearch/package.nix @@ -9,12 +9,12 @@ enableMysql ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sphinxsearch"; version = "2.2.11"; src = fetchurl { - url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz"; + url = "http://sphinxsearch.com/files/sphinx-${finalAttrs.version}-release.tar.gz"; sha256 = "1aa1mh32y019j8s3sjzn4vwi0xn83dwgl685jnbgh51k16gh6qk6"; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { valodim ]; }; -} +}) diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 109a7fd6daca..56c19a6751f7 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "spicetify-cli"; - version = "2.42.7"; + version = "2.42.8"; src = fetchFromGitHub { owner = "spicetify"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-vbpHONTH8TFjVQHfBgPNiLbcefx41SeM9GngnDExu2M="; + hash = "sha256-EXKrmm6ECQ2T8OsyBPcfCvjnRrw8w46a4WkWVI3EOUU="; }; - vendorHash = "sha256-7Dk4tTyVgnNgDECYj24Uy4xavWkVVxWE8uZlkKsFobI="; + vendorHash = "sha256-uuvlu5yocqnDh6OO5a4Ngp5SahqURc/14fcg1Kr9sec="; postPatch = '' substituteInPlace src/preprocess/preprocess.go \ diff --git a/pkgs/by-name/sp/spicy-parser-generator/package.nix b/pkgs/by-name/sp/spicy-parser-generator/package.nix index c1c9196b3a17..3e418cf9b8e8 100644 --- a/pkgs/by-name/sp/spicy-parser-generator/package.nix +++ b/pkgs/by-name/sp/spicy-parser-generator/package.nix @@ -10,7 +10,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spicy"; version = "1.14.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zeek"; repo = "spicy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Pc4BqQiaifB/kAbcaHYyTUeUE/HLlvg0qDSPdC/gMko="; fetchSubmodules = true; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ tobim ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sp/spin/package.nix b/pkgs/by-name/sp/spin/package.nix index 0f3b483b3cff..f9e2a320c67f 100644 --- a/pkgs/by-name/sp/spin/package.nix +++ b/pkgs/by-name/sp/spin/package.nix @@ -19,21 +19,21 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spin"; version = "6.5.2"; src = fetchFromGitHub { owner = "nimble-code"; repo = "Spin"; - rev = "version-${version}"; + rev = "version-${finalAttrs.version}"; sha256 = "sha256-drvQXfDZCZRycBZt/VNngy8zs4XVJg+d1b4dQXVcyFU="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bison ]; - sourceRoot = "${src.name}/Src"; + sourceRoot = "${finalAttrs.src.name}/Src"; preBuild = '' mkdir -p $out/bin @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { siraben ]; }; -} +}) diff --git a/pkgs/by-name/sp/spiped/package.nix b/pkgs/by-name/sp/spiped/package.nix index 068e248cb56b..8bc343586d04 100644 --- a/pkgs/by-name/sp/spiped/package.nix +++ b/pkgs/by-name/sp/spiped/package.nix @@ -7,12 +7,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spiped"; version = "1.6.4"; src = fetchurl { - url = "https://www.tarsnap.com/spiped/spiped-${version}.tgz"; + url = "https://www.tarsnap.com/spiped/spiped-${finalAttrs.version}.tgz"; hash = "sha256-Qk+003adkSsE3kPSHMMnSM39MSHE8dJtVJmSpUZ44Go="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/sp/spit/package.nix b/pkgs/by-name/sp/spit/package.nix index 77c1ba137dd8..bbebbb4401fe 100644 --- a/pkgs/by-name/sp/spit/package.nix +++ b/pkgs/by-name/sp/spit/package.nix @@ -5,14 +5,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spit"; version = "0.1"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = "spit"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bvcx+bQyi5tWDwuqdOv2h6q1ZSEHO9bHV2lfvRhL7iw="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.sternenseemann ]; mainProgram = "spit"; }; -} +}) diff --git a/pkgs/by-name/sp/spla/package.nix b/pkgs/by-name/sp/spla/package.nix index 32b29bd6ff9c..c6d662c633ec 100644 --- a/pkgs/by-name/sp/spla/package.nix +++ b/pkgs/by-name/sp/spla/package.nix @@ -26,14 +26,14 @@ assert builtins.elem gpuBackend [ "rocm" ]; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spla"; version = "1.6.1"; src = fetchFromGitHub { owner = "eth-cscs"; repo = "spla"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-fNH1IOKV1Re8G7GH9Xfn3itR80eonTbEGKQRRD16/2k="; }; @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/sp/splix/package.nix b/pkgs/by-name/sp/splix/package.nix index dbf889ce677f..e52319bbbd4c 100644 --- a/pkgs/by-name/sp/splix/package.nix +++ b/pkgs/by-name/sp/splix/package.nix @@ -27,7 +27,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "splix-svn"; version = "315"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # We build this from svn, because splix hasn't been in released in several years # although the community has been adding some new printer models. url = "svn://svn.code.sf.net/p/splix/code/splix"; - rev = version; + rev = finalAttrs.version; sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl"; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/sp/spooles/package.nix b/pkgs/by-name/sp/spooles/package.nix index d36fd7bd9e60..f0256be80c8d 100644 --- a/pkgs/by-name/sp/spooles/package.nix +++ b/pkgs/by-name/sp/spooles/package.nix @@ -5,12 +5,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spooles"; version = "2.2"; src = fetchurl { - url = "http://www.netlib.org/linalg/spooles/spooles.${version}.tgz"; + url = "http://www.netlib.org/linalg/spooles/spooles.${finalAttrs.version}.tgz"; sha256 = "1pf5z3vvwd8smbpibyabprdvcmax0grzvx2y0liy98c7x6h5jid8"; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sp/spotify-tray/package.nix b/pkgs/by-name/sp/spotify-tray/package.nix index ed4a9cd7c6ec..24651cab9195 100644 --- a/pkgs/by-name/sp/spotify-tray/package.nix +++ b/pkgs/by-name/sp/spotify-tray/package.nix @@ -9,14 +9,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spotify-tray"; version = "1.3.2"; src = fetchFromGitHub { owner = "tsmetana"; repo = "spotify-tray"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-E86rA8cBjy/bI7sZHlT40o7i23PcONXT5GTHEfcaDf0="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "spotify-tray"; }; -} +}) diff --git a/pkgs/by-name/sp/sptk/package.nix b/pkgs/by-name/sp/sptk/package.nix index 360550ac3cf8..03d875a0afa3 100644 --- a/pkgs/by-name/sp/sptk/package.nix +++ b/pkgs/by-name/sp/sptk/package.nix @@ -7,14 +7,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sptk"; version = "4.4"; src = fetchFromGitHub { owner = "sp-nitech"; repo = "SPTK"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-QdaXIFsFXL9/CtUJlOaUKOTmG/nm6ibBEsVfzW9pT/U="; }; @@ -42,10 +42,10 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - changelog = "https://github.com/sp-nitech/SPTK/releases/tag/v${version}"; + changelog = "https://github.com/sp-nitech/SPTK/releases/tag/v${finalAttrs.version}"; description = "Suite of speech signal processing tools"; homepage = "https://github.com/sp-nitech/SPTK"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/by-name/sq/sql-formatter/package.nix b/pkgs/by-name/sq/sql-formatter/package.nix index 9003dbde6071..4671dd6f57e8 100644 --- a/pkgs/by-name/sq/sql-formatter/package.nix +++ b/pkgs/by-name/sq/sql-formatter/package.nix @@ -9,19 +9,19 @@ nodejs, nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sql-formatter"; version = "15.7.0"; src = fetchFromGitHub { owner = "sql-formatter-org"; repo = "sql-formatter"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-k105xoppmxW1jSbkzbqHF7bg/IbY1P9kZVwa3pdKF7k="; }; yarnOfflineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-zcCYGTuaPkizZHc4K6RAPWwMnP5LtnyaLbF9xcPpNBs="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { mainProgram = "sql-formatter"; maintainers = with lib.maintainers; [ pyrox0 ]; }; -} +}) diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix index 93e9142d5455..b08a46bfcba6 100644 --- a/pkgs/by-name/sq/sql-studio/package.nix +++ b/pkgs/by-name/sq/sql-studio/package.nix @@ -9,19 +9,19 @@ }: let pname = "sql-studio"; - version = "0.1.46"; + version = "0.1.48"; src = fetchFromGitHub { owner = "frectonz"; repo = "sql-studio"; tag = version; - hash = "sha256-xtW6tF3hc8GyxOMwE6GlZNBNEE/QsKJzyOvAYU6i6M0="; + hash = "sha256-D/yLALIvzus9u8qUw5oLX+mEVzKgGfdZPEWkMEfM5tg="; }; ui = buildNpmPackage { pname = "sql-studio-ui"; inherit version src; - npmDepsHash = "sha256-1k054qLwvpSrWfBKXJRVVomCh1dMSEtjtwUTWCoAaEg="; + npmDepsHash = "sha256-4mDe8b5J1wrHz7OCClkE5WTbtfs3TMZB/vhiVuaHiyQ="; sourceRoot = "${src.name}/ui"; installPhase = '' runHook preInstall @@ -35,7 +35,7 @@ in rustPlatform.buildRustPackage { inherit pname version src; - cargoHash = "sha256-RMI2pW89PzmxHgZ7ondwNyGE4yeWpf3T6NRNr2eUFjQ="; + cargoHash = "sha256-CfyR1MNKgQlj0bii6U+En15sVnUpHluHXZn77P3KYgU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix index 06a9e09c66d9..89199313b584 100644 --- a/pkgs/by-name/sq/sqlitestudio/package.nix +++ b/pkgs/by-name/sq/sqlitestudio/package.nix @@ -12,14 +12,14 @@ sqlitestudio-plugins, includeOfficialPlugins ? lib.meta.availableOn stdenv.hostPlatform sqlitestudio-plugins, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sqlitestudio"; version = "3.4.21"; src = fetchFromGitHub { owner = "pawelsalawa"; repo = "sqlitestudio"; - rev = version; + rev = finalAttrs.version; hash = "sha256-xs0+bB0gPoDkIldaTA/nFofx9KPvIcyxe6kzcHuboxA="; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ asterismono ]; }; -} +}) diff --git a/pkgs/by-name/sq/squashfs-tools-ng/package.nix b/pkgs/by-name/sq/squashfs-tools-ng/package.nix index ec03bb270700..25b916fe2767 100644 --- a/pkgs/by-name/sq/squashfs-tools-ng/package.nix +++ b/pkgs/by-name/sq/squashfs-tools-ng/package.nix @@ -14,12 +14,12 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "squashfs-tools-ng"; version = "1.3.2"; src = fetchurl { - url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; + url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${finalAttrs.version}.tar.xz"; sha256 = "sha256-DZB6w+c1w1HkfIZ/tR2Uv/o7BfuVvsAfMehIt8RCFak="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ qyliss ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sq/squashfsTools/package.nix b/pkgs/by-name/sq/squashfsTools/package.nix index cf7ce417b987..2a24b41e2a26 100644 --- a/pkgs/by-name/sq/squashfsTools/package.nix +++ b/pkgs/by-name/sq/squashfsTools/package.nix @@ -12,14 +12,14 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "squashfs"; version = "4.7.4"; src = fetchFromGitHub { owner = "plougher"; repo = "squashfs-tools"; - rev = version; + rev = finalAttrs.version; hash = "sha256-xvTSGVwtzJjoAIF6GClASUIB5eIk+uquQNNzHIuwkuY="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ruuda ]; mainProgram = "mksquashfs"; }; -} +}) diff --git a/pkgs/by-name/sq/squashfuse/package.nix b/pkgs/by-name/sq/squashfuse/package.nix index 4b74c781731b..0289ea4bb083 100644 --- a/pkgs/by-name/sq/squashfuse/package.nix +++ b/pkgs/by-name/sq/squashfuse/package.nix @@ -13,7 +13,7 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "squashfuse"; version = "0.6.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "vasi"; repo = "squashfuse"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-HuDVCO+hKdUKz0TMfHquI0eqFNAoNhPfY2VBM2kXupk="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/by-name/sr/srain/package.nix b/pkgs/by-name/sr/srain/package.nix index 97ea8bd6eb02..91a5da28c517 100644 --- a/pkgs/by-name/sr/srain/package.nix +++ b/pkgs/by-name/sr/srain/package.nix @@ -20,14 +20,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "srain"; version = "1.8.1"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; - rev = version; + rev = finalAttrs.version; hash = "sha256-F7TFCPTAU856403QNUUyf+10s/Yr4xDN/CarJNcUv4A="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ wineee ]; }; -} +}) diff --git a/pkgs/by-name/sr/srandrd/package.nix b/pkgs/by-name/sr/srandrd/package.nix index 1a8e2145becf..7f55e8df6558 100644 --- a/pkgs/by-name/sr/srandrd/package.nix +++ b/pkgs/by-name/sr/srandrd/package.nix @@ -7,14 +7,14 @@ libXinerama, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "srandrd"; version = "0.6.3"; src = fetchFromGitHub { owner = "jceb"; repo = "srandrd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Wf+tVqDaNAiH6UHN8fFv2wM+LEch6wKlZOkqWEqLLkw="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { mainProgram = "srandrd"; }; -} +}) diff --git a/pkgs/by-name/sr/sregex/package.nix b/pkgs/by-name/sr/sregex/package.nix index 3f1f414528c6..7a2a7fe21b9d 100644 --- a/pkgs/by-name/sr/sregex/package.nix +++ b/pkgs/by-name/sr/sregex/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sregex"; version = "0.0.1"; src = fetchFromGitHub { owner = "openresty"; repo = "sregex"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-HZ9O/3BQHHrTVLLlU0o1fLHxyRSesBhreT3IdGHnNsg="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sr/srelay/package.nix b/pkgs/by-name/sr/srelay/package.nix index eeb3827e6ed7..3f1dc4030110 100644 --- a/pkgs/by-name/sr/srelay/package.nix +++ b/pkgs/by-name/sr/srelay/package.nix @@ -5,12 +5,12 @@ libxcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "srelay"; version = "0.4.8"; src = fetchurl { - url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-${version}/srelay-${version}.tar.gz"; + url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-${finalAttrs.version}/srelay-${finalAttrs.version}.tar.gz"; sha256 = "1sn6005aqyfvrlkm5445cyyaj6h6wfyskfncfmds55x34hfyxpvl"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; mainProgram = "srelay"; }; -} +}) diff --git a/pkgs/by-name/sr/srt-live-server/package.nix b/pkgs/by-name/sr/srt-live-server/package.nix index f919cf72ad9c..60db24f04eab 100644 --- a/pkgs/by-name/sr/srt-live-server/package.nix +++ b/pkgs/by-name/sr/srt-live-server/package.nix @@ -6,14 +6,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "srt-live-server"; version = "1.4.8"; src = fetchFromGitHub { owner = "Edward-Wu"; repo = "srt-live-server"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; sha256 = "0x48sxpgxznb1ymx8shw437pcgk76ka5rx0zhn9b3cyi9jlq1yld"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Edward-Wu/srt-live-server"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ss/ssdeep/package.nix b/pkgs/by-name/ss/ssdeep/package.nix index 7e5e2298602c..00f7c0e87487 100644 --- a/pkgs/by-name/ss/ssdeep/package.nix +++ b/pkgs/by-name/ss/ssdeep/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ssdeep"; version = "2.14.1"; src = fetchFromGitHub { owner = "ssdeep-project"; repo = "ssdeep"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "1yx6yjkggshw5yl89m4kvyzarjdg2l3hs0bbjbrfzwp1lkfd8i0c"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/ss/sshfs-fuse/common.nix b/pkgs/by-name/ss/sshfs-fuse/common.nix index 6c07df8fe07f..66bce241a6bd 100644 --- a/pkgs/by-name/ss/sshfs-fuse/common.nix +++ b/pkgs/by-name/ss/sshfs-fuse/common.nix @@ -25,14 +25,14 @@ let fuse = if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse3; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sshfs-fuse"; inherit version; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; - rev = "sshfs-${version}"; + rev = "sshfs-${finalAttrs.version}"; inherit sha256; }; @@ -93,4 +93,4 @@ stdenv.mkDerivation rec { mainProgram = "sshfs"; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ss/sshlatex/package.nix b/pkgs/by-name/ss/sshlatex/package.nix index a7683ab90835..af68fed01394 100644 --- a/pkgs/by-name/ss/sshlatex/package.nix +++ b/pkgs/by-name/ss/sshlatex/package.nix @@ -10,14 +10,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sshlatex"; version = "0.8"; src = fetchFromGitHub { owner = "iblech"; repo = "sshlatex"; - rev = version; + rev = finalAttrs.version; sha256 = "0kaah8is74zba9373xccmsxmnnn6kh0isr4qpg21x3qhdzhlxl7q"; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.iblech ]; mainProgram = "sshlatex"; }; -} +}) diff --git a/pkgs/by-name/ss/sshpass/package.nix b/pkgs/by-name/ss/sshpass/package.nix index dcb0a5c884b1..43cfaddacf24 100644 --- a/pkgs/by-name/ss/sshpass/package.nix +++ b/pkgs/by-name/ss/sshpass/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sshpass"; version = "1.10"; src = fetchurl { - url = "mirror://sourceforge/sshpass/sshpass-${version}.tar.gz"; + url = "mirror://sourceforge/sshpass/sshpass-${finalAttrs.version}.tar.gz"; sha256 = "sha256-rREGwgPLtWGFyjutjGzK/KO0BkaWGU2oefgcjXvf7to="; }; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "sshpass"; }; -} +}) diff --git a/pkgs/by-name/ss/sshping/package.nix b/pkgs/by-name/ss/sshping/package.nix index 09d6b318a618..1d65a3c7bb2d 100644 --- a/pkgs/by-name/ss/sshping/package.nix +++ b/pkgs/by-name/ss/sshping/package.nix @@ -5,14 +5,14 @@ libssh, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sshping"; version = "0.1.4"; src = fetchFromGitHub { owner = "spook"; repo = "sshping"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0p1fvpgrsy44yvj44xp9k9nf6z1fh0sqcjvy75pcb9f5icgms815"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jqueiroz ]; mainProgram = "sshping"; }; -} +}) diff --git a/pkgs/by-name/ss/sslh/package.nix b/pkgs/by-name/ss/sslh/package.nix index 9ad8fcd9f46d..2fbff56a3267 100644 --- a/pkgs/by-name/ss/sslh/package.nix +++ b/pkgs/by-name/ss/sslh/package.nix @@ -11,14 +11,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sslh"; version = "2.3.0"; src = fetchFromGitHub { owner = "yrutschle"; repo = "sslh"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-qGOOqEe9wlR3pXmYEwMQTxuMcNLLX2i/39AIAb6I4jU="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ss/sslsplit/package.nix b/pkgs/by-name/ss/sslsplit/package.nix index b51cb2f51620..73baf48b99e2 100644 --- a/pkgs/by-name/ss/sslsplit/package.nix +++ b/pkgs/by-name/ss/sslsplit/package.nix @@ -10,14 +10,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sslsplit"; version = "0.5.5"; src = fetchFromGitHub { owner = "droe"; repo = "sslsplit"; - rev = version; + rev = finalAttrs.version; sha256 = "1p43z9ln5rbc76v0j1k3r4nhvfw71hq8jzsallb54z9hvwfvqp3l"; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "sslsplit"; }; -} +}) diff --git a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix index a38ba61c178d..a58b01a34cda 100644 --- a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix +++ b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "ssm-session-manager-plugin"; - version = "1.2.707.0"; + version = "1.2.764.0"; src = fetchFromGitHub { owner = "aws"; repo = "session-manager-plugin"; rev = version; - hash = "sha256-4DPwFKt5pNNl4AczgIhZA7CuBHx7q41jMZKenDFYmwg="; + hash = "sha256-QJYKkEb70G/cmhZ1Wj4GKJaJLRothkeq0bijGkdazt0="; }; patches = [ diff --git a/pkgs/by-name/ss/ssocr/package.nix b/pkgs/by-name/ss/ssocr/package.nix index 5ed51f3b3483..be8b56e5c858 100644 --- a/pkgs/by-name/ss/ssocr/package.nix +++ b/pkgs/by-name/ss/ssocr/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ssocr"; version = "2.25.0"; src = fetchFromGitHub { owner = "auerswal"; repo = "ssocr"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-yQPjs4kGvp6C7kFcWQ3EzoFhwEAhm2nC7yXu9RbU4os="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { mainProgram = "ssocr"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ss/ssrc/package.nix b/pkgs/by-name/ss/ssrc/package.nix index f675e5901bfe..72ab5276f954 100644 --- a/pkgs/by-name/ss/ssrc/package.nix +++ b/pkgs/by-name/ss/ssrc/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ssrc"; version = "1.33"; @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { without audible degradation. ''; - version = version; + version = finalAttrs.version; homepage = "https://shibatch.sourceforge.net/"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ss/sssnake/package.nix b/pkgs/by-name/ss/sssnake/package.nix index bd126154caf2..8ef9d6a4252f 100644 --- a/pkgs/by-name/ss/sssnake/package.nix +++ b/pkgs/by-name/ss/sssnake/package.nix @@ -4,13 +4,13 @@ fetchFromGitHub, ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sssnake"; version = "0.3.2"; src = fetchFromGitHub { owner = "angeljumbo"; repo = "sssnake"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-zkErOV6Az0kJdwyXzMCnVW1997zpAB79TBvf/41Igic="; }; postPatch = '' @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ quantenzitrone ]; }; -} +}) diff --git a/pkgs/by-name/ss/ssss/package.nix b/pkgs/by-name/ss/ssss/package.nix index 1ab48035419f..db85513dfeb5 100644 --- a/pkgs/by-name/ss/ssss/package.nix +++ b/pkgs/by-name/ss/ssss/package.nix @@ -6,14 +6,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ssss"; version = "0.5.7"; src = fetchFromGitHub { owner = "MrJoy"; repo = "ssss"; - rev = "releases%2Fv${version}"; + rev = "releases%2Fv${finalAttrs.version}"; sha256 = "18r1hwch6nq6gjijavr4pvrxz2plrlrvdx8ssqhdj2vmqvlqwbvd"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ss/ssw/package.nix b/pkgs/by-name/ss/ssw/package.nix index 5d377c32417b..5beb8ffaeb2f 100644 --- a/pkgs/by-name/ss/ssw/package.nix +++ b/pkgs/by-name/ss/ssw/package.nix @@ -6,12 +6,12 @@ gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ssw"; version = "0.10"; src = fetchurl { - url = "https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-${version}.tar.gz"; + url = "https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-${finalAttrs.version}.tar.gz"; sha256 = "sha256-gGkuw1AnGZXhR9x1mSnN1507ZF5rXvqmtX9NLQXoR+U="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { description = "GNU Spread Sheet Widget"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/st/stagit/package.nix b/pkgs/by-name/st/stagit/package.nix index 8b186932771a..63fbb5451827 100644 --- a/pkgs/by-name/st/stagit/package.nix +++ b/pkgs/by-name/st/stagit/package.nix @@ -5,13 +5,13 @@ fetchgit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stagit"; version = "1.2"; src = fetchgit { url = "git://git.codemadness.org/stagit"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-mVYR8THGGfaTsx3aaSbQBxExRo87K47SD+PU5cZ8z58="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { sikmir ]; }; -} +}) diff --git a/pkgs/by-name/st/stalonetray/package.nix b/pkgs/by-name/st/stalonetray/package.nix index 7e1f47db9945..ef6638ad2b24 100644 --- a/pkgs/by-name/st/stalonetray/package.nix +++ b/pkgs/by-name/st/stalonetray/package.nix @@ -10,14 +10,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stalonetray"; version = "0.8.5"; src = fetchFromGitHub { owner = "kolbusa"; repo = "stalonetray"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/55oP6xA1LeLawOBkhh9acaDcObO4L4ojcy7e3vwnBw="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; mainProgram = "stalonetray"; }; -} +}) diff --git a/pkgs/by-name/st/star/package.nix b/pkgs/by-name/st/star/package.nix index aa12d73861a6..c9adc50fefea 100644 --- a/pkgs/by-name/st/star/package.nix +++ b/pkgs/by-name/st/star/package.nix @@ -9,18 +9,18 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "star"; version = "2.7.11b"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-4EoS9NOKUwfr6TDdjAqr4wGS9cqVX5GYptiOCQpmg9c="; }; - sourceRoot = "${src.name}/source"; + sourceRoot = "${finalAttrs.src.name}/source"; postPatch = '' substituteInPlace Makefile --replace-fail "-std=c++11" "-std=c++14" @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.arcadio ]; }; -} +}) diff --git a/pkgs/by-name/st/starfetch/package.nix b/pkgs/by-name/st/starfetch/package.nix index a59b28da2360..ad7e1e96e783 100644 --- a/pkgs/by-name/st/starfetch/package.nix +++ b/pkgs/by-name/st/starfetch/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "starfetch"; version = "0.0.4"; src = fetchFromGitHub { owner = "Haruno19"; repo = "starfetch"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-I2M/FlLRkGtD2+GcK1l5+vFsb5tCb4T3UJTPxRx68Ww="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ annaaurora ]; mainProgram = "starfetch"; }; -} +}) diff --git a/pkgs/by-name/st/stargate-libcds/package.nix b/pkgs/by-name/st/stargate-libcds/package.nix index 450d1985b2e9..cf6f94c8295a 100644 --- a/pkgs/by-name/st/stargate-libcds/package.nix +++ b/pkgs/by-name/st/stargate-libcds/package.nix @@ -5,14 +5,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stargate-libcds"; version = "1.0.0"; src = fetchFromGitHub { owner = "stargateaudio"; repo = "libcds"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-THThEzS8gGdwn3h0EBttaX5ljZH9Ma2Rcg143+GIdU8="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; license = lib.licenses.lgpl3Only; }; -} +}) diff --git a/pkgs/by-name/st/statserial/package.nix b/pkgs/by-name/st/statserial/package.nix index b1e23e532d53..2335a22db2aa 100644 --- a/pkgs/by-name/st/statserial/package.nix +++ b/pkgs/by-name/st/statserial/package.nix @@ -6,12 +6,12 @@ glibc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "statserial"; version = "1.1"; src = fetchurl { - url = "http://www.ibiblio.org/pub/Linux/system/serial/statserial-${version}.tar.gz"; + url = "http://www.ibiblio.org/pub/Linux/system/serial/statserial-${finalAttrs.version}.tar.gz"; sha256 = "0rrrmxfba5yn836zlgmr8g9xnrpash7cjs7lk2m44ac50vakpks0"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ rps ]; mainProgram = "statserial"; }; -} +}) diff --git a/pkgs/by-name/st/stderred/package.nix b/pkgs/by-name/st/stderred/package.nix index 651adff5f532..ad8d0c59e01b 100644 --- a/pkgs/by-name/st/stderred/package.nix +++ b/pkgs/by-name/st/stderred/package.nix @@ -5,7 +5,7 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stderred"; version = "unstable-2021-04-28"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cmake ]; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; meta = { description = "Colorize all stderr output that goes to terminal, making it distinguishable from stdout"; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ vojta001 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/st/stdman/package.nix b/pkgs/by-name/st/stdman/package.nix index 00fb7a3ec5e7..43678c941346 100644 --- a/pkgs/by-name/st/stdman/package.nix +++ b/pkgs/by-name/st/stdman/package.nix @@ -5,14 +5,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stdman"; version = "2024.07.05"; src = fetchFromGitHub { owner = "jeaye"; repo = "stdman"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-/yJqKwJHonnBkP6/yQQJT3yPyYO6/nFAf4XFrgl3L0A="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.twey ]; }; -} +}) diff --git a/pkgs/by-name/st/stdmanpages/package.nix b/pkgs/by-name/st/stdmanpages/package.nix index 8f7ac38a168d..0bb79ed1fa09 100644 --- a/pkgs/by-name/st/stdmanpages/package.nix +++ b/pkgs/by-name/st/stdmanpages/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "std-man-pages"; version = "4.4.0"; src = fetchurl { - url = "mirror://gcc/libstdc++/doxygen/libstdc++-man.${version}.tar.bz2"; + url = "mirror://gcc/libstdc++/doxygen/libstdc++-man.${finalAttrs.version}.tar.bz2"; sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ fdl13Plus ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/st/stegseek/package.nix b/pkgs/by-name/st/stegseek/package.nix index b8c6ac19a36d..a6f2be99032d 100644 --- a/pkgs/by-name/st/stegseek/package.nix +++ b/pkgs/by-name/st/stegseek/package.nix @@ -10,14 +10,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stegseek"; version = "0.6"; src = fetchFromGitHub { owner = "RickdeJager"; repo = "stegseek"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-B5oJffYOYfsH0YRq/Bq0ciIlCsCONyScFBjP7a1lIzo="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fab ]; mainProgram = "stegseek"; }; -} +}) diff --git a/pkgs/by-name/st/stenc/package.nix b/pkgs/by-name/st/stenc/package.nix index ba9d42d16385..aff92755ec3c 100644 --- a/pkgs/by-name/st/stenc/package.nix +++ b/pkgs/by-name/st/stenc/package.nix @@ -9,7 +9,7 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stenc"; version = "2.0.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "scsitape"; repo = "stenc"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-M7b+T0mm2QTP1LqqjdKV/NWZ60DrueFEnN1unwCOeH4="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ woffs ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index d3775a585561..34beb55577a3 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.52"; + version = "3.16.54"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-zZg5tYQT4bq5+cUjnziRvsd4FdpfK+Ow5toajnofaxA="; + hash = "sha256-NEBWlyBQllOI5L2dneXFxHYKM7kB7uofyJIIzGYRdVI="; }; outputs = [ diff --git a/pkgs/by-name/st/sticky-notes/package.nix b/pkgs/by-name/st/sticky-notes/package.nix index 8d12de0105d4..e47fc67490cb 100644 --- a/pkgs/by-name/st/sticky-notes/package.nix +++ b/pkgs/by-name/st/sticky-notes/package.nix @@ -20,14 +20,14 @@ nodejs, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sticky-notes"; version = "0.2.7"; src = fetchFromGitHub { owner = "vixalien"; repo = "sticky"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-82Yxw8NSw82rxhuAgsdN2lCiQ/hli4tQiU6jCgGyp4U="; fetchSubmodules = true; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; yarnOfflineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; + yarnLock = finalAttrs.src + "/yarn.lock"; hash = "sha256-NDGuG2rXJH0bHsD7yQMY6HAZDkMq0j63SYVz8+X3fPQ="; }; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - meson rewrite kwargs set project / version '${version}' + meson rewrite kwargs set project / version '${finalAttrs.version}' ''; postFixup = '' @@ -81,10 +81,10 @@ stdenv.mkDerivation rec { meta = { description = "Simple sticky notes app for GNOME"; homepage = "https://github.com/vixalien/sticky"; - changelog = "https://github.com/vixalien/sticky/releases/tag/v${version}"; + changelog = "https://github.com/vixalien/sticky/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pokon548 ]; mainProgram = "com.vixalien.sticky"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/st/sticky/package.nix b/pkgs/by-name/st/sticky/package.nix index aaf20f4d3437..317534af859c 100644 --- a/pkgs/by-name/st/sticky/package.nix +++ b/pkgs/by-name/st/sticky/package.nix @@ -15,14 +15,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sticky"; version = "1.30"; src = fetchFromGitHub { owner = "linuxmint"; repo = "sticky"; - rev = version; + rev = finalAttrs.version; hash = "sha256-8Y6PoQQHS8h1AT+4DMbExd9y7ScDMig0M9BJQjq09Uc="; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { bobby285271 ]; }; -} +}) diff --git a/pkgs/by-name/st/stilo-themes/package.nix b/pkgs/by-name/st/stilo-themes/package.nix index 88bb362e302b..71cabb5c2cd5 100644 --- a/pkgs/by-name/st/stilo-themes/package.nix +++ b/pkgs/by-name/st/stilo-themes/package.nix @@ -11,14 +11,14 @@ gtk-engine-murrine, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stilo-themes"; version = "4.0"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "stilo-themes"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-YKEDXrOAn7pGWb0VcOx7cKHnuX120yPzqtUVnzyLrDQ="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/st/stlink/package.nix b/pkgs/by-name/st/stlink/package.nix index 27dfb87b1176..da9ea1b4786f 100644 --- a/pkgs/by-name/st/stlink/package.nix +++ b/pkgs/by-name/st/stlink/package.nix @@ -20,14 +20,14 @@ let # Add services.udev.packages = [ pkgs.stlink ] to your configuration.nix in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stlink"; version = "1.8.0"; src = fetchFromGitHub { owner = "stlink-org"; repo = "stlink"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-hlFI2xpZ4ldMcxZbg/T5/4JuFFdO9THLcU0DQKSFqrw="; }; @@ -71,4 +71,4 @@ stdenv.mkDerivation rec { lib.maintainers.rongcuid ]; }; -} +}) diff --git a/pkgs/by-name/st/stochas/package.nix b/pkgs/by-name/st/stochas/package.nix index 56c37bac6678..e46871bdb4a1 100644 --- a/pkgs/by-name/st/stochas/package.nix +++ b/pkgs/by-name/st/stochas/package.nix @@ -14,14 +14,14 @@ libjack2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stochas"; version = "1.3.13"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = "stochas"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Gp49cWvUkwz4xAq5sA1nUO+amRC39iWeUemQJyv6hTs="; fetchSubmodules = true; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/st/stone-phaser/package.nix b/pkgs/by-name/st/stone-phaser/package.nix index 6abff3937a6f..e080de6f9433 100644 --- a/pkgs/by-name/st/stone-phaser/package.nix +++ b/pkgs/by-name/st/stone-phaser/package.nix @@ -11,14 +11,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stone-phaser"; version = "0.1.2"; src = fetchFromGitHub { owner = "jpcima"; repo = "stone-phaser"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "180b32z8h9zi8p0q55r1dzxfckamnngm52zjypjjvvy7qdj3mfcd"; fetchSubmodules = true; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.boost; }; -} +}) diff --git a/pkgs/by-name/st/stone/package.nix b/pkgs/by-name/st/stone/package.nix index db0aa64276e0..165c5f4241e0 100644 --- a/pkgs/by-name/st/stone/package.nix +++ b/pkgs/by-name/st/stone/package.nix @@ -5,12 +5,12 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stone"; version = "2.4"; src = fetchurl { - url = "http://www.gcd.org/sengoku/stone/stone-${version}.tar.gz"; + url = "http://www.gcd.org/sengoku/stone/stone-${finalAttrs.version}.tar.gz"; hash = "sha256-1dwa9uxdpQPypAs98/4ZqPv5085pa49G9NU9KsjY628="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ corngood ]; mainProgram = "stone"; }; -} +}) diff --git a/pkgs/by-name/st/stopmotion/package.nix b/pkgs/by-name/st/stopmotion/package.nix index f3fe0d1c5a62..0d16af78c90b 100644 --- a/pkgs/by-name/st/stopmotion/package.nix +++ b/pkgs/by-name/st/stopmotion/package.nix @@ -10,13 +10,13 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.9.0"; pname = "stopmotion"; src = fetchgit { url = "https://invent.kde.org/multimedia/stopmotion"; - rev = version; + rev = finalAttrs.version; hash = "sha256-RsFqvAmTJBVg32bnY2eA9jWWnuHgv66rZiWMqa6sviw="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "stopmotion"; }; -} +}) diff --git a/pkgs/by-name/st/storeBackup/package.nix b/pkgs/by-name/st/storeBackup/package.nix index 35610056b2a5..d73deb4046f5 100644 --- a/pkgs/by-name/st/storeBackup/package.nix +++ b/pkgs/by-name/st/storeBackup/package.nix @@ -24,7 +24,7 @@ let dummyMount = writeScriptBin "mount" "#!${stdenv.shell}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.5.2"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; src = fetchurl { - url = "mirror://savannah/storebackup/storeBackup-${version}.tar.bz2"; + url = "mirror://savannah/storebackup/storeBackup-${finalAttrs.version}.tar.bz2"; hash = "sha256-Ki1DT2zypFFiiMVd9Y8eSX7T+yr8moWMoALmAexjqWU="; }; @@ -130,4 +130,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix index 7a4b95f0fc1a..fdc32555610a 100644 --- a/pkgs/by-name/st/stress-ng/package.nix +++ b/pkgs/by-name/st/stress-ng/package.nix @@ -16,14 +16,14 @@ libgbm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stress-ng"; version = "0.19.06"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "stress-ng"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-xnH4Oy+DZcKSphshGkhDUPv5VNRSIS4i8qr0yXXvvjs="; }; @@ -92,10 +92,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/ColinIanKing/stress-ng"; downloadPage = "https://github.com/ColinIanKing/stress-ng/tags"; - changelog = "https://github.com/ColinIanKing/stress-ng/raw/V${version}/debian/changelog"; + changelog = "https://github.com/ColinIanKing/stress-ng/raw/V${finalAttrs.version}/debian/changelog"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ c0bw3b ]; platforms = lib.platforms.unix; mainProgram = "stress-ng"; }; -} +}) diff --git a/pkgs/by-name/st/stressapptest/package.nix b/pkgs/by-name/st/stressapptest/package.nix index 95261a62f02b..4b2324c1eec7 100644 --- a/pkgs/by-name/st/stressapptest/package.nix +++ b/pkgs/by-name/st/stressapptest/package.nix @@ -5,14 +5,14 @@ libaio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stressapptest"; version = "1.0.11"; src = fetchFromGitHub { owner = "stressapptest"; repo = "stressapptest"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lZpF7PdUwKnV0ha6xkLvi7XYFZQ4Avy0ltlXxukuWjM="; }; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { meta = { description = "Userspace memory and IO stress test tool"; homepage = "https://github.com/stressapptest/stressapptest"; - changelog = "https://github.com/stressapptest/stressapptest/releases/tag/v${version}"; + changelog = "https://github.com/stressapptest/stressapptest/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ fab ]; platforms = lib.platforms.unix; mainProgram = "stressapptest"; }; -} +}) diff --git a/pkgs/by-name/st/strongswan/package.nix b/pkgs/by-name/st/strongswan/package.nix index 6c62fa5ddbc6..f1fdf9fd0212 100644 --- a/pkgs/by-name/st/strongswan/package.nix +++ b/pkgs/by-name/st/strongswan/package.nix @@ -120,14 +120,14 @@ let tss-tss2 = true; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "strongswan"; version = "6.0.4"; # Make sure to also update when upgrading! src = fetchFromGitHub { owner = "strongswan"; repo = "strongswan"; - tag = version; + tag = finalAttrs.version; hash = "sha256-KRfEH7puwn+PgQvOrkTEowPnGzCtXdsUqg7wBNMypkQ="; }; @@ -192,10 +192,10 @@ stdenv.mkDerivation rec { meta = { description = "OpenSource IPsec-based VPN solution"; homepage = "https://www.strongswan.org/"; - changelog = "https://github.com/strongswan/strongswan/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/strongswan/strongswan/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ nickcao ]; mainProgram = "swanctl"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/st/stt/package.nix b/pkgs/by-name/st/stt/package.nix index 5d046a85d0ce..39eb9a8efcf9 100644 --- a/pkgs/by-name/st/stt/package.nix +++ b/pkgs/by-name/st/stt/package.nix @@ -7,12 +7,12 @@ xz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stt"; version = "1.4.0"; src = fetchurl { - url = "https://github.com/coqui-ai/STT/releases/download/v${version}/native_client.tflite.Linux.tar.xz"; + url = "https://github.com/coqui-ai/STT/releases/download/v${finalAttrs.version}/native_client.tflite.Linux.tar.xz"; hash = "sha256-RVYc64pLYumQoVUEFZdxfUUaBMozaqgD0h/yiMaWN90="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ rvolosatovs ]; mainProgram = "stt"; }; -} +}) diff --git a/pkgs/by-name/st/stxxl/package.nix b/pkgs/by-name/st/stxxl/package.nix index 0613e6850ce5..1c8942fe28f0 100644 --- a/pkgs/by-name/st/stxxl/package.nix +++ b/pkgs/by-name/st/stxxl/package.nix @@ -10,14 +10,14 @@ let mkFlag = optset: flag: if optset then "-D${flag}=ON" else "-D${flag}=OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stxxl"; version = "1.4.1"; src = fetchFromGitHub { owner = "stxxl"; repo = "stxxl"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-U6DQ5mI83pyTmq5/ga5rI8v0h2/iEnNl8mxhIOpbF1I="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { mainProgram = "stxxl_tool"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/st/styx/package.nix b/pkgs/by-name/st/styx/package.nix index 138f2d849205..3269909c1513 100644 --- a/pkgs/by-name/st/styx/package.nix +++ b/pkgs/by-name/st/styx/package.nix @@ -13,14 +13,14 @@ python3Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "styx"; version = "0.7.5"; src = fetchFromGitHub { owner = "styx-static"; repo = "styx"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-f6iA/nHpKnm3BALoQq8SzdcSzJLCFSferEf69SpgD2Y="; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; mainProgram = "styx"; }; -} +}) diff --git a/pkgs/by-name/su/su-exec/package.nix b/pkgs/by-name/su/su-exec/package.nix index 109ff9bf13a4..efa366bb0f7d 100644 --- a/pkgs/by-name/su/su-exec/package.nix +++ b/pkgs/by-name/su/su-exec/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "su-exec"; version = "0.3"; src = fetchFromGitHub { owner = "ncopa"; repo = "su-exec"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-VUaparvPZhVOtAVPULIDQmpLUypl9aYYZlZrIIxuoTI="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ zimbatm ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/su/subread/package.nix b/pkgs/by-name/su/subread/package.nix index 15aeb4183a36..2c1f057fb4a4 100644 --- a/pkgs/by-name/su/subread/package.nix +++ b/pkgs/by-name/su/subread/package.nix @@ -5,12 +5,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "subread"; version = "2.1.1"; src = fetchurl { - url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz"; + url = "mirror://sourceforge/subread/subread-${finalAttrs.version}/subread-${finalAttrs.version}-source.tar.gz"; sha256 = "sha256-Y5LXxmgxzddn5YJRiSp5pRtvq47QupZxrV6F/xqwHqo="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { homepage = "https://subread.sourceforge.net/"; }; -} +}) diff --git a/pkgs/by-name/su/subtitlecomposer/package.nix b/pkgs/by-name/su/subtitlecomposer/package.nix index d926a2ca7696..e725df5c9e34 100644 --- a/pkgs/by-name/su/subtitlecomposer/package.nix +++ b/pkgs/by-name/su/subtitlecomposer/package.nix @@ -9,7 +9,7 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "subtitlecomposer"; version = "0.8.2"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { domain = "invent.kde.org"; owner = "multimedia"; repo = "subtitlecomposer"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-zGbI960NerlOEUvhOLm+lEJdbhj8VFUfm8pkOYGRcGw="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { mainProgram = "subtitlecomposer"; platforms = with lib.platforms; linux ++ freebsd ++ windows; }; -} +}) diff --git a/pkgs/by-name/su/suil/package.nix b/pkgs/by-name/su/suil/package.nix index ba869d6982ea..9a234b973c1b 100644 --- a/pkgs/by-name/su/suil/package.nix +++ b/pkgs/by-name/su/suil/package.nix @@ -29,14 +29,14 @@ let inherit (lib) mesonEnable; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "suil"; version = "0.10.20"; src = fetchFromGitLab { owner = "lv2"; repo = "suil"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rP8tq+zmHrAZeuNttakPPfraFXNvnwqbhtt+LtTNV/k="; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/su/suitesparse-graphblas/package.nix b/pkgs/by-name/su/suitesparse-graphblas/package.nix index e15f8bd77cf7..bea97b098479 100644 --- a/pkgs/by-name/su/suitesparse-graphblas/package.nix +++ b/pkgs/by-name/su/suitesparse-graphblas/package.nix @@ -6,7 +6,7 @@ gnum4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "suitesparse-graphblas"; version = "10.3.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-wsvw/95eHF9KeduAgCfvNunRs86m4tiilxle26d1yJs="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wegank ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/su/sumo/package.nix b/pkgs/by-name/su/sumo/package.nix index f773b03caa54..3fb78cb40ab7 100644 --- a/pkgs/by-name/su/sumo/package.nix +++ b/pkgs/by-name/su/sumo/package.nix @@ -35,14 +35,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sumo"; version = "1.25.0"; src = fetchFromGitHub { owner = "eclipse-sumo"; repo = "sumo"; - tag = "v${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "v${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-rUa5DpoBfnviSEmzPEiVnZU0KGavAIOFoysQ74uTll0="; fetchSubmodules = true; }; @@ -98,4 +98,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; teams = [ lib.teams.geospatial ]; }; -} +}) diff --git a/pkgs/by-name/su/superTux/package.nix b/pkgs/by-name/su/superTux/package.nix index 5e73328624f7..4055f7323f60 100644 --- a/pkgs/by-name/su/superTux/package.nix +++ b/pkgs/by-name/su/superTux/package.nix @@ -21,12 +21,12 @@ libvorbis, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "supertux"; version = "0.6.3"; src = fetchurl { - url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"; + url = "https://github.com/SuperTux/supertux/releases/download/v${finalAttrs.version}/SuperTux-v${finalAttrs.version}-Source.tar.gz"; sha256 = "1xkr3ka2sxp5s0spp84iv294i29s1vxqzazb6kmjc0n415h0x57p"; }; @@ -95,4 +95,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "supertux2"; }; -} +}) diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix index 35a74463adff..4b8ea5d46fdd 100644 --- a/pkgs/by-name/su/superTuxKart/package.nix +++ b/pkgs/by-name/su/superTuxKart/package.nix @@ -64,7 +64,7 @@ let "mojoal" ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "supertuxkart"; version = "1.5"; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "supertuxkart"; repo = "stk-code"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/fp5iqTHVrVcxRqbTy/3r+dp19oUj9MI2JauvtPWTWA="; }; @@ -161,6 +161,6 @@ stdenv.mkDerivation rec { SchweGELBin ]; platforms = with lib.platforms; unix; - changelog = "https://github.com/supertuxkart/stk-code/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/supertuxkart/stk-code/blob/${finalAttrs.version}/CHANGELOG.md"; }; -} +}) diff --git a/pkgs/by-name/su/supergfxctl-plasmoid/package.nix b/pkgs/by-name/su/supergfxctl-plasmoid/package.nix index aaf3ac06bd66..3603831be2e7 100644 --- a/pkgs/by-name/su/supergfxctl-plasmoid/package.nix +++ b/pkgs/by-name/su/supergfxctl-plasmoid/package.nix @@ -6,14 +6,14 @@ kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "supergfxctl-plasmoid"; version = "2.1.1"; src = fetchFromGitLab { owner = "jhyub"; repo = "supergfxctl-plasmoid"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Un2uVTde18qloZoWk6bbscyvsBTIAdK1CfxYAZg1+F4="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/Jhyub/supergfxctl-plasmoid"; maintainers = with lib.maintainers; [ johnylpm ]; }; -} +}) diff --git a/pkgs/by-name/su/supervise/package.nix b/pkgs/by-name/su/supervise/package.nix index 1966e77f8d88..9c07f7d4e57e 100644 --- a/pkgs/by-name/su/supervise/package.nix +++ b/pkgs/by-name/su/supervise/package.nix @@ -4,13 +4,13 @@ fetchzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "supervise"; version = "1.4.0"; src = fetchzip { - url = "https://github.com/catern/supervise/releases/download/v${version}/supervise-${version}.tar.gz"; + url = "https://github.com/catern/supervise/releases/download/v${finalAttrs.version}/supervise-${finalAttrs.version}.tar.gz"; sha256 = "0jk6q2f67pfs18ah040lmsbvbrnjap7w04jjddsfn1j5bcrvs13x"; }; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/su/surfraw/package.nix b/pkgs/by-name/su/surfraw/package.nix index 6e4fb9265e51..c9848c157ba6 100644 --- a/pkgs/by-name/su/surfraw/package.nix +++ b/pkgs/by-name/su/surfraw/package.nix @@ -5,12 +5,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "surfraw"; version = "2.3.0"; src = fetchurl { - url = "https://gitlab.com/surfraw/Surfraw/uploads/2de827b2786ef2fe43b6f07913ca7b7f/surfraw-${version}.tar.gz"; + url = "https://gitlab.com/surfraw/Surfraw/uploads/2de827b2786ef2fe43b6f07913ca7b7f/surfraw-${finalAttrs.version}.tar.gz"; sha256 = "099nbif0x5cbcf18snc58nx1a3q7z0v9br9p2jiq9pcc7ic2015d"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.publicDomain; }; -} +}) diff --git a/pkgs/by-name/su/suscan/package.nix b/pkgs/by-name/su/suscan/package.nix index 55956ed45755..db9348802ec9 100644 --- a/pkgs/by-name/su/suscan/package.nix +++ b/pkgs/by-name/su/suscan/package.nix @@ -13,14 +13,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "suscan"; version = "0.3.0"; src = fetchFromGitHub { owner = "BatchDrake"; repo = "suscan"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-h1ogtYjkqiHb1/NAJfJ0HQIvGnZM2K/PSP5nqLXUf9M="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { oxapentane ]; }; -} +}) diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix index dfa11b986c04..7fbd1f4d407d 100644 --- a/pkgs/by-name/su/sushi/package.nix +++ b/pkgs/by-name/su/sushi/package.nix @@ -24,12 +24,12 @@ libepoxy, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sushi"; version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/sushi/${lib.versions.major version}/sushi-${version}.tar.xz"; + url = "mirror://gnome/sources/sushi/${lib.versions.major finalAttrs.version}/sushi-${finalAttrs.version}.tar.xz"; hash = "sha256-lghbqqQwqyFCxgaqtcR+L7sv0+two1ITfmXFmlig8sY="; }; @@ -79,11 +79,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/sushi"; - changelog = "https://gitlab.gnome.org/GNOME/sushi/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/sushi/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Quick previewer for Nautilus"; mainProgram = "sushi"; teams = [ lib.teams.gnome ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/su/sutils/package.nix b/pkgs/by-name/su/sutils/package.nix index 1ea0e1c22b16..c312ef2d2868 100644 --- a/pkgs/by-name/su/sutils/package.nix +++ b/pkgs/by-name/su/sutils/package.nix @@ -5,14 +5,14 @@ alsa-lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.2"; pname = "sutils"; src = fetchFromGitHub { owner = "baskerville"; repo = "sutils"; - rev = version; + rev = finalAttrs.version; sha256 = "0i2g6a6xdaq3w613dhq7mnsz4ymwqn6kvkyan5kgy49mzq97va6j"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.unlicense; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sv/svaba/package.nix b/pkgs/by-name/sv/svaba/package.nix index 84be387a2e82..3de12ef8311f 100644 --- a/pkgs/by-name/sv/svaba/package.nix +++ b/pkgs/by-name/sv/svaba/package.nix @@ -7,14 +7,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.1.0"; pname = "svaba"; src = fetchFromGitHub { owner = "walaj"; repo = "svaba"; - tag = version; + tag = finalAttrs.version; sha256 = "1vv5mc9z5d22kgdy7mm27ya5aahnqgkcrskdr2405058ikk9g8kp"; fetchSubmodules = true; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { ''; }; -} +}) diff --git a/pkgs/by-name/sv/svnfs/package.nix b/pkgs/by-name/sv/svnfs/package.nix index a8f0e51facde..2c07913c63d2 100644 --- a/pkgs/by-name/sv/svnfs/package.nix +++ b/pkgs/by-name/sv/svnfs/package.nix @@ -9,12 +9,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "svnfs"; version = "0.4"; src = fetchurl { - url = "http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-${version}.tgz"; + url = "http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-${finalAttrs.version}.tgz"; sha256 = "1lrzjr0812lrnkkwk60bws9k1hq2iibphm0nhqyv26axdsygkfky"; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "svnfs"; }; -} +}) diff --git a/pkgs/by-name/sw/swappy/package.nix b/pkgs/by-name/sw/swappy/package.nix index a1387ad5d74e..88cdbdbae1bb 100644 --- a/pkgs/by-name/sw/swappy/package.nix +++ b/pkgs/by-name/sw/swappy/package.nix @@ -16,14 +16,14 @@ hicolor-icon-theme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "swappy"; version = "1.8.0"; src = fetchFromGitHub { owner = "jtheoof"; repo = "swappy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rPe567ajk/umfZ2HHm+pRxpbMOTyUmqd+22kwDSFMTc="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.matthiasbeyer ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sw/swaykbdd/package.nix b/pkgs/by-name/sw/swaykbdd/package.nix index f8939ab1e22d..a23827c9b7b3 100644 --- a/pkgs/by-name/sw/swaykbdd/package.nix +++ b/pkgs/by-name/sw/swaykbdd/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "swaykbdd"; version = "1.4"; src = fetchFromGitHub { owner = "artemsen"; repo = "swaykbdd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-FtXmn5Lf0PhL99xGl/SHWNaE6vAMOF2Ok4xVJT2Bf/s="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "swaykbdd"; }; -} +}) diff --git a/pkgs/by-name/sw/swaysettings/package.nix b/pkgs/by-name/sw/swaysettings/package.nix index 9a8886a4e4c1..d4705596f5e1 100644 --- a/pkgs/by-name/sw/swaysettings/package.nix +++ b/pkgs/by-name/sw/swaysettings/package.nix @@ -33,14 +33,14 @@ gtk4-layer-shell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "swaysettings"; version = "0.5.0"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwaySettings"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XP0Q3Q40cvAl3MEqShY+VMWjlCtqs9e91nkxocVNQQQ="; }; @@ -101,4 +101,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.aacebedo ]; }; -} +}) diff --git a/pkgs/by-name/sw/swfmill/package.nix b/pkgs/by-name/sw/swfmill/package.nix index 3beae68dfefb..0e7cdfc8fe34 100644 --- a/pkgs/by-name/sw/swfmill/package.nix +++ b/pkgs/by-name/sw/swfmill/package.nix @@ -9,12 +9,12 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "swfmill"; version = "0.3.6"; src = fetchurl { - url = "http://swfmill.org/releases/swfmill-${version}.tar.gz"; + url = "http://swfmill.org/releases/swfmill-${finalAttrs.version}.tar.gz"; sha256 = "sha256-2yT2OWOVf67AK7FLi2HNr3CWd0+M/eudNXPi4ZIxVI4="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "swfmill"; }; -} +}) diff --git a/pkgs/by-name/sw/swh_lv2/package.nix b/pkgs/by-name/sw/swh_lv2/package.nix index 8ad6c4ce19ee..b8d6427ccfbe 100644 --- a/pkgs/by-name/sw/swh_lv2/package.nix +++ b/pkgs/by-name/sw/swh_lv2/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "swh-lv2"; version = "1.0.16"; src = fetchFromGitHub { owner = "swh"; repo = "lv2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-v6aJUWDbBZEmz0v6+cSCi/KhOYNUeK/MJLUSgzi39ng="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sw/swiften/package.nix b/pkgs/by-name/sw/swiften/package.nix index 1a313927acd6..961618dd0e89 100644 --- a/pkgs/by-name/sw/swiften/package.nix +++ b/pkgs/by-name/sw/swiften/package.nix @@ -15,12 +15,12 @@ scons, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "swiften"; version = "4.0.3"; src = fetchurl { - url = "http://swift.im/git/swift/snapshot/swift-${version}.tar.bz2"; + url = "http://swift.im/git/swift/snapshot/swift-${finalAttrs.version}.tar.bz2"; hash = "sha256-aj+T6AevtR8birbsj+83nfzFC6cf72q+7nwSM0jaZrA="; }; @@ -93,4 +93,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.twey ]; }; -} +}) diff --git a/pkgs/by-name/sw/swingsane/package.nix b/pkgs/by-name/sw/swingsane/package.nix index 06e02f8e0a35..36a55e6b9fe2 100644 --- a/pkgs/by-name/sw/swingsane/package.nix +++ b/pkgs/by-name/sw/swingsane/package.nix @@ -8,13 +8,13 @@ runtimeShell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "swingsane"; version = "0.2"; src = fetchurl { sha256 = "15pgqgyw46yd2i367ax9940pfyvinyw2m8apmwhrn0ix5nywa7ni"; - url = "mirror://sourceforge/swingsane/swingsane-${version}-bin.zip"; + url = "mirror://sourceforge/swingsane/swingsane-${finalAttrs.version}-bin.zip"; }; nativeBuildInputs = [ unzip ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { execWrapper = '' #!${runtimeShell} - exec ${jre}/bin/java -jar $out/share/java/swingsane/swingsane-${version}.jar "$@" + exec ${jre}/bin/java -jar $out/share/java/swingsane/swingsane-${finalAttrs.version}.jar "$@" ''; desktopItem = makeDesktopItem { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { icon = "swingsane"; desktopName = "SwingSane"; genericName = "Scan from local or remote SANE servers"; - comment = meta.description; + comment = finalAttrs.meta.description; categories = [ "Office" ]; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { echo "${execWrapper}" > swingsane install -v -D -m 755 swingsane $out/bin/swingsane - unzip -j swingsane-${version}.jar "com/swingsane/images/*.png" + unzip -j swingsane-${finalAttrs.version}.jar "com/swingsane/images/*.png" install -v -D -m 644 swingsane_512x512.png $out/share/pixmaps/swingsane.png cp -v -r ${desktopItem}/share/applications $out/share @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "swingsane"; }; -} +}) diff --git a/pkgs/by-name/sw/switchfin/package.nix b/pkgs/by-name/sw/switchfin/package.nix index b2f68da4dd75..e71be412ae4c 100644 --- a/pkgs/by-name/sw/switchfin/package.nix +++ b/pkgs/by-name/sw/switchfin/package.nix @@ -15,14 +15,14 @@ tweeny, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "switchfin"; version = "0.8.2"; src = fetchFromGitHub { owner = "dragonflylee"; repo = "switchfin"; - rev = version; + rev = finalAttrs.version; hash = "sha256-D41joed/ZjZLSNjQC9WVWrPOi8v/RHopf0MQrbmGyeg="; fetchSubmodules = true; }; @@ -61,10 +61,10 @@ stdenv.mkDerivation rec { meta = { description = "Third-party native Jellyfin client for PC/PS4/PSVita/Nintendo Switch"; homepage = "https://github.com/dragonflylee/switchfin"; - changelog = "https://github.com/dragonflylee/switchfin/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/dragonflylee/switchfin/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.k900 ]; mainProgram = "Switchfin"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index 7aa4e3bd243c..91c1c8be8a66 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sydbox"; - version = "3.48.5"; + version = "3.48.7"; outputs = [ "out" @@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Sydbox"; repo = "sydbox"; tag = "v${finalAttrs.version}"; - hash = "sha256-G2vp1hSY29D+50vMQWsiAznwiLe/Gs9zRRBOkCPfOlw="; + hash = "sha256-oNA0/1X0av/pd7e6lxDWidNdc+nu7fIclNwkH85Vdag="; }; - cargoHash = "sha256-9GpmO5AqijlaLVRQAM+9r+caDGJYfzsG1zzYLlK8n1o="; + cargoHash = "sha256-U8Q1OGHfM4o7QYSh7e0yuB7RdIN02z21ZnHfCMfrL74="; nativeBuildInputs = [ mandoc diff --git a/pkgs/by-name/sy/symbolic-preview/package.nix b/pkgs/by-name/sy/symbolic-preview/package.nix index af4ea9f2abbd..0ba27af0ee7a 100644 --- a/pkgs/by-name/sy/symbolic-preview/package.nix +++ b/pkgs/by-name/sy/symbolic-preview/package.nix @@ -15,12 +15,12 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "symbolic-preview"; version = "0.0.9"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/symbolic-preview/uploads/e2fed158fc0d267f2051302bcf14848b/symbolic-preview-${version}.tar.xz"; + url = "https://gitlab.gnome.org/World/design/symbolic-preview/uploads/e2fed158fc0d267f2051302bcf14848b/symbolic-preview-${finalAttrs.version}.tar.xz"; hash = "sha256-kx+70LCQzzWAw2Xd3fKGq941540IM3Y1+r4Em4MNWbw="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/sy/symlinks/package.nix b/pkgs/by-name/sy/symlinks/package.nix index 3ad9d9ce6e8b..6e0b1dacc896 100644 --- a/pkgs/by-name/sy/symlinks/package.nix +++ b/pkgs/by-name/sy/symlinks/package.nix @@ -4,14 +4,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "symlinks"; version = "1.4.3"; src = fetchFromGitHub { owner = "brandt"; repo = "symlinks"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "EMWd7T/k4v1uvXe2QxhyPoQKUpKIUANE9AOwX461FgU="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "symlinks"; }; -} +}) diff --git a/pkgs/by-name/sy/symmetrica/package.nix b/pkgs/by-name/sy/symmetrica/package.nix index 43adb5be3cb3..44abbae5d9ae 100644 --- a/pkgs/by-name/sy/symmetrica/package.nix +++ b/pkgs/by-name/sy/symmetrica/package.nix @@ -6,7 +6,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "symmetrica"; version = "3.1.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "sagemath"; repo = "symmetrica"; - tag = version; + tag = finalAttrs.version; hash = "sha256-unaNQfmDcQFUKApka7eEkjceurMnX0FICQXGDbOAOXo="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; homepage = "https://gitlab.com/sagemath/symmetrica"; }; -} +}) diff --git a/pkgs/by-name/sy/sympa/package.nix b/pkgs/by-name/sy/sympa/package.nix index 6b69898e9c64..1c348cd2e237 100644 --- a/pkgs/by-name/sy/sympa/package.nix +++ b/pkgs/by-name/sy/sympa/package.nix @@ -69,14 +69,14 @@ let ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sympa"; version = "6.2.76"; src = fetchFromGitHub { owner = "sympa-community"; repo = "sympa"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-XvLTO2Wau34zMoi+5d16JnWd/K96w2py9xC5oLlRfRM="; }; @@ -127,4 +127,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/sy/sympow/package.nix b/pkgs/by-name/sy/sympow/package.nix index f12c557566f8..06bf91fadc5f 100644 --- a/pkgs/by-name/sy/sympow/package.nix +++ b/pkgs/by-name/sy/sympow/package.nix @@ -10,7 +10,7 @@ pari, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.023.7"; pname = "sympow"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "rezozer"; owner = "forks"; repo = "sympow"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-sex8gRiBdTcVMV3nSeiTYamAjPoXQdiiZwjRmeKA+mc="; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.sage ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sy/synaesthesia/package.nix b/pkgs/by-name/sy/synaesthesia/package.nix index 24cbbb65d8dd..f4e14474bca4 100644 --- a/pkgs/by-name/sy/synaesthesia/package.nix +++ b/pkgs/by-name/sy/synaesthesia/package.nix @@ -6,12 +6,12 @@ pkg-config, libSM, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "synaesthesia"; version = "2.4"; src = fetchzip { - url = "https://logarithmic.net/pfh-files/synaesthesia/synaesthesia-${version}.tar.gz"; + url = "https://logarithmic.net/pfh-files/synaesthesia/synaesthesia-${finalAttrs.version}.tar.gz"; sha256 = "0nzsdxbah0shm2vlziaaw3ilzlizd3d35rridkpg40nfxmq84qnx"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "synaesthesia"; }; -} +}) diff --git a/pkgs/by-name/sy/syncterm/package.nix b/pkgs/by-name/sy/syncterm/package.nix index 8fcad3d6b7e2..830d0a78b4b2 100644 --- a/pkgs/by-name/sy/syncterm/package.nix +++ b/pkgs/by-name/sy/syncterm/package.nix @@ -12,12 +12,12 @@ alsa-lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "syncterm"; version = "1.6"; src = fetchurl { - url = "mirror://sourceforge/syncterm/syncterm-${version}-src.tgz"; + url = "mirror://sourceforge/syncterm/syncterm-${finalAttrs.version}-src.tgz"; hash = "sha256-eeOuQ9OfmKWSJo/0AJQJTaYqpYe1uSXmt0WdZqXRHUk="; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/sy/synergy/package.nix b/pkgs/by-name/sy/synergy/package.nix index ca46b4721acc..9f4663e3942d 100644 --- a/pkgs/by-name/sy/synergy/package.nix +++ b/pkgs/by-name/sy/synergy/package.nix @@ -27,14 +27,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "synergy"; version = "1.14.6.19-stable"; src = fetchFromGitHub { owner = "symless"; repo = "synergy-core"; - rev = version; + rev = finalAttrs.version; hash = "sha256-0QqklfSsvcXh7I2jaHk82k0nY8gQOj9haA4WOjGqBqY="; fetchSubmodules = true; }; @@ -138,10 +138,10 @@ stdenv.mkDerivation rec { meta = { description = "Share one mouse and keyboard between multiple computers"; homepage = "https://symless.com/synergy"; - changelog = "https://github.com/symless/synergy-core/blob/${version}/ChangeLog"; + changelog = "https://github.com/symless/synergy-core/blob/${finalAttrs.version}/ChangeLog"; mainProgram = lib.optionalString (!withGUI) "synergyc"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ talyz ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sy/synology-drive-client/package.nix b/pkgs/by-name/sy/synology-drive-client/package.nix index 9991da0558a5..ebac377e719c 100644 --- a/pkgs/by-name/sy/synology-drive-client/package.nix +++ b/pkgs/by-name/sy/synology-drive-client/package.nix @@ -17,8 +17,8 @@ let pname = "synology-drive-client"; baseUrl = "https://global.synologydownload.com/download/Utility/SynologyDriveClient"; - version = "4.0.1-17885"; - buildNumber = lib.last (lib.splitString "-" version); + version = "4.0.2-17889"; + buildNumberFn = ver: lib.last (lib.splitString "-" ver); meta = { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server"; homepage = "https://www.synology.com/en-global/dsm/feature/drive"; @@ -36,34 +36,18 @@ let ]; mainProgram = "synology-drive"; }; - passthru.updateScript = writeScript "update-synology-drive-client" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts + updateScript = ./update.sh; - set -eu -o pipefail - - version=$(curl -s "https://www.synology.com/api/releaseNote/findChangeLog?identify=SynologyDriveClient&lang=en-uk" \ - | jq -r '.info.versions | to_entries | .[0].value.all_versions[0].version') - - if [[ "$version" =~ ^[0-9.]+(-[0-9]+)?$ ]]; then - update-source-version synology-drive-client "$version" - else - echo "Error: Invalid version format: '$version'" - exit 1 - fi - ''; - - linux = stdenv.mkDerivation { + linux = stdenv.mkDerivation (finalAttrs: { inherit pname version meta - passthru ; src = fetchurl { - url = "${baseUrl}/${version}/Ubuntu/Installer/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-DMHqh8o0RknWTycANSbMpJj133/MZ8uZ18ytDZVaKMg="; + url = "${baseUrl}/${finalAttrs.version}/Ubuntu/Installer/synology-drive-client-${buildNumberFn finalAttrs.version}.x86_64.deb"; + sha256 = "sha256-refsAzqYmKAr107D4HiJViBQE1Qa6QoOECtX+TPjSwU="; }; nativeBuildInputs = [ @@ -99,19 +83,20 @@ let postInstall = '' substituteInPlace $out/bin/synology-drive --replace /opt $out/opt ''; - }; - darwin = stdenv.mkDerivation { + passthru = { inherit updateScript; }; + }); + + darwin = stdenv.mkDerivation (finalAttrs: { inherit pname version meta - passthru ; src = fetchurl { - url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "sha256-0rK7w4/RCv4qml+8XYPwLQmxHen3pB793Co4DvnDVuU="; + url = "${baseUrl}/${finalAttrs.version}/Mac/Installer/synology-drive-client-${buildNumberFn finalAttrs.version}.dmg"; + sha256 = "sha256-KAoc31Y2RTHu7RWgC61brtoeFR1c+pNi4Odub2JHrfQ="; }; nativeBuildInputs = [ @@ -132,6 +117,8 @@ let mkdir -p $out/Applications/ cp -R 'Synology Drive Client.app' $out/Applications/ ''; - }; + + passthru = { inherit updateScript; }; + }); in if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/sy/synology-drive-client/update.sh b/pkgs/by-name/sy/synology-drive-client/update.sh new file mode 100755 index 000000000000..a72dfbed866e --- /dev/null +++ b/pkgs/by-name/sy/synology-drive-client/update.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +set -euo pipefail + +version=$(curl -s "https://www.synology.com/api/releaseNote/findChangeLog?identify=SynologyDriveClient&lang=en-uk" | jq -r '.info.versions | to_entries[0].value.all_versions[0].version') +build="${version##*-}" + +update_hash() { + local system=$1 + if [[ "$system" == *"linux"* ]]; then + url="https://global.synologydownload.com/download/Utility/SynologyDriveClient/$version/Ubuntu/Installer/synology-drive-client-$build.x86_64.deb" + else + url="https://global.synologydownload.com/download/Utility/SynologyDriveClient/$version/Mac/Installer/synology-drive-client-$build.dmg" + fi + + hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$url")) + update-source-version synology-drive-client "$version" "$hash" --system="$system" --ignore-same-version +} + +update_hash x86_64-linux +update_hash aarch64-darwin diff --git a/pkgs/by-name/sy/sysbench/package.nix b/pkgs/by-name/sy/sysbench/package.nix index 5a247d3bc4c9..05384c0b00c0 100644 --- a/pkgs/by-name/sy/sysbench/package.nix +++ b/pkgs/by-name/sy/sysbench/package.nix @@ -12,7 +12,7 @@ sysbench, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sysbench"; version = "1.0.20"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "akopytov"; repo = "sysbench"; - rev = version; + rev = finalAttrs.version; sha256 = "1sanvl2a52ff4shj62nw395zzgdgywplqvwip74ky8q7s6qjf5qy"; }; @@ -87,9 +87,9 @@ stdenv.mkDerivation rec { server. ''; homepage = "https://github.com/akopytov/sysbench"; - downloadPage = "https://github.com/akopytov/sysbench/releases/tag/${version}"; - changelog = "https://github.com/akopytov/sysbench/blob/${version}/ChangeLog"; + downloadPage = "https://github.com/akopytov/sysbench/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/akopytov/sysbench/blob/${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sy/sysfsutils/package.nix b/pkgs/by-name/sy/sysfsutils/package.nix index 2935c5b04a64..c2cf265c8248 100644 --- a/pkgs/by-name/sy/sysfsutils/package.nix +++ b/pkgs/by-name/sy/sysfsutils/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sysfsutils"; version = "2.1.0"; src = fetchurl { - url = "mirror://sourceforge/linux-diag/sysfsutils-${version}.tar.gz"; + url = "mirror://sourceforge/linux-diag/sysfsutils-${finalAttrs.version}.tar.gz"; sha256 = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sy/sysklogd/package.nix b/pkgs/by-name/sy/sysklogd/package.nix index 5e095b4f4edf..e5bba4dd5e93 100644 --- a/pkgs/by-name/sy/sysklogd/package.nix +++ b/pkgs/by-name/sy/sysklogd/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sysklogd"; version = "2.7.2"; src = fetchFromGitHub { owner = "troglobit"; repo = "sysklogd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-HwzqWZox5qc/TvCafx4XjA4njQhcHBS0gZthqPzONHk="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ aanderse ]; platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/sy/systembus-notify/package.nix b/pkgs/by-name/sy/systembus-notify/package.nix index 821eeeaf3e59..405d28d771aa 100644 --- a/pkgs/by-name/sy/systembus-notify/package.nix +++ b/pkgs/by-name/sy/systembus-notify/package.nix @@ -28,14 +28,14 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "systembus-notify"; version = "1.1"; src = fetchFromGitHub { owner = "rfjakob"; repo = "systembus-notify"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-WzuBw7LXW54CCMgFE9BSJ2skxaz4IA2BcBny63Ihtt0="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "systembus-notify"; }; -} +}) diff --git a/pkgs/by-name/sy/systemc/package.nix b/pkgs/by-name/sy/systemc/package.nix index 19c55f980088..620bf12ceaac 100644 --- a/pkgs/by-name/sy/systemc/package.nix +++ b/pkgs/by-name/sy/systemc/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "systemc"; version = "3.0.1"; src = fetchFromGitHub { owner = "accellera-official"; repo = "systemc"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ReYRKx7H9rxVhvY9gAdxrMu5nlsK2FcVIzfgvZroD/E="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ amiloradovsky ]; }; -} +}) diff --git a/pkgs/by-name/sy/sysvinit/package.nix b/pkgs/by-name/sy/sysvinit/package.nix index 6eff2d095a32..afbb127e535b 100644 --- a/pkgs/by-name/sy/sysvinit/package.nix +++ b/pkgs/by-name/sy/sysvinit/package.nix @@ -6,12 +6,12 @@ withoutInitTools ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = if withoutInitTools then "sysvtools" else "sysvinit"; version = "3.04"; src = fetchurl { - url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz"; + url = "mirror://savannah/sysvinit/sysvinit-${finalAttrs.version}.tar.xz"; sha256 = "sha256-KmIf5uRSi8kTCLdIZ92q6733dT8COVwMW66Be9K346U="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/t1/t1utils/package.nix b/pkgs/by-name/t1/t1utils/package.nix index 2d6b761af141..45c53a9135a3 100644 --- a/pkgs/by-name/t1/t1utils/package.nix +++ b/pkgs/by-name/t1/t1utils/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "t1utils"; version = "1.42"; src = fetchurl { - url = "https://www.lcdf.org/type/t1utils-${version}.tar.gz"; + url = "https://www.lcdf.org/type/t1utils-${finalAttrs.version}.tar.gz"; sha256 = "YYd5NbGYcETd/0u5CgUgDKcWRnijVeFwv18aVVbMnyk="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/t4/t4kcommon/package.nix b/pkgs/by-name/t4/t4kcommon/package.nix index e5da52b7e3fa..ab98679d6bc2 100644 --- a/pkgs/by-name/t4/t4kcommon/package.nix +++ b/pkgs/by-name/t4/t4kcommon/package.nix @@ -15,14 +15,14 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.1.1"; pname = "t4kcommon"; src = fetchFromGitHub { owner = "tux4kids"; repo = "t4kcommon"; - rev = "upstream/${version}"; + rev = "upstream/${finalAttrs.version}"; sha256 = "13q02xpmps9qg8zrzzy2gzv4a6afgi28lxk4z242j780v0gphchp"; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ta/ta-lib/package.nix b/pkgs/by-name/ta/ta-lib/package.nix index 6f7933a3913b..31cfee9f0d43 100644 --- a/pkgs/by-name/ta/ta-lib/package.nix +++ b/pkgs/by-name/ta/ta-lib/package.nix @@ -6,13 +6,13 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ta-lib"; version = "0.4.0"; src = fetchFromGitHub { owner = "rafa-dot-el"; repo = "talib"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-bIzN8f9ZiOLaVzGAXcZUHUh/v9z1U+zY+MnyjJr1lSw="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ rafael ]; }; -} +}) diff --git a/pkgs/by-name/ta/tab/package.nix b/pkgs/by-name/ta/tab/package.nix index 1e780fe7ff64..84b51d9e0060 100644 --- a/pkgs/by-name/ta/tab/package.nix +++ b/pkgs/by-name/ta/tab/package.nix @@ -5,14 +5,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "9.2"; pname = "tab"; src = fetchFromGitHub { owner = "ivan-tkatchev"; repo = "tab"; - rev = version; + rev = finalAttrs.version; hash = "sha256-UOXfnpzYMKDdp8EeBo2HsVPGn61hkCqHe8olX9KAgOU="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ mstarzyk ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/ta/tacacsplus/package.nix b/pkgs/by-name/ta/tacacsplus/package.nix index b41918328815..0d977c193829 100644 --- a/pkgs/by-name/ta/tacacsplus/package.nix +++ b/pkgs/by-name/ta/tacacsplus/package.nix @@ -11,12 +11,12 @@ tcp_wrappers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tacacsplus"; version = "4.0.4.28"; src = fetchurl { - url = "ftp://ftp.shrubbery.net/pub/tac_plus/tacacs-F${version}.tar.gz"; + url = "ftp://ftp.shrubbery.net/pub/tac_plus/tacacs-F${finalAttrs.version}.tar.gz"; hash = "sha256-FH8tyY0m0vk/Crp2yYjO0Zb/4cAB3C6R94ihosdHIZ4="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ _0x4A6F ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/ta/tageditor/package.nix b/pkgs/by-name/ta/tageditor/package.nix index e41eb6e9085c..69e4e2364e6a 100644 --- a/pkgs/by-name/ta/tageditor/package.nix +++ b/pkgs/by-name/ta/tageditor/package.nix @@ -12,14 +12,14 @@ tagparser, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tageditor"; version = "3.9.9"; src = fetchFromGitHub { owner = "martchus"; repo = "tageditor"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xBb2VXDXScSUoMU2qTD2Q18WvjZZadWa7wtOXnQbLTU="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "tageditor"; }; -} +}) diff --git a/pkgs/by-name/ta/taglib-sharp/package.nix b/pkgs/by-name/ta/taglib-sharp/package.nix index a456ac860814..b5d14f22827f 100644 --- a/pkgs/by-name/ta/taglib-sharp/package.nix +++ b/pkgs/by-name/ta/taglib-sharp/package.nix @@ -8,14 +8,14 @@ mono, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taglib-sharp"; version = "2.1.0.0"; src = fetchFromGitHub { owner = "mono"; repo = "taglib-sharp"; - rev = "taglib-sharp-${version}"; + rev = "taglib-sharp-${finalAttrs.version}"; sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.lgpl21; }; -} +}) diff --git a/pkgs/by-name/ta/taglib_extras/package.nix b/pkgs/by-name/ta/taglib_extras/package.nix index 65c558733c48..7e815ca8cd04 100644 --- a/pkgs/by-name/ta/taglib_extras/package.nix +++ b/pkgs/by-name/ta/taglib_extras/package.nix @@ -7,11 +7,11 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taglib-extras"; version = "1.0.1"; src = fetchurl { - url = "https://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"; + url = "https://download.kde.org/stable/taglib-extras/${finalAttrs.version}/src/taglib-extras-${finalAttrs.version}.tar.gz"; sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.lgpl2; }; -} +}) diff --git a/pkgs/by-name/ta/tagparser/package.nix b/pkgs/by-name/ta/tagparser/package.nix index f19d5fde2a21..1ecc3b65bd14 100644 --- a/pkgs/by-name/ta/tagparser/package.nix +++ b/pkgs/by-name/ta/tagparser/package.nix @@ -8,14 +8,14 @@ isocodes, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tagparser"; version = "12.5.2"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-QVeEwQFXr2xYKFtrrWumMoo3sVRtCWCVZvwK71BgoSg="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.matthiasbeyer ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ta/tagutil/package.nix b/pkgs/by-name/ta/tagutil/package.nix index dd7e56e5bcec..4c14e5c55238 100644 --- a/pkgs/by-name/ta/tagutil/package.nix +++ b/pkgs/by-name/ta/tagutil/package.nix @@ -11,7 +11,7 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tagutil"; version = "3.1-unstable-2025-06-16"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-sKnBS9kXhJ2atN6A3qcX9A+0A7WfNkOe+nKSblL3i0o="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; nativeBuildInputs = [ cmake @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "tagutil"; }; -} +}) diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix index a43334c686bc..0a42502be8de 100644 --- a/pkgs/by-name/ta/tail-tray/package.nix +++ b/pkgs/by-name/ta/tail-tray/package.nix @@ -9,14 +9,14 @@ kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tail-tray"; version = "0.2.28"; src = fetchFromGitHub { owner = "SneWs"; repo = "tail-tray"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UhJyrlY9S3CRK3TgFf7nUGF6drj4Zx/yirZ0z4jpqtE="; }; @@ -42,10 +42,10 @@ stdenv.mkDerivation rec { meta = { description = "Tray icon to manage Tailscale"; homepage = "https://github.com/SneWs/tail-tray"; - changelog = "https://github.com/SneWs/tail-tray/releases/tag/${src.tag}"; + changelog = "https://github.com/SneWs/tail-tray/releases/tag/${finalAttrs.src.tag}"; mainProgram = "tail-tray"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ Svenum ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ta/talentedhack/package.nix b/pkgs/by-name/ta/talentedhack/package.nix index 2dd21484405a..1c41f6fc74fb 100644 --- a/pkgs/by-name/ta/talentedhack/package.nix +++ b/pkgs/by-name/ta/talentedhack/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "talentedhack"; version = "1.86"; src = fetchFromGitHub { owner = "jeremysalwen"; repo = "talentedhack"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.michalrus ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ta/taler-challenger/package.nix b/pkgs/by-name/ta/taler-challenger/package.nix index 288b2c06b36f..76763371fe9b 100644 --- a/pkgs/by-name/ta/taler-challenger/package.nix +++ b/pkgs/by-name/ta/taler-challenger/package.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "taler-challenger"; - version = "1.0.0"; + version = "1.3.0"; src = fetchgit { url = "https://git.taler.net/challenger.git"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZKRqNlva3LZCuAva7h6Wk2NIuHF3rReR+yNETqbCv1k="; + hash = "sha256-oomrqpA/V2sNTRzFbHS7rnZdTIs8w+SRYsa9AYDFn5o="; }; # https://git.taler.net/challenger.git/tree/bootstrap diff --git a/pkgs/by-name/ta/taler-exchange/0001-add-TALER_TEMPLATING_init_path.patch b/pkgs/by-name/ta/taler-exchange/0001-add-TALER_TEMPLATING_init_path.patch index 60ea8051366e..0e31e287ae83 100644 --- a/pkgs/by-name/ta/taler-exchange/0001-add-TALER_TEMPLATING_init_path.patch +++ b/pkgs/by-name/ta/taler-exchange/0001-add-TALER_TEMPLATING_init_path.patch @@ -9,14 +9,14 @@ headers, which makes it harder to patch in the correct directory. To circumvent this, a similar function that takes the templates path directly is added. --- - src/include/taler_templating_lib.h | 9 +++++++++ + src/include/taler/taler_templating_lib.h | 9 +++++++++ src/templating/templating_api.c | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+) -diff --git a/src/include/taler_templating_lib.h b/src/include/taler_templating_lib.h +diff --git a/src/include/taler/taler_templating_lib.h b/src/include/taler/taler_templating_lib.h index 6af6db715..343004ef1 100644 ---- a/src/include/taler_templating_lib.h -+++ b/src/include/taler_templating_lib.h +--- a/src/include/taler/taler_templating_lib.h ++++ b/src/include/taler/taler_templating_lib.h @@ -120,6 +120,16 @@ TALER_TEMPLATING_reply_error (struct MHD_Connection *connection, enum GNUNET_GenericReturnValue TALER_TEMPLATING_init (const char *subsystem); diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix index 185af90a718b..2fe055b21bdf 100644 --- a/pkgs/by-name/ta/taler-exchange/package.nix +++ b/pkgs/by-name/ta/taler-exchange/package.nix @@ -16,6 +16,7 @@ recutils, wget, jq, + uncrustify, gettext, texinfo, libtool, @@ -24,17 +25,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "taler-exchange"; - version = "1.0.4"; + version = "1.3.0"; src = fetchgit { url = "https://git.taler.net/exchange.git"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-k2e9pzy7vSIjCVGOVif9ntYvLcvoJA6J63vB/lg3iwA="; + hash = "sha256-FePuJUEa01E2jlAOdHryzkFwXqNcU+AkMKs1pamNJn8="; }; patches = [ ./0001-add-TALER_TEMPLATING_init_path.patch ]; + postPatch = '' + substituteInPlace contrib/gana-generate.sh \ + --replace-fail "existence git" "true" \ + --replace-fail "uncrustify.cfg" "contrib/uncrustify.cfg" + ''; + nativeBuildInputs = [ autoreconfHook recutils # recfix @@ -43,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { texinfo # makeinfo # jq is necessary for some tests and is checked by configure script jq + uncrustify ]; buildInputs = [ diff --git a/pkgs/by-name/ta/taler-mdb/package.nix b/pkgs/by-name/ta/taler-mdb/package.nix index d4ff3ccfe297..3bd77d459d27 100644 --- a/pkgs/by-name/ta/taler-mdb/package.nix +++ b/pkgs/by-name/ta/taler-mdb/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "taler-mdb"; - version = "1.0.0"; + version = "1.3.0"; src = fetchgit { url = "https://git.taler.net/taler-mdb.git"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-AAFnF8bN2Pnhy8OZbgA6CRHBIC6iP785HpVjPEVu+IQ="; + hash = "sha256-bslsC/m75kt8JoIQPp53u64SxghwZloOHehctphpNwI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix index 90bfac3411bb..79dcf63af244 100644 --- a/pkgs/by-name/ta/taler-merchant/package.nix +++ b/pkgs/by-name/ta/taler-merchant/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "taler-merchant"; - version = "1.0.1"; + version = "1.3.0"; src = fetchgit { url = "https://git.taler.net/merchant.git"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-H/JqMGLP0u68g/bMqsollAk6sKL73TCZ9no49psYST0="; + hash = "sha256-nrXokwZ0IFXAH3B12/FDAhhyE6JAiiJ59cuWLwLM684="; }; postUnpack = '' @@ -39,7 +39,8 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'TALER_TEMPLATING_init (TALER_MERCHANT_project_data ())' "TALER_TEMPLATING_init_path (\"merchant\", \"$out/share/taler\")" substituteInPlace src/backend/taler-merchant-httpd_spa.c \ - --replace-fail 'GNUNET_DISK_directory_scan (dn,' "GNUNET_DISK_directory_scan (\"$out/share/taler/merchant/spa/\"," + --replace-fail 'TALER_MHD_spa_load (TALER_MERCHANT_project_data (),' "TALER_MHD_spa_load_dir (\"$out/share/taler/merchant/spa/\");" \ + --replace-fail '"spa/");' "" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/taler-sync/package.nix b/pkgs/by-name/ta/taler-sync/package.nix index 43f5fad03afd..a935bba2b9f6 100644 --- a/pkgs/by-name/ta/taler-sync/package.nix +++ b/pkgs/by-name/ta/taler-sync/package.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "taler-sync"; - version = "1.0.0"; + version = "1.3.0"; src = fetchgit { url = "https://git.taler.net/sync.git"; tag = "v${finalAttrs.version}"; - hash = "sha256-di+AgCCgOTvzR6Fberz1ISo6ZT+OsKikeNCU2HZHSz4="; + hash = "sha256-1m26ORKsN0GHJWQ/5gtMO3x1ng+GsZK9Y80413vF5pI="; }; strictDeps = true; diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index 68bcedf8f3c6..e490ee3477c2 100644 --- a/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -40,12 +40,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taler-wallet-core"; - version = "1.0.12"; + version = "1.3.1"; src = fetchgit { url = "https://git.taler.net/taler-typescript-core.git"; tag = "v${finalAttrs.version}"; - hash = "sha256-lTFiaIgkPw0FhrpYPwg5/MMl8Yo1MfkDPYEDSJ11rQ8="; + hash = "sha256-YTFS4s8GuC3SQ/b4JJ5DbEbzc8hrywYaf6rtSKGiSpE="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm'; fetcherVersion = 1; - hash = "sha256-pLe5smsXdzSBgz/OYNO5FVEI2L6y/p+jMxEkzqUaX34="; + hash = "sha256-jwoSvqE0hqRxu76vDtUOpZxvi4SsmKukfpmp5G6ZV/I="; }; buildInputs = [ nodejs_20 ]; diff --git a/pkgs/by-name/ta/tali/package.nix b/pkgs/by-name/ta/tali/package.nix index 04c18c0fd4e4..1ea9125e5a23 100644 --- a/pkgs/by-name/ta/tali/package.nix +++ b/pkgs/by-name/ta/tali/package.nix @@ -19,12 +19,12 @@ desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tali"; version = "40.9"; src = fetchurl { - url = "mirror://gnome/sources/tali/${lib.versions.major version}/tali-${version}.tar.xz"; + url = "mirror://gnome/sources/tali/${lib.versions.major finalAttrs.version}/tali-${finalAttrs.version}.tar.xz"; hash = "sha256-+p7eNm8KcuTKpSGJw6sLEMG1aoDHiFsBZgJVjETc59M="; }; @@ -59,11 +59,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/GNOME/tali"; - changelog = "https://gitlab.gnome.org/GNOME/tali/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/tali/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Sort of poker with dice and less money"; mainProgram = "tali"; teams = [ lib.teams.gnome ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ta/tambura/package.nix b/pkgs/by-name/ta/tambura/package.nix index c91eb513603f..60838377e9a8 100644 --- a/pkgs/by-name/ta/tambura/package.nix +++ b/pkgs/by-name/ta/tambura/package.nix @@ -5,14 +5,14 @@ faust2jaqt, faust2lv2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "Tambura"; version = "1.0"; src = fetchFromGitHub { owner = "olilarkin"; repo = "Tambura"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1w80cmiyzca1wirf5gypg3hcix1ky777id8wnd3k92mn1jf4a24y"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.magnetophon ]; }; -} +}) diff --git a/pkgs/by-name/ta/tamzen/package.nix b/pkgs/by-name/ta/tamzen/package.nix index 260e180a2a1c..95609b118926 100644 --- a/pkgs/by-name/ta/tamzen/package.nix +++ b/pkgs/by-name/ta/tamzen/package.nix @@ -5,14 +5,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tamzen-font"; version = "1.11.6"; src = fetchFromGitHub { owner = "sunaku"; repo = "tamzen-font"; - rev = "Tamzen-${version}"; + rev = "Tamzen-${finalAttrs.version}"; sha256 = "sha256-W5Wqsm5rpzzcbJl2lv6ORAznaAwLcmJ2S6Qo2zIoq9I="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = lib.licenses.free; maintainers = with lib.maintainers; [ wishfort36 ]; }; -} +}) diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix index 71a6a3651898..6d6931dc458f 100644 --- a/pkgs/by-name/ta/tana/package.nix +++ b/pkgs/by-name/ta/tana/package.nix @@ -62,7 +62,7 @@ let stdenv.cc.cc stdenv.cc.libc ]; - version = "1.498.21"; + version = "1.506.0"; in stdenv.mkDerivation { pname = "tana"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb"; - hash = "sha256-6rX6UxOdSk29SYLwyVX6zkLuIxeKVfQfap1Q2zGpN7g="; + hash = "sha256-w37/8jxAxdDb0FUlS+eaQhremkXnT2xttj6sFEIxzl4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tango-cpp/package.nix b/pkgs/by-name/ta/tango-cpp/package.nix index 4940bf661168..20fb08f22a3c 100644 --- a/pkgs/by-name/ta/tango-cpp/package.nix +++ b/pkgs/by-name/ta/tango-cpp/package.nix @@ -14,14 +14,14 @@ tango-idl, zeromq, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tango-cpp"; version = "10.1.1"; src = fetchFromGitLab { owner = "tango-controls"; repo = "cppTango"; - tag = version; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-Edv7ZGnESjpuwt0Hentl0qgV2PfBgXWED7v9pUvTW0o="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.gilice ]; }; -} +}) diff --git a/pkgs/by-name/ta/tango-database/package.nix b/pkgs/by-name/ta/tango-database/package.nix index e3ea5445403a..ba0fd2ee8418 100644 --- a/pkgs/by-name/ta/tango-database/package.nix +++ b/pkgs/by-name/ta/tango-database/package.nix @@ -15,14 +15,14 @@ # NOTE: You need to manually set up the database structure to run Tango successfully. # See $out/share/tango/db/create_db.sh -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tango-database"; version = "5.28"; src = fetchFromGitLab { owner = "tango-controls"; repo = "TangoDatabase"; - tag = "Database-Release-${version}"; + tag = "Database-Release-${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-r8jrsDR22u30l1R6mK95KsLWHhheZa4/N6n/Xv4mKPc="; }; @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { meta = { description = "Tango distributed control system - database server"; homepage = "https://gitlab.com/tango-controls/TangoDatabase"; - changelog = "https://gitlab.com/tango-controls/TangoDatabase/-/blob/Database-Release-${version}/RELEASE_NOTES.md"; + changelog = "https://gitlab.com/tango-controls/TangoDatabase/-/blob/Database-Release-${finalAttrs.version}/RELEASE_NOTES.md"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.gilice ]; }; -} +}) diff --git a/pkgs/by-name/ta/tango-idl/package.nix b/pkgs/by-name/ta/tango-idl/package.nix index 3c470b6bae46..066ec5a96a24 100644 --- a/pkgs/by-name/ta/tango-idl/package.nix +++ b/pkgs/by-name/ta/tango-idl/package.nix @@ -5,14 +5,14 @@ fetchpatch, cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tango-idl"; version = "6.0.4"; src = fetchFromGitLab { owner = "tango-controls"; repo = "tango-idl"; - tag = version; + tag = finalAttrs.version; hash = "sha256-etXjey4X5mNCHLtu3TyQv0S9uP4BSfZVNN8YDc/fp68="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.gilice ]; }; -} +}) diff --git a/pkgs/by-name/ta/tangram/package.nix b/pkgs/by-name/ta/tangram/package.nix index 2ec1bac118f5..046db92f0986 100644 --- a/pkgs/by-name/ta/tangram/package.nix +++ b/pkgs/by-name/ta/tangram/package.nix @@ -25,14 +25,14 @@ wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tangram"; version = "3.3"; src = fetchFromGitHub { owner = "sonnyp"; repo = "Tangram"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OtQN8Iigu92iKa7CAaslIpbS0bqJ9Vus++inrgV/eeM="; fetchSubmodules = true; }; @@ -99,4 +99,4 @@ stdenv.mkDerivation rec { ]; teams = [ lib.teams.gnome-circle ]; }; -} +}) diff --git a/pkgs/by-name/ta/taoup/package.nix b/pkgs/by-name/ta/taoup/package.nix index f1cc9a3034be..0e27af6a8608 100644 --- a/pkgs/by-name/ta/taoup/package.nix +++ b/pkgs/by-name/ta/taoup/package.nix @@ -9,7 +9,7 @@ let rubyEnv = ruby.withPackages (ps: with ps; [ ansi ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taoup"; # nixpkgs-update: no auto update version = "1.1.23"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "globalcitizen"; repo = "taoup"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-9J46fKyeSZW71r67R8y9KVPeCH8fn27hOk/XpusqGmk="; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/globalcitizen/taoup"; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/pkgs/by-name/ta/target-isns/package.nix b/pkgs/by-name/ta/target-isns/package.nix index b89f9ed63754..b7c9d8f9eba1 100644 --- a/pkgs/by-name/ta/target-isns/package.nix +++ b/pkgs/by-name/ta/target-isns/package.nix @@ -6,14 +6,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "target-isns"; version = "0.6.8"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "target-isns"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1b6jjalvvkkjyjbg1pcgk8vmvc6xzzksyjnh2pfi45bbpya4zxim"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ta/tasknc/package.nix b/pkgs/by-name/ta/tasknc/package.nix index 12c3b63d7981..4dd874f49341 100644 --- a/pkgs/by-name/ta/tasknc/package.nix +++ b/pkgs/by-name/ta/tasknc/package.nix @@ -9,7 +9,7 @@ taskwarrior2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2020-12-17"; pname = "tasknc"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildFlags = [ "VERSION=${version}" ]; + buildFlags = [ "VERSION=${finalAttrs.version}" ]; installPhase = '' mkdir -p $out/bin/ @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; # Cannot test others license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/ta/taskopen/package.nix b/pkgs/by-name/ta/taskopen/package.nix index 0952e5f0505a..b46f3d98ec35 100644 --- a/pkgs/by-name/ta/taskopen/package.nix +++ b/pkgs/by-name/ta/taskopen/package.nix @@ -8,14 +8,14 @@ perlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taskopen"; version = "1.1.5"; src = fetchFromGitHub { owner = "ValiValpas"; repo = "taskopen"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/xf7Ph2KKiZ5lgLKk95nCgw/z9wIBmuWf3QGaNebgHg="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.winpat ]; }; -} +}) diff --git a/pkgs/by-name/ta/taskserver/package.nix b/pkgs/by-name/ta/taskserver/package.nix index 5112984aaf6a..615c1fb70166 100644 --- a/pkgs/by-name/ta/taskserver/package.nix +++ b/pkgs/by-name/ta/taskserver/package.nix @@ -9,12 +9,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taskserver"; version = "1.1.0"; src = fetchurl { - url = "http://www.taskwarrior.org/download/taskd-${version}.tar.gz"; + url = "http://www.taskwarrior.org/download/taskd-${finalAttrs.version}.tar.gz"; sha256 = "1d110q9vw8g5syzihxymik7hd27z1592wkpz55kya6lphzk8i13v"; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { makefu ]; }; -} +}) diff --git a/pkgs/by-name/ta/taskwarrior2/package.nix b/pkgs/by-name/ta/taskwarrior2/package.nix index 9f41fb3363a4..2bf41e3c7010 100644 --- a/pkgs/by-name/ta/taskwarrior2/package.nix +++ b/pkgs/by-name/ta/taskwarrior2/package.nix @@ -11,14 +11,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taskwarrior"; version = "2.6.2"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "taskwarrior"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw="; fetchSubmodules = true; }; @@ -83,4 +83,4 @@ stdenv.mkDerivation rec { mainProgram = "task"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/tb/tbox/package.nix b/pkgs/by-name/tb/tbox/package.nix index 50d7d7400c4c..277063da55c3 100644 --- a/pkgs/by-name/tb/tbox/package.nix +++ b/pkgs/by-name/tb/tbox/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tbox"; version = "1.7.9"; src = fetchFromGitHub { owner = "tboox"; repo = "tbox"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-l/JvDa8kH0evO65RfYQFTTGfkJc/7sHkhJpmQucgRTo="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ wineee ]; }; -} +}) diff --git a/pkgs/by-name/tc/tcp_wrappers/package.nix b/pkgs/by-name/tc/tcp_wrappers/package.nix index b94ed2135e7b..477648e43ea0 100644 --- a/pkgs/by-name/tc/tcp_wrappers/package.nix +++ b/pkgs/by-name/tc/tcp_wrappers/package.nix @@ -10,7 +10,7 @@ let vanillaVersion = "7.6.q"; patchLevel = "36"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tcp-wrappers"; version = "${vanillaVersion}-${patchLevel}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "md"; repo = "tcp-wrappers"; - tag = "debian/${version}"; + tag = "debian/${finalAttrs.version}"; hash = "sha256-SPJmhtgysChnxlta5l1huRq66YcEmHvx1Xs4k7iznTg="; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { license = lib.licenses.tcpWrappers; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/tc/tcpcrypt/package.nix b/pkgs/by-name/tc/tcpcrypt/package.nix index fb2c42be14ba..3508dbc4f78b 100644 --- a/pkgs/by-name/tc/tcpcrypt/package.nix +++ b/pkgs/by-name/tc/tcpcrypt/package.nix @@ -11,14 +11,14 @@ libnetfilter_queue, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tcpcrypt"; version = "0.5"; src = fetchFromGitHub { repo = "tcpcrypt"; owner = "scslab"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0a015rlyvagz714pgwr85f8gjq1fkc0il7d7l39qcgxrsp15b96w"; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/by-name/tc/tcpdirect/package.nix b/pkgs/by-name/tc/tcpdirect/package.nix index 67ee5ead68ae..b1361b7919e2 100644 --- a/pkgs/by-name/tc/tcpdirect/package.nix +++ b/pkgs/by-name/tc/tcpdirect/package.nix @@ -10,14 +10,14 @@ openonload, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tcpdirect"; version = "9.0.2.45"; src = fetchFromGitHub { owner = "Xilinx-CNS"; repo = "tcpdirect"; - rev = "tcpdirect-${version}"; + rev = "tcpdirect-${finalAttrs.version}"; hash = "sha256-7VQwep078hXdXE4pqGUe2CLqnPdDuWupcyuC+NCM5Ms="; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { # ARM64 build fails, see https://github.com/Xilinx-CNS/onload/issues/253 platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/tc/tcpdump/package.nix b/pkgs/by-name/tc/tcpdump/package.nix index c7d04ae911ca..9c7a2ba4c2ee 100644 --- a/pkgs/by-name/tc/tcpdump/package.nix +++ b/pkgs/by-name/tc/tcpdump/package.nix @@ -7,12 +7,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tcpdump"; version = "4.99.6"; src = fetchurl { - url = "https://www.tcpdump.org/release/tcpdump-${version}.tar.gz"; + url = "https://www.tcpdump.org/release/tcpdump-${finalAttrs.version}.tar.gz"; hash = "sha256-WDmSGg9n19j6PazZzUHkTInMuGfoptshbWJijH/RSwk="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "tcpdump"; }; -} +}) diff --git a/pkgs/by-name/tc/tcpreplay/package.nix b/pkgs/by-name/tc/tcpreplay/package.nix index d7165c5c6369..f75218d2b36d 100644 --- a/pkgs/by-name/tc/tcpreplay/package.nix +++ b/pkgs/by-name/tc/tcpreplay/package.nix @@ -6,12 +6,12 @@ tcpdump, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tcpreplay"; version = "4.5.2"; src = fetchurl { - url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; + url = "https://github.com/appneta/tcpreplay/releases/download/v${finalAttrs.version}/tcpreplay-${finalAttrs.version}.tar.gz"; sha256 = "sha256-zP87spRpoEzMIO0LUY4+Q8Sntah2M52UNb/Z23/l0PE="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ eleanor ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/td/tdrop/package.nix b/pkgs/by-name/td/tdrop/package.nix index 9f5a23e8ec56..8a63abe4aaa4 100644 --- a/pkgs/by-name/td/tdrop/package.nix +++ b/pkgs/by-name/td/tdrop/package.nix @@ -12,14 +12,14 @@ procps, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tdrop"; version = "0.5.0"; src = fetchFromGitHub { owner = "noctuid"; repo = "tdrop"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-fHvGXaZL7MMvTnkap341B79PDDo2lOVPPcOH4AX/zXo="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 0ff28e5d6342..6a47d8fbad2a 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.7.0"; + version = "2.7.2"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-WGxbUekGJ8P5D0WrI6ZC1z5ZQneH+ruo6CDQWOmsKzM="; + hash = "sha256-I9z61dbGBEw21WfU4oWFTbqHHMG634lKuO4UMm5+V+U="; }; - npmDepsHash = "sha256-VBvQbAiZ7aOIQB6ab9zzIarPU8BVlIbZeKZdJ6vL+LQ="; + npmDepsHash = "sha256-IVZmkBxbeVlQKNyXhbuUP1XMg/1chCTQK3wsKzwxXgA="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/te/teetertorture/package.nix b/pkgs/by-name/te/teetertorture/package.nix index a9852baed320..df7a98ff1f6d 100644 --- a/pkgs/by-name/te/teetertorture/package.nix +++ b/pkgs/by-name/te/teetertorture/package.nix @@ -7,11 +7,11 @@ SDL_mixer, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "teeter-torture"; version = "2005-10-18"; src = fetchurl { - url = "ftp://ftp.tuxpaint.org/unix/x/teetertorture/source/teetertorture-${version}.tar.gz"; + url = "ftp://ftp.tuxpaint.org/unix/x/teetertorture/source/teetertorture-${finalAttrs.version}.tar.gz"; sha256 = "175gdbkx3m82icyzvwpyzs4v2fd69c695k5n8ca0lnjv81wnw2hr"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { inherit (SDL.meta) platforms; mainProgram = "teetertorture"; }; -} +}) diff --git a/pkgs/by-name/te/teeworlds/package.nix b/pkgs/by-name/te/teeworlds/package.nix index 373e85eaa889..269690fdd9f7 100644 --- a/pkgs/by-name/te/teeworlds/package.nix +++ b/pkgs/by-name/te/teeworlds/package.nix @@ -19,14 +19,14 @@ buildClient ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "teeworlds"; version = "0.7.5"; src = fetchFromGitHub { owner = "teeworlds"; repo = "teeworlds"; - rev = version; + rev = finalAttrs.version; sha256 = "1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz"; fetchSubmodules = true; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # Quote nonsense is a workaround for https://github.com/NixOS/nix/issues/661 substituteInPlace 'other/bundle/client/Info.plist.in' \ --replace ${"'"}''${TARGET_CLIENT}' 'teeworlds' \ - --replace ${"'"}''${PROJECT_VERSION}' '${version}' + --replace ${"'"}''${PROJECT_VERSION}' '${finalAttrs.version}' # Make sure some bundled dependencies are actually unbundled. # This will fail compilation if one of these dependencies could not @@ -150,4 +150,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/te/tektoncd-cli-pac/package.nix b/pkgs/by-name/te/tektoncd-cli-pac/package.nix index 24b1fb5a78d2..77db033f4545 100644 --- a/pkgs/by-name/te/tektoncd-cli-pac/package.nix +++ b/pkgs/by-name/te/tektoncd-cli-pac/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "tektoncd-cli-pac"; - version = "0.41.0"; + version = "0.41.1"; src = fetchFromGitHub { owner = "openshift-pipelines"; repo = "pipelines-as-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-j3HVaaW7fhaFK+Uv/zJXUBmylHV04QCFRr/V7cfeSNg="; + hash = "sha256-ZuYaYBSDpU2NCBssw+j3cP4jV6t+pCezFrQRQBS/zKk="; }; vendorHash = null; diff --git a/pkgs/by-name/te/termcolor/package.nix b/pkgs/by-name/te/termcolor/package.nix index 1990ab7fa8a9..f2474f74b3a7 100644 --- a/pkgs/by-name/te/termcolor/package.nix +++ b/pkgs/by-name/te/termcolor/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "termcolor"; version = "2.1.0"; src = fetchFromGitHub { owner = "ikalnytskyi"; repo = "termcolor"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-2RXQ8sn2VNhQ2WZfwCCeQuM6x6C+sLA6ulAaFtaDMZw="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ prusnak ]; }; -} +}) diff --git a/pkgs/by-name/te/terminal-colors/package.nix b/pkgs/by-name/te/terminal-colors/package.nix index 9692ffa735c1..4987015f30e7 100644 --- a/pkgs/by-name/te/terminal-colors/package.nix +++ b/pkgs/by-name/te/terminal-colors/package.nix @@ -6,7 +6,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "terminal-colors"; version = "3.0.2"; outputs = [ @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "eikenb"; repo = "terminal-colors"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-KRoP/Reo5nDKJYG9zVTVpoYL7soAGMNk46vDoaLfnv4="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ kaction ]; mainProgram = "terminal-colors"; }; -} +}) diff --git a/pkgs/by-name/te/termsyn/package.nix b/pkgs/by-name/te/termsyn/package.nix index dbac95f96fb8..c92eba3d7c89 100644 --- a/pkgs/by-name/te/termsyn/package.nix +++ b/pkgs/by-name/te/termsyn/package.nix @@ -5,12 +5,12 @@ mkfontscale, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "termsyn"; version = "1.8.7"; src = fetchurl { - url = "mirror://sourceforge/termsyn/termsyn-${version}.tar.gz"; + url = "mirror://sourceforge/termsyn/termsyn-${finalAttrs.version}.tar.gz"; sha256 = "15vsmc3nmzl0pkgdpr2993da7p38fiw2rvcg01pwldzmpqrmkpn6"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ sophrosyne ]; }; -} +}) diff --git a/pkgs/by-name/te/terra/package.nix b/pkgs/by-name/te/terra/package.nix index df2baaec6fae..c41332c7ad03 100644 --- a/pkgs/by-name/te/terra/package.nix +++ b/pkgs/by-name/te/terra/package.nix @@ -42,14 +42,14 @@ let clangVersion = llvmPackages.clang-unwrapped.version; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "terra"; version = "1.2.0"; src = fetchFromGitHub { owner = "terralang"; repo = "terra"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; hash = "sha256-CukNCvTHZUhjdHyvDUSH0YCVNkThUFPaeyLepyEKodA="; }; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { in [ "-DHAS_TERRA_VERSION=0" - "-DTERRA_VERSION=${version}" + "-DTERRA_VERSION=${finalAttrs.version}" "-DTERRA_LUA=luajit" "-DTERRA_SKIP_LUA_DOWNLOAD=ON" "-DCLANG_RESOURCE_DIR=${resourceDir}" @@ -124,4 +124,4 @@ stdenv.mkDerivation rec { # https://github.com/terralang/terra/issues/597 broken = stdenv.hostPlatform.isAarch64; }; -} +}) diff --git a/pkgs/by-name/te/terranix/package.nix b/pkgs/by-name/te/terranix/package.nix index e3c82ea6da6e..83222df3c2bc 100644 --- a/pkgs/by-name/te/terranix/package.nix +++ b/pkgs/by-name/te/terranix/package.nix @@ -7,14 +7,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "terranix"; version = "2.8.0"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "terranix"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-1Pu2j5xsBTuoyga08ZVf+rKp3FOMmJh/0fXen/idOrA="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { sshine ]; }; -} +}) diff --git a/pkgs/by-name/te/test-drive/package.nix b/pkgs/by-name/te/test-drive/package.nix index fbb1b020cb3c..b4eca02f6c01 100644 --- a/pkgs/by-name/te/test-drive/package.nix +++ b/pkgs/by-name/te/test-drive/package.nix @@ -17,14 +17,14 @@ assert ( ] ); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "test-drive"; version = "0.5.0"; src = fetchFromGitHub { owner = "fortran-lang"; repo = "test-drive"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-xRx8ErIN9xjxZt/nEsdIQkIGFRltuELdlI8lXA+M030="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/te/tetgen/package.nix b/pkgs/by-name/te/tetgen/package.nix index d2b307a24b56..d027d6904076 100644 --- a/pkgs/by-name/te/tetgen/package.nix +++ b/pkgs/by-name/te/tetgen/package.nix @@ -5,12 +5,12 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tetgen"; version = "1.6.0"; src = fetchurl { - url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz"; + url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${finalAttrs.version}.tar.gz"; sha256 = "sha256-h7XmHr06Rx/E8s3XEkwrEd1mOfT+sflBpdL1EQ0Fzjk="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/te/texi2mdoc/package.nix b/pkgs/by-name/te/texi2mdoc/package.nix index 07245c442aaf..6e3bec3b486f 100644 --- a/pkgs/by-name/te/texi2mdoc/package.nix +++ b/pkgs/by-name/te/texi2mdoc/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "texi2mdoc"; version = "0.1.2"; src = fetchurl { - url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/texi2mdoc-${version}.tgz"; + url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/texi2mdoc-${finalAttrs.version}.tgz"; sha256 = "1zjb61ymwfkw6z5g0aqmsn6qpw895zdxv7fv3059gj3wqa3zsibs"; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ramkromberg ]; mainProgram = "texi2mdoc"; }; -} +}) diff --git a/pkgs/by-name/tg/tgt/package.nix b/pkgs/by-name/tg/tgt/package.nix index 15a84511ab9e..e78ffd04a1e6 100644 --- a/pkgs/by-name/tg/tgt/package.nix +++ b/pkgs/by-name/tg/tgt/package.nix @@ -13,14 +13,14 @@ sg3_utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tgt"; version = "1.0.95"; src = fetchFromGitHub { owner = "fujita"; repo = "tgt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-e7rI8/WQl1L78l2Nk9ajomRucPwsSqZ7fLSHSw11jeY="; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ johnazoidberg ]; }; -} +}) diff --git a/pkgs/by-name/th/thc-ipv6/package.nix b/pkgs/by-name/th/thc-ipv6/package.nix index c00eabd2e9a7..76c6cf7ca571 100644 --- a/pkgs/by-name/th/thc-ipv6/package.nix +++ b/pkgs/by-name/th/thc-ipv6/package.nix @@ -7,14 +7,14 @@ libnetfilter_queue, libnfnetlink, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "thc-ipv6"; version = "3.8"; src = fetchFromGitHub { owner = "vanhauser-thc"; repo = "thc-ipv6"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "07kwika1zdq62s5p5z94xznm77dxjxdg8k0hrg7wygz50151nzmx"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.agpl3Only; }; -} +}) diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix index 9a3db9630c98..8210feeae290 100644 --- a/pkgs/by-name/th/the-powder-toy/package.nix +++ b/pkgs/by-name/th/the-powder-toy/package.nix @@ -18,14 +18,14 @@ stdenv, zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "the-powder-toy"; version = "99.3.384"; src = fetchFromGitHub { owner = "The-Powder-Toy"; repo = "The-Powder-Toy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vlswHNkjyxM9sZT+mwiCMfNbdAbhYyx06w+ZLfaPaEQ="; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "powder"; }; -} +}) diff --git a/pkgs/by-name/th/theft/package.nix b/pkgs/by-name/th/theft/package.nix index 6677b23daebd..7f524d810bbd 100644 --- a/pkgs/by-name/th/theft/package.nix +++ b/pkgs/by-name/th/theft/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.4.5"; pname = "theft"; src = fetchFromGitHub { owner = "silentbicycle"; repo = "theft"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1n2mkawfl2bpd4pwy3mdzxwlqjjvb5bdrr2x2gldlyqdwbk7qjhd"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/th/theme-jade1/package.nix b/pkgs/by-name/th/theme-jade1/package.nix index eb4483b777bc..544fb224ddd9 100644 --- a/pkgs/by-name/th/theme-jade1/package.nix +++ b/pkgs/by-name/th/theme-jade1/package.nix @@ -5,12 +5,12 @@ gtk-engine-murrine, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "theme-jade1"; version = "1.15"; src = fetchurl { - url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; + url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${finalAttrs.version}/jade-1-theme.tar.xz"; sha256 = "sha256-VfV3dVpA3P0ChRjpxuh6C9loxr5t3s1xK0BP3DOCeQ4="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/th/theme-sh/package.nix b/pkgs/by-name/th/theme-sh/package.nix index 694bfd895f38..d8257661af23 100644 --- a/pkgs/by-name/th/theme-sh/package.nix +++ b/pkgs/by-name/th/theme-sh/package.nix @@ -7,14 +7,14 @@ gawk, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "theme-sh"; version = "1.1.5"; src = fetchFromGitHub { owner = "lemnos"; repo = "theme.sh"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-zDw8WGBzO4/HRCgN7yoUxT49ibTz+QkRa5WpBQbl1nI="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "theme.sh"; }; -} +}) diff --git a/pkgs/by-name/th/therion/package.nix b/pkgs/by-name/th/therion/package.nix index e72fd85e5e55..09e6cef875c6 100644 --- a/pkgs/by-name/th/therion/package.nix +++ b/pkgs/by-name/th/therion/package.nix @@ -28,14 +28,14 @@ catch2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "therion"; version = "6.3.4"; src = fetchFromGitHub { owner = "therion"; repo = "therion"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kus5MoiUrLadpzq0wPB+J85F0RVva7NAYM6E6HX4eJ8="; }; @@ -98,8 +98,8 @@ stdenv.mkDerivation rec { meta = { description = "Cave surveying software"; homepage = "https://therion.speleo.sk/"; - changelog = "https://github.com/therion/therion/blob/${src.rev}/CHANGES"; + changelog = "https://github.com/therion/therion/blob/${finalAttrs.src.rev}/CHANGES"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ matthewcroughan ]; }; -} +}) diff --git a/pkgs/by-name/th/thermald/package.nix b/pkgs/by-name/th/thermald/package.nix index 4253b8c17cff..17c4737da45c 100644 --- a/pkgs/by-name/th/thermald/package.nix +++ b/pkgs/by-name/th/thermald/package.nix @@ -17,7 +17,7 @@ upower, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "thermald"; version = "2.5.10"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "intel"; repo = "thermal_daemon"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+dk3lOlI8kaf8NvcWQSvTxSqVGPCgvVnTB9nltqQHrU="; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "thermald"; }; -} +}) diff --git a/pkgs/by-name/th/thinkingRock/package.nix b/pkgs/by-name/th/thinkingRock/package.nix index 33555f5ccf30..d6be4d444343 100644 --- a/pkgs/by-name/th/thinkingRock/package.nix +++ b/pkgs/by-name/th/thinkingRock/package.nix @@ -5,12 +5,12 @@ runtimeShell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "thinkingrock-binary"; version = "2.2.1"; src = fetchurl { - url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%20${version}/tr-${version}.tar.gz"; + url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%20${finalAttrs.version}/tr-${finalAttrs.version}.tar.gz"; sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { license = lib.licenses.cddl; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/th/throttled/package.nix b/pkgs/by-name/th/throttled/package.nix index a82aae3949ea..4d8736e28d0c 100644 --- a/pkgs/by-name/th/throttled/package.nix +++ b/pkgs/by-name/th/throttled/package.nix @@ -8,14 +8,14 @@ wrapGAppsNoGuiHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "throttled"; version = "0.11"; src = fetchFromGitHub { owner = "erpalma"; repo = "throttled"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+3ktDkr5hvOfHcch4+mjgJqcuw24UgWTkJqTyDQumyk="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/th/thunar-dropbox-plugin/package.nix b/pkgs/by-name/th/thunar-dropbox-plugin/package.nix index e90f14845618..7ba04464f980 100644 --- a/pkgs/by-name/th/thunar-dropbox-plugin/package.nix +++ b/pkgs/by-name/th/thunar-dropbox-plugin/package.nix @@ -10,14 +10,14 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "thunar-dropbox"; version = "0.3.2"; src = fetchFromGitHub { owner = "Jeinzi"; repo = "thunar-dropbox"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-uYqO87ftEtnSRn/yMSF1jVGleYXR3hVj2Jb1/kAd64Y="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.xfce ]; }; -} +}) diff --git a/pkgs/by-name/th/thunderbolt/package.nix b/pkgs/by-name/th/thunderbolt/package.nix index 2d324ac60428..b69838686acc 100644 --- a/pkgs/by-name/th/thunderbolt/package.nix +++ b/pkgs/by-name/th/thunderbolt/package.nix @@ -9,13 +9,13 @@ udevCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "thunderbolt"; version = "0.9.3"; src = fetchFromGitHub { owner = "01org"; repo = "thunderbolt-software-user-space"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { homepage = "https://01.org/thunderbolt-sw"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ti/tig/package.nix b/pkgs/by-name/ti/tig/package.nix index 360e5435f02f..306fdf907fca 100644 --- a/pkgs/by-name/ti/tig/package.nix +++ b/pkgs/by-name/ti/tig/package.nix @@ -16,14 +16,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tig"; version = "2.6.0"; src = fetchFromGitHub { owner = "jonas"; repo = "tig"; - rev = "tig-${version}"; + rev = "tig-${finalAttrs.version}"; sha256 = "sha256-LJVK4y4C/TyM7sD/AZeHyavZ66SoeSh1y+hXnAAKMws="; }; @@ -96,4 +96,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "tig"; }; -} +}) diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix index fdaa67907cc7..6e87c2be9991 100644 --- a/pkgs/by-name/ti/tiledb/package.nix +++ b/pkgs/by-name/ti/tiledb/package.nix @@ -35,14 +35,14 @@ let ''; catch2 = catch2_3; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tiledb"; version = "2.28.1"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Cs3Lr8I/Mu02x78d7IySG0XX4u/VAjBs4p4b00XDT5k="; }; @@ -150,4 +150,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ rakesh4g ]; }; -} +}) diff --git a/pkgs/by-name/ti/time-ghc-modules/package.nix b/pkgs/by-name/ti/time-ghc-modules/package.nix index a0a55a789562..b2ed0eef3c2f 100644 --- a/pkgs/by-name/ti/time-ghc-modules/package.nix +++ b/pkgs/by-name/ti/time-ghc-modules/package.nix @@ -10,14 +10,14 @@ gnused, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "time-ghc-modules"; version = "2.0.0"; src = fetchFromGitHub { owner = "codedownio"; repo = "time-ghc-modules"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-/PhJAhP3KCWFyeSk8e5JV0cpBueH/eVDwQTMZSnnZCo="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.thomasjm ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ti/time12/package.nix b/pkgs/by-name/ti/time12/package.nix index 810377c81c07..e6f067ea2bb4 100644 --- a/pkgs/by-name/ti/time12/package.nix +++ b/pkgs/by-name/ti/time12/package.nix @@ -16,6 +16,9 @@ libXrandr, libXtst, writableTmpDirAsHomeHook, + + buildVST3 ? true, + buildLV2 ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "COPY_PLUGIN_AFTER_BUILD" false) - (lib.cmakeFeature "BUILD_STANDALONE" "OFF") + + (lib.cmakeBool "BUILD_STANDALONE" false) + (lib.cmakeBool "BUILD_VST3" buildVST3) + (lib.cmakeBool "BUILD_LV2" buildLV2) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" @@ -76,10 +82,17 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/lib/vst3 $out/lib/lv2 + pushd TIME12_artefacts/Release + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + cp -r VST3/TIME-12.vst3 $out/lib/vst3 + ''} - cp -r "TIME12_artefacts/Release/LV2/TIME-12.lv2" $out/lib/lv2 - cp -r "TIME12_artefacts/Release/VST3/TIME-12.vst3" $out/lib/vst3 + ${lib.optionalString buildLV2 '' + mkdir -p $out/lib/lv2 + cp -r LV2/TIME-12.lv2 $out/lib/lv2 + ''} + popd runHook postInstall ''; @@ -89,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tiagolr/time12"; changelog = "https://github.com/tiagolr/time12/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ magnetophon ]; + maintainers = with lib.maintainers; [ + magnetophon + mrtnvgr + ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ti/timelapse-deflicker/package.nix b/pkgs/by-name/ti/timelapse-deflicker/package.nix index df8cdcbf7b75..2b2e885a1e28 100644 --- a/pkgs/by-name/ti/timelapse-deflicker/package.nix +++ b/pkgs/by-name/ti/timelapse-deflicker/package.nix @@ -7,14 +7,14 @@ perlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "timelapse-deflicker"; version = "0.1.0"; src = fetchFromGitHub { owner = "cyberang3l"; repo = "timelapse-deflicker"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0bbfnrdycrpyz7rqrql5ib9qszny7z5xpqp65c1mxqd2876gv960"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ valeriangalliat ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ti/timelimit/package.nix b/pkgs/by-name/ti/timelimit/package.nix index f93de022bb76..5fd1978e41ed 100644 --- a/pkgs/by-name/ti/timelimit/package.nix +++ b/pkgs/by-name/ti/timelimit/package.nix @@ -5,14 +5,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "timelimit"; version = "1.9.2"; src = fetchFromGitLab { owner = "timelimit"; repo = "timelimit"; - rev = "release/${version}"; + rev = "release/${finalAttrs.version}"; hash = "sha256-5IEAF8zCKaCVH6BAxjoa/2rrue9pRGBBkFzN57d+g+g="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "timelimit"; }; -} +}) diff --git a/pkgs/by-name/ti/timeloop/package.nix b/pkgs/by-name/ti/timeloop/package.nix index 59fb29962c78..0ad21b4668c1 100644 --- a/pkgs/by-name/ti/timeloop/package.nix +++ b/pkgs/by-name/ti/timeloop/package.nix @@ -14,14 +14,14 @@ accelergy, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "timeloop"; version = "3.0.3"; src = fetchFromGitHub { owner = "NVlabs"; repo = "timeloop"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-CGPhrBNzFdERAA/Eym2v0+FvFUe+VkBLnwYEqEMHE9k="; }; @@ -98,4 +98,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ gdinh ]; }; -} +}) diff --git a/pkgs/by-name/ti/timemachine/package.nix b/pkgs/by-name/ti/timemachine/package.nix index c1781aed8171..53a088d01167 100644 --- a/pkgs/by-name/ti/timemachine/package.nix +++ b/pkgs/by-name/ti/timemachine/package.nix @@ -10,13 +10,13 @@ libsndfile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "timemachine"; version = "0.3.4"; src = fetchFromGitHub { owner = "swh"; repo = "timemachine"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "16fgyw6jnscx9279dczv72092dddghwlp53rkfw469kcgvjhwx0z"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.nico202 ]; mainProgram = "timemachine"; }; -} +}) diff --git a/pkgs/by-name/ti/timewarrior/package.nix b/pkgs/by-name/ti/timewarrior/package.nix index 75f3e2d9ca97..8ff3c671ffba 100644 --- a/pkgs/by-name/ti/timewarrior/package.nix +++ b/pkgs/by-name/ti/timewarrior/package.nix @@ -7,14 +7,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "timewarrior"; version = "1.9.1"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "timewarrior"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wwuyXcLCrNvpDIQvoBt/OQlwoTMhPzGZ+WrZdTo6IPo="; fetchSubmodules = true; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { mainProgram = "timew"; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/ti/tini/package.nix b/pkgs/by-name/ti/tini/package.nix index 1d5258134f15..5319593d2543 100644 --- a/pkgs/by-name/ti/tini/package.nix +++ b/pkgs/by-name/ti/tini/package.nix @@ -6,14 +6,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.19.0"; pname = "tini"; src = fetchFromGitHub { owner = "krallin"; repo = "tini"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "tini"; }; -} +}) diff --git a/pkgs/by-name/ti/tintin/package.nix b/pkgs/by-name/ti/tintin/package.nix index a7203c96449d..19b84aeec482 100644 --- a/pkgs/by-name/ti/tintin/package.nix +++ b/pkgs/by-name/ti/tintin/package.nix @@ -7,14 +7,14 @@ gnutls, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tintin"; version = "2.02.60"; src = fetchFromGitHub { owner = "scandum"; repo = "tintin"; - rev = version; + rev = finalAttrs.version; hash = "sha256-2pkQv3Tf0cT0P7x1eiQYYlDYr9kA5F4DQxb8muJFX6Y="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { mainProgram = "tt++"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ti/tinycbor/package.nix b/pkgs/by-name/ti/tinycbor/package.nix index 9b0b1c0d6fbe..475dbf5ed752 100644 --- a/pkgs/by-name/ti/tinycbor/package.nix +++ b/pkgs/by-name/ti/tinycbor/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tinycbor"; version = "0.6.1"; src = fetchFromGitHub { owner = "intel"; repo = "tinycbor"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-JgkZAvZ63jjTdFRnyk+AeIWcGsg36UtPPFbhFjky9e8="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ oxzi ]; }; -} +}) diff --git a/pkgs/by-name/ti/tinycompress/package.nix b/pkgs/by-name/ti/tinycompress/package.nix index d04b63cdcb35..6d92d3e1b559 100644 --- a/pkgs/by-name/ti/tinycompress/package.nix +++ b/pkgs/by-name/ti/tinycompress/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tinycompress"; version = "1.2.13"; src = fetchurl { - url = "mirror://alsa/tinycompress/tinycompress-${version}.tar.bz2"; + url = "mirror://alsa/tinycompress/tinycompress-${finalAttrs.version}.tar.bz2"; hash = "sha256-Dv5svXv/MZg+DUFt8ENnZ2ZcxM1w0njAbODoPg7qtds="; }; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ k900 ]; }; -} +}) diff --git a/pkgs/by-name/ti/tinyfecvpn/package.nix b/pkgs/by-name/ti/tinyfecvpn/package.nix index 62a2aa06a5a0..650ccff79349 100644 --- a/pkgs/by-name/ti/tinyfecvpn/package.nix +++ b/pkgs/by-name/ti/tinyfecvpn/package.nix @@ -5,14 +5,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tinyfecvpn"; version = "20230206.0"; src = fetchFromGitHub { owner = "wangyu-"; repo = "tinyfecvpn"; - tag = version; + tag = finalAttrs.version; hash = "sha256-g4dduREH64TDK3Y2PKc5RZiISW4h2ALRh8vQK7jvCZU="; fetchSubmodules = true; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "tinyvpn"; }; -} +}) diff --git a/pkgs/by-name/ti/tinyfetch/package.nix b/pkgs/by-name/ti/tinyfetch/package.nix index 06b54e128383..f5b5662337b5 100644 --- a/pkgs/by-name/ti/tinyfetch/package.nix +++ b/pkgs/by-name/ti/tinyfetch/package.nix @@ -4,18 +4,18 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tinyfetch"; version = "0.2"; src = fetchFromGitHub { owner = "abrik1"; repo = "tinyfetch"; - tag = version; + tag = finalAttrs.version; hash = "sha256-I0OurcPKKZntZn7Bk9AnWdpSrU9olGp7kghdOajPDeQ="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; buildPhase = '' runHook preBuild @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pagedMov ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ti/tinyobjloader/package.nix b/pkgs/by-name/ti/tinyobjloader/package.nix index 5c987c1100c4..295498f39818 100644 --- a/pkgs/by-name/ti/tinyobjloader/package.nix +++ b/pkgs/by-name/ti/tinyobjloader/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tinyobjloader"; version = "1.0.7"; src = fetchFromGitHub { owner = "tinyobjloader"; repo = "tinyobjloader"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-BNffbicnLTGK2GQ2/bB328LFU9fqHxrpAVj2hJaekWc="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ti/tinyproxy/package.nix b/pkgs/by-name/ti/tinyproxy/package.nix index 5e7f29489d81..2875acff42cc 100644 --- a/pkgs/by-name/ti/tinyproxy/package.nix +++ b/pkgs/by-name/ti/tinyproxy/package.nix @@ -8,13 +8,13 @@ withDebug ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tinyproxy"; version = "1.11.2"; src = fetchFromGitHub { hash = "sha256-bpr/O723FmW2gb+85aJrwW5/U7R2HwbePTx15i3rpsE="; - rev = version; + rev = finalAttrs.version; repo = "tinyproxy"; owner = "tinyproxy"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.carlosdagos ]; mainProgram = "tinyproxy"; }; -} +}) diff --git a/pkgs/by-name/ti/tiscamera/package.nix b/pkgs/by-name/ti/tiscamera/package.nix index 007b3fbe45d3..ba2ccf7016f0 100644 --- a/pkgs/by-name/ti/tiscamera/package.nix +++ b/pkgs/by-name/ti/tiscamera/package.nix @@ -32,14 +32,14 @@ qt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tiscamera"; version = "1.1.1"; src = fetchFromGitHub { owner = "TheImagingSource"; repo = "tiscamera"; - rev = "v-tiscamera-${version}"; + rev = "v-tiscamera-${finalAttrs.version}"; hash = "sha256-33U/8CbqNWIRwfDHXCZSN466WEQj9fip+Z5EJ7kIwRM="; }; @@ -141,4 +141,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jraygauthier ]; }; -} +}) diff --git a/pkgs/by-name/tk/tkrev/package.nix b/pkgs/by-name/tk/tkrev/package.nix index 2ef1bb8a167d..9e6dbf6b83c1 100644 --- a/pkgs/by-name/tk/tkrev/package.nix +++ b/pkgs/by-name/tk/tkrev/package.nix @@ -6,12 +6,12 @@ tk, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tkrev"; version = "9.6.1"; src = fetchurl { - url = "mirror://sourceforge/tkcvs/tkrev_${version}.tar.gz"; + url = "mirror://sourceforge/tkcvs/tkrev_${finalAttrs.version}.tar.gz"; sha256 = "sha256-hWGxxL7ArWPi1uCeigJIccke5vYTLn2OWHR7t8TIrZc="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/tk/tkrzw/package.nix b/pkgs/by-name/tk/tkrzw/package.nix index e2467b0bda69..4b025502418c 100644 --- a/pkgs/by-name/tk/tkrzw/package.nix +++ b/pkgs/by-name/tk/tkrzw/package.nix @@ -4,13 +4,13 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tkrzw"; version = "1.0.32"; # TODO: defeat multi-output reference cycles src = fetchurl { - url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; + url = "https://dbmx.net/tkrzw/pkg/tkrzw-${finalAttrs.version}.tar.gz"; hash = "sha256-00BN+saJhjK2l4DA8JlMX2upYhkaYcmw9LU7qLsncxw="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/tl/tl-expected/package.nix b/pkgs/by-name/tl/tl-expected/package.nix index 977dc531dab9..040fab0ef9da 100644 --- a/pkgs/by-name/tl/tl-expected/package.nix +++ b/pkgs/by-name/tl/tl-expected/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tl-expected"; version = "1.1.0"; src = fetchFromGitHub { owner = "TartanLlama"; repo = "expected"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-AuRU8VI5l7Th9fJ5jIc/6mPm0Vqbbt6rY8QCCNDOU50="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/tl/tla/package.nix b/pkgs/by-name/tl/tla/package.nix index 3d978d922b32..7794b1d68f01 100644 --- a/pkgs/by-name/tl/tla/package.nix +++ b/pkgs/by-name/tl/tla/package.nix @@ -8,12 +8,12 @@ gnutar, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tla"; version = "1.3.5"; src = fetchurl { - url = "https://ftp.gnu.org/old-gnu/gnu-arch/tla-${version}.tar.gz"; + url = "https://ftp.gnu.org/old-gnu/gnu-arch/tla-${finalAttrs.version}.tar.gz"; sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gnu-arch/"; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/tl/tlaplus/package.nix b/pkgs/by-name/tl/tlaplus/package.nix index 36bf0203b746..ac8c01557736 100644 --- a/pkgs/by-name/tl/tlaplus/package.nix +++ b/pkgs/by-name/tl/tlaplus/package.nix @@ -7,12 +7,12 @@ jre8, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tlaplus"; version = "1.7.4"; src = fetchurl { - url = "https://github.com/tlaplus/tlaplus/releases/download/v${version}/tla2tools.jar"; + url = "https://github.com/tlaplus/tlaplus/releases/download/v${finalAttrs.version}/tla2tools.jar"; sha256 = "sha256-k2omIGHJFGlN/WaaVDviRXPEXVqg/yCouWsj0B4FDog="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { mgregson ]; }; -} +}) diff --git a/pkgs/by-name/tl/tlaplus18/package.nix b/pkgs/by-name/tl/tlaplus18/package.nix index f808d73bf31c..c70e05526a28 100644 --- a/pkgs/by-name/tl/tlaplus18/package.nix +++ b/pkgs/by-name/tl/tlaplus18/package.nix @@ -6,12 +6,12 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tlaplus"; version = "1.8.0"; src = fetchurl { - url = "https://github.com/tlaplus/tlaplus/releases/download/v${version}/tla2tools.jar"; + url = "https://github.com/tlaplus/tlaplus/releases/download/v${finalAttrs.version}/tla2tools.jar"; sha256 = "sha256-OXgpd1xuyvhveunlybBi/N6jnxtp/J8Kmp8PYX3eSZ4="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { mgregson ]; }; -} +}) diff --git a/pkgs/by-name/tl/tlf/package.nix b/pkgs/by-name/tl/tlf/package.nix index 56aaffff557d..4f33277cbdf8 100644 --- a/pkgs/by-name/tl/tlf/package.nix +++ b/pkgs/by-name/tl/tlf/package.nix @@ -14,14 +14,14 @@ xmlrpc_c, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tlf"; version = "1.4.1"; src = fetchFromGitHub { owner = "tlf"; repo = "tlf"; - rev = "tlf-${version}"; + rev = "tlf-${finalAttrs.version}"; sha256 = "1xpgs4k27pjd9mianfknknp6mf34365bcp96wrv5xh4dhph573rj"; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/tl/tlwg/package.nix b/pkgs/by-name/tl/tlwg/package.nix index 87af4fe72f48..8e73d0475fb2 100644 --- a/pkgs/by-name/tl/tlwg/package.nix +++ b/pkgs/by-name/tl/tlwg/package.nix @@ -7,14 +7,14 @@ fontforge, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tlwg"; version = "0.7.3"; src = fetchFromGitHub { owner = "tlwg"; repo = "fonts-tlwg"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "hWiH5KJnYTdcrm+Kzn9HUQry8ry3SKzjA6/0536kCLQ="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { ]; maintainers = [ lib.maintainers.yrashk ]; }; -} +}) diff --git a/pkgs/by-name/tm/tmatrix/package.nix b/pkgs/by-name/tm/tmatrix/package.nix index e7bb012b041b..a089d7c66eca 100644 --- a/pkgs/by-name/tm/tmatrix/package.nix +++ b/pkgs/by-name/tm/tmatrix/package.nix @@ -7,14 +7,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tmatrix"; version = "1.4"; src = fetchFromGitHub { owner = "M4444"; repo = "TMatrix"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-G3dg0SWfBjCA66TTxkVAcVrFNJOWE9+GJXYKzCUX34w="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "tmatrix"; }; -} +}) diff --git a/pkgs/by-name/tm/tmpwatch/package.nix b/pkgs/by-name/tm/tmpwatch/package.nix index 964cfff7c513..bf211804239f 100644 --- a/pkgs/by-name/tm/tmpwatch/package.nix +++ b/pkgs/by-name/tm/tmpwatch/package.nix @@ -5,12 +5,12 @@ psmisc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tmpwatch"; version = "2.11"; src = fetchurl { - url = "https://releases.pagure.org/tmpwatch/tmpwatch-${version}.tar.bz2"; + url = "https://releases.pagure.org/tmpwatch/tmpwatch-${finalAttrs.version}.tar.bz2"; sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "tmpwatch"; }; -} +}) diff --git a/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix index 94eab2c5fb92..a7e3338db5f9 100644 --- a/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix +++ b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tmux-mem-cpu-load"; version = "3.8.2"; src = fetchFromGitHub { owner = "thewtex"; repo = "tmux-mem-cpu-load"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-g++6n6OD9FAw8CtXArKBgNwFf+3v+SBCHmbma7RpMBA="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "tmux-mem-cpu-load"; }; -} +}) diff --git a/pkgs/by-name/tm/tmux-xpanes/package.nix b/pkgs/by-name/tm/tmux-xpanes/package.nix index 165461b8ede7..51dd505a6f14 100644 --- a/pkgs/by-name/tm/tmux-xpanes/package.nix +++ b/pkgs/by-name/tm/tmux-xpanes/package.nix @@ -6,14 +6,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tmux-xpanes"; version = "4.2.0"; src = fetchFromGitHub { owner = "greymd"; repo = "tmux-xpanes"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-PF2K2A49c5djQqSO7ZLFyBwPZaJRK58qZTFpY7n+Z0w="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ monsieurp ]; }; -} +}) diff --git a/pkgs/by-name/tm/tmuxifier/package.nix b/pkgs/by-name/tm/tmuxifier/package.nix index f564b9e9e994..fb53f74b6338 100644 --- a/pkgs/by-name/tm/tmuxifier/package.nix +++ b/pkgs/by-name/tm/tmuxifier/package.nix @@ -5,14 +5,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tmuxifier"; version = "0.13.0"; src = fetchFromGitHub { owner = "jimeh"; repo = "tmuxifier"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7TvJnvtZEo5h45PcSy3tJN09UblswV0mQbTaKjgLyqw="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wigust ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/tn/tnat64/package.nix b/pkgs/by-name/tn/tnat64/package.nix index 063670d9ce75..9c5eb59c524b 100644 --- a/pkgs/by-name/tn/tnat64/package.nix +++ b/pkgs/by-name/tn/tnat64/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tnat64"; version = "0.06"; src = fetchFromGitHub { owner = "andrewshadura"; repo = "tnat64"; - rev = "tnat64-${version}"; + rev = "tnat64-${finalAttrs.version}"; sha256 = "191j1fpr3bw6fk48npl99z7iq6m1g33f15xk5cay1gnk5f46i2j6"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.rnhmjoj ]; }; -} +}) diff --git a/pkgs/by-name/tn/tncattach/package.nix b/pkgs/by-name/tn/tncattach/package.nix index 0c5df0849902..48fc49381106 100644 --- a/pkgs/by-name/tn/tncattach/package.nix +++ b/pkgs/by-name/tn/tncattach/package.nix @@ -5,14 +5,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tncattach"; version = "0.1.9"; src = fetchFromGitHub { owner = "markqvist"; repo = "tncattach"; - rev = version; + rev = finalAttrs.version; sha256 = "0n7ad4gqvpgabw2i67s51lfz386wmv0cvnhxq9ygxpsqmx9aynxk"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "tncattach"; }; -} +}) diff --git a/pkgs/by-name/tn/tnef/package.nix b/pkgs/by-name/tn/tnef/package.nix index f80c31aec274..36746531a6f8 100644 --- a/pkgs/by-name/tn/tnef/package.nix +++ b/pkgs/by-name/tn/tnef/package.nix @@ -6,14 +6,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.4.18"; pname = "tnef"; src = fetchFromGitHub { owner = "verdammelt"; repo = "tnef"; - rev = version; + rev = finalAttrs.version; sha256 = "104g48mcm00bgiyzas2vf86331w7bnw7h3bc11ib4lp7rz6zqfck"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "tnef"; }; -} +}) diff --git a/pkgs/by-name/tn/tntdb/package.nix b/pkgs/by-name/tn/tntdb/package.nix index e7037ae0c77e..3a5a124691ce 100644 --- a/pkgs/by-name/tn/tntdb/package.nix +++ b/pkgs/by-name/tn/tntdb/package.nix @@ -11,14 +11,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tntdb"; version = "1.4"; src = fetchFromGitHub { owner = "maekitalo"; repo = "tntdb"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-ciqHv077sXnvCx+TJjdY1uPrlCP7/s972koXjGLgWhU="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.juliendehos ]; }; -} +}) diff --git a/pkgs/by-name/tn/tntnet/package.nix b/pkgs/by-name/tn/tntnet/package.nix index fdef0a329a65..01a9917cbaeb 100644 --- a/pkgs/by-name/tn/tntnet/package.nix +++ b/pkgs/by-name/tn/tntnet/package.nix @@ -10,14 +10,14 @@ zip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tntnet"; version = "3.0"; src = fetchFromGitHub { owner = "maekitalo"; repo = "tntnet"; - rev = "V${version}"; + rev = "V${finalAttrs.version}"; hash = "sha256-ujVPOreCGCFlYHa19yCIiZ0ed+p0jnS14DHDwKYvtc0="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.juliendehos ]; }; -} +}) diff --git a/pkgs/by-name/to/todofi-sh/package.nix b/pkgs/by-name/to/todofi-sh/package.nix index 9efc5fc846ac..1a3a0c2b73b4 100644 --- a/pkgs/by-name/to/todofi-sh/package.nix +++ b/pkgs/by-name/to/todofi-sh/package.nix @@ -11,14 +11,14 @@ todo-txt-cli, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "todofi.sh"; version = "1.0.0"; src = fetchFromGitHub { owner = "hugokernel"; repo = "todofi.sh"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1gmy5inlghycsxiwnyyjyv81jn2fmfk3s9x78kcgyf7khzb5kwvj"; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ewok ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/to/tofi/package.nix b/pkgs/by-name/to/tofi/package.nix index adae7d11e673..1f4cf05f3fae 100644 --- a/pkgs/by-name/to/tofi/package.nix +++ b/pkgs/by-name/to/tofi/package.nix @@ -16,14 +16,14 @@ libxkbcommon, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tofi"; version = "0.9.1"; src = fetchFromGitHub { owner = "philj56"; repo = "tofi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-lokp6Zmdt7WuAyuRnHBkKD4ydbNiQY7pEVY97Z62U90="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "tofi"; }; -} +}) diff --git a/pkgs/by-name/to/toilet/package.nix b/pkgs/by-name/to/toilet/package.nix index 55de424cc74b..b81a13ab2539 100644 --- a/pkgs/by-name/to/toilet/package.nix +++ b/pkgs/by-name/to/toilet/package.nix @@ -8,12 +8,12 @@ testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "toilet"; version = "0.3"; src = fetchurl { - url = "http://caca.zoy.org/raw-attachment/wiki/toilet/toilet-${version}.tar.gz"; + url = "http://caca.zoy.org/raw-attachment/wiki/toilet/toilet-${finalAttrs.version}.tar.gz"; sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "toilet"; }; -} +}) diff --git a/pkgs/by-name/to/tokyotyrant/package.nix b/pkgs/by-name/to/tokyotyrant/package.nix index b82d761db158..ce775c08afba 100644 --- a/pkgs/by-name/to/tokyotyrant/package.nix +++ b/pkgs/by-name/to/tokyotyrant/package.nix @@ -6,12 +6,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tokyotyrant"; version = "1.1.41"; src = fetchurl { - url = "https://fallabs.com/tokyotyrant/tokyotyrant-${version}.tar.gz"; + url = "https://fallabs.com/tokyotyrant/tokyotyrant-${finalAttrs.version}.tar.gz"; sha256 = "13xqcinhydqmh7231qlir6pymacjwcf98drybkhd9597kzxp1bs2"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/to/tomat/package.nix b/pkgs/by-name/to/tomat/package.nix index 723301f3bda6..a32396201e4a 100644 --- a/pkgs/by-name/to/tomat/package.nix +++ b/pkgs/by-name/to/tomat/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "tomat"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "jolars"; repo = "tomat"; tag = "v${version}"; - hash = "sha256-91/yCWjuLOpeY0APJviElhLBWDM4a8ytUEYkp0oKuRk="; + hash = "sha256-8/AOnwCJFXScnyyg2CUhIxzcCOxeWyVlEpae9sWhhts="; }; - cargoHash = "sha256-/EYSk7bsCnKNRGe/f6RH0L2h0KKU2uEQPSKgqi2a58g="; + cargoHash = "sha256-gjeqmuzz6qdAasu1/0Gz8y+tKhJEZTu90aJabdDafsc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index 5252a177387c..2385f26bd20b 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -9,19 +9,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.7.12"; + version = "0.7.25"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-UeccD8fsph9y054vGDQMwGEeoaHEY0lPL0/X3QIn97g="; + hash = "sha256-tZBQE1hyKF4osDQIiqwpnhT9dxDxCPrvrOhn+Yhr86w="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-Gp8wU0+jIcFYqtFWVXfLmEx28jLcFwtMsGzDbvo/O8s="; + cargoHash = "sha256-+Gs9+vAbYzbz/wcNApcxXahwdzCZay+vdJhFFGT5gjI="; postPatch = '' substituteInPlace Cargo.toml \ diff --git a/pkgs/by-name/to/toml-f/package.nix b/pkgs/by-name/to/toml-f/package.nix index 3b97ff41ccbd..5a843bcd48d7 100644 --- a/pkgs/by-name/to/toml-f/package.nix +++ b/pkgs/by-name/to/toml-f/package.nix @@ -18,14 +18,14 @@ assert ( ] ); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "toml-f"; version = "0.4.3"; src = fetchFromGitHub { owner = "toml-f"; repo = "toml-f"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-QRghnzsLGuQ5MHoVVTDg6ACtwVIkIRexNx/zrrQ0Icc="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/to/torcs/package.nix b/pkgs/by-name/to/torcs/package.nix index 52d41132a717..b3e79ea0b51e 100644 --- a/pkgs/by-name/to/torcs/package.nix +++ b/pkgs/by-name/to/torcs/package.nix @@ -24,12 +24,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "torcs"; version = "1.3.8"; src = fetchurl { - url = "mirror://sourceforge/torcs/torcs-${version}.tar.bz2"; + url = "mirror://sourceforge/torcs/torcs-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-S5Z3NUX7NkEZgqbziXIF64/VciedTOVp8s4HsI6Jp68="; }; @@ -81,4 +81,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; hydraPlatforms = [ ]; }; -} +}) diff --git a/pkgs/by-name/to/torctl/package.nix b/pkgs/by-name/to/torctl/package.nix index a06ac455af79..5bcb7a5f48e9 100644 --- a/pkgs/by-name/to/torctl/package.nix +++ b/pkgs/by-name/to/torctl/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "torctl"; version = "0.5.7"; src = fetchFromGitHub { owner = "BlackArch"; repo = "torctl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rTJR+9pbK/sWMqdHyIqJgASgCGtGtpUPoHmYZJ7COFQ="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { mainProgram = "torctl"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/to/torrent7z/package.nix b/pkgs/by-name/to/torrent7z/package.nix index 9fa29ae1acac..45177f77f1f0 100644 --- a/pkgs/by-name/to/torrent7z/package.nix +++ b/pkgs/by-name/to/torrent7z/package.nix @@ -6,14 +6,14 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "torrent7z"; version = "1.3"; src = fetchFromGitHub { owner = "BubblesInTheTub"; repo = "torrent7z"; - rev = version; + rev = finalAttrs.version; sha256 = "Y2tr0+z9uij4Ifi6FfWRN24BwcDXUZKVLkLtKUiVjU4="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { # RAR code is under non-free UnRAR license, but we remove it license = lib.licenses.gpl3Only; }; -} +}) diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix index 5f294657bfd0..48da603890d7 100644 --- a/pkgs/by-name/to/totem/package.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -32,12 +32,12 @@ xvfb-run, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "totem"; version = "43.2"; src = fetchurl { - url = "mirror://gnome/sources/totem/${lib.versions.major version}/totem-${version}.tar.xz"; + url = "mirror://gnome/sources/totem/${lib.versions.major finalAttrs.version}/totem-${finalAttrs.version}.tar.xz"; hash = "sha256-CwB9MPu5O5WmBPFISKSX9X/DM6dcLmOKJJly6ZwB5qQ="; }; @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://apps.gnome.org/Totem/"; - changelog = "https://gitlab.gnome.org/GNOME/totem/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/totem/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Movie player for the GNOME desktop based on GStreamer"; teams = [ lib.teams.gnome ]; license = lib.licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins @@ -130,4 +130,4 @@ stdenv.mkDerivation rec { # gst-inspect-1.0 is not smart enough for cross compiling broken = stdenv.buildPlatform != stdenv.hostPlatform; }; -} +}) diff --git a/pkgs/by-name/tp/tpacpi-bat/package.nix b/pkgs/by-name/tp/tpacpi-bat/package.nix index 8a5f8d32e534..48111ede5e44 100644 --- a/pkgs/by-name/tp/tpacpi-bat/package.nix +++ b/pkgs/by-name/tp/tpacpi-bat/package.nix @@ -8,14 +8,14 @@ }: # Requires the acpi_call kernel module in order to run. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tpacpi-bat"; version = "3.2"; src = fetchFromGitHub { owner = "teleshoes"; repo = "tpacpi-bat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-9XnvVNdgB5VeI3juZfc8N5weEyULXuqu1IDChZfQqFk="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { mainProgram = "tpacpi-bat"; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/tp/tpm2-abrmd/package.nix b/pkgs/by-name/tp/tpm2-abrmd/package.nix index ebfc37621029..c869fae1bea9 100644 --- a/pkgs/by-name/tp/tpm2-abrmd/package.nix +++ b/pkgs/by-name/tp/tpm2-abrmd/package.nix @@ -13,14 +13,14 @@ cmocka, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tpm2-abrmd"; version = "3.0.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = "tpm2-abrmd"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-l0ncCMsStaeFACRU3Bt6F1zyiOTGY6wOHewA4AD58Ww="; }; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Emulate the required behavior of ./bootstrap in the original # package preAutoreconf = '' - echo "${version}" > VERSION + echo "${finalAttrs.version}" > VERSION ''; # Unit tests are currently broken as the check phase attempts to start a dbus daemon etc. @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { scottstephens ]; }; -} +}) diff --git a/pkgs/by-name/tp/tpm2-totp/package.nix b/pkgs/by-name/tp/tpm2-totp/package.nix index bfad56141344..854242c220ad 100644 --- a/pkgs/by-name/tp/tpm2-totp/package.nix +++ b/pkgs/by-name/tp/tpm2-totp/package.nix @@ -12,14 +12,14 @@ qrencode, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tpm2-totp"; version = "0.3.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = "tpm2-totp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-aeWhI2GQcWa0xAqlmHfcbCMg78UqcD6eanLlEVNVnRM="; }; @@ -43,10 +43,10 @@ stdenv.mkDerivation rec { meta = { description = "Attest the trustworthiness of a device against a human using time-based one-time passwords"; homepage = "https://github.com/tpm2-software/tpm2-totp"; - changelog = "https://github.com/tpm2-software/tpm2-totp/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/tpm2-software/tpm2-totp/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.bsd3; mainProgram = "tpm2-totp"; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ raitobezarius ]; }; -} +}) diff --git a/pkgs/by-name/tp/tpmmanager/package.nix b/pkgs/by-name/tp/tpmmanager/package.nix index b9a6ac8a1f5c..7d56d5e7b622 100644 --- a/pkgs/by-name/tp/tpmmanager/package.nix +++ b/pkgs/by-name/tp/tpmmanager/package.nix @@ -6,14 +6,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tpmmanager"; version = "0.9.0"; src = fetchFromGitHub { owner = "Rohde-Schwarz"; repo = "TPMManager"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-FhdrUJQq4us6BT8CxgWqWiXnbl900204yjyS3nnQACU="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/tr/tracebox/package.nix b/pkgs/by-name/tr/tracebox/package.nix index 5a37e8b63c80..b770b87554f5 100644 --- a/pkgs/by-name/tr/tracebox/package.nix +++ b/pkgs/by-name/tr/tracebox/package.nix @@ -9,14 +9,14 @@ testers, tracebox, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tracebox"; version = "0.4.4"; src = fetchFromGitHub { owner = "tracebox"; repo = "tracebox"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1KBJ4uXa1XpzEw23IjndZg+aGJXk3PVw8LYKAvxbxCA="; fetchSubmodules = true; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i configure.ac \ - -e 's,$(git describe .*),${version},' + -e 's,$(git describe .*),${finalAttrs.version},' ''; configureFlags = [ @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ck3d ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix index 8ea21dd241ca..5f078ddda337 100644 --- a/pkgs/by-name/tr/tracy/package.nix +++ b/pkgs/by-name/tr/tracy/package.nix @@ -26,14 +26,14 @@ assert withGtkFileSelector -> stdenv.hostPlatform.isLinux; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = if withWayland then "tracy-wayland" else "tracy-glfw"; version = "0.11.1"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-HofqYJT1srDJ6Y1f18h7xtAbI/Gvvz0t9f0wBNnOZK8="; }; @@ -127,4 +127,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux ++ lib.optionals (!withWayland) lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/tr/trafficserver/package.nix b/pkgs/by-name/tr/trafficserver/package.nix index 83b8d313d9ea..b4e4e4ec8c7f 100644 --- a/pkgs/by-name/tr/trafficserver/package.nix +++ b/pkgs/by-name/tr/trafficserver/package.nix @@ -46,12 +46,12 @@ enableWCCP ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trafficserver"; version = "9.2.11"; src = fetchzip { - url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; + url = "mirror://apache/trafficserver/trafficserver-${finalAttrs.version}.tar.bz2"; hash = "sha256-WFABr7+JsUbQagLFK0OXZ20t4QCuYrozeaV4fKO/c2s="; }; @@ -183,7 +183,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://trafficserver.apache.org"; - changelog = "https://raw.githubusercontent.com/apache/trafficserver/${version}/CHANGELOG-${version}"; + changelog = "https://raw.githubusercontent.com/apache/trafficserver/${finalAttrs.version}/CHANGELOG-${finalAttrs.version}"; description = "Fast, scalable, and extensible HTTP caching proxy server"; longDescription = '' Apache Traffic Server is a high-performance web proxy cache that improves @@ -198,4 +198,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ midchildan ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/tr/transcrypt/package.nix b/pkgs/by-name/tr/transcrypt/package.nix index 90ff85719756..8e54b8e56027 100644 --- a/pkgs/by-name/tr/transcrypt/package.nix +++ b/pkgs/by-name/tr/transcrypt/package.nix @@ -14,14 +14,14 @@ transcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "transcrypt"; version = "2.3.1"; src = fetchFromGitHub { owner = "elasticdog"; repo = "transcrypt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-s95EnEmcdd5mFAKvtZ88aXxkrRLSZUP0VBrCy5PR4fo="; }; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { passthru.tests.version = testers.testVersion { package = transcrypt; command = "transcrypt --version"; - version = "transcrypt ${version}"; + version = "transcrypt ${finalAttrs.version}"; }; meta = { @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.elasticdog ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/tr/translate-shell/package.nix b/pkgs/by-name/tr/translate-shell/package.nix index da0d93affa91..7f9449e8f70c 100644 --- a/pkgs/by-name/tr/translate-shell/package.nix +++ b/pkgs/by-name/tr/translate-shell/package.nix @@ -12,14 +12,14 @@ hexdump, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "translate-shell"; version = "0.9.7.1"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ILXE8cSrivYqMruE+xtNIInLdwdRfMX5dneY9Nn12Uk="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { mainProgram = "trans"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/tr/transmission-remote-gtk/package.nix b/pkgs/by-name/tr/transmission-remote-gtk/package.nix index c25017e45d9f..ef2398ba1f07 100644 --- a/pkgs/by-name/tr/transmission-remote-gtk/package.nix +++ b/pkgs/by-name/tr/transmission-remote-gtk/package.nix @@ -21,14 +21,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "transmission-remote-gtk"; version = "1.6.0"; src = fetchFromGitHub { owner = "transmission-remote-gtk"; repo = "transmission-remote-gtk"; - tag = version; + tag = finalAttrs.version; hash = "sha256-/syZI/5LhuYLvXrNknnpbGHEH0z5iHeye2YRNJFWZJ0="; }; @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { description = "GTK remote control for the Transmission BitTorrent client"; mainProgram = "transmission-remote-gtk"; homepage = "https://github.com/transmission-remote-gtk/transmission-remote-gtk"; - changelog = "https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/tag/${version}"; + changelog = "https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/tr/tree/package.nix b/pkgs/by-name/tr/tree/package.nix index 26a5fa08f18f..cd2aae2b06a8 100644 --- a/pkgs/by-name/tr/tree/package.nix +++ b/pkgs/by-name/tr/tree/package.nix @@ -23,14 +23,14 @@ let LDFLAGS=-s ''; # use linux flags by default in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tree"; version = "2.2.1"; src = fetchFromGitLab { owner = "OldManProgrammer"; repo = "unix-tree"; - rev = version; + rev = finalAttrs.version; hash = "sha256-sC3XdZWJSXyCIYr/Y41ogz5bNBTfwKjOFtYwhayXPhY="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ nickcao ]; mainProgram = "tree"; }; -} +}) diff --git a/pkgs/by-name/tr/trexio/package.nix b/pkgs/by-name/tr/trexio/package.nix index e6b876f40d75..6e052a59e1d2 100644 --- a/pkgs/by-name/tr/trexio/package.nix +++ b/pkgs/by-name/tr/trexio/package.nix @@ -10,14 +10,14 @@ swig, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trexio"; version = "2.6.0"; src = fetchFromGitHub { owner = "TREX-CoE"; repo = "trexio"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-mTn/46oIvBbv7X0QwDxXQJH3QyH34u487QpLferC2Uc="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/tr/trf/package.nix b/pkgs/by-name/tr/trf/package.nix index 61c91ce0be8a..a8494d716b3d 100644 --- a/pkgs/by-name/tr/trf/package.nix +++ b/pkgs/by-name/tr/trf/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trf"; version = "4.09.1"; src = fetchFromGitHub { owner = "Benson-Genomics-Lab"; repo = "trf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-73LypVqBdlRdDCblf9JNZQmS5Za8xpId4ha5GjTJHDo="; }; @@ -22,4 +22,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ natsukium ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/tr/triggerhappy/package.nix b/pkgs/by-name/tr/triggerhappy/package.nix index 94d31c36868a..4ec269791549 100644 --- a/pkgs/by-name/tr/triggerhappy/package.nix +++ b/pkgs/by-name/tr/triggerhappy/package.nix @@ -7,14 +7,14 @@ systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "triggerhappy"; version = "0.5.0"; src = fetchFromGitHub { owner = "wertarbyte"; repo = "triggerhappy"; - rev = "release/${version}"; + rev = "release/${finalAttrs.version}"; sha256 = "0gb1qhrxwq7i5abd408d01a2dpf28nr1fph1fg7w7n0i5i1nnk90"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ taha ]; }; -} +}) diff --git a/pkgs/by-name/tr/trilinos/package.nix b/pkgs/by-name/tr/trilinos/package.nix index eae532e226ad..6f9be0d259e0 100644 --- a/pkgs/by-name/tr/trilinos/package.nix +++ b/pkgs/by-name/tr/trilinos/package.nix @@ -58,14 +58,14 @@ let -DTPL_ENABLE_MPI=ON ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trilinos"; version = "16.1.0"; src = fetchFromGitHub { owner = "trilinos"; repo = "Trilinos"; - tag = "trilinos-release-${lib.replaceStrings [ "." ] [ "-" ] version}"; + tag = "trilinos-release-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; hash = "sha256-9Yn79kt7JHS30lc+qImSbLOU3Cdb87S3xmlm3v9G1uo="; }; @@ -111,4 +111,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fbeffa ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/tr/trimal/package.nix b/pkgs/by-name/tr/trimal/package.nix index 5e1d2ce5aba6..f203081f1cec 100644 --- a/pkgs/by-name/tr/trimal/package.nix +++ b/pkgs/by-name/tr/trimal/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trimal"; version = "1.5.1"; src = fetchFromGitHub { repo = "trimal"; owner = "scapella"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ONSkYceCgYGSpABj0iOx6yj2hMyFHqCHflYRW+Q6RVc="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { homepage = "http://trimal.cgenomics.org"; maintainers = [ lib.maintainers.bzizou ]; }; -} +}) diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix index 0ed7493d4f31..4ed0f45e95c9 100644 --- a/pkgs/by-name/tr/trivy/package.nix +++ b/pkgs/by-name/tr/trivy/package.nix @@ -10,19 +10,19 @@ }: buildGoModule rec { pname = "trivy"; - version = "0.68.2"; + version = "0.69.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; tag = "v${version}"; - hash = "sha256-0s9N7BHLJOTnOfa9tQ70D5tfTDSEHsiLUYHpWZjuoEU="; + hash = "sha256-auCbZmVr7LzYrw+IOpXBZPUs2YmcPAzr5fo12vSyHeM="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-0HbMMzkxDbDb/Q7s490JfjK63tPdWDuEbV2oQjvD1zI="; + vendorHash = "sha256-GLHr2bLAt3jIOz+E38fryca3r9QqC31sjSOXXk3UP0w="; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/by-name/tr/trompeloeil/package.nix b/pkgs/by-name/tr/trompeloeil/package.nix index 2052a278168f..78381dc212c7 100644 --- a/pkgs/by-name/tr/trompeloeil/package.nix +++ b/pkgs/by-name/tr/trompeloeil/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trompeloeil"; version = "49"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-AyTBHsPYaruq0jadifVqOs80YZ5xwajHdHgMINl3i1Q="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/tr/truecrack/package.nix b/pkgs/by-name/tr/truecrack/package.nix index dc7a9aa2da97..2dc314ee0411 100644 --- a/pkgs/by-name/tr/truecrack/package.nix +++ b/pkgs/by-name/tr/truecrack/package.nix @@ -12,14 +12,14 @@ let stdenv = if cudaSupport then cudaPackages.backendStdenv else gccStdenv; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "truecrack"; version = "3.6"; src = fetchFromGitLab { owner = "kalilinux"; repo = "packages/truecrack"; - tag = "kali/${version}+git20150326-0kali4"; + tag = "kali/${finalAttrs.version}+git20150326-0kali4"; hash = "sha256-d6ld6KHSqYM4RymHf5qcm2AWK6FHWC0rFaLRfIQ2m5Q="; }; @@ -73,14 +73,14 @@ stdenv.mkDerivation rec { runHook preInstallCheck echo "Cracking test volumes" - $out/bin/${meta.mainProgram} -t test/ripemd160_aes.test.tc -w test/passwords.txt | grep -aF "Found password" - $out/bin/${meta.mainProgram} -t test/ripemd160_aes.test.tc -c test/tes -m 4 | grep -aF "Found password" - $out/bin/${meta.mainProgram} -t test/ripemd160_aes.test.tc -w test/passwords.txt | grep -aF "Found password" - $out/bin/${meta.mainProgram} -t test/whirlpool_aes.test.tc -w test/passwords.txt -k whirlpool | grep -aF "Found password" - $out/bin/${meta.mainProgram} -t test/sha512_aes.test.tc -w test/passwords.txt -k sha512 | grep -aF "Found password" - $out/bin/${meta.mainProgram} -t test/ripemd160_aes.test.tc -w test/passwords.txt | grep -aF "Found password" - $out/bin/${meta.mainProgram} -t test/ripemd160_serpent.test.tc -w test/passwords.txt -e serpent | grep -aF "Found password" - $out/bin/${meta.mainProgram} -t test/ripemd160_twofish.test.tc -w test/passwords.txt -e twofish | grep -aF "Found password" + $out/bin/${finalAttrs.meta.mainProgram} -t test/ripemd160_aes.test.tc -w test/passwords.txt | grep -aF "Found password" + $out/bin/${finalAttrs.meta.mainProgram} -t test/ripemd160_aes.test.tc -c test/tes -m 4 | grep -aF "Found password" + $out/bin/${finalAttrs.meta.mainProgram} -t test/ripemd160_aes.test.tc -w test/passwords.txt | grep -aF "Found password" + $out/bin/${finalAttrs.meta.mainProgram} -t test/whirlpool_aes.test.tc -w test/passwords.txt -k whirlpool | grep -aF "Found password" + $out/bin/${finalAttrs.meta.mainProgram} -t test/sha512_aes.test.tc -w test/passwords.txt -k sha512 | grep -aF "Found password" + $out/bin/${finalAttrs.meta.mainProgram} -t test/ripemd160_aes.test.tc -w test/passwords.txt | grep -aF "Found password" + $out/bin/${finalAttrs.meta.mainProgram} -t test/ripemd160_serpent.test.tc -w test/passwords.txt -e serpent | grep -aF "Found password" + $out/bin/${finalAttrs.meta.mainProgram} -t test/ripemd160_twofish.test.tc -w test/passwords.txt -e twofish | grep -aF "Found password" echo "Finished cracking test volumes" runHook postInstallCheck @@ -98,4 +98,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ethancedwards8 ]; }; -} +}) diff --git a/pkgs/by-name/tr/trunk-recorder/package.nix b/pkgs/by-name/tr/trunk-recorder/package.nix index bc7675ed7357..6365c7e3fba0 100644 --- a/pkgs/by-name/tr/trunk-recorder/package.nix +++ b/pkgs/by-name/tr/trunk-recorder/package.nix @@ -21,14 +21,14 @@ sox, hackrfSupport ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trunk-recorder"; version = "5.1.1"; src = fetchFromGitHub { owner = "robotastic"; repo = "trunk-recorder"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-2qy6krI5NglkC+bUFfJaEuHIcBoYJrxBRnFs8O0NcZA="; }; @@ -72,9 +72,9 @@ stdenv.mkDerivation rec { meta = { description = "Record calls from trunked radio systems"; homepage = "https://trunkrecorder.com/"; - changelog = "https://github.com/robotastic/trunk-recorder/releases/tag/v${version}"; + changelog = "https://github.com/robotastic/trunk-recorder/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ PapayaJackal ]; mainProgram = "trunk-recorder"; }; -} +}) diff --git a/pkgs/by-name/ts/ts/package.nix b/pkgs/by-name/ts/ts/package.nix index 98a08d3ed3b1..07d4da642b6f 100644 --- a/pkgs/by-name/ts/ts/package.nix +++ b/pkgs/by-name/ts/ts/package.nix @@ -5,7 +5,7 @@ sendmailPath ? "/run/wrappers/bin/sendmail", }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ts"; version = "1.0.3"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "https://viric.name/~viric/soft/ts/ts-${version}.tar.gz"; + url = "https://viric.name/~viric/soft/ts/ts-${finalAttrs.version}.tar.gz"; sha256 = "sha256-+oMzEVQ9xTW2DLerg8ZKte4xEo26qqE93jQZhOVCtCg="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "ts"; }; -} +}) diff --git a/pkgs/by-name/ts/tsung/package.nix b/pkgs/by-name/ts/tsung/package.nix index a67c1eb0bc83..66a7ee410d41 100644 --- a/pkgs/by-name/ts/tsung/package.nix +++ b/pkgs/by-name/ts/tsung/package.nix @@ -10,12 +10,12 @@ gnuplot, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tsung"; version = "1.8.0"; src = fetchurl { - url = "http://tsung.erlang-projects.org/dist/tsung-${version}.tar.gz"; + url = "http://tsung.erlang-projects.org/dist/tsung-${finalAttrs.version}.tar.gz"; hash = "sha256-kehkMCYBfj0AiKZxD7EcT2F0d+gm6+TF/lhqpjFH/JI="; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tsung.erlang-projects.org/"; - changelog = "https://github.com/processone/tsung/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/processone/tsung/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "High-performance benchmark framework for various protocols including HTTP, XMPP, LDAP, etc"; longDescription = '' Tsung is a distributed load testing tool. It is protocol-independent and @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ uskudnik ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix b/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix index 50c2d0863b43..6bde53ed7b72 100644 --- a/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix +++ b/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix @@ -5,14 +5,14 @@ tt-rss, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tt-rss-plugin-feediron"; version = "1.33"; src = fetchFromGitHub { owner = "feediron"; repo = "ttrss_plugin-feediron"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-KU4XQJNK7Ua7rZaXA32lv16RlloCysAb54E5kEY847A="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ milogert ]; inherit (tt-rss.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix b/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix index 53a11bef9ba2..719313b1aaef 100644 --- a/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix +++ b/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix @@ -5,14 +5,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tt-rss-theme-feedly"; version = "4.1.0"; src = fetchFromGitHub { owner = "levito"; repo = "tt-rss-feedly-theme"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-3mD1aY7gjdvucRzY7sLmZ1RsHtraAg1RGE/3uDp6/o4="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ das_j ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/tt/tt-rss/package.nix b/pkgs/by-name/tt/tt-rss/package.nix index bbbbf5607294..74ad67ac7545 100644 --- a/pkgs/by-name/tt/tt-rss/package.nix +++ b/pkgs/by-name/tt/tt-rss/package.nix @@ -7,7 +7,7 @@ unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tt-rss"; version = "0-unstable-2025-11-01"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # see the code of Config::get_version(). you can check that the version in # the footer of the preferences pages is not UNKNOWN - echo "${version}" > $out/version_static.txt + echo "${finalAttrs.version}" > $out/version_static.txt runHook postInstall ''; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/tt/tthsum/package.nix b/pkgs/by-name/tt/tthsum/package.nix index a4c5f47fbc74..6b76d56bbac7 100644 --- a/pkgs/by-name/tt/tthsum/package.nix +++ b/pkgs/by-name/tt/tthsum/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tthsum"; version = "1.3.2"; src = fetchurl { - url = "http://tthsum.devs.nu/pkg/tthsum-${version}.tar.bz2"; + url = "http://tthsum.devs.nu/pkg/tthsum-${finalAttrs.version}.tar.bz2"; sha256 = "0z6jq8lbg9rasv98kxfs56936dgpgzsg3yc9k52878qfw1l2bp59"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "tthsum"; }; -} +}) diff --git a/pkgs/by-name/tt/ttyd/package.nix b/pkgs/by-name/tt/ttyd/package.nix index c802eae7c1de..801de3173d00 100644 --- a/pkgs/by-name/tt/ttyd/package.nix +++ b/pkgs/by-name/tt/ttyd/package.nix @@ -13,13 +13,13 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ttyd"; version = "1.7.7"; src = fetchFromGitHub { owner = "tsl0922"; repo = "ttyd"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-7e08oBKU7BMZ8328qCfNynCSe7LVZ88+iQZRRKl2YkY="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "ttyd"; }; -} +}) diff --git a/pkgs/by-name/tt/ttygif/package.nix b/pkgs/by-name/tt/ttygif/package.nix index 93ec84f151f4..dc4b96fc96a4 100644 --- a/pkgs/by-name/tt/ttygif/package.nix +++ b/pkgs/by-name/tt/ttygif/package.nix @@ -7,14 +7,14 @@ xwd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ttygif"; version = "1.6.0"; src = fetchFromGitHub { owner = "icholy"; repo = "ttygif"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-GsMeVR2wNivQguZ6B/0v39Td9VGHg+m3RtAG9DYkNmU="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ moaxcp ]; mainProgram = "ttygif"; }; -} +}) diff --git a/pkgs/by-name/tt/ttylog/package.nix b/pkgs/by-name/tt/ttylog/package.nix index 1a6b6bf40f1d..5a91cb61754c 100644 --- a/pkgs/by-name/tt/ttylog/package.nix +++ b/pkgs/by-name/tt/ttylog/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ttylog"; version = "0.31"; src = fetchFromGitHub { owner = "rocasa"; repo = "ttylog"; - rev = version; + rev = finalAttrs.version; sha256 = "0c746bpjpa77vsr88fxk8h1803p5np1di1mpjf4jy5bv5x3zwm07"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ttylog"; }; -} +}) diff --git a/pkgs/by-name/tt/ttyplot/package.nix b/pkgs/by-name/tt/ttyplot/package.nix index 84c73aae19a7..5a5f82e0eb93 100644 --- a/pkgs/by-name/tt/ttyplot/package.nix +++ b/pkgs/by-name/tt/ttyplot/package.nix @@ -6,14 +6,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ttyplot"; version = "1.7.4"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; - rev = version; + rev = finalAttrs.version; hash = "sha256-hWjjl11NGhbv0VrLpdJ/W+a8tJPjg8OtUTKgDIqpsfs="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lassulus ]; mainProgram = "ttyplot"; }; -} +}) diff --git a/pkgs/by-name/tu/tuba/package.nix b/pkgs/by-name/tu/tuba/package.nix index e17c50ca5491..29295e6bfa04 100644 --- a/pkgs/by-name/tu/tuba/package.nix +++ b/pkgs/by-name/tu/tuba/package.nix @@ -35,14 +35,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tuba"; version = "0.10.3"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-uMfxHQOjL1bnKAz0MUUEv2IR4aRiR4UhIM5aHPspJDU="; }; @@ -119,11 +119,11 @@ stdenv.mkDerivation rec { homepage = "https://tuba.geopjr.dev/"; mainProgram = "dev.geopjr.Tuba"; license = lib.licenses.gpl3Only; - changelog = "https://github.com/GeopJr/Tuba/releases/tag/v${version}"; + changelog = "https://github.com/GeopJr/Tuba/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ chuangzhu donovanglover ]; teams = [ lib.teams.gnome-circle ]; }; -} +}) diff --git a/pkgs/by-name/tu/tunctl/package.nix b/pkgs/by-name/tu/tunctl/package.nix index bc1b965f4618..06c6105a5a22 100644 --- a/pkgs/by-name/tu/tunctl/package.nix +++ b/pkgs/by-name/tu/tunctl/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tunctl"; version = "1.5"; src = fetchurl { - url = "mirror://sourceforge/tunctl/tunctl-${version}.tar.gz"; + url = "mirror://sourceforge/tunctl/tunctl-${finalAttrs.version}.tar.gz"; sha256 = "aa2a6c4cc6bfacb11e0d9f62334a6638a0d435475c61230116f00b6af8b14fff"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/tu/tuner/package.nix b/pkgs/by-name/tu/tuner/package.nix index 5c3be6074447..66f17a112766 100644 --- a/pkgs/by-name/tu/tuner/package.nix +++ b/pkgs/by-name/tu/tuner/package.nix @@ -18,14 +18,14 @@ gst_all_1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tuner"; version = "2.0.0"; src = fetchFromGitHub { owner = "louis77"; repo = "tuner"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-i6I5NSwiS8FJuZaHbrXvUcumo9RZvEVPcfKOkHUXiLo="; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { aleksana ]; }; -} +}) diff --git a/pkgs/by-name/tu/tup/package.nix b/pkgs/by-name/tu/tup/package.nix index 598e980ec19b..53f7c47c8c0f 100644 --- a/pkgs/by-name/tu/tup/package.nix +++ b/pkgs/by-name/tu/tup/package.nix @@ -12,7 +12,7 @@ let fuse = if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse3; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tup"; version = "0.8"; outputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gittup"; repo = "tup"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-biVR932wHiUG56mvXoKWFzrzpkclbW9RWM4vY1+OMZ0="; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - substituteInPlace src/tup/link.sh --replace-fail '`git describe' '`echo ${version}' + substituteInPlace src/tup/link.sh --replace-fail '`git describe' '`echo ${finalAttrs.version}' for path in Tupfile build.sh src/tup/server/Tupfile ; do substituteInPlace $path --replace-fail "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" @@ -100,4 +100,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/tu/tuptime/package.nix b/pkgs/by-name/tu/tuptime/package.nix index ae41111a81b3..c0eaf6ac9991 100644 --- a/pkgs/by-name/tu/tuptime/package.nix +++ b/pkgs/by-name/tu/tuptime/package.nix @@ -9,14 +9,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tuptime"; version = "5.2.4"; src = fetchFromGitHub { owner = "rfmoz"; repo = "tuptime"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-pYGtgv9hPBG/URD2nOWg6qJYYLtlqLW+t5mCLpzKlEc="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "tuptime"; }; -} +}) diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix index 79f885c6dc13..06b150fee9a9 100644 --- a/pkgs/by-name/tu/turso-cli/package.nix +++ b/pkgs/by-name/tu/turso-cli/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "1.0.16"; + version = "1.0.17"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-X5rQ+bnyNlEek1mMgBW1SmeTIf5NSfxQvLxEQJuWOhU="; + hash = "sha256-3u5yc49v0vwNKaI5GcE+rDEoscbQqpnaN11Bax0SEtE="; }; vendorHash = "sha256-Cb4/KA9jfI/pNHbJqLWtm9oEXfMHGBS46J9o3lL4/Tk="; diff --git a/pkgs/by-name/tu/tuxtype/package.nix b/pkgs/by-name/tu/tuxtype/package.nix index 56fe035c15f6..318ac71da2e9 100644 --- a/pkgs/by-name/tu/tuxtype/package.nix +++ b/pkgs/by-name/tu/tuxtype/package.nix @@ -14,14 +14,14 @@ t4kcommon, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.8.3"; pname = "tuxtype"; src = fetchFromGitHub { owner = "tux4kids"; repo = "tuxtype"; - rev = "upstream/${version}"; + rev = "upstream/${finalAttrs.version}"; sha256 = "1i33rhi9gpzfml4hd73s18h6p2s8zcr26va2vwf2pqqd9fhdwpsg"; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/tv/tvm/package.nix b/pkgs/by-name/tv/tvm/package.nix index 69532e905532..237942231276 100644 --- a/pkgs/by-name/tv/tvm/package.nix +++ b/pkgs/by-name/tv/tvm/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tvm"; version = "0.19.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-/5IpOraFTgg6sQ1TLHoepq/C8VHKg5BXKrNMBSyYajA="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ adelbertc ]; }; -} +}) diff --git a/pkgs/by-name/tw/twa/package.nix b/pkgs/by-name/tw/twa/package.nix index 584f4802f36c..4eb30e5474c6 100644 --- a/pkgs/by-name/tw/twa/package.nix +++ b/pkgs/by-name/tw/twa/package.nix @@ -12,14 +12,14 @@ netcat, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "twa"; version = "1.11.0"; src = fetchFromGitHub { owner = "trailofbits"; repo = "twa"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-B+UwH7oCtediLzurjYuLp56IxiKNAqyoW5QkwXX72MA="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ avaq ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/tw/twelf/package.nix b/pkgs/by-name/tw/twelf/package.nix index e488c78f5842..528359bf2655 100644 --- a/pkgs/by-name/tw/twelf/package.nix +++ b/pkgs/by-name/tw/twelf/package.nix @@ -8,12 +8,12 @@ rsync, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "twelf"; version = "1.7.1"; src = fetchurl { - url = "http://twelf.plparty.org/releases/twelf-src-${version}.tar.gz"; + url = "http://twelf.plparty.org/releases/twelf-src-${finalAttrs.version}.tar.gz"; sha256 = "0fi1kbs9hrdrm1x4k13angpjasxlyd1gc3ys8ah54i75qbcd9c4i"; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jwiegley ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/tx/txt2man/package.nix b/pkgs/by-name/tx/txt2man/package.nix index e603b0730d75..632b75f83c43 100644 --- a/pkgs/by-name/tx/txt2man/package.nix +++ b/pkgs/by-name/tx/txt2man/package.nix @@ -6,14 +6,14 @@ gawk, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "txt2man"; version = "1.7.1"; src = fetchFromGitHub { owner = "mvertes"; repo = "txt2man"; - rev = "txt2man-${version}"; + rev = "txt2man-${finalAttrs.version}"; hash = "sha256-Aqi5PNNaaM/tr9A/7vKeafYKYIs/kHbwHzE7+R/9r9s="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/tx/txtw/package.nix b/pkgs/by-name/tx/txtw/package.nix index 72444e4cd8ec..47291d733bf5 100644 --- a/pkgs/by-name/tx/txtw/package.nix +++ b/pkgs/by-name/tx/txtw/package.nix @@ -5,14 +5,14 @@ cairo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.4"; pname = "txtw"; src = fetchFromGitHub { owner = "baskerville"; repo = "txtw"; - rev = version; + rev = finalAttrs.version; sha256 = "17yjdgdd080fsf5r1wzgk6vvzwsa15gcwc9z64v7x588jm1ryy3k"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "txtw"; }; -} +}) diff --git a/pkgs/by-name/ty/tym/package.nix b/pkgs/by-name/ty/tym/package.nix index c58905155d98..dc18a23cae41 100644 --- a/pkgs/by-name/ty/tym/package.nix +++ b/pkgs/by-name/ty/tym/package.nix @@ -10,14 +10,14 @@ pcre2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tym"; version = "3.5.2"; src = fetchFromGitHub { owner = "endaaman"; repo = "tym"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-ySriCBmwDiDmAkIIByaZgmK0nUyYiVb0VAV5bi38JGw="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "tym"; }; -} +}) diff --git a/pkgs/by-name/ty/typespeed/package.nix b/pkgs/by-name/ty/typespeed/package.nix index cb9eb5f16e35..52c7044d60c1 100644 --- a/pkgs/by-name/ty/typespeed/package.nix +++ b/pkgs/by-name/ty/typespeed/package.nix @@ -5,12 +5,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "typespeed"; version = "0.6.5"; buildInputs = [ ncurses ]; src = fetchurl { - url = "https://typespeed.sourceforge.net/typespeed-${version}.tar.gz"; + url = "https://typespeed.sourceforge.net/typespeed-${finalAttrs.version}.tar.gz"; sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.auntie ]; }; -} +}) diff --git a/pkgs/by-name/ua/uacme/package.nix b/pkgs/by-name/ua/uacme/package.nix index 7770212279f8..fc7457d41db4 100644 --- a/pkgs/by-name/ua/uacme/package.nix +++ b/pkgs/by-name/ua/uacme/package.nix @@ -9,14 +9,14 @@ curl, openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uacme"; version = "1.7.6"; src = fetchFromGitHub { owner = "ndilieto"; repo = "uacme"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-he0k4o/5JGFDxLrHBO6PNtRgKUzIkGby96cSz0ymuRs="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ua/uarmsolver/package.nix b/pkgs/by-name/ua/uarmsolver/package.nix index d6f4931a6de3..0dbbd0d4f944 100644 --- a/pkgs/by-name/ua/uarmsolver/package.nix +++ b/pkgs/by-name/ua/uarmsolver/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uarmsolver"; version = "0.4.0"; src = fetchFromGitHub { owner = "firefly-cpp"; repo = "uARMSolver"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-fJtGZ1Y1mL/JjuaDbLfXb+AjTESEGjoh3ZEmhBZKotA="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ firefly-cpp ]; }; -} +}) diff --git a/pkgs/by-name/ub/ubertooth/package.nix b/pkgs/by-name/ub/ubertooth/package.nix index b0288ee6f994..de9bac3f0be8 100644 --- a/pkgs/by-name/ub/ubertooth/package.nix +++ b/pkgs/by-name/ub/ubertooth/package.nix @@ -11,18 +11,18 @@ udevGroup ? "ubertooth", }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ubertooth"; version = "2020-12-R1"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "ubertooth"; - rev = version; + rev = finalAttrs.version; sha256 = "11r5ag2l5xn4pr7ycicm30w9c3ldn9yiqj1sqnjc79csxl2vrcfw"; }; - sourceRoot = "${src.name}/host"; + sourceRoot = "${finalAttrs.src.name}/host"; patches = [ # https://github.com/greatscottgadgets/ubertooth/pull/546 @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ oxzi ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ub/ubridge/package.nix b/pkgs/by-name/ub/ubridge/package.nix index 541f5b4d0b16..d8c3634955ee 100644 --- a/pkgs/by-name/ub/ubridge/package.nix +++ b/pkgs/by-name/ub/ubridge/package.nix @@ -8,14 +8,14 @@ ubridge, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ubridge"; version = "0.9.19"; src = fetchFromGitHub { owner = "GNS3"; repo = "ubridge"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-utzXLPF0VszMZORoik5/0lKhiyKO9heKuNO4KPsPVsI="; }; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { and TAP interfaces is supported. Packet capture is also supported. ''; homepage = "https://github.com/GNS3/ubridge"; - changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}"; + changelog = "https://github.com/GNS3/ubridge/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; mainProgram = "ubridge"; maintainers = with lib.maintainers; [ @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/ub/ubuntu-themes/package.nix b/pkgs/by-name/ub/ubuntu-themes/package.nix index c5ef88e309a3..18be38a93b4d 100644 --- a/pkgs/by-name/ub/ubuntu-themes/package.nix +++ b/pkgs/by-name/ub/ubuntu-themes/package.nix @@ -11,12 +11,12 @@ python3Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ubuntu-themes"; version = "24.04"; src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/ubuntu-themes/${version}-0ubuntu1/ubuntu-themes_${version}.orig.tar.gz"; + url = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/ubuntu-themes/${finalAttrs.version}-0ubuntu1/ubuntu-themes_${finalAttrs.version}.orig.tar.gz"; hash = "sha256-/SMwwDaSUe86SXNe7U9Sh7SzzlC4yOXVA+urAIxeDxk="; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/uc/ucarp/package.nix b/pkgs/by-name/uc/ucarp/package.nix index 63992e0080d0..c73f0f85258d 100644 --- a/pkgs/by-name/uc/ucarp/package.nix +++ b/pkgs/by-name/uc/ucarp/package.nix @@ -6,12 +6,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ucarp"; version = "1.5.2"; src = fetchurl { - url = "https://download.pureftpd.org/pub/ucarp/ucarp-${version}.tar.bz2"; + url = "https://download.pureftpd.org/pub/ucarp/ucarp-${finalAttrs.version}.tar.bz2"; sha256 = "0qidz5sr55nxlmnl8kcbjsrff2j97b44h9l1dmhvvjl46iji7q7j"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ oxzi ]; mainProgram = "ucarp"; }; -} +}) diff --git a/pkgs/by-name/uc/ucl/package.nix b/pkgs/by-name/uc/ucl/package.nix index fed243d117a2..ec019da11d24 100644 --- a/pkgs/by-name/uc/ucl/package.nix +++ b/pkgs/by-name/uc/ucl/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ucl"; version = "1.03"; src = fetchurl { - url = "https://www.oberhumer.com/opensource/ucl/download/ucl-${version}.tar.gz"; + url = "https://www.oberhumer.com/opensource/ucl/download/ucl-${finalAttrs.version}.tar.gz"; sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348"; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/uc/ucode/package.nix b/pkgs/by-name/uc/ucode/package.nix index db6a3daa9262..a8309fbc4e26 100644 --- a/pkgs/by-name/uc/ucode/package.nix +++ b/pkgs/by-name/uc/ucode/package.nix @@ -7,14 +7,14 @@ json_c, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ucode"; version = "0.0.20250529"; src = fetchFromGitHub { owner = "jow-"; repo = "ucode"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-V8WGd4rSuCtGIA5oTfnagp0Dmh5FNG87/MJSeILtbM4="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ mkg20001 ]; }; -} +}) diff --git a/pkgs/by-name/uc/ucspi-tcp/package.nix b/pkgs/by-name/uc/ucspi-tcp/package.nix index 27dd43811476..ddc6afdbe072 100644 --- a/pkgs/by-name/uc/ucspi-tcp/package.nix +++ b/pkgs/by-name/uc/ucspi-tcp/package.nix @@ -6,7 +6,7 @@ quilt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ucspi-tcp"; version = "0.88"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-std=gnu89"; src = fetchurl { - url = "https://cr.yp.to/ucspi-tcp/ucspi-tcp-${version}.tar.gz"; + url = "https://cr.yp.to/ucspi-tcp/ucspi-tcp-${finalAttrs.version}.tar.gz"; sha256 = "171yl9kfm8w7l17dfxild99mbf877a9k5zg8yysgb1j8nz51a1ja"; }; @@ -94,4 +94,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/ud/udevil/package.nix b/pkgs/by-name/ud/udevil/package.nix index a84279c1f2a5..180b91427cf7 100644 --- a/pkgs/by-name/ud/udevil/package.nix +++ b/pkgs/by-name/ud/udevil/package.nix @@ -10,14 +10,14 @@ util-linux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "udevil"; version = "0.4.4"; src = fetchFromGitHub { owner = "IgnorantGuru"; repo = "udevil"; - tag = version; + tag = finalAttrs.version; hash = "sha256-TTW2gPa4ND6ILq4yxKEL07AQpSqfiEo66S72lVEmpFk="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ud/udftools/package.nix b/pkgs/by-name/ud/udftools/package.nix index c1f46bea9955..e2e607d86d53 100644 --- a/pkgs/by-name/ud/udftools/package.nix +++ b/pkgs/by-name/ud/udftools/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "udftools"; version = "2.3"; src = fetchFromGitHub { owner = "pali"; repo = "udftools"; - tag = version; + tag = finalAttrs.version; hash = "sha256-SUdwJpJfbs6LhcyNMPJUhhpp/3htwT/EVep7+4PRgto="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/ud/udisks/package.nix b/pkgs/by-name/ud/udisks/package.nix index 26312470acc6..d78bd7c072b2 100644 --- a/pkgs/by-name/ud/udisks/package.nix +++ b/pkgs/by-name/ud/udisks/package.nix @@ -40,14 +40,14 @@ libconfig, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "udisks"; version = "2.11.0"; src = fetchFromGitHub { owner = "storaged-project"; repo = "udisks"; - tag = "udisks-${version}"; + tag = "udisks-${finalAttrs.version}"; hash = "sha256-G3qE4evcn5gtsd8Lrj6vjxCsAl/2LCdqdtaqLFFadMw="; }; @@ -165,4 +165,4 @@ stdenv.mkDerivation rec { teams = [ lib.teams.freedesktop ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ud/udp2raw/package.nix b/pkgs/by-name/ud/udp2raw/package.nix index 9dbb322f3f14..0782f1346414 100644 --- a/pkgs/by-name/ud/udp2raw/package.nix +++ b/pkgs/by-name/ud/udp2raw/package.nix @@ -8,14 +8,14 @@ iptables, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "udp2raw"; version = "20230206.0"; src = fetchFromGitHub { owner = "wangyu-"; repo = "udp2raw"; - rev = version; + rev = finalAttrs.version; hash = "sha256-mchSaqw6sOJ7+dydCM8juP7QMOVUrPL4MFA79Rvyjdo="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - echo 'const char *gitversion = "${version}";' > git_version.h + echo 'const char *gitversion = "${finalAttrs.version}";' > git_version.h # Adress sanitization crashes the application, reported upstream at https://github.com/wangyu-/udp2raw/issues/474 substituteInPlace CMakeLists.txt --replace "sanitize=address," "sanitize=" ''; @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { description = "Tunnel which turns UDP traffic into encrypted UDP/FakeTCP/ICMP traffic by using a raw socket"; mainProgram = "udp2raw"; license = lib.licenses.mit; - changelog = "https://github.com/wangyu-/udp2raw/releases/tag/${version}"; + changelog = "https://github.com/wangyu-/udp2raw/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ chvp ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ud/udpreplay/package.nix b/pkgs/by-name/ud/udpreplay/package.nix index 6c8a07582db9..f1b5156d4353 100644 --- a/pkgs/by-name/ud/udpreplay/package.nix +++ b/pkgs/by-name/ud/udpreplay/package.nix @@ -6,7 +6,7 @@ fetchpatch, lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "updreplay"; version = "1.1.0"; nativeBuildInputs = [ cmake ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rigtorp"; repo = "udpreplay"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-kF9a3pjQbFKf25NKyK7uSq0AAO6JK7QeChLhm9Z3wEA="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "udpreplay"; }; -} +}) diff --git a/pkgs/by-name/ud/udptunnel/package.nix b/pkgs/by-name/ud/udptunnel/package.nix index 1bc9c190e7f8..3316f121107f 100644 --- a/pkgs/by-name/ud/udptunnel/package.nix +++ b/pkgs/by-name/ud/udptunnel/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "udptunnel"; version = "19"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/udptunnel/udptunnel-r${version}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/udptunnel/udptunnel-r${finalAttrs.version}.tar.gz"; sha256 = "1hkrn153rdyrp9g15z4d5dq44cqlnby2bfplp6z0g3862lnv7m3l"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "udptunnel"; }; -} +}) diff --git a/pkgs/by-name/uf/ufiformat/package.nix b/pkgs/by-name/uf/ufiformat/package.nix index 8af9d3a4b612..629e1b0b34c7 100644 --- a/pkgs/by-name/uf/ufiformat/package.nix +++ b/pkgs/by-name/uf/ufiformat/package.nix @@ -5,7 +5,7 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ufiformat"; version = "0.9.9"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "tedigh"; repo = "ufiformat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "heFETZj9migz2s9kvmw0ZQ1ieNpU4V4Lwfp91ek2cS4="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "ufiformat"; }; -} +}) diff --git a/pkgs/by-name/uf/ufoai/package.nix b/pkgs/by-name/uf/ufoai/package.nix index 6335501d0fb9..751fccaaab98 100644 --- a/pkgs/by-name/uf/ufoai/package.nix +++ b/pkgs/by-name/uf/ufoai/package.nix @@ -17,16 +17,16 @@ enableEditor ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ufoai"; version = "2.4"; src = fetchurl { - url = "mirror://sourceforge/ufoai/ufoai-${version}-source.tar.bz2"; + url = "mirror://sourceforge/ufoai/ufoai-${finalAttrs.version}-source.tar.bz2"; sha256 = "0kxrbcjrharcwz319s90m789i4my9285ihp5ax6kfhgif2vn2ji5"; }; srcData = fetchurl { - url = "mirror://sourceforge/ufoai/ufoai-${version}-data.tar"; + url = "mirror://sourceforge/ufoai/ufoai-${finalAttrs.version}-data.tar"; sha256 = "1drhh08cqqkwv1yz3z4ngkplr23pqqrdx6cp8c3isy320gy25cvb"; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # https://github.com/ufoai/ufoai/commit/8a3075fffdad294e env.NIX_CFLAGS_COMPILE = "-fcommon"; - preConfigure = ''tar xvf "${srcData}"''; + preConfigure = ''tar xvf "${finalAttrs.srcData}"''; configureFlags = [ "--enable-release" @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; hydraPlatforms = [ ]; }; -} +}) diff --git a/pkgs/by-name/uf/uftp/package.nix b/pkgs/by-name/uf/uftp/package.nix index f3298fcd7f5f..251be8bf7feb 100644 --- a/pkgs/by-name/uf/uftp/package.nix +++ b/pkgs/by-name/uf/uftp/package.nix @@ -5,12 +5,12 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uftp"; version = "5.0.3"; src = fetchurl { - url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; + url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${finalAttrs.version}.tar.gz"; sha256 = "sha256-y4ZowZsfELxjoW/6iT4gXcPshjYQN9R32AAyYOvEAIA="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/uf/uftpd/package.nix b/pkgs/by-name/uf/uftpd/package.nix index 71ef70583463..bfaa08caf2d8 100644 --- a/pkgs/by-name/uf/uftpd/package.nix +++ b/pkgs/by-name/uf/uftpd/package.nix @@ -8,14 +8,14 @@ libite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uftpd"; version = "2.15"; src = fetchFromGitHub { owner = "troglobit"; repo = "uftpd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-+y1eRPUgYf5laRFIDD1XOEfonPP8QMJNCSkmHlXIjdY="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ vifino ]; }; -} +}) diff --git a/pkgs/by-name/uf/uftrace/package.nix b/pkgs/by-name/uf/uftrace/package.nix index 3f13f6481481..9afca56147e3 100644 --- a/pkgs/by-name/uf/uftrace/package.nix +++ b/pkgs/by-name/uf/uftrace/package.nix @@ -14,14 +14,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uftrace"; version = "0.18.1"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-9fVBV23gVN1kSkdqBlWV0oEIj6ew6yVO4edUTTHV5H0="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.nthorne ]; }; -} +}) diff --git a/pkgs/by-name/ug/uget-integrator/package.nix b/pkgs/by-name/ug/uget-integrator/package.nix index 2418ac79b3ae..abb9b2b53607 100644 --- a/pkgs/by-name/ug/uget-integrator/package.nix +++ b/pkgs/by-name/ug/uget-integrator/package.nix @@ -7,14 +7,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uget-integrator"; version = "1.0.0"; src = fetchFromGitHub { owner = "ugetdm"; repo = "uget-integrator"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0bfqwbpprxp5sy49p2hqcjdfj7zamnp2hhcnnyccffkn7pghx8pp"; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/ug/ugs/package.nix b/pkgs/by-name/ug/ugs/package.nix index 24cbc7baf0ab..eb7b49592bf7 100644 --- a/pkgs/by-name/ug/ugs/package.nix +++ b/pkgs/by-name/ug/ugs/package.nix @@ -17,12 +17,12 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ugs"; version = "2.1.17"; src = fetchzip { - url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; + url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${finalAttrs.version}/UniversalGcodeSender.zip"; hash = "sha256-7Ed3oz6E/9pEX01Xk1UokRxo5vf80JrcdBaPoT7hgm4="; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/ugs \ --prefix PATH : ${lib.makeBinPath [ jre ]} \ - --add-flags "-jar ${src}/UniversalGcodeSender.jar" + --add-flags "-jar ${finalAttrs.src}/UniversalGcodeSender.jar" runHook postInstall ''; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "ugs"; }; -} +}) diff --git a/pkgs/by-name/ug/ugtrain/package.nix b/pkgs/by-name/ug/ugtrain/package.nix index 8e9b55be005c..9d154d07d9d0 100644 --- a/pkgs/by-name/ug/ugtrain/package.nix +++ b/pkgs/by-name/ug/ugtrain/package.nix @@ -7,14 +7,14 @@ scanmem, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.4.1"; pname = "ugtrain"; src = fetchFromGitHub { owner = "ugtrain"; repo = "ugtrain"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0pw9lm8y83mda7x39874ax2147818h1wcibi83pd2x4rp1hjbkkn"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl3Only; }; -} +}) diff --git a/pkgs/by-name/uh/uhubctl/package.nix b/pkgs/by-name/uh/uhubctl/package.nix index e33866652cf8..51cdab323f2d 100644 --- a/pkgs/by-name/uh/uhubctl/package.nix +++ b/pkgs/by-name/uh/uhubctl/package.nix @@ -7,14 +7,14 @@ libusb1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uhubctl"; version = "2.6.0"; src = fetchFromGitHub { owner = "mvp"; repo = "uhubctl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-mpeDePHLsa4sGe2+8X9KQ8AYn7wtybDnaZzxnf4oETQ="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; mainProgram = "uhubctl"; }; -} +}) diff --git a/pkgs/by-name/ui/uid_wrapper/package.nix b/pkgs/by-name/ui/uid_wrapper/package.nix index 13465db19542..145a1113d731 100644 --- a/pkgs/by-name/ui/uid_wrapper/package.nix +++ b/pkgs/by-name/ui/uid_wrapper/package.nix @@ -6,12 +6,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uid_wrapper"; version = "1.3.2"; src = fetchurl { - url = "mirror://samba/cwrap/uid_wrapper-${version}.tar.gz"; + url = "mirror://samba/cwrap/uid_wrapper-${finalAttrs.version}.tar.gz"; sha256 = "sha256-rkvzuPCnSPRwUxplBDazkYLIIX7pJpqcfpJcZDgKm9o="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ui/uisp/package.nix b/pkgs/by-name/ui/uisp/package.nix index c87b916eed38..18a758182762 100644 --- a/pkgs/by-name/ui/uisp/package.nix +++ b/pkgs/by-name/ui/uisp/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uisp"; version = "20050207"; src = fetchurl { - url = "https://savannah.nongnu.org/download/uisp/uisp-${version}.tar.gz"; + url = "https://savannah.nongnu.org/download/uisp/uisp-${finalAttrs.version}.tar.gz"; sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw"; }; @@ -22,4 +22,4 @@ stdenv.mkDerivation rec { homepage = "https://savannah.nongnu.org/projects/uisp"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix index ee09fdb98eb5..e0a1510b44c0 100644 --- a/pkgs/by-name/ul/ultrastardx/package.nix +++ b/pkgs/by-name/ul/ultrastardx/package.nix @@ -43,14 +43,14 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ultrastardx"; version = "2025.12.1"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-NwYFsd15nUgEnzQaoZdp7Au1H1QrrpoZX8PmnQ9URVA="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix index 458c7bdaec24..e46c3e002de2 100644 --- a/pkgs/by-name/um/umpire/package.nix +++ b/pkgs/by-name/um/umpire/package.nix @@ -10,14 +10,14 @@ assert cudaSupport -> cudaPackages != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "umpire"; version = "2025.12.0"; src = fetchFromGitHub { owner = "LLNL"; repo = "umpire"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9lGI5SKpDIIzZvsG/yKopfXS1PuHOQB9bwSuML2Xh/8="; fetchSubmodules = true; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ mit ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/um/umr/package.nix b/pkgs/by-name/um/umr/package.nix index fcd742b19e85..22ecfd07f1b6 100644 --- a/pkgs/by-name/um/umr/package.nix +++ b/pkgs/by-name/um/umr/package.nix @@ -19,7 +19,7 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "umr"; version = "1.0.10"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "tomstdenis"; repo = "umr"; - rev = version; + rev = finalAttrs.version; hash = "sha256-i0pTcg1Y+G/nGZSbMtlg37z12gF4heitEl5L4gfVO9c="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ Flakebi ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/um/ums/package.nix b/pkgs/by-name/um/ums/package.nix index 1fcda5dae0b2..1fb6f1bcf9b3 100644 --- a/pkgs/by-name/um/ums/package.nix +++ b/pkgs/by-name/um/ums/package.nix @@ -8,7 +8,7 @@ jdk17, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ums"; version = "13.2.1"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; in fetchurl { - url = "mirror://sourceforge/project/unimediaserver/${version}/UMS-${version}-${arch}.tgz"; + url = "mirror://sourceforge/project/unimediaserver/${finalAttrs.version}/UMS-${finalAttrs.version}-${arch}.tgz"; hash = selectSystem { x86_64-linux = "sha256-MGi5S0jA9WVh7PuNei5hInUVZLcypJu8izwWJpDi42s="; aarch64-linux = "sha256-9x1M1rZxwg65RdMmxQ2geeF0yXrukQ3dQPXKfQ2GRIw="; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "ums"; }; -} +}) diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index 9f809ab42ccc..5c7fa33bb892 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -12,7 +12,7 @@ nix-update-script, }: let - version = "4.19.9"; + version = "4.19.10"; desktopItem = makeDesktopItem { name = "unciv"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-+HVpzm60hyJhD1b7VlDLpa5NY48ffBIPF54SHqDYfF8="; + hash = "sha256-4y1tsAyomjygJ+DwcCAG8fiEIljVm159qU/Y+kfkShc="; }; dontUnpack = true; diff --git a/pkgs/by-name/un/unclutter/package.nix b/pkgs/by-name/un/unclutter/package.nix index 19c7dfa4ea91..e7e477233c6e 100644 --- a/pkgs/by-name/un/unclutter/package.nix +++ b/pkgs/by-name/un/unclutter/package.nix @@ -5,11 +5,11 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unclutter"; version = "8"; src = fetchurl { - url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-${version}.tar.gz"; + url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-${finalAttrs.version}.tar.gz"; sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { license = lib.licenses.publicDomain; mainProgram = "unclutter"; }; -} +}) diff --git a/pkgs/by-name/un/uncrustify/package.nix b/pkgs/by-name/un/uncrustify/package.nix index 2e72f11cc654..3a6fcadf0581 100644 --- a/pkgs/by-name/un/uncrustify/package.nix +++ b/pkgs/by-name/un/uncrustify/package.nix @@ -6,14 +6,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uncrustify"; version = "0.82.0"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; - rev = "uncrustify-${version}"; + rev = "uncrustify-${finalAttrs.version}"; sha256 = "sha256-sBIjBN3tP/gwTWHDLwonEIfk3OduqQtixn4sn28V7pI="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/un/uni2ascii/package.nix b/pkgs/by-name/un/uni2ascii/package.nix index e121d4a9cfa0..e1e251b8200d 100644 --- a/pkgs/by-name/un/uni2ascii/package.nix +++ b/pkgs/by-name/un/uni2ascii/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uni2ascii"; version = "4.20"; src = fetchurl { - url = "https://billposer.org/Software/Downloads/uni2ascii-${version}.tar.gz"; + url = "https://billposer.org/Software/Downloads/uni2ascii-${finalAttrs.version}.tar.gz"; hash = "sha256-7tjYOpwdLb0NfKTFJRmYg9cxfWiLQhtXjQmKJ7b/cFY="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/un/unibilium/package.nix b/pkgs/by-name/un/unibilium/package.nix index a77bb2cdd01a..39d9bf2f52fc 100644 --- a/pkgs/by-name/un/unibilium/package.nix +++ b/pkgs/by-name/un/unibilium/package.nix @@ -9,14 +9,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unibilium"; version = "2.1.2"; src = fetchFromGitHub { owner = "neovim"; repo = "unibilium"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-6bFZtR8TUZJembRBj6wUUCyurUdsn3vDGnCzCti/ESc="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ pSub ]; }; -} +}) diff --git a/pkgs/by-name/un/unicorn-angr/package.nix b/pkgs/by-name/un/unicorn-angr/package.nix index 197d2a588ad4..bb076522518d 100644 --- a/pkgs/by-name/un/unicorn-angr/package.nix +++ b/pkgs/by-name/un/unicorn-angr/package.nix @@ -6,7 +6,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unicorn-angr"; # Version must follow what angr requires version = "2.0.1.post1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "unicorn-engine"; repo = "unicorn"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Jz5C35rwnDz0CXcfcvWjkwScGNQO1uijF7JrtZhM7mI="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/un/unicorn/package.nix b/pkgs/by-name/un/unicorn/package.nix index a9bcfb52604b..54d524e33ff8 100644 --- a/pkgs/by-name/un/unicorn/package.nix +++ b/pkgs/by-name/un/unicorn/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unicorn"; version = "2.1.4"; src = fetchFromGitHub { owner = "unicorn-engine"; repo = "unicorn"; - tag = version; + tag = finalAttrs.version; hash = "sha256-jEQXjYlLUdKrKPL4XfSbixn2KWJlNG7IYQveF4jDgl4="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { thoughtpolice ]; }; -} +}) diff --git a/pkgs/by-name/un/unigine-heaven/package.nix b/pkgs/by-name/un/unigine-heaven/package.nix index 9b3e3e22e86b..86fac20ca258 100644 --- a/pkgs/by-name/un/unigine-heaven/package.nix +++ b/pkgs/by-name/un/unigine-heaven/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://assets.unigine.com/d/Unigine_Heaven-${version}.run"; - sha256 = "19rndwwxnb9k2nw9h004hyrmr419471s0fp25yzvvc6rkd521c0v"; + hash = "sha256-UtsuXe3VYh18K/qTa0gsCnzGmzBhYnjvGZUT1JTY45c="; }; installPhase = '' diff --git a/pkgs/by-name/un/unigine-valley/package.nix b/pkgs/by-name/un/unigine-valley/package.nix index 1d6625cbc727..4fc86d00920d 100644 --- a/pkgs/by-name/un/unigine-valley/package.nix +++ b/pkgs/by-name/un/unigine-valley/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://assets.unigine.com/d/Unigine_Valley-${version}.run"; - sha256 = "sha256-XwyL0kMRGFURgrq79fHCD7FOekB4lpckDcr1RkQ2YPQ="; + hash = "sha256-L7R6nEXQbLTEi76VUoUyhS2LFeTdgdaTaIQVWGn/1+8="; }; sourceRoot = "Unigine_Valley-${version}"; diff --git a/pkgs/by-name/un/unihan-database/package.nix b/pkgs/by-name/un/unihan-database/package.nix index 2b31006e6e31..721f2ca84fdc 100644 --- a/pkgs/by-name/un/unihan-database/package.nix +++ b/pkgs/by-name/un/unihan-database/package.nix @@ -5,12 +5,12 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unihan-database"; version = "17.0.0"; src = fetchurl { - url = "https://www.unicode.org/Public/${version}/ucd/Unihan.zip"; + url = "https://www.unicode.org/Public/${finalAttrs.version}/ucd/Unihan.zip"; hash = "sha256-96SLK1Raz6p3stYHrih0dATOArrv7hY5bF0teo7zS14="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { license = lib.licenses.unicode-dfs-2016; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/un/unionfs-fuse/package.nix b/pkgs/by-name/un/unionfs-fuse/package.nix index 4f1859ba1f97..5550ce95cf6d 100644 --- a/pkgs/by-name/un/unionfs-fuse/package.nix +++ b/pkgs/by-name/un/unionfs-fuse/package.nix @@ -8,14 +8,14 @@ fuse3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unionfs-fuse"; version = "3.7"; src = fetchFromGitHub { owner = "rpodgorny"; repo = "unionfs-fuse"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wha1AMwJMbC5rZBE4ybeOmH7Dq4p5YdMJDCT/a3B6cI="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/un/unit/package.nix b/pkgs/by-name/un/unit/package.nix index 16a0d2af1904..a473dee2e1d5 100644 --- a/pkgs/by-name/un/unit/package.nix +++ b/pkgs/by-name/un/unit/package.nix @@ -32,14 +32,14 @@ let inherit (lib) optional optionals optionalString; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.35.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-0cMtU7wmy8GFKqxS8fXPIrMljYXBHzoxrUJCOJSzLMA="; }; @@ -93,4 +93,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ izorkin ]; }; -} +}) diff --git a/pkgs/by-name/un/unittest-cpp/package.nix b/pkgs/by-name/un/unittest-cpp/package.nix index 8ddbc575fbe5..9bbc488e9875 100644 --- a/pkgs/by-name/un/unittest-cpp/package.nix +++ b/pkgs/by-name/un/unittest-cpp/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unittest-cpp"; version = "2.0.0"; src = fetchFromGitHub { owner = "unittest-cpp"; repo = "unittest-cpp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # Fix 'Version:' setting in .pc file. TODO: remove once upstreamed: # https://github.com/unittest-cpp/unittest-cpp/pull/188 - cmakeFlags = [ "-DPACKAGE_VERSION=${version}" ]; + cmakeFlags = [ "-DPACKAGE_VERSION=${finalAttrs.version}" ]; nativeBuildInputs = [ cmake ]; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/un/unoconv/package.nix b/pkgs/by-name/un/unoconv/package.nix index b40f15cdc03e..d1965cbaeaf4 100644 --- a/pkgs/by-name/un/unoconv/package.nix +++ b/pkgs/by-name/un/unoconv/package.nix @@ -9,14 +9,14 @@ installSymlinks ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unoconv"; version = "0.9.0"; src = fetchFromGitHub { owner = "unoconv"; repo = "unoconv"; - rev = version; + rev = finalAttrs.version; sha256 = "1akx64686in8j8arl6vsgp2n3bv770q48pfv283c6fz6wf9p8fvr"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "unoconv"; }; -} +}) diff --git a/pkgs/by-name/un/unshield/package.nix b/pkgs/by-name/un/unshield/package.nix index d60891224542..6bb94d4a29ec 100644 --- a/pkgs/by-name/un/unshield/package.nix +++ b/pkgs/by-name/un/unshield/package.nix @@ -7,14 +7,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unshield"; version = "1.6.2"; src = fetchFromGitHub { owner = "twogood"; repo = "unshield"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-CYlrPwNPneJIwvQCnzyfi6MZiXoflMDfUDCRL79+yBk="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "unshield"; }; -} +}) diff --git a/pkgs/by-name/un/unstick/package.nix b/pkgs/by-name/un/unstick/package.nix index 91eb9616a2c6..e4afe44ea7b7 100644 --- a/pkgs/by-name/un/unstick/package.nix +++ b/pkgs/by-name/un/unstick/package.nix @@ -8,7 +8,7 @@ libseccomp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unstick"; version = "0.1.0"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "08la3jmmzlf4pm48bf9zx4cqj9gbqalpqy0s57bh5vfsdk74nnhv"; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; nativeBuildInputs = [ meson @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ kwohlfahrt ]; }; -} +}) diff --git a/pkgs/by-name/up/uptimed/package.nix b/pkgs/by-name/up/uptimed/package.nix index c1833fcdbb1d..d3a417c0de26 100644 --- a/pkgs/by-name/up/uptimed/package.nix +++ b/pkgs/by-name/up/uptimed/package.nix @@ -5,13 +5,13 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uptimed"; version = "0.4.7"; src = fetchFromGitHub { sha256 = "sha256-gP6Syzu54/co4L+UCPikUhXDpxpfAB4jO/5ZF/9RdN0="; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; repo = "uptimed"; owner = "rpodgorny"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/uq/uqm/package.nix b/pkgs/by-name/uq/uqm/package.nix index 773c0ad9d1e2..82bd61c48c59 100644 --- a/pkgs/by-name/uq/uqm/package.nix +++ b/pkgs/by-name/uq/uqm/package.nix @@ -52,27 +52,27 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uqm"; version = "0.8.0"; src = fetchurl { - url = "mirror://sourceforge/sc2/uqm-${version}-src.tgz"; + url = "mirror://sourceforge/sc2/uqm-${finalAttrs.version}-src.tgz"; sha256 = "JPL325z3+vU7lfniWA5vWWIFqY7QwzXP6DTGR4WtT1o="; }; content = fetchurl { - url = "mirror://sourceforge/sc2/uqm-${version}-content.uqm"; + url = "mirror://sourceforge/sc2/uqm-${finalAttrs.version}-content.uqm"; sha256 = "d9dawl5vt1WjPEujs4p7e8Qfy8AolokbDMmskhS3Lu8="; }; voice = fetchurl { - url = "mirror://sourceforge/sc2/uqm-${version}-voice.uqm"; + url = "mirror://sourceforge/sc2/uqm-${finalAttrs.version}-voice.uqm"; sha256 = "ntv1HXfYtTM5nF86+1STFKghDXqrccosUbTySDIzekU="; }; music = fetchurl { - url = "mirror://sourceforge/sc2/uqm-${version}-3domusic.uqm"; + url = "mirror://sourceforge/sc2/uqm-${finalAttrs.version}-3domusic.uqm"; sha256 = "RM087H6VabQRettNd/FSKJCXJWYmc5GuCWMUhdIx2Lk="; }; @@ -88,11 +88,11 @@ stdenv.mkDerivation rec { ]; postUnpack = '' - mkdir -p uqm-${version}/content/packages - mkdir -p uqm-${version}/content/addons - ln -s "$content" "uqm-${version}/content/packages/uqm-${version}-content.uqm" - ln -s "$music" "uqm-${version}/content/addons/uqm-${version}-3domusic.uqm" - ln -s "$voice" "uqm-${version}/content/addons/uqm-${version}-voice.uqm" + mkdir -p uqm-${finalAttrs.version}/content/packages + mkdir -p uqm-${finalAttrs.version}/content/addons + ln -s "$content" "uqm-${finalAttrs.version}/content/packages/uqm-${finalAttrs.version}-content.uqm" + ln -s "$music" "uqm-${finalAttrs.version}/content/addons/uqm-${finalAttrs.version}-3domusic.uqm" + ln -s "$voice" "uqm-${finalAttrs.version}/content/addons/uqm-${finalAttrs.version}-voice.uqm" '' + lib.optionalString useRemixPacks ( lib.concatMapStrings (disc: '' @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { '') remixPacks ) + lib.optionalString use3DOVideos '' - ln -s "${videos}" "uqm-${version}/content/addons/3dovideo" + ln -s "${videos}" "uqm-${finalAttrs.version}/content/addons/3dovideo" ''; postPatch = '' @@ -152,4 +152,4 @@ stdenv.mkDerivation rec { ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/ur/urbackup-client/package.nix b/pkgs/by-name/ur/urbackup-client/package.nix index 17c34cec6a6d..50d92d94ad87 100644 --- a/pkgs/by-name/ur/urbackup-client/package.nix +++ b/pkgs/by-name/ur/urbackup-client/package.nix @@ -7,12 +7,12 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "urbackup-client"; version = "2.5.25"; src = fetchzip { - url = "https://hndl.urbackup.org/Client/${version}/urbackup-client-${version}.tar.gz"; + url = "https://hndl.urbackup.org/Client/${finalAttrs.version}/urbackup-client-${finalAttrs.version}.tar.gz"; sha256 = "sha256-+xm2mBcTLMvrstCq2sLgJiU3zbFCassKvln3SMmRH9s="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.mgttlinger ]; }; -} +}) diff --git a/pkgs/by-name/ur/urbit/package.nix b/pkgs/by-name/ur/urbit/package.nix index 5c2790978fcb..5a7abb39af92 100644 --- a/pkgs/by-name/ur/urbit/package.nix +++ b/pkgs/by-name/ur/urbit/package.nix @@ -9,12 +9,12 @@ let arch = if stdenv.hostPlatform.isAarch64 then "aarch64" else "x86_64"; platform = "${os}-${arch}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "urbit"; version = "3.5"; src = fetchzip { - url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; + url = "https://github.com/urbit/vere/releases/download/vere-v${finalAttrs.version}/${platform}.tgz"; sha256 = { x86_64-linux = "sha256-eB80GuyNuVZbBsyNnek8UCtquZbNt5G4Co7IKqq7aeI="; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; postInstall = '' - install -m755 -D vere-v${version}-${platform} $out/bin/urbit + install -m755 -D vere-v${finalAttrs.version}-${platform} $out/bin/urbit ''; passthru.updateScript = ./update-bin.sh; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "urbit"; }; -} +}) diff --git a/pkgs/by-name/ur/uri/package.nix b/pkgs/by-name/ur/uri/package.nix index fadb45516731..3ad3da727d7f 100644 --- a/pkgs/by-name/ur/uri/package.nix +++ b/pkgs/by-name/ur/uri/package.nix @@ -6,14 +6,14 @@ doxygen, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uri"; version = "1.1.0"; src = fetchFromGitHub { owner = "cpp-netlib"; repo = "uri"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd"; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { license = lib.licenses.boost; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ur/urjtag/package.nix b/pkgs/by-name/ur/urjtag/package.nix index 9f6ba088633b..0cb7f63a9e2a 100644 --- a/pkgs/by-name/ur/urjtag/package.nix +++ b/pkgs/by-name/ur/urjtag/package.nix @@ -16,12 +16,12 @@ svfSupport ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "urjtag"; version = "2021.03"; src = fetchurl { - url = "mirror://sourceforge/project/urjtag/urjtag/${version}/urjtag-${version}.tar.xz"; + url = "mirror://sourceforge/project/urjtag/urjtag/${finalAttrs.version}/urjtag-${finalAttrs.version}.tar.xz"; hash = "sha256-sKLqokVROvCW3E13AQmDIzXGlMbBKqXpL++uhoVBbxw="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ur/urlscan/package.nix b/pkgs/by-name/ur/urlscan/package.nix index 550b8f8d0ac1..022cee70a0c4 100644 --- a/pkgs/by-name/ur/urlscan/package.nix +++ b/pkgs/by-name/ur/urlscan/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "urlscan"; - version = "1.0.7"; + version = "1.0.8"; pyproject = true; src = fetchFromGitHub { owner = "firecat53"; repo = "urlscan"; tag = version; - hash = "sha256-grQZ1dYa6OII1ah2FWOZg17rnTV/wfzXUtV3ijE8oDE="; + hash = "sha256-7Sq+5dWbrPofRP54xr/UTfjAxJ7EVXQyGz3zzHLZd2Y="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/us/usbimager/package.nix b/pkgs/by-name/us/usbimager/package.nix index ac1dea030b93..89f8183ff24b 100644 --- a/pkgs/by-name/us/usbimager/package.nix +++ b/pkgs/by-name/us/usbimager/package.nix @@ -12,18 +12,18 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "usbimager"; version = "1.0.10"; src = fetchFromGitLab { owner = "bztsrc"; repo = "usbimager"; - rev = version; + rev = finalAttrs.version; hash = "sha256-HTFopc2xrhp0XYubQtOwMKWTQ+3JSKAyL4mMyQ82kAs="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; nativeBuildInputs = [ pkg-config @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; mainProgram = "usbimager"; }; -} +}) diff --git a/pkgs/by-name/us/usbmuxd/package.nix b/pkgs/by-name/us/usbmuxd/package.nix index e60862e35ae7..7708e5f5cc60 100644 --- a/pkgs/by-name/us/usbmuxd/package.nix +++ b/pkgs/by-name/us/usbmuxd/package.nix @@ -8,7 +8,7 @@ libusb1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "usbmuxd"; version = "1.1.1+date=2023-05-05"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; preAutoreconf = '' - export RELEASE_VERSION=${version} + export RELEASE_VERSION=${finalAttrs.version} ''; configureFlags = [ @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "usbmuxd"; }; -} +}) diff --git a/pkgs/by-name/us/usbutils/package.nix b/pkgs/by-name/us/usbutils/package.nix index 41d14132a730..ed9c38b3f1fc 100644 --- a/pkgs/by-name/us/usbutils/package.nix +++ b/pkgs/by-name/us/usbutils/package.nix @@ -12,12 +12,12 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "usbutils"; version = "018"; src = fetchurl { - url = "mirror://kernel/linux/utils/usb/usbutils/usbutils-${version}.tar.xz"; + url = "mirror://kernel/linux/utils/usb/usbutils/usbutils-${finalAttrs.version}.tar.xz"; hash = "sha256-g/aLWbWFR1icACZugmcYZGJ1k6tDYtjIB/UO6pI8rZM="; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; mainProgram = "lsusb"; }; -} +}) diff --git a/pkgs/by-name/us/usbview/package.nix b/pkgs/by-name/us/usbview/package.nix index d411eff7aff7..2beb2038a22e 100644 --- a/pkgs/by-name/us/usbview/package.nix +++ b/pkgs/by-name/us/usbview/package.nix @@ -8,14 +8,14 @@ gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "usbview"; version = "3.1"; src = fetchFromGitHub { owner = "gregkh"; repo = "usbview"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-h+sB83BYsrB2VxwtatPWNiM0WdTCMY289nh+/0o8GOw="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "usbview"; }; -} +}) diff --git a/pkgs/by-name/us/userhosts/package.nix b/pkgs/by-name/us/userhosts/package.nix index 342f282e538c..ba1b7de253eb 100644 --- a/pkgs/by-name/us/userhosts/package.nix +++ b/pkgs/by-name/us/userhosts/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "userhosts"; version = "1.0.0"; src = fetchFromGitHub { owner = "figiel"; repo = "hosts"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-9uF0fYl4Zz/Ia2UKx7CBi8ZU8jfWoBfy2QSgTSwXo5A"; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { license = lib.licenses.cc0; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/us/usrsctp/package.nix b/pkgs/by-name/us/usrsctp/package.nix index e0d7d8b515d9..760e0f5a70d7 100644 --- a/pkgs/by-name/us/usrsctp/package.nix +++ b/pkgs/by-name/us/usrsctp/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "usrsctp"; version = "0.9.5.0"; src = fetchFromGitHub { owner = "sctplab"; repo = "usrsctp"; - rev = version; + rev = finalAttrs.version; sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9"; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/us/ustreamer/package.nix b/pkgs/by-name/us/ustreamer/package.nix index d10d2c9a7446..cad1b45a1505 100644 --- a/pkgs/by-name/us/ustreamer/package.nix +++ b/pkgs/by-name/us/ustreamer/package.nix @@ -21,14 +21,14 @@ withJanus ? true, withPython ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ustreamer"; version = "6.40"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jKltFQsx8Q9+TMTOg1p6nljII72CLEg6VYe60/KojUY="; }; @@ -103,4 +103,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "ustreamer"; }; -} +}) diff --git a/pkgs/by-name/ut/utf8cpp/package.nix b/pkgs/by-name/ut/utf8cpp/package.nix index b609e22aab5a..b8c53dce7e66 100644 --- a/pkgs/by-name/ut/utf8cpp/package.nix +++ b/pkgs/by-name/ut/utf8cpp/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "utf8cpp"; version = "4.0.8"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-9lfs2tqsSDbf1appDC+S3qdmS4DipHhXoiJQluKytbM="; }; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/nemtrif/utfcpp"; - changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${version}"; + changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${finalAttrs.version}"; description = "UTF-8 with C++ in a Portable Way"; license = lib.licenses.boost; maintainers = with lib.maintainers; [ jobojeha ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ut/uthash/package.nix b/pkgs/by-name/ut/uthash/package.nix index 6442910ef85f..03576564438c 100644 --- a/pkgs/by-name/ut/uthash/package.nix +++ b/pkgs/by-name/ut/uthash/package.nix @@ -5,14 +5,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uthash"; version = "2.3.0"; src = fetchFromGitHub { owner = "troydhanson"; repo = "uthash"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-F0M5ENT3bMn3dD16Oaq9mBFYOWzVliVWupAIrLc2nkQ="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; # it's one-clause, actually, as it's source-only platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ut/uthenticode/package.nix b/pkgs/by-name/ut/uthenticode/package.nix index 17197c75cc34..ff0a853c8087 100644 --- a/pkgs/by-name/ut/uthenticode/package.nix +++ b/pkgs/by-name/ut/uthenticode/package.nix @@ -8,14 +8,14 @@ pe-parse, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uthenticode"; version = "2.0.1"; src = fetchFromGitHub { owner = "trailofbits"; repo = "uthenticode"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-NGVOGXMRlgpSRw56jr63rJc/5/qCmPjtAFa0D21ogd4="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ arturcygan ]; }; -} +}) diff --git a/pkgs/by-name/ut/utsushi/package.nix b/pkgs/by-name/ut/utsushi/package.nix index 9e3037959080..ff5ca581154e 100644 --- a/pkgs/by-name/ut/utsushi/package.nix +++ b/pkgs/by-name/ut/utsushi/package.nix @@ -28,14 +28,14 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imagescan"; version = "3.65.0"; src = fetchFromGitLab { owner = "utsushi"; repo = "imagescan"; - rev = version; + rev = finalAttrs.version; hash = "sha256-CrN9F/WJKmlDN7eozEHtKgGUQBWVwTqwjnrfiATk7lI="; }; @@ -194,4 +194,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/uv/uvccapture/package.nix b/pkgs/by-name/uv/uvccapture/package.nix index 317893cd6af0..c3bb829190f6 100644 --- a/pkgs/by-name/uv/uvccapture/package.nix +++ b/pkgs/by-name/uv/uvccapture/package.nix @@ -13,12 +13,12 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uvccapture"; version = "0.5"; src = fetchurl { - url = "mirror://debian/pool/main/u/uvccapture/uvccapture_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/u/uvccapture/uvccapture_${finalAttrs.version}.orig.tar.gz"; sha256 = "1b3akkcmr3brbf93akr8xi20w8zqf2g0qfq928500wy04qi6jqpi"; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "uvccapture"; }; -} +}) diff --git a/pkgs/by-name/uw/uwimap/package.nix b/pkgs/by-name/uw/uwimap/package.nix index 060080383181..ff296ef4b24a 100644 --- a/pkgs/by-name/uw/uwimap/package.nix +++ b/pkgs/by-name/uw/uwimap/package.nix @@ -8,12 +8,12 @@ libkrb5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uw-imap"; version = "2007f"; src = fetchurl { - url = "ftp://ftp.cac.washington.edu/imap/imap-${version}.tar.gz"; + url = "ftp://ftp.cac.washington.edu/imap/imap-${finalAttrs.version}.tar.gz"; sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak"; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { passthru = { withSSL = true; }; -} +}) diff --git a/pkgs/by-name/uw/uwufetch/package.nix b/pkgs/by-name/uw/uwufetch/package.nix index 0bafdc321ba1..a4ffbd2066a6 100644 --- a/pkgs/by-name/uw/uwufetch/package.nix +++ b/pkgs/by-name/uw/uwufetch/package.nix @@ -6,14 +6,14 @@ viu, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uwufetch"; version = "2.1"; src = fetchFromGitHub { owner = "TheDarkBug"; repo = "uwufetch"; - rev = version; + rev = finalAttrs.version; hash = "sha256-cA8sajh+puswyKikr0Jp9ei+EpVkH+vhEp+pTerkUqA="; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; makeFlags = [ - "UWUFETCH_VERSION=${version}" + "UWUFETCH_VERSION=${finalAttrs.version}" ]; installFlags = [ @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bbjubjub ]; mainProgram = "uwufetch"; }; -} +}) diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index 526331e167b5..5e3bd2262227 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20260122141558"; + version = "20260129053508"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-MmtAA+SR8a6glzAuKaqH3z/cqKlYUQNRzymtPlOrbcg="; + hash = "sha256-Nm9LmAgJQwlRit2oreWyTymbu1PZjTpu2LH5twU0X6o="; }; vendorHash = "sha256-9tXv+rDBowxDN9gH4zHCr4TRbic4kijco3Y6bojJKRk="; meta = { @@ -35,11 +35,13 @@ stdenv.mkDerivation { buildPhase = '' runHook preBuild ${generator}/bin/domain-list-community -datapath $src/data + ${generator}/bin/datdump --inputdata=dlc.dat --exportlists=_all_ runHook postBuild ''; installPhase = '' runHook preInstall - install -Dm644 dlc.dat $out/share/v2ray/geosite.dat + install -Dm644 dlc.dat $out/share/v2ray/geosite.dat + install -Dm644 dlc.dat_plain.yml $out/share/v2ray/geosite.dat_plain.yml runHook postInstall ''; passthru = { diff --git a/pkgs/by-name/va/vaapi-intel-hybrid/package.nix b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix index 3bd0ae01e10c..b68eee97b3b5 100644 --- a/pkgs/by-name/va/vaapi-intel-hybrid/package.nix +++ b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix @@ -13,14 +13,14 @@ wayland, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "intel-hybrid-driver"; version = "1.0.2"; src = fetchFromGitHub { owner = "intel"; repo = "intel-hybrid-driver"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-uYX7RoU1XVzcC2ea3z/VBjmT47xmzK67Y4LaiFXyJZ8="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ tadfisher ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/va/vala-language-server/package.nix b/pkgs/by-name/va/vala-language-server/package.nix index ba2a21349c74..c97a68f110cc 100644 --- a/pkgs/by-name/va/vala-language-server/package.nix +++ b/pkgs/by-name/va/vala-language-server/package.nix @@ -15,14 +15,14 @@ vala, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vala-language-server"; version = "0.48.7"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-language-server"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-Vl5DjKBdpk03aPD+0xGoTwD9Slg1rREorqZGX5o10cY="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ andreasfelix ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/va/valijson/package.nix b/pkgs/by-name/va/valijson/package.nix index a5845f3b617e..46856e27b9e8 100644 --- a/pkgs/by-name/va/valijson/package.nix +++ b/pkgs/by-name/va/valijson/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "valijson"; version = "1.0.6"; src = fetchFromGitHub { owner = "tristanpenman"; repo = "valijson"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-3hQrCCDOrJx4XwTzJNTRPLghd+uoWKVDISa8rLaGiRM="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/va/vamp-plugin-sdk/package.nix b/pkgs/by-name/va/vamp-plugin-sdk/package.nix index 0dc9743fac6a..5acf17b4aab1 100644 --- a/pkgs/by-name/va/vamp-plugin-sdk/package.nix +++ b/pkgs/by-name/va/vamp-plugin-sdk/package.nix @@ -9,14 +9,14 @@ libsndfile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vamp-plugin-sdk"; version = "2.10"; src = fetchFromGitHub { owner = "vamp-plugins"; repo = "vamp-plugin-sdk"; - rev = "vamp-plugin-sdk-v${version}"; + rev = "vamp-plugin-sdk-v${finalAttrs.version}"; hash = "sha256-5jNA6WmeIOVjkEMZXB5ijxyfJT88alVndBif6dnUFdI="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/va/vapoursynth-mvtools/package.nix b/pkgs/by-name/va/vapoursynth-mvtools/package.nix index cb4ee66667e8..45577f16dac0 100644 --- a/pkgs/by-name/va/vapoursynth-mvtools/package.nix +++ b/pkgs/by-name/va/vapoursynth-mvtools/package.nix @@ -9,14 +9,14 @@ fftwFloat, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vapoursynth-mvtools"; version = "24"; src = fetchFromGitHub { owner = "dubhater"; repo = "vapoursynth-mvtools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-bEifU1PPNOBr6o9D6DGIzTaG4xjygBxkQYnZxd/4SwQ="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ rnhmjoj ]; }; -} +}) diff --git a/pkgs/by-name/va/vapoursynth/package.nix b/pkgs/by-name/va/vapoursynth/package.nix index 5d6e5626bd73..b4ceb354c689 100644 --- a/pkgs/by-name/va/vapoursynth/package.nix +++ b/pkgs/by-name/va/vapoursynth/package.nix @@ -16,14 +16,14 @@ darwinMinVersionHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vapoursynth"; version = "73"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; - rev = "R${version}"; + rev = "R${finalAttrs.version}"; hash = "sha256-cs+MEnOi1bwA52fiTIlGGzYjy5/m/FdoK55WSADR/gQ="; }; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { tests.version = testers.testVersion { package = vapoursynth; # Check Core version to prevent false positive with API version - version = "Core R${version}"; + version = "Core R${finalAttrs.version}"; }; }; @@ -118,4 +118,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "vspipe"; }; -} +}) diff --git a/pkgs/by-name/vc/vc/package.nix b/pkgs/by-name/vc/vc/package.nix index 01d20a690e58..adb74e4bd041 100644 --- a/pkgs/by-name/vc/vc/package.nix +++ b/pkgs/by-name/vc/vc/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "Vc"; version = "1.4.5"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-A2qUzjXv50unFcoZp2nRVinkph+CoHyiU7AgOphDphM="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/vc/vcal/package.nix b/pkgs/by-name/vc/vcal/package.nix index 0facbd56be48..ededc4b063d1 100644 --- a/pkgs/by-name/vc/vcal/package.nix +++ b/pkgs/by-name/vc/vcal/package.nix @@ -5,7 +5,7 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vcal"; version = "2.8"; @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/{bin,share/man/man1} - substitute ${src} $out/bin/vcal \ + substitute ${finalAttrs.src} $out/bin/vcal \ --replace /usr/bin/perl ${perl}/bin/perl chmod 0755 $out/bin/* - pod2man --name=vcal --release=${version} ${src} > $out/share/man/man1/vcal.1 + pod2man --name=vcal --release=${finalAttrs.version} ${finalAttrs.src} > $out/share/man/man1/vcal.1 runHook postInstall ''; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ peterhoeg ]; mainProgram = "vcal"; }; -} +}) diff --git a/pkgs/by-name/vc/vcftools/package.nix b/pkgs/by-name/vc/vcftools/package.nix index 1a5e4168bcbf..c9f0c81cb98e 100644 --- a/pkgs/by-name/vc/vcftools/package.nix +++ b/pkgs/by-name/vc/vcftools/package.nix @@ -8,14 +8,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vcftools"; version = "0.1.17"; src = fetchFromGitHub { repo = "vcftools"; owner = "vcftools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-IiePgDpaL/6XOpQsOn90clB6ST7F/37sztmHrC7Ysbw="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { homepage = "https://vcftools.github.io/index.html"; maintainers = [ lib.maintainers.rybern ]; }; -} +}) diff --git a/pkgs/by-name/vc/vcs_query/package.nix b/pkgs/by-name/vc/vcs_query/package.nix index 4411838d0158..41d745d15b0c 100644 --- a/pkgs/by-name/vc/vcs_query/package.nix +++ b/pkgs/by-name/vc/vcs_query/package.nix @@ -5,14 +5,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vcs_query"; version = "0.4.0"; src = fetchFromGitHub { owner = "mageta"; repo = "vcs_query"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "05va0na9yxkpqhm9v0x3k58148qcf2bbcv5bnmj7vn9r7fwyjrlx"; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ma27 ]; mainProgram = "vcs_query"; }; -} +}) diff --git a/pkgs/by-name/vd/vde2/package.nix b/pkgs/by-name/vd/vde2/package.nix index 58fb31bcfe99..6bb1a895fccd 100644 --- a/pkgs/by-name/vd/vde2/package.nix +++ b/pkgs/by-name/vd/vde2/package.nix @@ -8,14 +8,14 @@ wolfssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vde2"; version = "2.3.3"; src = fetchFromGitHub { owner = "virtualsquare"; repo = "vde-2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Yf6QB7j5lYld2XtqhYspK4037lTtimoFc7nCavCP+mU="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/ve/venta/package.nix b/pkgs/by-name/ve/venta/package.nix index 1546ed42b84c..ff09cc878998 100644 --- a/pkgs/by-name/ve/venta/package.nix +++ b/pkgs/by-name/ve/venta/package.nix @@ -9,14 +9,14 @@ marwaita, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "venta"; version = "0.7.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "venta"; - rev = version; + rev = finalAttrs.version; sha256 = "14ckkvyarq1xmf48fh47by5h3jnkmksj2n4y6zvx3aw7pfg2jc51"; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/ve/vercel-pkg/package.nix b/pkgs/by-name/ve/vercel-pkg/package.nix index ab8f4fbb0498..07634e82cb3e 100644 --- a/pkgs/by-name/ve/vercel-pkg/package.nix +++ b/pkgs/by-name/ve/vercel-pkg/package.nix @@ -9,19 +9,19 @@ yarn, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pkg"; version = "5.8.1"; src = fetchFromGitHub { owner = "vercel"; repo = "pkg"; - rev = version; + rev = finalAttrs.version; hash = "sha256-h3rHR3JE9hVcd3oiE7VL2daYXGTQo7NcOHGC6pmE/xs="; }; offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-KesP3X7LwZ7KSIxcCPXdn/sWcX9TJlwT9z/SdotS2ZQ="; }; @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ cmcdragonkai ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ve/verilator/package.nix b/pkgs/by-name/ve/verilator/package.nix index bafc727b0215..6447dcf6ce70 100644 --- a/pkgs/by-name/ve/verilator/package.nix +++ b/pkgs/by-name/ve/verilator/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, perl, flex, bison, @@ -18,29 +17,21 @@ gdb, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "verilator"; - version = "5.040"; + version = "5.044"; # Verilator gets the version from this environment variable # if it can't do git describe while building. - VERILATOR_SRC_VERSION = "v${version}"; + VERILATOR_SRC_VERSION = "v${finalAttrs.version}"; src = fetchFromGitHub { owner = "verilator"; repo = "verilator"; - tag = "v${version}"; - hash = "sha256-S+cDnKOTPjLw+sNmWL3+Ay6+UM8poMadkyPSGd3hgnc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-z3jYNzhnZ+OocDAbmsRBWHNNPXLLvExKK1TLDi9JzPQ="; }; - patches = [ - (fetchpatch { - name = "clang-V3hash-overload-fix.patch"; - url = "https://github.com/verilator/verilator/commit/2aa260a03b67d3fe86bc64b8a59183f8dc21e117.patch"; - hash = "sha256-waUsctWiAMG3lCpQi+VUUZ7qMw/kJGu/wNXPHZGuAoU="; - }) - ]; - enableParallelBuilding = true; buildInputs = [ perl @@ -102,7 +93,7 @@ stdenv.mkDerivation rec { }; meta = { - changelog = "https://github.com/verilator/verilator/blob/${src.tag}/Changes"; + changelog = "https://github.com/verilator/verilator/blob/${finalAttrs.src.tag}/Changes"; description = "Fast and robust (System)Verilog simulator/compiler and linter"; homepage = "https://www.veripool.org/verilator"; license = with lib.licenses; [ @@ -115,4 +106,4 @@ stdenv.mkDerivation rec { amiloradovsky ]; }; -} +}) diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index 67da5bf6a3e0..dec452551203 100644 --- a/pkgs/by-name/ve/versatiles/package.nix +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "versatiles"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "versatiles-org"; repo = "versatiles-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-DJChr9Yaj0GXkXRMkXPDnOPjLrwuztAfCITbSCjbO44="; + hash = "sha256-9mguuYR8sc+WpF9Jl+1O3iLkx+0jQxbckw8dUVPL3S4="; }; - cargoHash = "sha256-XKJDnOrIeYbj/Fj2ym2NAksh1sy4DvCBuuGPdk1R+L0="; + cargoHash = "sha256-/2gQib4ui7OG0DC+gk+kpNBNznCIcm9XuY0QasIi3Mg="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/vi/vice/package.nix b/pkgs/by-name/vi/vice/package.nix index 1276c1287b94..634b05fddb05 100644 --- a/pkgs/by-name/vi/vice/package.nix +++ b/pkgs/by-name/vi/vice/package.nix @@ -27,12 +27,12 @@ pulseaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vice"; version = "3.9"; src = fetchurl { - url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz"; + url = "mirror://sourceforge/vice-emu/vice-${finalAttrs.version}.tar.gz"; sha256 = "sha256-QCArY0VeJrh+zGPrWlIyLG+j9XyrEqzwwifPn02uw3A="; }; @@ -89,4 +89,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index c415ea524d4e..388442b0b329 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -22,13 +22,13 @@ }: gcc15Stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-YXFSCJ4q1XIom4/CzCy4ASt7RDjxSkIWH6MqrCg+PNY="; + hash = "sha256-x/WIhul+slaDhW8PvcHpa/FElraGCWfFvgT7Xgw1Hbo="; }; apiDeps = fetchNpmDeps { diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix index 57a006c5e957..8c158f4bc105 100644 --- a/pkgs/by-name/vi/victorialogs/package.nix +++ b/pkgs/by-name/vi/victorialogs/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaLogs"; - version = "1.43.1"; + version = "1.44.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaLogs"; tag = "v${finalAttrs.version}"; - hash = "sha256-Tez8XTOLcuuOOVXt3cgOfRyXldP1b9ox9N9Ddm28E7I="; + hash = "sha256-Ud5jGiQd75RIM+xTpWXULRe34ThssxcazKQ0HKsbgYM="; }; vendorHash = null; diff --git a/pkgs/by-name/vi/video-compare/package.nix b/pkgs/by-name/vi/video-compare/package.nix index 16d676842b5a..db06fee1b08b 100644 --- a/pkgs/by-name/vi/video-compare/package.nix +++ b/pkgs/by-name/vi/video-compare/package.nix @@ -7,14 +7,14 @@ ffmpeg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "video-compare"; version = "20250928"; src = fetchFromGitHub { owner = "pixop"; repo = "video-compare"; - tag = version; + tag = finalAttrs.version; hash = "sha256-md+h39tMbd07pHZzQ1eae5QCkqYErMoD6oEYov9lLBU="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { mainProgram = "video-compare"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix index b7b828443966..b92b6f240396 100644 --- a/pkgs/by-name/vi/vifm/package.nix +++ b/pkgs/by-name/vi/vifm/package.nix @@ -21,12 +21,12 @@ let isFullPackage = mediaSupport; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = if isFullPackage then "vifm-full" else "vifm"; version = "0.14.3"; src = fetchurl { - url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; + url = "https://github.com/vifm/vifm/releases/download/v${finalAttrs.version}/vifm-${finalAttrs.version}.tar.bz2"; hash = "sha256-Fqm+EQjWpaCen5R/clY3XlGbpB6+lHNlmyBzn9vzRA4="; }; @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; downloadPage = "https://vifm.info/downloads.shtml"; homepage = "https://vifm.info/"; - changelog = "https://github.com/vifm/vifm/blob/v${version}/ChangeLog"; + changelog = "https://github.com/vifm/vifm/blob/v${finalAttrs.version}/ChangeLog"; }; -} +}) diff --git a/pkgs/by-name/vi/viking/package.nix b/pkgs/by-name/vi/viking/package.nix index e21d229c30f0..355687132041 100644 --- a/pkgs/by-name/vi/viking/package.nix +++ b/pkgs/by-name/vi/viking/package.nix @@ -38,12 +38,12 @@ xz, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "viking"; version = "1.11"; src = fetchurl { - url = "mirror://sourceforge/viking/viking-${version}.tar.bz2"; + url = "mirror://sourceforge/viking/viking-${finalAttrs.version}.tar.bz2"; hash = "sha256-/iHVwRHvIId9HNlbGkvDT6rp3ToXuskj9BjhJxo8/JE="; }; @@ -115,4 +115,4 @@ stdenv.mkDerivation rec { ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/vi/vimb-unwrapped/package.nix b/pkgs/by-name/vi/vimb-unwrapped/package.nix index d01cb36edc07..f32933a1d7b1 100644 --- a/pkgs/by-name/vi/vimb-unwrapped/package.nix +++ b/pkgs/by-name/vi/vimb-unwrapped/package.nix @@ -11,14 +11,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vimb"; version = "3.7.0"; src = fetchFromGitHub { owner = "fanglingsu"; repo = "vimb"; - tag = version; + tag = finalAttrs.version; hash = "sha256-NW9B/hybSOaojKIubaxiQ+Nd5f/D4XKxPl9vUyFoX/k="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/vi/vimer/package.nix b/pkgs/by-name/vi/vimer/package.nix index 61929aba1577..7871a75c7ff9 100644 --- a/pkgs/by-name/vi/vimer/package.nix +++ b/pkgs/by-name/vi/vimer/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.2.0"; pname = "vimer"; src = fetchFromGitHub { owner = "susam"; repo = "vimer"; - rev = version; + rev = finalAttrs.version; sha256 = "01qhr3i7wasbaxvms39c81infpry2vk0nzh7r5m5b9p713p0phsi"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { mainProgram = "vimer"; }; -} +}) diff --git a/pkgs/by-name/vi/vimpc/package.nix b/pkgs/by-name/vi/vimpc/package.nix index f18fc98310e1..ac72e3955499 100644 --- a/pkgs/by-name/vi/vimpc/package.nix +++ b/pkgs/by-name/vi/vimpc/package.nix @@ -12,14 +12,14 @@ curl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.09.2"; pname = "vimpc"; src = fetchFromGitHub { owner = "boysetsfrog"; repo = "vimpc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0lswzkap2nm7v5h7ppb6a64cb35rajysd09nb204rxgrkij4m6nx"; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; mainProgram = "vimpc"; }; -} +}) diff --git a/pkgs/by-name/vi/virt-manager/package.nix b/pkgs/by-name/vi/virt-manager/package.nix index 94ff866c48e5..293e66c7ce0c 100644 --- a/pkgs/by-name/vi/virt-manager/package.nix +++ b/pkgs/by-name/vi/virt-manager/package.nix @@ -32,14 +32,14 @@ let requests ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "virt-manager"; version = "5.1.0"; src = fetchFromGitHub { owner = "virt-manager"; repo = "virt-manager"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-nMWLDo2pfWcqsVuEk0JbzLZ1a0lViTohsZ8gEXGhBuI="; }; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - glib-compile-schemas $out/share/gsettings-schemas/virt-manager-${version}/glib-2.0/schemas + glib-compile-schemas $out/share/gsettings-schemas/virt-manager-${finalAttrs.version}/glib-2.0/schemas gappsWrapperArgs+=(--set PYTHONPATH "${python3.pkgs.makePythonPath pythonDependencies}") # these are called from virt-install in installerinject.py @@ -110,4 +110,4 @@ stdenv.mkDerivation rec { fpletz ]; }; -} +}) diff --git a/pkgs/by-name/vi/virt-viewer/package.nix b/pkgs/by-name/vi/virt-viewer/package.nix index 02bf0f2062c1..56a1962294ab 100644 --- a/pkgs/by-name/vi/virt-viewer/package.nix +++ b/pkgs/by-name/vi/virt-viewer/package.nix @@ -33,12 +33,12 @@ vte, wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "virt-viewer"; version = "11.0"; src = fetchurl { - url = "https://releases.pagure.org/virt-viewer/virt-viewer-${version}.tar.xz"; + url = "https://releases.pagure.org/virt-viewer/virt-viewer-${finalAttrs.version}.tar.xz"; sha256 = "sha256-pD+iMlxMHHelyMmAZaww7wURohrJjlkPIjQIabrZq9A="; }; @@ -118,4 +118,4 @@ stdenv.mkDerivation rec { downloadPage = "https://virt-manager.org/download.html"; }; }; -} +}) diff --git a/pkgs/by-name/vi/virtio-win/package.nix b/pkgs/by-name/vi/virtio-win/package.nix index b84263e98a22..e7efbd8f26aa 100644 --- a/pkgs/by-name/vi/virtio-win/package.nix +++ b/pkgs/by-name/vi/virtio-win/package.nix @@ -5,12 +5,12 @@ libarchive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "virtio-win"; version = "0.1.285-1"; src = fetchurl { - url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; + url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${finalAttrs.version}/virtio-win.iso"; hash = "sha256-4UzyuUSSw+kl8AcLp/3+3rIEjJHuqcWlr7MCMqOXYzE="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix index 79bd8d72f604..f5c36473266a 100644 --- a/pkgs/by-name/vi/virtnbdbackup/package.nix +++ b/pkgs/by-name/vi/virtnbdbackup/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "virtnbdbackup"; - version = "2.44"; + version = "2.45"; pyproject = true; src = fetchFromGitHub { owner = "abbbi"; repo = "virtnbdbackup"; tag = "v${version}"; - hash = "sha256-p3oTd0RT/bw9C73QO83OD21/BHH2E3qX2KS687NyN9Q="; + hash = "sha256-lX0zXNSwSOeNZSL+6UScxKK5zg3kQ91zRDA+wDSiu6Q="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/vi/virtualpg/package.nix b/pkgs/by-name/vi/virtualpg/package.nix index 5bd5c48cec59..d5e2a50ff1b4 100644 --- a/pkgs/by-name/vi/virtualpg/package.nix +++ b/pkgs/by-name/vi/virtualpg/package.nix @@ -7,12 +7,12 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "virtualpg"; version = "2.0.1"; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/virtualpg-${version}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/virtualpg-${finalAttrs.version}.tar.gz"; hash = "sha256-virr64yf8nQ4IIX1HUIugjhYvKT2vC+pCYFkZMah4Is="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ sikmir ]; }; -} +}) diff --git a/pkgs/by-name/vi/vitetris/package.nix b/pkgs/by-name/vi/vitetris/package.nix index ce96940699e0..0e759dfc0dfa 100644 --- a/pkgs/by-name/vi/vitetris/package.nix +++ b/pkgs/by-name/vi/vitetris/package.nix @@ -4,14 +4,14 @@ lib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vitetris"; version = "0.59.1"; src = fetchFromGitHub { owner = "vicgeralds"; repo = "vitetris"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Rbfa2hD67RGmInfWwYD4SthL8lm5bGSBi3oudV5hAao="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { garbage, network play, joystick (gamepad) support on Linux or with Allegro. ''; }; -} +}) diff --git a/pkgs/by-name/vk/vk-bootstrap/package.nix b/pkgs/by-name/vk/vk-bootstrap/package.nix index b925d3f668ec..64bbd45289cd 100644 --- a/pkgs/by-name/vk/vk-bootstrap/package.nix +++ b/pkgs/by-name/vk/vk-bootstrap/package.nix @@ -8,7 +8,7 @@ catch2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vk-bootstrap"; version = "0.7"; outputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "charles-lunarg"; repo = "vk-bootstrap"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-X3ANqfplrCF1R494+H5/plcwMH7rbW6zpLA4MZrYaoE="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/charles-lunarg/vk-bootstrap"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/vk/vk-cli/package.nix b/pkgs/by-name/vk/vk-cli/package.nix index e5e800e1a3fb..9815883b5418 100644 --- a/pkgs/by-name/vk/vk-cli/package.nix +++ b/pkgs/by-name/vk/vk-cli/package.nix @@ -9,12 +9,12 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vk-cli"; version = "0.7.6"; src = fetchurl { - url = "https://github.com/vk-cli/vk/releases/download/${version}/vk-${version}-64-bin.7z"; + url = "https://github.com/vk-cli/vk/releases/download/${finalAttrs.version}/vk-${finalAttrs.version}-64-bin.7z"; sha256 = "sha256-Y40oLjddunrd7ZF1JbCcgjSCn8jFTubq69jhAVxInXw="; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin/ - mv $TMP/vk-${version}-64-bin vk-cli + mv $TMP/vk-${finalAttrs.version}-64-bin vk-cli install -D vk-cli --target-directory=$out/bin/ ''; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/vk/vkdevicechooser/package.nix b/pkgs/by-name/vk/vkdevicechooser/package.nix index 2af58ec88424..96606acc62a5 100644 --- a/pkgs/by-name/vk/vkdevicechooser/package.nix +++ b/pkgs/by-name/vk/vkdevicechooser/package.nix @@ -10,14 +10,14 @@ jq, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vkdevicechooser"; version = "1.1"; src = fetchFromGitHub { owner = "jiriks74"; repo = "vkdevicechooser"; - rev = version; + rev = finalAttrs.version; hash = "sha256-j4hefarOQ3q0sKkB2g/dO2/4bSYzt4oxmCna0nMAjFk="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.sigmike ]; }; -} +}) diff --git a/pkgs/by-name/vk/vkdisplayinfo/package.nix b/pkgs/by-name/vk/vkdisplayinfo/package.nix index cb6ea5239dd7..bf826f1fb525 100644 --- a/pkgs/by-name/vk/vkdisplayinfo/package.nix +++ b/pkgs/by-name/vk/vkdisplayinfo/package.nix @@ -7,14 +7,14 @@ vulkan-headers, fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vkdisplayinfo"; version = "0.1"; src = fetchFromGitHub { owner = "ChristophHaag"; repo = "vkdisplayinfo"; - rev = version; + rev = finalAttrs.version; hash = "sha256-n6U7T5aOYTpgWE2WGPBPHtQKzitf9PxAoXJNWyz4rYw="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.LunNova ]; mainProgram = "vkdisplayinfo"; }; -} +}) diff --git a/pkgs/by-name/vl/vlock/package.nix b/pkgs/by-name/vl/vlock/package.nix index ac82ccaec579..2dd11c936994 100644 --- a/pkgs/by-name/vl/vlock/package.nix +++ b/pkgs/by-name/vl/vlock/package.nix @@ -5,12 +5,12 @@ pam, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vlock"; version = "2.2.2"; src = fetchurl { - url = "mirror://debian/pool/main/v/vlock/vlock_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/v/vlock/vlock_${finalAttrs.version}.orig.tar.gz"; sha256 = "1b9gv7hmlb8swda5bn40lp1yki8b8wv29vdnhcjqfl6ir98551za"; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "vlock"; }; -} +}) diff --git a/pkgs/by-name/vm/vmmlib/package.nix b/pkgs/by-name/vm/vmmlib/package.nix index 325e9d47e4f0..efddf68a75b1 100644 --- a/pkgs/by-name/vm/vmmlib/package.nix +++ b/pkgs/by-name/vm/vmmlib/package.nix @@ -8,14 +8,14 @@ lapack, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.14.0"; pname = "vmmlib"; src = fetchFromGitHub { owner = "Eyescale"; repo = "vmmlib"; - tag = version; + tag = finalAttrs.version; hash = "sha256-QEfeQcE66XbsFTN/Fojgldem5C+RhbOBmRyBX3sfUrg="; fetchSubmodules = true; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.adev ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/vm/vmtouch/package.nix b/pkgs/by-name/vm/vmtouch/package.nix index a49750e59ffd..f20914c41fb2 100644 --- a/pkgs/by-name/vm/vmtouch/package.nix +++ b/pkgs/by-name/vm/vmtouch/package.nix @@ -5,14 +5,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vmtouch"; version = "1.3.1"; src = fetchFromGitHub { owner = "hoytech"; repo = "vmtouch"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "08da6apzfkfjwasn4dxrlfxqfx7arl28apdzac5nvm0fhvws0dxk"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "vmtouch"; }; -} +}) diff --git a/pkgs/by-name/vn/vnstat/package.nix b/pkgs/by-name/vn/vnstat/package.nix index 16a816bb6f80..ab7ad969d06f 100644 --- a/pkgs/by-name/vn/vnstat/package.nix +++ b/pkgs/by-name/vn/vnstat/package.nix @@ -9,14 +9,14 @@ check, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vnstat"; version = "2.13"; src = fetchFromGitHub { owner = "vergoh"; repo = "vnstat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Xd3s4Wrtfwis0dxRijeWhfloHcXPUNAj0P91uWi1C3M="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/vo/vo-amrwbenc/package.nix b/pkgs/by-name/vo/vo-amrwbenc/package.nix index 4fcf5c2b1fe3..286aa344d30e 100644 --- a/pkgs/by-name/vo/vo-amrwbenc/package.nix +++ b/pkgs/by-name/vo/vo-amrwbenc/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vo-amrwbenc"; version = "0.1.3"; src = fetchFromGitHub { owner = "mstorsjo"; repo = "vo-amrwbenc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-oHhoJAI47VqBGk9cO3G5oqnHpWxA2jnJs103MwcYj+w="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/vo/vokoscreen-ng/package.nix b/pkgs/by-name/vo/vokoscreen-ng/package.nix index 0cce78d622c5..fe84e8ff612d 100644 --- a/pkgs/by-name/vo/vokoscreen-ng/package.nix +++ b/pkgs/by-name/vo/vokoscreen-ng/package.nix @@ -11,14 +11,14 @@ wayland, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vokoscreen-ng"; version = "4.8.3"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; - tag = version; + tag = finalAttrs.version; hash = "sha256-D2E4G6rq6kFZbwjYhoccl/aROCdpuS8UJu0JKGc8wKU="; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "vokoscreenNG"; }; -} +}) diff --git a/pkgs/by-name/vo/volatility3/package.nix b/pkgs/by-name/vo/volatility3/package.nix index eed8f8d6f479..e66fb2cbd48d 100644 --- a/pkgs/by-name/vo/volatility3/package.nix +++ b/pkgs/by-name/vo/volatility3/package.nix @@ -4,21 +4,19 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "volatility3"; - version = "2.26.2"; + version = "2.27.0"; pyproject = true; src = fetchFromGitHub { owner = "volatilityfoundation"; repo = "volatility3"; - tag = "v${version}"; - hash = "sha256-B7S66/HpXuMOXvKzrnQCskbDQ0kjwBXN85VLr90w+c4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-TtkLxzZq7tmLDpCl1UpOqdCWM7t+dgiUmQMsIg3vUGs="; }; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ capstone @@ -35,14 +33,12 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "volatility3" - ]; + pythonImportsCheck = [ "volatility3" ]; meta = { description = "Volatile memory extraction frameworks"; homepage = "https://www.volatilityfoundation.org/"; - changelog = "https://github.com/volatilityfoundation/volatility3/releases/tag/${src.tag}"; + changelog = "https://github.com/volatilityfoundation/volatility3/releases/tag/${finalAttrs.src.tag}"; license = { # Volatility Software License 1.0 free = false; @@ -50,4 +46,4 @@ python3.pkgs.buildPythonApplication rec { }; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/by-name/vo/volume_key/package.nix b/pkgs/by-name/vo/volume_key/package.nix index 30a8cf0146be..cfa7e8ef4757 100644 --- a/pkgs/by-name/vo/volume_key/package.nix +++ b/pkgs/by-name/vo/volume_key/package.nix @@ -16,13 +16,13 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "volume_key"; version = "0.3.11"; src = fetchgit { url = "https://pagure.io/volume_key.git"; - rev = "volume_key-${version}"; + rev = "volume_key-${finalAttrs.version}"; sha256 = "1sqdbcih1c39bjiv4mm1m7acc3lfh2i2hf2r9i7rk8adfzq8awma"; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/vo/volumeicon/package.nix b/pkgs/by-name/vo/volumeicon/package.nix index 323572e392ed..525a655ec39e 100644 --- a/pkgs/by-name/vo/volumeicon/package.nix +++ b/pkgs/by-name/vo/volumeicon/package.nix @@ -10,14 +10,14 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "volumeicon"; version = "0.5.1"; src = fetchFromGitHub { owner = "Maato"; repo = "volumeicon"; - rev = version; + rev = finalAttrs.version; hash = "sha256-zYKC7rOoLf08rV4B43TrGNBcXfSBFxWZCe9bQD9JzaA"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; mainProgram = "volumeicon"; }; -} +}) diff --git a/pkgs/by-name/vo/vorbis-tools/package.nix b/pkgs/by-name/vo/vorbis-tools/package.nix index 29f432e400ae..386641b82b99 100644 --- a/pkgs/by-name/vo/vorbis-tools/package.nix +++ b/pkgs/by-name/vo/vorbis-tools/package.nix @@ -13,12 +13,12 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vorbis-tools"; version = "1.4.3"; src = fetchurl { - url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-${version}.tar.gz"; + url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-${finalAttrs.version}.tar.gz"; hash = "sha256-of493Gd3vc6/a3l+ft/gQ3lUskdW/8yMa4FrY+BGDd4="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/vo/vorbisgain/package.nix b/pkgs/by-name/vo/vorbisgain/package.nix index 66d7125dde03..077f2697d707 100644 --- a/pkgs/by-name/vo/vorbisgain/package.nix +++ b/pkgs/by-name/vo/vorbisgain/package.nix @@ -6,12 +6,12 @@ libvorbis, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vorbisgain"; version = "0.37"; src = fetchurl { - url = "https://sjeng.org/ftp/vorbis/vorbisgain-${version}.tar.gz"; + url = "https://sjeng.org/ftp/vorbis/vorbisgain-${finalAttrs.version}.tar.gz"; sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; mainProgram = "vorbisgain"; }; -} +}) diff --git a/pkgs/by-name/vo/vowpal-wabbit/package.nix b/pkgs/by-name/vo/vowpal-wabbit/package.nix index fa17a0eba94b..bb0de38445f3 100644 --- a/pkgs/by-name/vo/vowpal-wabbit/package.nix +++ b/pkgs/by-name/vo/vowpal-wabbit/package.nix @@ -10,14 +10,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vowpal-wabbit"; version = "9.10.0"; src = fetchFromGitHub { owner = "VowpalWabbit"; repo = "vowpal_wabbit"; - tag = version; + tag = finalAttrs.version; hash = "sha256-HKxhEB4ph2tOWgvYngYTcv0OCMISj3KqZpP2zsEUPs0="; fetchSubmodules = true; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jackgerrits ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index 3a771e668b8d..02e0953e2f5b 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -8,7 +8,7 @@ libva, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vpl-gpu-rt"; version = "25.4.6"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "intel"; repo = "vpl-gpu-rt"; - rev = "intel-onevpl-${version}"; + rev = "intel-onevpl-${finalAttrs.version}"; hash = "sha256-Uv2KLkTqTejM3sh62iBfSV+eXE4lnR5kQ2d3ZLPXTho="; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "oneAPI Video Processing Library Intel GPU implementation"; homepage = "https://github.com/intel/vpl-gpu-rt"; - changelog = "https://github.com/intel/vpl-gpu-rt/releases/tag/${src.rev}"; + changelog = "https://github.com/intel/vpl-gpu-rt/releases/tag/${finalAttrs.src.rev}"; license = [ lib.licenses.mit ]; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { pjungkamp ]; }; -} +}) diff --git a/pkgs/by-name/vr/vrpn/package.nix b/pkgs/by-name/vr/vrpn/package.nix index 23f2ef0a54eb..87c1837bec5e 100644 --- a/pkgs/by-name/vr/vrpn/package.nix +++ b/pkgs/by-name/vr/vrpn/package.nix @@ -8,14 +8,14 @@ libGL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vrpn"; version = "07.36"; src = fetchFromGitHub { owner = "vrpn"; repo = "vrpn"; - rev = "version_${version}"; + rev = "version_${finalAttrs.version}"; hash = "sha256-eXmj9Wqm+ytsnypC+MrOLnJg9zlri5y0puavamZqFmY="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.darwin ++ lib.platforms.linux; maintainers = with lib.maintainers; [ ludo ]; }; -} +}) diff --git a/pkgs/by-name/vs/vsqlite/package.nix b/pkgs/by-name/vs/vsqlite/package.nix index 1ed1dcfc05f2..5259e5cfbe38 100644 --- a/pkgs/by-name/vs/vsqlite/package.nix +++ b/pkgs/by-name/vs/vsqlite/package.nix @@ -6,12 +6,12 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vsqlite"; version = "0.3.13"; src = fetchurl { - url = "https://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz"; + url = "https://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${finalAttrs.version}.tar.gz"; sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/vt/vtable-dumper/package.nix b/pkgs/by-name/vt/vtable-dumper/package.nix index 47f6e2e1c187..1887e6f38095 100644 --- a/pkgs/by-name/vt/vtable-dumper/package.nix +++ b/pkgs/by-name/vt/vtable-dumper/package.nix @@ -5,14 +5,14 @@ libelf, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vtable-dumper"; version = "1.2"; src = fetchFromGitHub { owner = "lvc"; repo = "vtable-dumper"; - rev = version; + rev = finalAttrs.version; sha256 = "0sl7lnjr2l4c2f7qaazvpwpzsp4gckkvccfam88wcq9f7j9xxbyp"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/vt/vttest/package.nix b/pkgs/by-name/vt/vttest/package.nix index ac4ce1c4e4a8..a36f9aa01482 100644 --- a/pkgs/by-name/vt/vttest/package.nix +++ b/pkgs/by-name/vt/vttest/package.nix @@ -4,14 +4,14 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vttest"; version = "20241208"; src = fetchurl { urls = [ - "https://invisible-mirror.net/archives/vttest/vttest-${version}.tgz" - "https://invisible-island.net/archives/vttest/vttest-${version}.tgz" + "https://invisible-mirror.net/archives/vttest/vttest-${finalAttrs.version}.tgz" + "https://invisible-island.net/archives/vttest/vttest-${finalAttrs.version}.tgz" ]; sha256 = "sha256-j+47rH6H1KpKIXvSs4q5kQw7jPmmBbRQx2zMCtKmUZ0="; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "vttest"; }; -} +}) diff --git a/pkgs/by-name/vu/vue/package.nix b/pkgs/by-name/vu/vue/package.nix index fc4b9bb45564..bfcad835b6e8 100644 --- a/pkgs/by-name/vu/vue/package.nix +++ b/pkgs/by-name/vu/vue/package.nix @@ -6,7 +6,7 @@ runtimeShell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vue"; version = "3.3.0"; src = fetchurl { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{share/vue,bin} - cp ${src} "$out/share/vue/vue.jar" + cp ${finalAttrs.src} "$out/share/vue/vue.jar" echo '#!${runtimeShell}' >> "$out/bin/vue" echo '${jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" chmod a+x "$out/bin/vue" @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.ecl20; mainProgram = "vue"; }; -} +}) diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix index 6651d61f24dd..faa9a469c5a7 100644 --- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix +++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix @@ -14,14 +14,14 @@ wayland, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vulkan-extension-layer"; version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; - rev = "vulkan-sdk-${version}"; + rev = "vulkan-sdk-${finalAttrs.version}"; hash = "sha256-1Ax/0W882nJFO2hVqXamT89lFu5ncnrytnwDdUIihnk="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/vu/vulkan-headers/package.nix b/pkgs/by-name/vu/vulkan-headers/package.nix index a97e281624a7..81ca1d849c86 100644 --- a/pkgs/by-name/vu/vulkan-headers/package.nix +++ b/pkgs/by-name/vu/vulkan-headers/package.nix @@ -5,7 +5,7 @@ cmake, ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vulkan-headers"; version = "1.4.335.0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "vulkan-sdk-${version}"; + rev = "vulkan-sdk-${finalAttrs.version}"; hash = "sha256-DIePLzDoImnaso0WYUv819wSDeA7Zy1I/tYAbsALXKg="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.ralith ]; }; -} +}) diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix index ba2cc8f59c46..6e2a6f298ed3 100644 --- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix +++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix @@ -25,14 +25,14 @@ qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vulkan-tools-lunarg"; version = "1.4.335.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; - rev = "vulkan-sdk-${version}"; + rev = "vulkan-sdk-${finalAttrs.version}"; hash = "sha256-2DUxlGH9Yco64Y74QByVniWXiYYy+e4MfyN4S+E6KKA="; }; @@ -97,4 +97,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix index 43fe919e19b8..4d4bb47138dd 100644 --- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix +++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix @@ -24,14 +24,14 @@ let robin-hood-hashing = callPackage ./robin-hood-hashing.nix { }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vulkan-validation-layers"; version = "1.4.335.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; - rev = "vulkan-sdk-${version}"; + rev = "vulkan-sdk-${finalAttrs.version}"; hash = "sha256-FRxr33epHe+HIH/7Y7ms+6E9L0yzaNnFzN3YnswZfRo="; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.ralith ]; }; -} +}) diff --git a/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix b/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix index 1885afee0022..ce260b1ef7f3 100644 --- a/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix +++ b/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "robin-hood-hashing"; version = "3.11.5"; # pin src = fetchFromGitHub { owner = "martinus"; repo = "robin-hood-hashing"; - rev = version; # pin + rev = finalAttrs.version; # pin sha256 = "sha256-J4u9Q6cXF0SLHbomP42AAn5LSKBYeVgTooOhqxOIpuM="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/vz/vzic/package.nix b/pkgs/by-name/vz/vzic/package.nix index 48ac5341b843..91ee97fd9d75 100644 --- a/pkgs/by-name/vz/vzic/package.nix +++ b/pkgs/by-name/vz/vzic/package.nix @@ -7,7 +7,7 @@ glib, libical, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vzic"; version = "0-unstable-2024-06-04"; @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/libical/vzic"; description = "Program to convert the IANA timezone database files into VTIMEZONE files compatible with the iCalendar specification"; - changelog = "https://github.com/libical/vzic/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/libical/vzic/blob/${finalAttrs.src.rev}/ChangeLog"; mainProgram = "vzic"; license = with lib.licenses; [ gpl2Plus ]; maintainers = with lib.maintainers; [ moraxyc ]; broken = !stdenv.hostPlatform.emulatorAvailable buildPackages; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/w_/w_scan2/package.nix b/pkgs/by-name/w_/w_scan2/package.nix index 663a9d2a1722..8ca4128e066d 100644 --- a/pkgs/by-name/w_/w_scan2/package.nix +++ b/pkgs/by-name/w_/w_scan2/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "w_scan2"; version = "1.0.17"; src = fetchFromGitHub { owner = "stefantalpalaru"; repo = "w_scan2"; - rev = version; + rev = finalAttrs.version; hash = "sha256-2wtH7mb6XfgLHr0vDVTZwoYxpSTM5N8Y/vi0YWN6MUE="; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; mainProgram = "w_scan2"; }; -} +}) diff --git a/pkgs/by-name/wa/wabt/package.nix b/pkgs/by-name/wa/wabt/package.nix index 70a7df0120b5..c8f09597acb6 100644 --- a/pkgs/by-name/wa/wabt/package.nix +++ b/pkgs/by-name/wa/wabt/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wabt"; version = "1.0.37"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Ejr+FxaYRDI01apHhKTs11iwcv72a8ZxyPmVetEvadU="; fetchSubmodules = true; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_TESTS=OFF" - "-DCMAKE_PROJECT_VERSION=${version}" + "-DCMAKE_PROJECT_VERSION=${finalAttrs.version}" ]; meta = { @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/wa/waffle/package.nix b/pkgs/by-name/wa/waffle/package.nix index 0fb776f8cb27..342acb401faa 100644 --- a/pkgs/by-name/wa/waffle/package.nix +++ b/pkgs/by-name/wa/waffle/package.nix @@ -23,7 +23,7 @@ udev, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "waffle"; version = "1.8.1"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "Mesa"; repo = "waffle"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Y7GRYLqSO572qA1eZ3jS8QlZ1X9xKpDtScaySTuPK/U="; }; @@ -91,4 +91,4 @@ stdenv.mkDerivation rec { inherit (libgbm.meta) platforms; maintainers = with lib.maintainers; [ Flakebi ]; }; -} +}) diff --git a/pkgs/by-name/wa/waifu2x-converter-cpp/package.nix b/pkgs/by-name/wa/waifu2x-converter-cpp/package.nix index be40726bc26a..223a6a343e36 100644 --- a/pkgs/by-name/wa/waifu2x-converter-cpp/package.nix +++ b/pkgs/by-name/wa/waifu2x-converter-cpp/package.nix @@ -12,14 +12,14 @@ cudatoolkit ? null, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "waifu2x-converter-cpp"; version = "5.3.4"; src = fetchFromGitHub { owner = "DeadSix27"; repo = "waifu2x-converter-cpp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0rv8bnyxz89za6gwk9gmdbaf3j7c1j52mip7h81rir288j35m84x"; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "waifu2x-converter-cpp"; }; -} +}) diff --git a/pkgs/by-name/wa/wannier90/package.nix b/pkgs/by-name/wa/wannier90/package.nix index 1c1b0136802b..2a8996daf779 100644 --- a/pkgs/by-name/wa/wannier90/package.nix +++ b/pkgs/by-name/wa/wannier90/package.nix @@ -11,7 +11,7 @@ assert (!blas.isILP64); assert blas.isILP64 == lapack.isILP64; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wannier90"; version = "3.1.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wannier-developers"; repo = "wannier90"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-+Mq7lM6WuwAnK/2FlDz9gNRIg2sRazQRezb3BfD0veY="; }; @@ -88,4 +88,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/wa/waon/package.nix b/pkgs/by-name/wa/waon/package.nix index c165ba05ce54..cc637ee384c0 100644 --- a/pkgs/by-name/wa/waon/package.nix +++ b/pkgs/by-name/wa/waon/package.nix @@ -11,14 +11,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "waon"; version = "0.11"; src = fetchFromGitHub { owner = "kichiki"; repo = "waon"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1xmq8d2rj58xbp4rnyav95y1vnz3r9s9db7xxfa2rd0ilq0ps4y7"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.puckipedia ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/wa/warpd/package.nix b/pkgs/by-name/wa/warpd/package.nix index fd6b074f6cc1..4399deb01d2c 100644 --- a/pkgs/by-name/wa/warpd/package.nix +++ b/pkgs/by-name/wa/warpd/package.nix @@ -17,14 +17,14 @@ libXext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "warpd"; version = "1.3.5"; src = fetchFromGitHub { owner = "rvaiya"; repo = "warpd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-5B3Ec+R1vF2iI0ennYcsRlnFXJkSns0jVbyAWJA4lTU="; leaveDotGit = true; }; @@ -64,10 +64,10 @@ stdenv.mkDerivation rec { meta = { description = "Modal keyboard driven interface for mouse manipulation"; homepage = "https://github.com/rvaiya/warpd"; - changelog = "https://github.com/rvaiya/warpd/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/rvaiya/warpd/blob/${finalAttrs.src.rev}/CHANGELOG.md"; maintainers = with lib.maintainers; [ hhydraa ]; license = lib.licenses.mit; platforms = lib.platforms.linux; mainProgram = "warpd"; }; -} +}) diff --git a/pkgs/by-name/wa/warpinator/package.nix b/pkgs/by-name/wa/warpinator/package.nix index f1c6c1ad31af..a4b182c70588 100644 --- a/pkgs/by-name/wa/warpinator/package.nix +++ b/pkgs/by-name/wa/warpinator/package.nix @@ -40,14 +40,14 @@ let ++ qrcode.optional-dependencies.pil ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "warpinator"; version = "2.0.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "warpinator"; - rev = version; + rev = finalAttrs.version; hash = "sha256-3ZkufMZFTn8BQO9DHr3s9ELRuDrTflE4Ym73dO7rrKs="; }; @@ -106,4 +106,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/wa/watchdogd/package.nix b/pkgs/by-name/wa/watchdogd/package.nix index 563d56b96f8f..d06ec172b7b2 100644 --- a/pkgs/by-name/wa/watchdogd/package.nix +++ b/pkgs/by-name/wa/watchdogd/package.nix @@ -9,14 +9,14 @@ libconfuse, nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "watchdogd"; version = "4.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "watchdogd"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Q3j16hxDwusZdmIjHm/CVi7VrwRziPGERAvJ3F/Bvdg="; }; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { meta = { description = "Advanced system & process supervisor for Linux"; homepage = "https://troglobit.com/watchdogd.html"; - changelog = "https://github.com/troglobit/watchdogd/releases/tag/${version}"; + changelog = "https://github.com/troglobit/watchdogd/releases/tag/${finalAttrs.version}"; license = lib.licenses.isc; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ vifino ]; }; -} +}) diff --git a/pkgs/by-name/wa/watcher/package.nix b/pkgs/by-name/wa/watcher/package.nix index 18d6f8b703b7..55c65e9959c2 100644 --- a/pkgs/by-name/wa/watcher/package.nix +++ b/pkgs/by-name/wa/watcher/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "watcher"; version = "0.14.3"; src = fetchFromGitHub { owner = "e-dant"; repo = "watcher"; - tag = version; + tag = finalAttrs.version; hash = "sha256-LDzZk47GHSh+SSolz7FdOVNKsNhVNrrsuNGBtXanC+U="; }; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { meta = { description = "Filesystem watcher. Works anywhere. Simple, efficient and friendly"; homepage = "https://github.com/e-dant/watcher"; - changelog = "https://github.com/e-dant/watcher/releases/tag/${src.tag}"; + changelog = "https://github.com/e-dant/watcher/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; mainProgram = "tw"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/wa/wavemon/package.nix b/pkgs/by-name/wa/wavemon/package.nix index 42c4144bf34b..473ff3f86943 100644 --- a/pkgs/by-name/wa/wavemon/package.nix +++ b/pkgs/by-name/wa/wavemon/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wavemon"; version = "0.9.6"; src = fetchFromGitHub { owner = "uoaerg"; repo = "wavemon"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-OnELXlnzXamQflCAWuc4fxwvqHZtl+nrlTpkKK4IGKw="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "wavemon"; }; -} +}) diff --git a/pkgs/by-name/wa/wavpack/package.nix b/pkgs/by-name/wa/wavpack/package.nix index 9546be7a2bf0..34f776249442 100644 --- a/pkgs/by-name/wa/wavpack/package.nix +++ b/pkgs/by-name/wa/wavpack/package.nix @@ -7,7 +7,7 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wavpack"; version = "5.8.1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "dbry"; repo = "WavPack"; - rev = version; + rev = finalAttrs.version; hash = "sha256-V9jRIuDpZYIBohJRouGr2TI32BZMXSNVfavqPl56YO0="; }; @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { meta = { description = "Hybrid audio compression format"; homepage = "https://www.wavpack.com/"; - changelog = "https://github.com/dbry/WavPack/releases/tag/${version}"; + changelog = "https://github.com/dbry/WavPack/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ codyopel ]; }; -} +}) diff --git a/pkgs/by-name/wa/way-displays/package.nix b/pkgs/by-name/wa/way-displays/package.nix index 416cc46a3734..eb43eb9ec245 100644 --- a/pkgs/by-name/wa/way-displays/package.nix +++ b/pkgs/by-name/wa/way-displays/package.nix @@ -9,14 +9,14 @@ yaml-cpp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "way-displays"; version = "1.15.0"; src = fetchFromGitHub { owner = "alex-courtis"; repo = "way-displays"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-M1d6o4mODnFNInSt0GL1aCUcRU9VBVhHFQuwTrw6zY4="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "way-displays"; }; -} +}) diff --git a/pkgs/by-name/wa/wayland-logout/package.nix b/pkgs/by-name/wa/wayland-logout/package.nix index 6604408d0434..c5460756c0fd 100644 --- a/pkgs/by-name/wa/wayland-logout/package.nix +++ b/pkgs/by-name/wa/wayland-logout/package.nix @@ -5,13 +5,13 @@ meson, ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wayland-logout"; version = "1.4"; src = fetchFromGitHub { owner = "soreau"; repo = "wayland-logout"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-VSAw6go4v937HWazXfMz8OdHgOnUtrlDXkslsV4eDIg="; }; nativeBuildInputs = [ @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ mit ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/wa/wayland-utils/package.nix b/pkgs/by-name/wa/wayland-utils/package.nix index c8cbddd18f78..dfe8228b46ef 100644 --- a/pkgs/by-name/wa/wayland-utils/package.nix +++ b/pkgs/by-name/wa/wayland-utils/package.nix @@ -12,12 +12,12 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wayland-utils"; version = "1.3.0"; src = fetchurl { - url = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${version}/downloads/wayland-utils-${version}.tar.xz"; + url = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${finalAttrs.version}/downloads/wayland-utils-${finalAttrs.version}.tar.xz"; hash = "sha256-o50OZWF8auGG12jCI/VwYKOkNfb58C0DB0+UUxO/zw0="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ wineee ]; mainProgram = "wayland-info"; }; -} +}) diff --git a/pkgs/by-name/wa/waynergy/package.nix b/pkgs/by-name/wa/waynergy/package.nix index ca6cbef8b93e..b16a10884bd4 100644 --- a/pkgs/by-name/wa/waynergy/package.nix +++ b/pkgs/by-name/wa/waynergy/package.nix @@ -13,14 +13,14 @@ libxkbcommon, libressl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "waynergy"; version = "0.0.17"; src = fetchFromGitHub { owner = "r-c-f"; repo = "waynergy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-cwpW6O+KJNDvSrHeSM1Ci7S0kNw6a8KCdGAIhowPEIw="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ maxhero ]; }; -} +}) diff --git a/pkgs/by-name/wc/wch-isp/package.nix b/pkgs/by-name/wc/wch-isp/package.nix index 09beba2b96f3..e2e3dcfa1eca 100644 --- a/pkgs/by-name/wc/wch-isp/package.nix +++ b/pkgs/by-name/wc/wch-isp/package.nix @@ -6,14 +6,14 @@ libusb1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wch-isp"; version = "0.4.1"; src = fetchFromSourcehut { owner = "~jmaselbas"; repo = "wch-isp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-JB7cvZPzRhYJ8T3QJkguHOzZFrLOft5rRz0F0sVav/k="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lesuisse ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/wc/wcpg/package.nix b/pkgs/by-name/wc/wcpg/package.nix index 42fbb07d0ce5..bd7beced1f2e 100644 --- a/pkgs/by-name/wc/wcpg/package.nix +++ b/pkgs/by-name/wc/wcpg/package.nix @@ -11,14 +11,14 @@ mpfr, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wcpg"; version = "0.9"; src = fetchFromGitHub { owner = "fixif"; repo = "wcpg"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-uA/ENjf4urEO+lqebkp/k54199o2434FYgPSmYCG4UA="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ wegank ]; }; -} +}) diff --git a/pkgs/by-name/wd/wdfs/package.nix b/pkgs/by-name/wd/wdfs/package.nix index e1192b91120b..654ddc482f6e 100644 --- a/pkgs/by-name/wd/wdfs/package.nix +++ b/pkgs/by-name/wd/wdfs/package.nix @@ -9,12 +9,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wdfs-fuse"; version = "1.4.2"; src = fetchurl { - url = "http://noedler.de/projekte/wdfs/wdfs-${version}.tar.gz"; + url = "http://noedler.de/projekte/wdfs/wdfs-${finalAttrs.version}.tar.gz"; sha256 = "fcf2e1584568b07c7f3683a983a9be26fae6534b8109e09167e5dff9114ba2e5"; }; nativeBuildInputs = [ @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "wdfs"; }; -} +}) diff --git a/pkgs/by-name/we/webalizer/package.nix b/pkgs/by-name/we/webalizer/package.nix index f74aaa3812d9..88d1e7b9e969 100644 --- a/pkgs/by-name/we/webalizer/package.nix +++ b/pkgs/by-name/we/webalizer/package.nix @@ -9,12 +9,12 @@ db, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "webalizer"; version = "2.23.08"; src = fetchurl { - url = "mirror://debian/pool/main/w/webalizer/webalizer_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/w/webalizer/webalizer_${finalAttrs.version}.orig.tar.gz"; sha256 = "sha256-7a3bWqQcxKCBoVAOP6lmFdS0G8Eghrzt+ZOAGM557Y0="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/we/webp-pixbuf-loader/package.nix b/pkgs/by-name/we/webp-pixbuf-loader/package.nix index b1658bdc5e1d..8a82940af68a 100644 --- a/pkgs/by-name/we/webp-pixbuf-loader/package.nix +++ b/pkgs/by-name/we/webp-pixbuf-loader/package.nix @@ -14,14 +14,14 @@ let inherit (gdk-pixbuf) moduleDir; loadersPath = "${gdk-pixbuf.binaryDir}/webp-loaders.cache"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "webp-pixbuf-loader"; version = "0.2.7"; src = fetchFromGitHub { owner = "aruiz"; repo = "webp-pixbuf-loader"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-IJEweV2ACFp+Ua2ESrRUNApXWBg3NED60FDKijYO5TI="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.cwyc ]; teams = [ lib.teams.gnome ]; }; -} +}) diff --git a/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix index 05e763932fcc..a7f99ed06883 100644 --- a/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix +++ b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix @@ -7,12 +7,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "webrtc-audio-processing"; version = "0.3.1"; src = fetchurl { - url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${version}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${finalAttrs.version}.tar.xz"; sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; }; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { ++ lib.platforms.x86 ); }; -} +}) diff --git a/pkgs/by-name/we/webrtc-audio-processing_1/package.nix b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix index cf4191c2ad10..a2033347597e 100644 --- a/pkgs/by-name/we/webrtc-audio-processing_1/package.nix +++ b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix @@ -9,7 +9,7 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "webrtc-audio-processing"; version = "1.3"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "pulseaudio"; repo = "webrtc-audio-processing"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-8CDt4kMt2Owzyv22dqWIcFuHeg4Y3FxB405cLw3FZ+g="; }; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/31 badPlatforms = lib.platforms.bigEndian; }; -} +}) diff --git a/pkgs/by-name/we/websocketpp/package.nix b/pkgs/by-name/we/websocketpp/package.nix index 7cdecf70d81d..b596a64d716c 100644 --- a/pkgs/by-name/we/websocketpp/package.nix +++ b/pkgs/by-name/we/websocketpp/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "websocket++"; version = "0.8.2"; src = fetchFromGitHub { owner = "zaphoyd"; repo = "websocketpp"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ revol-xut ]; }; -} +}) diff --git a/pkgs/by-name/we/weidu/package.nix b/pkgs/by-name/we/weidu/package.nix index af07c4234385..4e34d334b331 100644 --- a/pkgs/by-name/we/weidu/package.nix +++ b/pkgs/by-name/we/weidu/package.nix @@ -16,14 +16,14 @@ let ocaml' = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "weidu"; version = "249.00"; src = fetchFromGitHub { owner = "WeiDUorg"; repo = "weidu"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+vkKTzFZdAzY2dL+mZ4A0PDxhTKGgs9bfArz7S6b4m4="; }; @@ -80,4 +80,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "weidu"; }; -} +}) diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix index 4096661b660f..1ed7c54d6364 100644 --- a/pkgs/by-name/we/weston/package.nix +++ b/pkgs/by-name/we/weston/package.nix @@ -47,12 +47,12 @@ xwayland, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "weston"; version = "14.0.1"; src = fetchurl { - url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; + url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${finalAttrs.version}/downloads/weston-${finalAttrs.version}.tar.xz"; hash = "sha256-qBUFBbEmpZ33gf6MMMjm+H2nAT4XkDnrhEpbu8x8ebM="; }; @@ -149,4 +149,4 @@ stdenv.mkDerivation rec { qyliss ]; }; -} +}) diff --git a/pkgs/by-name/wf/wfa2-lib/package.nix b/pkgs/by-name/wf/wfa2-lib/package.nix index 53afb60b385c..423311a35115 100644 --- a/pkgs/by-name/wf/wfa2-lib/package.nix +++ b/pkgs/by-name/wf/wfa2-lib/package.nix @@ -8,14 +8,14 @@ enableOpenMP ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wfa2-lib"; version = "2.3.5"; src = fetchFromGitHub { owner = "smarco"; repo = "WFA2-lib"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-vTeSvhSt3PQ/BID6uM1CuXkQipgG7VViDexvAwV4nW8="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/wg/wget/package.nix b/pkgs/by-name/wg/wget/package.nix index 44166739a2c8..0debae3460e7 100644 --- a/pkgs/by-name/wg/wget/package.nix +++ b/pkgs/by-name/wg/wget/package.nix @@ -23,12 +23,12 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wget"; version = "1.25.0"; src = fetchurl { - url = "mirror://gnu/wget/wget-${version}.tar.lz"; + url = "mirror://gnu/wget/wget-${finalAttrs.version}.tar.lz"; hash = "sha256-GSJcx1awoIj8gRSNxqQKDI8ymvf9hIPxx7L+UPTgih8="; }; @@ -123,4 +123,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fpletz ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix index 3245c5703325..2b6fe4db9b08 100644 --- a/pkgs/by-name/wg/wget2/package.nix +++ b/pkgs/by-name/wg/wget2/package.nix @@ -26,7 +26,7 @@ versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wget2"; version = "2.2.1"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "gnuwget"; repo = "wget2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-od5Zyeod3auMY3u0IxMEMHnGeKGzEgMk+W5jjMQqSXc="; }; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { versionCheckHook ]; doInstallCheck = true; - versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; meta = { description = "Successor of GNU Wget, a file and recursive website downloader"; @@ -117,4 +117,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ SuperSandro2000 ]; mainProgram = "wget2"; }; -} +}) diff --git a/pkgs/by-name/wg/wgetpaste/package.nix b/pkgs/by-name/wg/wgetpaste/package.nix index 23841e256e4e..44f2a07a39ca 100644 --- a/pkgs/by-name/wg/wgetpaste/package.nix +++ b/pkgs/by-name/wg/wgetpaste/package.nix @@ -6,12 +6,12 @@ bash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wgetpaste"; version = "2.34"; src = fetchurl { - url = "https://github.com/zlin/wgetpaste/releases/download/${version}/wgetpaste-${version}.tar.xz"; + url = "https://github.com/zlin/wgetpaste/releases/download/${finalAttrs.version}/wgetpaste-${finalAttrs.version}.tar.xz"; sha256 = "sha256-vW0G7ZAaPWPJyMVxJghP8JlPCZAb+xY4uHlT6sHpQz8="; }; # currently zsh-autocompletion support is not installed @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/wh/whatfiles/package.nix b/pkgs/by-name/wh/whatfiles/package.nix index afac76726f1b..cf852e6bfbee 100644 --- a/pkgs/by-name/wh/whatfiles/package.nix +++ b/pkgs/by-name/wh/whatfiles/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "whatfiles"; version = "1.0"; src = fetchFromGitHub { owner = "spieglt"; repo = "whatfiles"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-5Ju9g7/B9uxLkQzV/MN3vBkjve4EAMseO6K4HTAoS/o="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "whatfiles"; }; -} +}) diff --git a/pkgs/by-name/wh/whatweb/package.nix b/pkgs/by-name/wh/whatweb/package.nix index cb6615d526d5..2b84a0da7f2a 100644 --- a/pkgs/by-name/wh/whatweb/package.nix +++ b/pkgs/by-name/wh/whatweb/package.nix @@ -50,14 +50,14 @@ let inherit gemfile lockfile gemset; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "whatweb"; version = "0.6.2"; src = fetchFromGitHub { owner = "urbanadventurer"; repo = "whatweb"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-EFQ4RHI1+kmlz/Bm+9KXbmY0iEBJnKfdQL5YGDWCfJQ="; }; @@ -115,4 +115,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/wh/whois/package.nix b/pkgs/by-name/wh/whois/package.nix index 804e423972bf..c95394a97f82 100644 --- a/pkgs/by-name/wh/whois/package.nix +++ b/pkgs/by-name/wh/whois/package.nix @@ -10,14 +10,14 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "5.6.5"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-zCaM3fMittoEzuMRELqc1ES8QPgZRXVjyHUfMsS5tJA="; }; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "whois"; }; -} +}) diff --git a/pkgs/by-name/wh/whsniff/package.nix b/pkgs/by-name/wh/whsniff/package.nix index 943f2afafeb2..b1230a441256 100644 --- a/pkgs/by-name/wh/whsniff/package.nix +++ b/pkgs/by-name/wh/whsniff/package.nix @@ -5,14 +5,14 @@ libusb1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "whsniff"; version = "1.3"; src = fetchFromGitHub { owner = "homewsn"; repo = "whsniff"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "000l5vk9c0332m35lndk8892ivdr445lgg25hmq1lajn24cash5w"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/pkgs/by-name/wi/wifish/package.nix b/pkgs/by-name/wi/wifish/package.nix index be6e3d3f5c77..11812f44257a 100644 --- a/pkgs/by-name/wi/wifish/package.nix +++ b/pkgs/by-name/wi/wifish/package.nix @@ -8,14 +8,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wifish"; version = "1.1.4"; src = fetchFromGitHub { owner = "bougyman"; repo = "wifish"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-eTErN6CfKDey/wV+9o9cBVaG5FzCRBiA9UicrMz3KBc="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/wi/wiggle/package.nix b/pkgs/by-name/wi/wiggle/package.nix index b0758c19e784..13cb0805f7cc 100644 --- a/pkgs/by-name/wi/wiggle/package.nix +++ b/pkgs/by-name/wi/wiggle/package.nix @@ -6,14 +6,14 @@ groff, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wiggle"; version = "1.3"; src = fetchFromGitHub { owner = "neilbrown"; repo = "wiggle"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf"; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/wi/wiiload/package.nix b/pkgs/by-name/wi/wiiload/package.nix index 1de0f2ee9d96..24ff433b37f9 100644 --- a/pkgs/by-name/wi/wiiload/package.nix +++ b/pkgs/by-name/wi/wiiload/package.nix @@ -6,7 +6,7 @@ automake, zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.5.3"; pname = "wiiload"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "devkitPro"; repo = "wiiload"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-pZdZzCAPfAVucuiV/q/ROY3cz/wxQWep6dCTGNn2fSo="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ tomsmeets ]; }; -} +}) diff --git a/pkgs/by-name/wi/wiimms-iso-tools/package.nix b/pkgs/by-name/wi/wiimms-iso-tools/package.nix index 37c9c931cf99..5c6d35117502 100644 --- a/pkgs/by-name/wi/wiimms-iso-tools/package.nix +++ b/pkgs/by-name/wi/wiimms-iso-tools/package.nix @@ -8,12 +8,12 @@ fuse, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wiimms-iso-tools"; version = "3.05a"; src = fetchurl { - url = "https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-${version}.txz"; + url = "https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-${finalAttrs.version}.txz"; hash = "sha256-5aikiPJkZf9OwD8QmQ7ijhBOtFQpkIErvb6gOvEu2L0="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ nilp0inter ]; }; -} +}) diff --git a/pkgs/by-name/wi/wimboot/package.nix b/pkgs/by-name/wi/wimboot/package.nix index 9ea5e4529067..5929a4fcb94c 100644 --- a/pkgs/by-name/wi/wimboot/package.nix +++ b/pkgs/by-name/wi/wimboot/package.nix @@ -7,18 +7,18 @@ libiberty, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wimboot"; version = "2.8.0"; src = fetchFromGitHub { owner = "ipxe"; repo = "wimboot"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-JqdOgcwOXIJDl8O7k/pHdd4MNC/rJ0fWTowtEVpJyx8="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; buildInputs = [ libbfd @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/wi/windowchef/package.nix b/pkgs/by-name/wi/windowchef/package.nix index 0d8062a43ab8..24c2105d6ff0 100644 --- a/pkgs/by-name/wi/windowchef/package.nix +++ b/pkgs/by-name/wi/windowchef/package.nix @@ -10,14 +10,14 @@ xcbproto, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "windowchef"; version = "0.5.2"; src = fetchFromGitHub { owner = "tudurom"; repo = "windowchef"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1m4vly7w2f28lrj26rhh3x9xsp3d97m5cxj91fafgh5rds4ygyhp"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = lib.licenses.isc; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/wi/wings/package.nix b/pkgs/by-name/wi/wings/package.nix index 026d4887e772..5f80dc7a6e64 100644 --- a/pkgs/by-name/wi/wings/package.nix +++ b/pkgs/by-name/wi/wings/package.nix @@ -13,14 +13,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wings"; version = "2.4.1"; src = fetchFromGitHub { owner = "dgud"; repo = "wings"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3ulWbAOtYujaymN50u7buvnBdtYMEAe8Ji3arvPUH/s="; }; @@ -52,12 +52,12 @@ stdenv.mkDerivation rec { find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/src/,../src/,' {} \; find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/e3d/,../e3d/,' {} \; find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/intl_tools/,../intl_tools/,' {} \; - echo "${version}" > version + echo "${finalAttrs.version}" > version ''; makeFlags = [ "TYPE=opt" - "WINGS_VSN=${version}" + "WINGS_VSN=${finalAttrs.version}" ]; preBuild = '' @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - make TYPE=opt WINGS_VSN=${version} + make TYPE=opt WINGS_VSN=${finalAttrs.version} cd c_src make cd .. @@ -84,17 +84,17 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/lib/wings-${version}/ebin $out/lib/wings-${version}/priv - cp -R ebin/* $out/lib/wings-${version}/ebin/ - cp -R textures shaders plugins $out/lib/wings-${version}/ - cp -R priv/* $out/lib/wings-${version}/priv/ || true + mkdir -p $out/bin $out/lib/wings-${finalAttrs.version}/ebin $out/lib/wings-${finalAttrs.version}/priv + cp -R ebin/* $out/lib/wings-${finalAttrs.version}/ebin/ + cp -R textures shaders plugins $out/lib/wings-${finalAttrs.version}/ + cp -R priv/* $out/lib/wings-${finalAttrs.version}/priv/ || true if [ -d c_src ]; then - find c_src -name "*.so" -exec cp {} $out/lib/wings-${version}/priv/ \; + find c_src -name "*.so" -exec cp {} $out/lib/wings-${finalAttrs.version}/priv/ \; fi cat << EOF > $out/bin/wings #!${runtimeShell} ${erlang}/bin/erl \ - -pa $out/lib/wings-${version}/ebin -run wings_start start_halt "$@" + -pa $out/lib/wings-${finalAttrs.version}/ebin -run wings_start start_halt "$@" EOF chmod +x $out/bin/wings @@ -113,4 +113,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "wings"; }; -} +}) diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix index 433ac876fbb2..3e98eef5298d 100644 --- a/pkgs/by-name/wi/wire-desktop/package.nix +++ b/pkgs/by-name/wi/wire-desktop/package.nix @@ -76,6 +76,9 @@ let ./update.sh ./. ]; + # R-ryantm does not respect the commit feature, leading to inaccurate + # commit messages because it only sees the Linux version numbers. + # nixpkgs-update: no auto update supportedFeatures = [ "commit" ]; }; diff --git a/pkgs/by-name/wi/wire-desktop/versions.json b/pkgs/by-name/wi/wire-desktop/versions.json index 3ef3c71d0589..d1771695f066 100644 --- a/pkgs/by-name/wi/wire-desktop/versions.json +++ b/pkgs/by-name/wi/wire-desktop/versions.json @@ -1,10 +1,10 @@ { "linux": { - "version": "3.40.3718", - "hash": "sha256-1jBhF+Rnys8C3DaVbCKHDiylox2WG1qRvwnDbQrp1Mk=" + "version": "3.40.3882", + "hash": "sha256-8cZGbOngQ0LcUdCcalexkF2nEDb+u3I0zqEbRf/sRiw=" }, "macos": { - "version": "3.40.5285", - "hash": "sha256-pcWB3irdPyDj55dWmNyc+oThVGgHtIu//EAk1k/56is=" + "version": "3.40.5442", + "hash": "sha256-BxGkAbkl5kgeHq4dgITYsU1fXFY8XDWEOfwjHnk6XtQ=" } } diff --git a/pkgs/by-name/wi/wireguard-tools/package.nix b/pkgs/by-name/wi/wireguard-tools/package.nix index 380e5c91530d..6a3855c7b2f7 100644 --- a/pkgs/by-name/wi/wireguard-tools/package.nix +++ b/pkgs/by-name/wi/wireguard-tools/package.nix @@ -12,12 +12,12 @@ wireguard-go, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wireguard-tools"; version = "1.0.20250521"; src = fetchzip { - url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; + url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${finalAttrs.version}.tar.xz"; sha256 = "sha256-V9yKf4ZvxpOoVCFkFk18+130YBMhyeMt0641tn0O0e0="; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "man" ]; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; nativeBuildInputs = [ makeWrapper ]; @@ -94,4 +94,4 @@ stdenv.mkDerivation rec { mainProgram = "wg"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/wi/wirelesstools/package.nix b/pkgs/by-name/wi/wirelesstools/package.nix index e95eb87ce598..9b59feba5ded 100644 --- a/pkgs/by-name/wi/wirelesstools/package.nix +++ b/pkgs/by-name/wi/wirelesstools/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wireless-tools"; version = "30.pre9"; src = fetchurl { - url = "https://hewlettpackard.github.io/wireless-tools/wireless_tools.${version}.tar.gz"; + url = "https://hewlettpackard.github.io/wireless-tools/wireless_tools.${finalAttrs.version}.tar.gz"; sha256 = "0qscyd44jmhs4k32ggp107hlym1pcyjzihiai48xs7xzib4wbndb"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/pkgs/by-name/wl/wl-clipboard-x11/package.nix b/pkgs/by-name/wl/wl-clipboard-x11/package.nix index d7a640be0b1c..2016050d1ac8 100644 --- a/pkgs/by-name/wl/wl-clipboard-x11/package.nix +++ b/pkgs/by-name/wl/wl-clipboard-x11/package.nix @@ -6,14 +6,14 @@ bash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wl-clipboard-x11"; version = "5"; src = fetchFromGitHub { owner = "brunelli"; repo = "wl-clipboard-x11"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-i+oF1Mu72O5WPTWzqsvo4l2CERWWp4Jq/U0DffPZ8vg="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { mainProgram = "xclip"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/wl/wl-clipboard/package.nix b/pkgs/by-name/wl/wl-clipboard/package.nix index d206ec3f2b2a..e7ee417b46cb 100644 --- a/pkgs/by-name/wl/wl-clipboard/package.nix +++ b/pkgs/by-name/wl/wl-clipboard/package.nix @@ -12,14 +12,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wl-clipboard"; version = "2.2.1"; src = fetchFromGitHub { owner = "bugaevc"; repo = "wl-clipboard"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-BYRXqVpGt9FrEBYQpi2kHPSZyeMk9o1SXkxjjcduhiY="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/wl/wl-mirror/package.nix b/pkgs/by-name/wl/wl-mirror/package.nix index 2617cc1affc3..d14841045be2 100644 --- a/pkgs/by-name/wl/wl-mirror/package.nix +++ b/pkgs/by-name/wl/wl-mirror/package.nix @@ -29,14 +29,14 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wl-mirror"; version = "0.18.3"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-xj+CZPHeMAisOMB8mYSIc2jAa5iQD5pM+Stccq4gnak="; }; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - echo 'v${version}' > version.txt + echo 'v${finalAttrs.version}' > version.txt substituteInPlace CMakeLists.txt \ --replace 'WL_PROTOCOL_DIR "/usr' 'WL_PROTOCOL_DIR "${wayland-protocols}' \ --replace 'WLR_PROTOCOL_DIR "/usr' 'WLR_PROTOCOL_DIR "${wlr-protocols}' @@ -92,4 +92,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ synthetica ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/wl/wla-dx/package.nix b/pkgs/by-name/wl/wla-dx/package.nix index 819a1a4c4b31..beb4efff2f31 100644 --- a/pkgs/by-name/wl/wla-dx/package.nix +++ b/pkgs/by-name/wl/wla-dx/package.nix @@ -6,14 +6,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wla-dx"; version = "10.6"; src = fetchFromGitHub { owner = "vhelin"; repo = "wla-dx"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-t+X1Y1NhAGi4NOPik2fuLZAR3A7NQMAkSgWvqAFaIik="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/wl/wlclock/package.nix b/pkgs/by-name/wl/wlclock/package.nix index b75de4eb5957..cb4ac7f81de6 100644 --- a/pkgs/by-name/wl/wlclock/package.nix +++ b/pkgs/by-name/wl/wlclock/package.nix @@ -13,14 +13,14 @@ scdoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wlclock"; version = "1.0.1"; src = fetchFromSourcehut { owner = "~leon_plickat"; repo = "wlclock"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-aHA4kXHYH+KvAJSep5X3DqsiK6WFpXr3rGQl/KNiUcY="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "wlclock"; }; -} +}) diff --git a/pkgs/by-name/wl/wlr-randr/package.nix b/pkgs/by-name/wl/wlr-randr/package.nix index 33b1631bfb14..b867c9f87249 100644 --- a/pkgs/by-name/wl/wlr-randr/package.nix +++ b/pkgs/by-name/wl/wlr-randr/package.nix @@ -10,7 +10,7 @@ wayland-scanner, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wlr-randr"; version = "0.5.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "emersion"; repo = "wlr-randr"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-lHOGpY0IVnR8QdSqJbtIA4FkhmQ/zDiFNqqXyj8iw/s="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "wlr-randr"; }; -} +}) diff --git a/pkgs/by-name/wl/wlrctl/package.nix b/pkgs/by-name/wl/wlrctl/package.nix index d7ed65e671f9..1b8a9d3e764c 100644 --- a/pkgs/by-name/wl/wlrctl/package.nix +++ b/pkgs/by-name/wl/wlrctl/package.nix @@ -11,14 +11,14 @@ wayland-scanner, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wlrctl"; version = "0.2.2"; src = fetchFromSourcehut { owner = "~brocellous"; repo = "wlrctl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-5mDcCSHbZMbfXbksAO4YhELznKpanse7jtbtfr09HL0="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "wlrctl"; }; -} +}) diff --git a/pkgs/by-name/wl/wlsunset/package.nix b/pkgs/by-name/wl/wlsunset/package.nix index 11cc2044b9da..d2c35be33e9d 100644 --- a/pkgs/by-name/wl/wlsunset/package.nix +++ b/pkgs/by-name/wl/wlsunset/package.nix @@ -11,14 +11,14 @@ wayland-protocols, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wlsunset"; version = "0.4.0"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = "wlsunset"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-U/yROKkU9pOBLIIIsmkltF64tt5ZR97EAxxGgrFYwNg="; }; @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { wlr-gamma-control-unstable-v1. ''; homepage = "https://sr.ht/~kennylevinsen/wlsunset/"; - changelog = "https://git.sr.ht/~kennylevinsen/wlsunset/refs/${version}"; + changelog = "https://git.sr.ht/~kennylevinsen/wlsunset/refs/${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ wineee ]; mainProgram = "wlsunset"; }; -} +}) diff --git a/pkgs/by-name/wm/wmic-bin/package.nix b/pkgs/by-name/wm/wmic-bin/package.nix index 5491bcac71b4..aa49879fbb73 100644 --- a/pkgs/by-name/wm/wmic-bin/package.nix +++ b/pkgs/by-name/wm/wmic-bin/package.nix @@ -7,14 +7,14 @@ libxcrypt-legacy, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wmic-bin"; version = "0.5.0"; src = fetchFromGitHub { owner = "R-Vision"; repo = "wmi-client"; - rev = version; + rev = finalAttrs.version; sha256 = "1w1mdbiwz37wzry1q38h8dyjaa6iggmsb9wcyhhlawwm1vj50w48"; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ peterhoeg ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/wm/wmname/package.nix b/pkgs/by-name/wm/wmname/package.nix index 6b33f04f9dd2..4ba2bd581c13 100644 --- a/pkgs/by-name/wm/wmname/package.nix +++ b/pkgs/by-name/wm/wmname/package.nix @@ -5,12 +5,12 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wmname"; version = "0.1"; src = fetchurl { - url = "https://dl.suckless.org/tools/wmname-${version}.tar.gz"; + url = "https://dl.suckless.org/tools/wmname-${finalAttrs.version}.tar.gz"; sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "wmname"; }; -} +}) diff --git a/pkgs/by-name/wm/wmutils-core/package.nix b/pkgs/by-name/wm/wmutils-core/package.nix index 781e921ebb6b..2bab3597b7a5 100644 --- a/pkgs/by-name/wm/wmutils-core/package.nix +++ b/pkgs/by-name/wm/wmutils-core/package.nix @@ -7,14 +7,14 @@ xcb-util-cursor, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wmutils-core"; version = "1.7"; src = fetchFromGitHub { owner = "wmutils"; repo = "core"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-OKAvJovGu9rMxEe5g4kdL7Foj41kl3zUYIJa04jf0dI="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { license = lib.licenses.isc; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/wm/wmutils-libwm/package.nix b/pkgs/by-name/wm/wmutils-libwm/package.nix index 39ed3f337435..2ed91047c2bb 100644 --- a/pkgs/by-name/wm/wmutils-libwm/package.nix +++ b/pkgs/by-name/wm/wmutils-libwm/package.nix @@ -6,14 +6,14 @@ xcb-util-cursor, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wmutils-libwm"; version = "1.3"; src = fetchFromGitHub { owner = "wmutils"; repo = "libwm"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ROWRgTn33c5gH4ZdkwZ05rRg/Z9e2NppAQSNExSGZ4s="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bhougland ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/wo/wofi-emoji/package.nix b/pkgs/by-name/wo/wofi-emoji/package.nix index 3ba5e16bab46..718caa04f6f2 100644 --- a/pkgs/by-name/wo/wofi-emoji/package.nix +++ b/pkgs/by-name/wo/wofi-emoji/package.nix @@ -15,14 +15,14 @@ let hash = "sha256-IoU9ZPCqvSPX4DmfC+r5MiglhFc41XMRrbJRL9ZNrvs="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wofi-emoji"; version = "1.1.0"; src = fetchFromGitHub { owner = "Zeioth"; repo = "wofi-emoji"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NHiAAPRbIz0sC5yh9DTDmIU3zDBFIlUsbpW4HAPr5C8="; }; @@ -71,4 +71,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "wofi-emoji"; }; -} +}) diff --git a/pkgs/by-name/wo/wofi/package.nix b/pkgs/by-name/wo/wofi/package.nix index 32a406e1ca48..6c0abcef65f2 100644 --- a/pkgs/by-name/wo/wofi/package.nix +++ b/pkgs/by-name/wo/wofi/package.nix @@ -10,7 +10,7 @@ wrapGAppsHook3, installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wofi"; version = "1.5.2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromSourcehut { repo = "wofi"; owner = "~scoopta"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-j0KkmRfTRYpzfqHdIsOXk+pYHCrdzICD1Dm847C5ihs="; vc = "hg"; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "wofi"; }; -} +}) diff --git a/pkgs/by-name/wo/wolf-shaper/package.nix b/pkgs/by-name/wo/wolf-shaper/package.nix index c51199dc68d2..481a0e5f6998 100644 --- a/pkgs/by-name/wo/wolf-shaper/package.nix +++ b/pkgs/by-name/wo/wolf-shaper/package.nix @@ -11,14 +11,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wolf-shaper"; version = "1.0.2"; src = fetchFromGitHub { owner = "wolf-plugins"; repo = "wolf-shaper"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4oi1wnex6eNRHUWXZHnvrmqp4veFuPJqD0YuOhDepg4="; fetchSubmodules = true; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "wolf-shaper"; }; -} +}) diff --git a/pkgs/by-name/wo/wolfebin/package.nix b/pkgs/by-name/wo/wolfebin/package.nix index f80159bcd77f..60f5f8314563 100644 --- a/pkgs/by-name/wo/wolfebin/package.nix +++ b/pkgs/by-name/wo/wolfebin/package.nix @@ -5,14 +5,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wolfebin"; version = "5.6"; src = fetchFromGitHub { owner = "thejoshwolfe"; repo = "wolfebin"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-tsI71/UdLaGZ3O2lNTd1c8S5OS2imquLovh0n0ez8Ts="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ andrewrk ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/wo/wordgrinder/package.nix b/pkgs/by-name/wo/wordgrinder/package.nix index 7a9612d45865..bea0b9bef9d2 100644 --- a/pkgs/by-name/wo/wordgrinder/package.nix +++ b/pkgs/by-name/wo/wordgrinder/package.nix @@ -12,14 +12,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wordgrinder"; version = "0.8"; src = fetchFromGitHub { repo = "wordgrinder"; owner = "davidgiven"; - rev = version; + rev = finalAttrs.version; sha256 = "124d1bnn2aqs6ik8pdazzni6a0583prz9lfdjrbwyb97ipqga9pm"; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ matthiasbeyer ]; platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/by-name/wo/wordnet/package.nix b/pkgs/by-name/wo/wordnet/package.nix index 95c92c7c8e18..ddbd676c8802 100644 --- a/pkgs/by-name/wo/wordnet/package.nix +++ b/pkgs/by-name/wo/wordnet/package.nix @@ -7,11 +7,11 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.0"; pname = "wordnet"; src = fetchurl { - url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2"; + url = "http://wordnetcode.princeton.edu/${finalAttrs.version}/WordNet-${finalAttrs.version}.tar.bz2"; sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux ++ darwin; mainProgram = "wn"; }; -} +}) diff --git a/pkgs/by-name/wo/workcraft/package.nix b/pkgs/by-name/wo/workcraft/package.nix index 8fe9325a45a6..369ac3ce5701 100644 --- a/pkgs/by-name/wo/workcraft/package.nix +++ b/pkgs/by-name/wo/workcraft/package.nix @@ -6,12 +6,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "workcraft"; version = "3.5.3"; src = fetchurl { - url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; + url = "https://github.com/workcraft/workcraft/releases/download/v${finalAttrs.version}/workcraft-v${finalAttrs.version}-linux.tar.gz"; sha256 = "sha256-p0w65Y4W1ozFLFNVcqYldyZ78+kJPwZeLgrREpc9CLQ="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ timor ]; }; -} +}) diff --git a/pkgs/by-name/wo/wownero/package.nix b/pkgs/by-name/wo/wownero/package.nix index 7679dc236725..47664be5cfcc 100644 --- a/pkgs/by-name/wo/wownero/package.nix +++ b/pkgs/by-name/wo/wownero/package.nix @@ -37,7 +37,7 @@ let hash = "sha256-imiXr4irXeKiQ6VMd6f3MJ46zvdvymnRdHGgnEvkT+o="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wownero"; version = "0.11.3.0"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "wownero"; repo = "wownero"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EioXFfUQ+CV6+Ipef1wbmc+taKI98I420J7eqzz15Ss="; }; @@ -111,4 +111,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/wp/wpsoffice-cn/sources.nix b/pkgs/by-name/wp/wpsoffice-cn/sources.nix index edf71f7ff0db..bac7958d405f 100644 --- a/pkgs/by-name/wp/wpsoffice-cn/sources.nix +++ b/pkgs/by-name/wp/wpsoffice-cn/sources.nix @@ -1,18 +1,18 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-11-27 +# Last updated: 2026-01-29 { - linux-version = "12.1.2.23578"; - darwin-version = "12.1.24031"; + linux-version = "12.1.2.24722"; + darwin-version = "12.1.25195"; x86_64-linux = { - url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/23578/wps-office_12.1.2.23578.AK.preread.sw_542488_amd64.deb"; - hash = "sha256-IMklnH6rCPZFHElLFF6At5QdDg7Ut/lBZFw+oPwQYWc="; + url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/24722/wps-office_12.1.2.24722.AK.preread.sw_612408_amd64.deb"; + hash = "sha256-eSX3Zu1q1Hrq1HNQPfILJWH7D3F55rr3FiJ79Er57xs="; }; x86_64-darwin = { - url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.24031/WPS_Office_12.1.24031(24031)_x64.dmg"; - hash = "sha256-i4i+o1OmgZdbPTkeRkqlATKnyC3L+tt9cdRQuH4VAXE="; + url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25195/WPS_Office_12.1.25195(25195)_x64.dmg"; + hash = "sha256-QwCV281dlE0j0Q2dHt/gV3QPFaQ8vQm8UIU2ohaaSus="; }; aarch64-darwin = { - url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.24031/WPS_Office_12.1.24031(24031)_arm64.dmg"; - hash = "sha256-olOgQ8jzO/IFXGJc9YANPC12LoZhzbtSzXjyZXO9x84="; + url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25195/WPS_Office_12.1.25195(25195)_arm64.dmg"; + hash = "sha256-9HqZTJ73tE8XzbEI+MH3ePVNr/gtELwcjZHrAKWK+x0="; }; } diff --git a/pkgs/by-name/wp/wpsoffice-cn/update.sh b/pkgs/by-name/wp/wpsoffice-cn/update.sh index 50923b0f6aa9..25c309f3edf3 100755 --- a/pkgs/by-name/wp/wpsoffice-cn/update.sh +++ b/pkgs/by-name/wp/wpsoffice-cn/update.sh @@ -3,6 +3,8 @@ set -euo pipefail +cd $(readlink -e $(dirname "${BASH_SOURCE[0]}")) + export SSL_CERT_FILE=$NIX_SSL_CERT_FILE readonly SECURITY_KEY="7f8faaaa468174dc1c9cd62e5f218a5b" diff --git a/pkgs/by-name/wr/wrk/package.nix b/pkgs/by-name/wr/wrk/package.nix index 495c3c0e7495..f26256a540ba 100644 --- a/pkgs/by-name/wr/wrk/package.nix +++ b/pkgs/by-name/wr/wrk/package.nix @@ -7,14 +7,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wrk"; version = "4.2.0"; src = fetchFromGitHub { owner = "wg"; repo = "wrk"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-nCfA444p7krXOB3qRtDKWxWj9tsrDZsGf03ThtE1dXM="; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { makeFlags = [ "WITH_LUAJIT=${luajit}" "WITH_OPENSSL=${openssl.dev}" - "VER=${version}" + "VER=${finalAttrs.version}" ]; preBuild = '' @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "wrk"; }; -} +}) diff --git a/pkgs/by-name/ws/wsmancli/package.nix b/pkgs/by-name/ws/wsmancli/package.nix index 70e9e9b4f9f1..6af05cf3d84c 100644 --- a/pkgs/by-name/ws/wsmancli/package.nix +++ b/pkgs/by-name/ws/wsmancli/package.nix @@ -7,14 +7,14 @@ openwsman, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wsmancli"; version = "2.8.0"; src = fetchFromGitHub { owner = "Openwsman"; repo = "wsmancli"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-pTA5p5+Fuiw2lQaaSKnp/29HMy8NZNTFwP5K/+sJ9OU="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms ; }; -} +}) diff --git a/pkgs/by-name/wt/wtype/package.nix b/pkgs/by-name/wt/wtype/package.nix index 6d8f07bce660..f11224d746e0 100644 --- a/pkgs/by-name/wt/wtype/package.nix +++ b/pkgs/by-name/wt/wtype/package.nix @@ -12,14 +12,14 @@ wayland-scanner, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wtype"; version = "0.4"; src = fetchFromGitHub { owner = "atx"; repo = "wtype"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-TfpzAi0mkXugQn70MISyNFOXIJpDwvgh3enGv0Xq8S4="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ justinlovinger ]; mainProgram = "wtype"; }; -} +}) diff --git a/pkgs/by-name/wv/wv2/package.nix b/pkgs/by-name/wv/wv2/package.nix index 5fabc08f05d0..51cd6f488d27 100644 --- a/pkgs/by-name/wv/wv2/package.nix +++ b/pkgs/by-name/wv/wv2/package.nix @@ -10,11 +10,11 @@ libiconvReal, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wv2"; version = "0.4.2"; src = fetchurl { - url = "mirror://sourceforge/wvware/wv2-${version}.tar.bz2"; + url = "mirror://sourceforge/wvware/wv2-${finalAttrs.version}.tar.bz2"; sha256 = "1p1qxr8z5bsiq8pvlina3c8c1vjcb5d96bs3zz4jj3nb20wnsawz"; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2; homepage = "https://wvware.sourceforge.net"; }; -} +}) diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix index 5ebad4ab20f9..5957a5c73210 100644 --- a/pkgs/by-name/wx/wxGTK31/package.nix +++ b/pkgs/by-name/wx/wxGTK31/package.nix @@ -25,14 +25,14 @@ libpng, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wxwidgets"; version = "3.1.7"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9qYPatpTT28H+fz77o7/Y3YVmiK0OCsiQT5QAYe93M0="; fetchSubmodules = true; }; @@ -133,4 +133,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix index 895bf3468032..c820a2e39f92 100644 --- a/pkgs/by-name/wx/wxGTK32/package.nix +++ b/pkgs/by-name/wx/wxGTK32/package.nix @@ -45,14 +45,14 @@ let hash = "sha256-ymziU0NgGqxPOKHwGm0QyEdK/8jL/QYk5UdIQ3Tn8jw="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wxwidgets"; version = "3.2.8.1"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-aXI59oN5qqds6u2/6MI7BYLbFPy3Yrfn2FGTfxlPG7o="; }; @@ -157,4 +157,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/wx/wxedid/package.nix b/pkgs/by-name/wx/wxedid/package.nix index dff8684ceae0..f5bc34961d49 100644 --- a/pkgs/by-name/wx/wxedid/package.nix +++ b/pkgs/by-name/wx/wxedid/package.nix @@ -5,12 +5,12 @@ wrapGAppsHook3, wxwidgets_3_3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wxedid"; version = "0.0.33"; src = fetchzip { - url = "https://downloads.sourceforge.net/project/wxedid/wxedid-${version}.tar.gz"; + url = "https://downloads.sourceforge.net/project/wxedid/wxedid-${finalAttrs.version}.tar.gz"; hash = "sha256-ShO2e5rQCVBdgyg4iiFzFEywl2m9A+jILMGI+MT8qgo="; }; nativeBuildInputs = [ @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.meanwhile131 ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/wx/wxhexeditor/package.nix b/pkgs/by-name/wx/wxhexeditor/package.nix index ee4c2601e1b1..66d705ab90f1 100644 --- a/pkgs/by-name/wx/wxhexeditor/package.nix +++ b/pkgs/by-name/wx/wxhexeditor/package.nix @@ -13,14 +13,14 @@ llvmPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wxhexeditor"; version = "0.24"; src = fetchFromGitHub { repo = "wxHexEditor"; owner = "EUA"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-EmdWYifwewk40s1TARYoUzx/qhyMmgmUC9tr5KKCtiM="; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { mainProgram = "wxHexEditor"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/wx/wxmacmolplt/package.nix b/pkgs/by-name/wx/wxmacmolplt/package.nix index 5e8c968fa687..4629193946c9 100644 --- a/pkgs/by-name/wx/wxmacmolplt/package.nix +++ b/pkgs/by-name/wx/wxmacmolplt/package.nix @@ -11,14 +11,14 @@ wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wxmacmolplt"; version = "7.7.3"; src = fetchFromGitHub { owner = "brettbode"; repo = "wxmacmolplt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-gFGstyq9bMmBaIS4QE6N3EIC9GxRvyJYUr8DUvwRQBc="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/wx/wxsqlite3/package.nix b/pkgs/by-name/wx/wxsqlite3/package.nix index 82f2067e2b1e..18da48b8af14 100644 --- a/pkgs/by-name/wx/wxsqlite3/package.nix +++ b/pkgs/by-name/wx/wxsqlite3/package.nix @@ -7,14 +7,14 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wxsqlite3"; version = "4.11.2"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-RSAA4wZRouGPpIekfSXA8cTUb9ByCK2GbV5/mcJ/6eQ="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { gpl3Plus ]; }; -} +}) diff --git a/pkgs/by-name/wx/wxsqliteplus/package.nix b/pkgs/by-name/wx/wxsqliteplus/package.nix index 7717c287cfe4..9fcd3ab13e72 100644 --- a/pkgs/by-name/wx/wxsqliteplus/package.nix +++ b/pkgs/by-name/wx/wxsqliteplus/package.nix @@ -10,14 +10,14 @@ sqlite, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wxsqliteplus"; version = "0.4.0"; src = fetchFromGitHub { owner = "guanlisheng"; repo = "wxsqliteplus"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-gyH1Wlmg9xQy7xm7rhKZa7BFTFFN4JQHp3CHmzMkVOg="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/x1/x11_ssh_askpass/package.nix b/pkgs/by-name/x1/x11_ssh_askpass/package.nix index 758ee40a3b5b..2543427868d0 100644 --- a/pkgs/by-name/x1/x11_ssh_askpass/package.nix +++ b/pkgs/by-name/x1/x11_ssh_askpass/package.nix @@ -11,7 +11,7 @@ libice, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "x11-ssh-askpass"; version = "1.2.4.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-${version}.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-${version}.tar.gz"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-${finalAttrs.version}.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-${finalAttrs.version}.tar.gz"; sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88"; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/x2/x2vnc/package.nix b/pkgs/by-name/x2/x2vnc/package.nix index 5496cbfb2474..c720b7e48b0f 100644 --- a/pkgs/by-name/x2/x2vnc/package.nix +++ b/pkgs/by-name/x2/x2vnc/package.nix @@ -8,12 +8,12 @@ xorgproto, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "x2vnc"; version = "1.7.2"; src = fetchurl { - url = "https://fredrik.hubbe.net/x2vnc/x2vnc-${version}.tar.gz"; + url = "https://fredrik.hubbe.net/x2vnc/x2vnc-${finalAttrs.version}.tar.gz"; sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "x2vnc"; }; -} +}) diff --git a/pkgs/by-name/x4/x42-avldrums/package.nix b/pkgs/by-name/x4/x42-avldrums/package.nix index c371ae7c948d..f92907155014 100644 --- a/pkgs/by-name/x4/x42-avldrums/package.nix +++ b/pkgs/by-name/x4/x42-avldrums/package.nix @@ -10,14 +10,14 @@ pango, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "x42-avldrums"; version = "0.7.3"; src = fetchFromGitHub { owner = "x42"; repo = "avldrums.lv2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-AZKHjzgw0TtLHh4TF+yOUSa+GlNVwyHCpJWAZikXTy4="; fetchSubmodules = true; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/x4/x42-gmsynth/package.nix b/pkgs/by-name/x4/x42-gmsynth/package.nix index 5633113a77da..efe23304dae8 100644 --- a/pkgs/by-name/x4/x42-gmsynth/package.nix +++ b/pkgs/by-name/x4/x42-gmsynth/package.nix @@ -7,14 +7,14 @@ lv2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "x42-gmsynth"; version = "0.6.2"; src = fetchFromGitHub { owner = "x42"; repo = "gmsynth.lv2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Fu/wCQY5fTvAWo18hhiQC9LZAUwi3WJfhgWLI0rgmKs="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xa/Xaw3d/package.nix b/pkgs/by-name/xa/Xaw3d/package.nix index df892e80019f..f9a2230c0d69 100644 --- a/pkgs/by-name/xa/Xaw3d/package.nix +++ b/pkgs/by-name/xa/Xaw3d/package.nix @@ -13,12 +13,12 @@ xorgproto, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "Xaw3d"; version = "1.6.6"; src = fetchurl { - url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.xz"; + url = "https://www.x.org/releases/individual/lib/libXaw3d-${finalAttrs.version}.tar.xz"; sha256 = "sha256-pBw+NxNa1hax8ou95wACr788tZow3zQUH4KdMurchkY="; }; nativeBuildInputs = [ @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/xa/xaos/package.nix b/pkgs/by-name/xa/xaos/package.nix index 29359f95161a..624cf8d5b0b8 100644 --- a/pkgs/by-name/xa/xaos/package.nix +++ b/pkgs/by-name/xa/xaos/package.nix @@ -9,7 +9,7 @@ let datapath = "$out/share/XaoS"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xaos"; version = "4.3.4"; outputs = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "xaos-project"; repo = "XaoS"; - tag = "release-${version}"; + tag = "release-${finalAttrs.version}"; hash = "sha256-vOFwZbdbcrcJLHUa1QzxzadPcx5GF5uNPg+MZ7NbAPc="; }; @@ -62,11 +62,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = src.meta // { + meta = finalAttrs.src.meta // { description = "Real-time interactive fractal zoomer"; mainProgram = "xaos"; homepage = "https://xaos-project.github.io/"; license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix index e2d6fba185fd..c18b94a9f468 100644 --- a/pkgs/by-name/xa/xapp/package.nix +++ b/pkgs/by-name/xa/xapp/package.nix @@ -22,7 +22,7 @@ libdbusmenu-gtk3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xapp"; version = "3.2.2"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "linuxmint"; repo = "xapp"; - rev = version; + rev = finalAttrs.version; hash = "sha256-xVGIrK7koqX6xKoanVHWQMBUusUjtvHzQg2OV0E0b78="; }; @@ -107,4 +107,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/xa/xarchiver/package.nix b/pkgs/by-name/xa/xarchiver/package.nix index 36c7e4aeb40e..f7807e4c0ac2 100644 --- a/pkgs/by-name/xa/xarchiver/package.nix +++ b/pkgs/by-name/xa/xarchiver/package.nix @@ -23,14 +23,14 @@ desktopToDarwinBundle, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.5.4.26"; pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; - rev = version; + rev = finalAttrs.version; hash = "sha256-s6lVKtWJRAFrkUYUwKGH+XNTGi/L+Zt0kSWIekBUWYs="; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "xarchiver"; }; -} +}) diff --git a/pkgs/by-name/xa/xastir/package.nix b/pkgs/by-name/xa/xastir/package.nix index 4daf9abf5022..ab5a4457512d 100644 --- a/pkgs/by-name/xa/xastir/package.nix +++ b/pkgs/by-name/xa/xastir/package.nix @@ -21,14 +21,14 @@ libax25, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xastir"; version = "2.2.2"; src = fetchFromGitHub { owner = "xastir"; repo = "xastir"; - tag = "Release-${version}"; + tag = "Release-${finalAttrs.version}"; hash = "sha256-bpT8F3xURo9jRxBrGGflmcLD6U7F+FTW+VAK1WCgqF4="; }; @@ -91,4 +91,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xa/xautoclick/package.nix b/pkgs/by-name/xa/xautoclick/package.nix index e1d90009050c..feabaffefe8f 100644 --- a/pkgs/by-name/xa/xautoclick/package.nix +++ b/pkgs/by-name/xa/xautoclick/package.nix @@ -18,14 +18,14 @@ qt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xautoclick"; version = "0.34"; src = fetchFromGitHub { owner = "qarkai"; repo = "xautoclick"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "GN3zI5LQnVmRC0KWffzUTHKrxcqnstiL55hopwTTwpE="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xa/xautomation/package.nix b/pkgs/by-name/xa/xautomation/package.nix index e79aa9e14e6f..dbcaf6f39798 100644 --- a/pkgs/by-name/xa/xautomation/package.nix +++ b/pkgs/by-name/xa/xautomation/package.nix @@ -10,11 +10,11 @@ libXtst, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xautomation"; version = "1.09"; src = fetchurl { - url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz"; + url = "https://www.hoopajoo.net/static/projects/xautomation-${finalAttrs.version}.tar.gz"; sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ vaibhavsagar ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/xa/xavs/package.nix b/pkgs/by-name/xa/xavs/package.nix index d8038effa36f..0d0f52dea1e1 100644 --- a/pkgs/by-name/xa/xavs/package.nix +++ b/pkgs/by-name/xa/xavs/package.nix @@ -4,13 +4,13 @@ fetchsvn, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xavs"; version = "55"; src = fetchsvn { url = "https://svn.code.sf.net/p/xavs/code/trunk"; - rev = version; + rev = finalAttrs.version; sha256 = "0drw16wm95dqszpl7j33y4gckz0w0107lnz6wkzb66f0dlbv48cf"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ codyopel ]; }; -} +}) diff --git a/pkgs/by-name/xa/xawtv/package.nix b/pkgs/by-name/xa/xawtv/package.nix index 663b0bf31985..f963a8b8d00d 100644 --- a/pkgs/by-name/xa/xawtv/package.nix +++ b/pkgs/by-name/xa/xawtv/package.nix @@ -20,12 +20,12 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xawtv"; version = "3.107"; src = fetchurl { - url = "https://linuxtv.org/downloads/xawtv/xawtv-${version}.tar.bz2"; + url = "https://linuxtv.org/downloads/xawtv/xawtv-${finalAttrs.version}.tar.bz2"; sha256 = "055p0wia0xsj073l8mg4ifa6m81dmv6p45qyh99brramq5iylfy5"; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xb/xbanish/package.nix b/pkgs/by-name/xb/xbanish/package.nix index d03b9240967f..e21b8cdf5137 100644 --- a/pkgs/by-name/xb/xbanish/package.nix +++ b/pkgs/by-name/xb/xbanish/package.nix @@ -9,7 +9,7 @@ libXext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.8"; pname = "xbanish"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "jcs"; repo = "xbanish"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-jwCoJ2shFGuJHhmXmlw/paFpMl5ARD6e5zDnDZHlsoo="; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xbanish"; }; -} +}) diff --git a/pkgs/by-name/xb/xbindkeys/package.nix b/pkgs/by-name/xb/xbindkeys/package.nix index c2d7208bf857..47bb0fa045c6 100644 --- a/pkgs/by-name/xb/xbindkeys/package.nix +++ b/pkgs/by-name/xb/xbindkeys/package.nix @@ -8,11 +8,11 @@ guile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xbindkeys"; version = "1.8.7"; src = fetchurl { - url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; + url = "https://www.nongnu.org/xbindkeys/xbindkeys-${finalAttrs.version}.tar.gz"; sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/xb/xboard/package.nix b/pkgs/by-name/xb/xboard/package.nix index 0cd935aed871..2d6e349927c9 100644 --- a/pkgs/by-name/xb/xboard/package.nix +++ b/pkgs/by-name/xb/xboard/package.nix @@ -21,12 +21,12 @@ gtk2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xboard"; version = "4.9.1"; src = fetchurl { - url = "mirror://gnu/xboard/xboard-${version}.tar.gz"; + url = "mirror://gnu/xboard/xboard-${finalAttrs.version}.tar.gz"; sha256 = "sha256-Ky5T6EKK2bbo3IpVs6UYM4GRGk2uLABy+pYpa7sZcNY="; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.gpl3Plus; }; -} +}) diff --git a/pkgs/by-name/xb/xbomb/package.nix b/pkgs/by-name/xb/xbomb/package.nix index 981403284884..8c640cd2b325 100644 --- a/pkgs/by-name/xb/xbomb/package.nix +++ b/pkgs/by-name/xb/xbomb/package.nix @@ -6,11 +6,11 @@ libXaw, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xbomb"; version = "2.2b"; src = fetchurl { - url = "https://www.gedanken.org.uk/software/xbomb/download/xbomb-${version}.tgz"; + url = "https://www.gedanken.org.uk/software/xbomb/download/xbomb-${finalAttrs.version}.tgz"; sha256 = "0692gjw28qvh8wj9l58scjw6kxj7jdyb3yzgcgs9wcznq11q839m"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xc/xc3sprog/package.nix b/pkgs/by-name/xc/xc3sprog/package.nix index 2e553c7a0873..ce591ca20251 100644 --- a/pkgs/by-name/xc/xc3sprog/package.nix +++ b/pkgs/by-name/xc/xc3sprog/package.nix @@ -11,14 +11,14 @@ # The xc3sprog project doesn't seem to make proper releases, they only put out # prebuilt binary subversion snapshots on sourceforge. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "795"; pname = "xc3sprog"; src = fetchsvn { url = "https://svn.code.sf.net/p/xc3sprog/code/trunk"; sha256 = "sha256-E0MGwC3gIfl60gjGaSeSPTR5jJm9r8m7Et3402lek/w="; - rev = version; + rev = finalAttrs.version; }; nativeBuildInputs = [ @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.bjornfor ]; }; -} +}) diff --git a/pkgs/by-name/xc/xcb-imdkit/package.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix index 2cac834ac619..f5e3528d2d93 100644 --- a/pkgs/by-name/xc/xcb-imdkit/package.nix +++ b/pkgs/by-name/xc/xcb-imdkit/package.nix @@ -10,14 +10,14 @@ xorgproto, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xcb-imdkit"; version = "1.0.9"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; - rev = version; + rev = finalAttrs.version; hash = "sha256-QfuetGPY6u4OhFiE5/CoVEpdODWnd1PHWBtM3ymsZ98="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ poscat ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xc/xcd/package.nix b/pkgs/by-name/xc/xcd/package.nix index 2b14a6d8c558..2066cd60b4ed 100644 --- a/pkgs/by-name/xc/xcd/package.nix +++ b/pkgs/by-name/xc/xcd/package.nix @@ -5,12 +5,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xcd"; version = "1.2"; src = fetchurl { - url = "https://www.muppetlabs.com/~breadbox/pub/software/xcd-${version}.tar.gz"; + url = "https://www.muppetlabs.com/~breadbox/pub/software/xcd-${finalAttrs.version}.tar.gz"; sha256 = "1cgwspy08q05rhxbp7m1yrrix252i9jzfcfbzmhdvlgf5bfpl25g"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "xcd"; }; -} +}) diff --git a/pkgs/by-name/xc/xcftools/package.nix b/pkgs/by-name/xc/xcftools/package.nix index 2a5d14f42a8f..e9cabf467759 100644 --- a/pkgs/by-name/xc/xcftools/package.nix +++ b/pkgs/by-name/xc/xcftools/package.nix @@ -8,12 +8,12 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xcftools"; version = "1.0.7"; src = fetchurl { - url = "http://henning.makholm.net/xcftools/xcftools-${version}.tar.gz"; + url = "http://henning.makholm.net/xcftools/xcftools-${finalAttrs.version}.tar.gz"; sha256 = "19i0x7yhlw6hd2gp013884zchg63yzjdj4hpany011il0n26vgqy"; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xc/xcfun/package.nix b/pkgs/by-name/xc/xcfun/package.nix index c1affcce0a07..fde1dfa24446 100644 --- a/pkgs/by-name/xc/xcfun/package.nix +++ b/pkgs/by-name/xc/xcfun/package.nix @@ -7,14 +7,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xcfun"; version = "2.1.1"; src = fetchFromGitHub { owner = "dftlibs"; repo = "xcfun"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1bj70cnhbh6ziy02x988wwl7cbwaq17ld7qwhswqkgnnx8rpgxid"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/by-name/xc/xchainkeys/package.nix b/pkgs/by-name/xc/xchainkeys/package.nix index ac6ec9aa0d47..4650b13cdc7a 100644 --- a/pkgs/by-name/xc/xchainkeys/package.nix +++ b/pkgs/by-name/xc/xchainkeys/package.nix @@ -5,12 +5,12 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xchainkeys"; version = "0.11"; src = fetchurl { - url = "http://henning-bekel.de/download/xchainkeys/xchainkeys-${version}.tar.gz"; + url = "http://henning-bekel.de/download/xchainkeys/xchainkeys-${finalAttrs.version}.tar.gz"; sha256 = "1rpqs7h5krral08vqxwb0imy33z17v5llvrg5hy8hkl2ap7ya0mn"; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { # The last successful Darwin Hydra build was in 2023 broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/xc/xchm/package.nix b/pkgs/by-name/xc/xchm/package.nix index a2d005d8c497..b08bd22bc745 100644 --- a/pkgs/by-name/xc/xchm/package.nix +++ b/pkgs/by-name/xc/xchm/package.nix @@ -8,14 +8,14 @@ desktopToDarwinBundle, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xchm"; version = "1.37"; src = fetchFromGitHub { owner = "rzvncj"; repo = "xCHM"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-UMn8ds4nheuYSu0PesxdGoyxyn5AcKq9WByeRUxxx3k="; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "xchm"; }; -} +}) diff --git a/pkgs/by-name/xc/xclip/package.nix b/pkgs/by-name/xc/xclip/package.nix index 5b3383dae99c..9ee63bd97221 100644 --- a/pkgs/by-name/xc/xclip/package.nix +++ b/pkgs/by-name/xc/xclip/package.nix @@ -6,14 +6,14 @@ libXmu, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xclip"; version = "0.13"; src = fetchFromGitHub { owner = "astrand"; repo = "xclip"; - rev = version; + rev = finalAttrs.version; sha256 = "0q0hmvcjlv8arhh1pzhja2wglyj6n7z209jnpnzd281kqqv4czcs"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; mainProgram = "xclip"; }; -} +}) diff --git a/pkgs/by-name/xc/xconq/package.nix b/pkgs/by-name/xc/xconq/package.nix index e9731e77e11c..b96e22314b06 100644 --- a/pkgs/by-name/xc/xconq/package.nix +++ b/pkgs/by-name/xc/xconq/package.nix @@ -15,12 +15,12 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xconq"; version = "7.5.0-0pre.0.20050612"; src = fetchurl { - url = "mirror://sourceforge/project/xconq/xconq/xconq-${version}/xconq-${version}.tar.gz"; + url = "mirror://sourceforge/project/xconq/xconq/xconq-${finalAttrs.version}/xconq-${finalAttrs.version}.tar.gz"; sha256 = "1za78yx57mgwcmmi33wx3533yz1x093dnqis8q2qmqivxav51lca"; }; @@ -83,4 +83,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/xc/xcowsay/package.nix b/pkgs/by-name/xc/xcowsay/package.nix index 3787dabd39bd..41945ed107fb 100644 --- a/pkgs/by-name/xc/xcowsay/package.nix +++ b/pkgs/by-name/xc/xcowsay/package.nix @@ -12,12 +12,12 @@ fortune, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xcowsay"; version = "1.6"; src = fetchurl { - url = "http://www.nickg.me.uk/files/xcowsay-${version}.tar.gz"; + url = "http://www.nickg.me.uk/files/xcowsay-${finalAttrs.version}.tar.gz"; sha256 = "sha256-RqzoZP8o0tIfS3BY8CleGNAEGhIMEHipUfpDxOD1yMU="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ das_j ]; }; -} +}) diff --git a/pkgs/by-name/xc/xcpc/package.nix b/pkgs/by-name/xc/xcpc/package.nix index dcd7d22fb0d5..e15c4f1e540a 100644 --- a/pkgs/by-name/xc/xcpc/package.nix +++ b/pkgs/by-name/xc/xcpc/package.nix @@ -10,14 +10,14 @@ libepoxy, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.52.1"; pname = "xcpc"; src = fetchFromGitHub { owner = "ponceto"; repo = "xcpc-emulator"; - rev = "xcpc-${version}"; + rev = "xcpc-${finalAttrs.version}"; hash = "sha256-N4UfnCbebaAhx0490niMov/JqlrXt5goblWbW0ajkcc="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xcpc"; }; -} +}) diff --git a/pkgs/by-name/xc/xcruiser/package.nix b/pkgs/by-name/xc/xcruiser/package.nix index 637dbf9b8775..e37436dc7552 100644 --- a/pkgs/by-name/xc/xcruiser/package.nix +++ b/pkgs/by-name/xc/xcruiser/package.nix @@ -12,12 +12,12 @@ makeDesktopItem, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xcruiser"; version = "0.30"; src = fetchurl { - url = "mirror://sourceforge/xcruiser/xcruiser/xcruiser-${version}/xcruiser-${version}.tar.gz"; + url = "mirror://sourceforge/xcruiser/xcruiser/xcruiser-${finalAttrs.version}/xcruiser-${finalAttrs.version}.tar.gz"; sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "xcruiser"; }; -} +}) diff --git a/pkgs/by-name/xc/xcur2png/package.nix b/pkgs/by-name/xc/xcur2png/package.nix index 863fd2ec4e32..e7d5ce226844 100644 --- a/pkgs/by-name/xc/xcur2png/package.nix +++ b/pkgs/by-name/xc/xcur2png/package.nix @@ -10,14 +10,14 @@ xorgproto, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xcur2png"; version = "0.7.1"; src = fetchFromGitHub { owner = "eworm-de"; repo = "xcur2png"; - rev = version; + rev = finalAttrs.version; sha256 = "0858wn2p14bxpv9lvaz2bz1rk6zk0g8zgxf8iy595m8fqv4q2fya"; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ romildo ]; mainProgram = "xcur2png"; }; -} +}) diff --git a/pkgs/by-name/xd/xdaliclock/package.nix b/pkgs/by-name/xd/xdaliclock/package.nix index f7fbc9367f08..f1c9acd08902 100644 --- a/pkgs/by-name/xd/xdaliclock/package.nix +++ b/pkgs/by-name/xd/xdaliclock/package.nix @@ -7,12 +7,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdaliclock"; version = "2.49"; src = fetchurl { - url = "https://www.jwz.org/xdaliclock/xdaliclock-${version}.tar.gz"; + url = "https://www.jwz.org/xdaliclock/xdaliclock-${finalAttrs.version}.tar.gz"; hash = "sha256-jRTlt8IYZZ6EDLyU7kLQ2bktQztnj15IUpqUBvntXU8="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { downloadPage = "http://www.jwz.org/xdaliclock/"; mainProgram = "xdaliclock"; }; -} +}) diff --git a/pkgs/by-name/xd/xdelta/package.nix b/pkgs/by-name/xd/xdelta/package.nix index 81ad7b9b2502..0a3ac3683974 100644 --- a/pkgs/by-name/xd/xdelta/package.nix +++ b/pkgs/by-name/xd/xdelta/package.nix @@ -12,13 +12,13 @@ assert lzmaSupport -> xz != null; let mkWith = flag: name: if flag then "--with-${name}" else "--without-${name}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdelta"; version = "3.1.0"; src = fetchFromGitHub { sha256 = "09mmsalc7dwlvgrda56s2k927rpl3a5dzfa88aslkqcjnr790wjy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; repo = "xdelta-devel"; owner = "jmacd"; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { mainProgram = "xdelta3"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix index c4beca28d883..77df77dbbede 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix @@ -20,14 +20,14 @@ wayland, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-wlr"; version = "0.8.1"; src = fetchFromGitHub { owner = "emersion"; repo = "xdg-desktop-portal-wlr"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-FltwfZtxKdbJuDYVQJTTtEE/WHV5AaDnwPnAkN76qTY="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix index 248b333af041..ca9dc42fcfce 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix @@ -15,14 +15,14 @@ xdg-desktop-portal, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-xapp"; version = "1.1.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; - rev = version; + rev = finalAttrs.version; hash = "sha256-5gJmWj15jUVGhCf8jOl/eXHVisFdegbbx6pqz6btNTM="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.lgpl21Plus; }; -} +}) diff --git a/pkgs/by-name/xd/xdg-launch/package.nix b/pkgs/by-name/xd/xdg-launch/package.nix index 3f15b25238b4..a4f8df9ede25 100644 --- a/pkgs/by-name/xd/xdg-launch/package.nix +++ b/pkgs/by-name/xd/xdg-launch/package.nix @@ -12,7 +12,7 @@ libxrandr, libx11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-launch"; version = "1.12"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bbidulock"; repo = "xdg-launch"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-S/0Wn1T5MSOPN6QXkzfmygHL6XTAnnMJr5Z3fBzsHEw="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.ck3d ]; }; -} +}) diff --git a/pkgs/by-name/xd/xdg-utils-cxx/package.nix b/pkgs/by-name/xd/xdg-utils-cxx/package.nix index 9ca6987aa7d7..215de2313602 100644 --- a/pkgs/by-name/xd/xdg-utils-cxx/package.nix +++ b/pkgs/by-name/xd/xdg-utils-cxx/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-utils-cxx"; version = "1.0.1"; src = fetchFromGitHub { owner = "azubieta"; repo = "xdg-utils-cxx"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-hEN0xqZUNfMOIrw3q+x4kEFhYoqmyn7W3f2w8AGw2wI="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { mainProgram = "xdg-utils-cxx"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xd/xdo/package.nix b/pkgs/by-name/xd/xdo/package.nix index 6db6f50b0d8b..c7378e84ef1c 100644 --- a/pkgs/by-name/xd/xdo/package.nix +++ b/pkgs/by-name/xd/xdo/package.nix @@ -7,14 +7,14 @@ xcbutilwm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdo"; version = "0.5.7"; src = fetchFromGitHub { owner = "baskerville"; repo = "xdo"; - rev = version; + rev = finalAttrs.version; sha256 = "1h3jrygcjjbavdbkpx2hscsf0yf97gk487lzjdlvymd7dxdv9hy9"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xdo"; }; -} +}) diff --git a/pkgs/by-name/xd/xdotool/package.nix b/pkgs/by-name/xd/xdotool/package.nix index 96dc805e0c02..780d424c17f9 100644 --- a/pkgs/by-name/xd/xdotool/package.nix +++ b/pkgs/by-name/xd/xdotool/package.nix @@ -13,14 +13,14 @@ libXext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdotool"; version = "3.20211022.1"; src = fetchFromGitHub { owner = "jordansissel"; repo = "xdotool"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-XFiaiHHtUSNFw+xhUR29+2RUHOa+Eyj1HHfjCUjwd9k="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "xdotool"; }; -} +}) diff --git a/pkgs/by-name/xd/xdp-tools/package.nix b/pkgs/by-name/xd/xdp-tools/package.nix index 8863498ac4b1..3607ae911ad9 100644 --- a/pkgs/by-name/xd/xdp-tools/package.nix +++ b/pkgs/by-name/xd/xdp-tools/package.nix @@ -15,14 +15,14 @@ wireshark-cli, nukeReferences, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdp-tools"; version = "1.6.0"; src = fetchFromGitHub { owner = "xdp-project"; repo = "xdp-tools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Smu93zwZN2jn9bLkVRpyubqTUh8VnVFMGqzc9myryLU="; }; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xe/xe/package.nix b/pkgs/by-name/xe/xe/package.nix index 7cafdd4b2932..de8556711968 100644 --- a/pkgs/by-name/xe/xe/package.nix +++ b/pkgs/by-name/xe/xe/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xe"; version = "1.0"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = "xe"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-yek6flBhgjSeN3M695BglUfcbnUGp3skzWT2W/BxW8Y="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.pbsds ]; mainProgram = "xe"; }; -} +}) diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix index 708b89454fe6..f2d38142d9ef 100644 --- a/pkgs/by-name/xe/xed-editor/package.nix +++ b/pkgs/by-name/xe/xed-editor/package.nix @@ -21,14 +21,14 @@ itstool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xed-editor"; version = "3.8.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ZTrTCyyyUDbt+/kjb1+I/bOjwXcsYGYd5K9ebPjJTA8="; }; @@ -80,4 +80,4 @@ stdenv.mkDerivation rec { ]; mainProgram = "xed"; }; -} +}) diff --git a/pkgs/by-name/xe/xephem/package.nix b/pkgs/by-name/xe/xephem/package.nix index f57ce374bcce..d99d801b1db0 100644 --- a/pkgs/by-name/xe/xephem/package.nix +++ b/pkgs/by-name/xe/xephem/package.nix @@ -14,14 +14,14 @@ libxext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xephem"; version = "4.2.0"; src = fetchFromGitHub { owner = "XEphem"; repo = "XEphem"; - rev = version; + rev = finalAttrs.version; hash = "sha256-TuzXrWoJOAHg31DrJObPcHBXgtqR/KWKFRsqddPzL4c="; }; @@ -111,4 +111,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ EstebanMacanek ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/xf/xf86-input-cmt/package.nix b/pkgs/by-name/xf/xf86-input-cmt/package.nix index 057da069fb0b..2e7a21877d58 100644 --- a/pkgs/by-name/xf/xf86-input-cmt/package.nix +++ b/pkgs/by-name/xf/xf86-input-cmt/package.nix @@ -10,13 +10,13 @@ libevdevc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-cmt"; version = "2.0.2"; src = fetchFromGitHub { owner = "hugegreenbug"; repo = "xf86-input-cmt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1cnwf518nc0ybc1r3rsgc1gcql1k3785khffv0i4v3akrm9wdw98"; }; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { homepage = "https://www.github.com/hugegreenbug/xf86-input-cmt"; maintainers = with lib.maintainers; [ kcalvinalvin ]; }; -} +}) diff --git a/pkgs/by-name/xf/xf86-input-wacom/package.nix b/pkgs/by-name/xf/xf86-input-wacom/package.nix index d8c6060368b1..7eb6174e950f 100644 --- a/pkgs/by-name/xf/xf86-input-wacom/package.nix +++ b/pkgs/by-name/xf/xf86-input-wacom/package.nix @@ -19,14 +19,14 @@ xorgserver, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-wacom"; version = "1.2.4"; src = fetchFromGitHub { owner = "linuxwacom"; repo = "xf86-input-wacom"; - rev = "xf86-input-wacom-${version}"; + rev = "xf86-input-wacom-${finalAttrs.version}"; sha256 = "sha256-12m9PL28NnqIwNpGHOFqjJaNrzBaagdG3Sp/jSLpgkE="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; # Probably, works with other unixes as well }; -} +}) diff --git a/pkgs/by-name/xf/xfce4-power-manager/package.nix b/pkgs/by-name/xf/xfce4-power-manager/package.nix index b32bb82307cb..b7c95754b531 100644 --- a/pkgs/by-name/xf/xfce4-power-manager/package.nix +++ b/pkgs/by-name/xf/xfce4-power-manager/package.nix @@ -56,12 +56,15 @@ stdenv.mkDerivation (finalAttrs: { # using /run/current-system/sw/bin instead of nix store path prevents polkit permission errors on # rebuild. See https://github.com/NixOS/nixpkgs/issues/77485 postPatch = '' - substituteInPlace src/org.xfce.power.policy.in.in --replace-fail "@sbindir@" "/run/current-system/sw/bin" substituteInPlace common/xfpm-brightness-polkit.c --replace-fail "SBINDIR" "\"/run/current-system/sw/bin\"" substituteInPlace src/xfpm-suspend.c --replace-fail "SBINDIR" "\"/run/current-system/sw/bin\"" ''; - configureFlags = [ "--enable-maintainer-mode" ]; + configureFlags = [ + "--enable-maintainer-mode" + "--sbindir=\${out}/bin" + ]; + enableParallelBuilding = true; passthru.updateScript = gitUpdater { diff --git a/pkgs/by-name/xf/xfe/package.nix b/pkgs/by-name/xf/xfe/package.nix index 24d2187bb817..081e9f9b766b 100644 --- a/pkgs/by-name/xf/xfe/package.nix +++ b/pkgs/by-name/xf/xfe/package.nix @@ -16,12 +16,12 @@ libx11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfe"; version = "2.1.2"; src = fetchurl { - url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz"; + url = "mirror://sourceforge/xfe/xfe-${finalAttrs.version}.tar.xz"; sha256 = "sha256-jgDgd/DOB92v19SAGqBnTHIYQE+EohgDvvFCwTNDJlE="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xf/xfstests/package.nix b/pkgs/by-name/xf/xfstests/package.nix index 64df41aea1bb..ee6bf53c0c1d 100644 --- a/pkgs/by-name/xf/xfstests/package.nix +++ b/pkgs/by-name/xf/xfstests/package.nix @@ -32,12 +32,12 @@ runtimeShell, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfstests"; version = "2023.05.14"; src = fetchzip { - url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/snapshot/xfstests-dev-v${version}.tar.gz"; + url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/snapshot/xfstests-dev-v${finalAttrs.version}.tar.gz"; hash = "sha256-yyjY9Q3eUH+q+o15zFUjOcNz1HpXPCwdcxWXoycOx98="; }; @@ -163,4 +163,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xfstests-check"; }; -} +}) diff --git a/pkgs/by-name/xg/xgalagapp/package.nix b/pkgs/by-name/xg/xgalagapp/package.nix index a6f974529f17..36535de44ad8 100644 --- a/pkgs/by-name/xg/xgalagapp/package.nix +++ b/pkgs/by-name/xg/xgalagapp/package.nix @@ -6,11 +6,11 @@ libXpm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xgalaga++"; version = "0.9"; src = fetchurl { - url = "https://marc.mongenet.ch/OSS/XGalaga/xgalaga++_${version}.tar.gz"; + url = "https://marc.mongenet.ch/OSS/XGalaga/xgalaga++_${finalAttrs.version}.tar.gz"; sha256 = "sha256-yNtLuYCMHLvQAVM7CDGPardrh3q27TE9l31qhUbMf8k="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/xg/xgeometry-select/package.nix b/pkgs/by-name/xg/xgeometry-select/package.nix index 5fb11d9119fd..9e9eac5cfbbc 100644 --- a/pkgs/by-name/xg/xgeometry-select/package.nix +++ b/pkgs/by-name/xg/xgeometry-select/package.nix @@ -5,7 +5,7 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xgeometry-select"; version = "0.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; buildPhase = '' - gcc -Wall -lX11 ${src} -o xgeometry-select + gcc -Wall -lX11 ${finalAttrs.src} -o xgeometry-select ''; installPhase = '' @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xgeometry-select"; }; -} +}) diff --git a/pkgs/by-name/xi/xits-math/package.nix b/pkgs/by-name/xi/xits-math/package.nix index 182973f60e79..37c0fad2656a 100644 --- a/pkgs/by-name/xi/xits-math/package.nix +++ b/pkgs/by-name/xi/xits-math/package.nix @@ -5,14 +5,14 @@ python3Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xits-math"; version = "1.302"; src = fetchFromGitHub { owner = "alif-type"; repo = "xits"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1x3r505dylz9rz8dj98h5n9d0zixyxmvvhnjnms9qxdrz9bxy9g1"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/xk/xkb-switch-i3/package.nix b/pkgs/by-name/xk/xkb-switch-i3/package.nix index 210a37c4ce04..13427370089e 100644 --- a/pkgs/by-name/xk/xkb-switch-i3/package.nix +++ b/pkgs/by-name/xk/xkb-switch-i3/package.nix @@ -12,14 +12,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xkb-switch-i3"; version = "2.0.1"; src = fetchFromGitHub { owner = "Zebradil"; repo = "xkb-switch-i3"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5d1DdRtz0QCWISSsWQt9xgTOekYUCkhfMsjG+/kyQK4="; fetchSubmodules = true; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xkb-switch"; }; -} +}) diff --git a/pkgs/by-name/xk/xkb-switch/package.nix b/pkgs/by-name/xk/xkb-switch/package.nix index cbe5794ee342..969344600454 100644 --- a/pkgs/by-name/xk/xkb-switch/package.nix +++ b/pkgs/by-name/xk/xkb-switch/package.nix @@ -7,14 +7,14 @@ libxkbfile, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xkb-switch"; version = "1.8.5"; src = fetchFromGitHub { owner = "ierton"; repo = "xkb-switch"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-DZAIL6+D+Hgs+fkJwRaQb9BHrEjAkxiqhOZyrR+Mpuk="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xkb-switch"; }; -} +}) diff --git a/pkgs/by-name/xk/xkblayout-state/package.nix b/pkgs/by-name/xk/xkblayout-state/package.nix index 4868eb959566..06e48c2c2a2e 100644 --- a/pkgs/by-name/xk/xkblayout-state/package.nix +++ b/pkgs/by-name/xk/xkblayout-state/package.nix @@ -5,14 +5,14 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xkblayout-state"; version = "1b"; src = fetchFromGitHub { owner = "nonpop"; repo = "xkblayout-state"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-diorqwDEBdzcBteKvhRisQaY3bx5seaOaWSaPwBkWDo="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xkblayout-state"; }; -} +}) diff --git a/pkgs/by-name/xk/xkbmon/package.nix b/pkgs/by-name/xk/xkbmon/package.nix index 798e3f3ca80d..9ac85eeacb4b 100644 --- a/pkgs/by-name/xk/xkbmon/package.nix +++ b/pkgs/by-name/xk/xkbmon/package.nix @@ -6,14 +6,14 @@ libxcb, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xkbmon"; version = "0.4"; src = fetchFromGitHub { owner = "xkbmon"; repo = "xkbmon"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-EWW6L6NojzXodDOET01LMcQT8/1JIMpOD++MCiM3j1Y="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.romildo ]; mainProgram = "xkbmon"; }; -} +}) diff --git a/pkgs/by-name/xl/xl2tpd/package.nix b/pkgs/by-name/xl/xl2tpd/package.nix index 9ce06a11249a..4d0a575997fb 100644 --- a/pkgs/by-name/xl/xl2tpd/package.nix +++ b/pkgs/by-name/xl/xl2tpd/package.nix @@ -6,14 +6,14 @@ ppp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xl2tpd"; version = "1.3.19"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Oyy64b5xrKOYSkiCtWksh0vKGDXHsmUNlNgVTRXftOw="; }; @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -std=gnu17"; meta = { - homepage = src.meta.homepage; + homepage = finalAttrs.src.meta.homepage; description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)"; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/xl/xlibinput-calibrator/package.nix b/pkgs/by-name/xl/xlibinput-calibrator/package.nix index ec4f0d154c88..9f8b08240c65 100644 --- a/pkgs/by-name/xl/xlibinput-calibrator/package.nix +++ b/pkgs/by-name/xl/xlibinput-calibrator/package.nix @@ -8,14 +8,14 @@ txt2man, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xlibinput-calibrator"; version = "0.11"; src = fetchFromGitHub { owner = "kreijack"; repo = "xlibinput_calibrator"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-MvlamN8WSER0zN9Ru3Kr2MFARD9s7PYKkRtyD8s6ZPI="; }; @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { description = "Touch calibrator for libinput"; mainProgram = "xlibinput_calibrator"; homepage = "https://github.com/kreijack/xlibinput_calibrator"; - changelog = "https://github.com/kreijack/xlibinput_calibrator/blob/${src.rev}/Changelog"; + changelog = "https://github.com/kreijack/xlibinput_calibrator/blob/${finalAttrs.src.rev}/Changelog"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ atemu ]; }; -} +}) diff --git a/pkgs/by-name/xl/xlogo/package.nix b/pkgs/by-name/xl/xlogo/package.nix index 546a8f2b8b9a..4e76c9e43947 100644 --- a/pkgs/by-name/xl/xlogo/package.nix +++ b/pkgs/by-name/xl/xlogo/package.nix @@ -13,7 +13,7 @@ util-macros, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xlogo"; version = "1.0.7"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { group = "xorg"; owner = "app"; repo = "xlogo"; - tag = "xlogo-${version}"; + tag = "xlogo-${finalAttrs.version}"; hash = "sha256-KjJhuiFVn34vEZbC7ds4MrcXCHq9PcIpAuaCGBX/EXc="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; mainProgram = "xlogo"; }; -} +}) diff --git a/pkgs/by-name/xl/xlslib/package.nix b/pkgs/by-name/xl/xlslib/package.nix index 04577f7313f7..d29295301615 100644 --- a/pkgs/by-name/xl/xlslib/package.nix +++ b/pkgs/by-name/xl/xlslib/package.nix @@ -6,12 +6,12 @@ unzip, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xlslib"; version = "2.5.0"; src = fetchurl { - url = "mirror://sourceforge/xlslib/xlslib-package-${version}.zip"; + url = "mirror://sourceforge/xlslib/xlslib-package-${finalAttrs.version}.zip"; sha256 = "1wx3jbpkz2rvgs45x6mwawamd1b2llb0vn29b5sr0rfxzx9d1985"; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/xm/xmagnify/package.nix b/pkgs/by-name/xm/xmagnify/package.nix index d411466f5b06..edeae3fbaec5 100644 --- a/pkgs/by-name/xm/xmagnify/package.nix +++ b/pkgs/by-name/xm/xmagnify/package.nix @@ -6,14 +6,14 @@ xorgproto, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xmagnify"; version = "0.1.0"; src = fetchFromGitLab { owner = "amiloradovsky"; repo = "magnify"; - rev = version; + rev = finalAttrs.version; sha256 = "1ngnp5f5zl3v35vhbdyjpymy6mwrs0476fm5nd7dzkba7n841jdh"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { mainProgram = "magnify"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/xm/xml2/package.nix b/pkgs/by-name/xm/xml2/package.nix index a53946e5c7a3..8cb020900b27 100644 --- a/pkgs/by-name/xm/xml2/package.nix +++ b/pkgs/by-name/xm/xml2/package.nix @@ -6,12 +6,12 @@ libxml2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xml2"; version = "0.5"; src = fetchurl { - url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-${version}.tar.gz"; + url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-${finalAttrs.version}.tar.gz"; sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.rycee ]; }; -} +}) diff --git a/pkgs/by-name/xm/xmlsec/package.nix b/pkgs/by-name/xm/xmlsec/package.nix index 8a69af613232..0d0d713b443a 100644 --- a/pkgs/by-name/xm/xmlsec/package.nix +++ b/pkgs/by-name/xm/xmlsec/package.nix @@ -17,16 +17,16 @@ lib.fix ( self: - stdenv.mkDerivation rec { + stdenv.mkDerivation (finalAttrs: { pname = "xmlsec"; version = "1.3.7"; src = fetchurl { urls = [ - "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz" + "https://www.aleksey.com/xmlsec/download/xmlsec1-${finalAttrs.version}.tar.gz" - # for when the ${version} gets older than the last two - "https://www.aleksey.com/xmlsec/download/older-releases/xmlsec1-${version}.tar.gz" + # for when the ${finalAttrs.version} gets older than the last two + "https://www.aleksey.com/xmlsec/download/older-releases/xmlsec1-${finalAttrs.version}.tar.gz" ]; hash = "sha256-2C6TtpuKogWmFrYpF6JpMiv2Oj6q+zd1AU5hdSsgE+o="; }; @@ -124,5 +124,5 @@ lib.fix ( maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; }; - } + }) ) diff --git a/pkgs/by-name/xm/xmlstarlet/package.nix b/pkgs/by-name/xm/xmlstarlet/package.nix index 4616e388c280..d012cd304a88 100644 --- a/pkgs/by-name/xm/xmlstarlet/package.nix +++ b/pkgs/by-name/xm/xmlstarlet/package.nix @@ -9,12 +9,12 @@ libxslt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xmlstarlet"; version = "1.6.1"; src = fetchurl { - url = "mirror://sourceforge/xmlstar/xmlstarlet-${version}.tar.gz"; + url = "mirror://sourceforge/xmlstar/xmlstarlet-${finalAttrs.version}.tar.gz"; sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m"; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { mainProgram = "xmlstarlet"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/xm/xmousepasteblock/package.nix b/pkgs/by-name/xm/xmousepasteblock/package.nix index 4304632e50e6..10eab1242619 100644 --- a/pkgs/by-name/xm/xmousepasteblock/package.nix +++ b/pkgs/by-name/xm/xmousepasteblock/package.nix @@ -9,14 +9,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xmousepasteblock"; version = "1.4"; src = fetchFromGitHub { owner = "milaq"; repo = "XMousePasteBlock"; hash = "sha256-uHlHGVnIro6X4kRp79ibtqMmiv2XQT+zgbQagUxdB0c="; - rev = version; + rev = finalAttrs.version; }; makeFlags = [ "PREFIX=$(out)" @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "xmousepasteblock"; }; -} +}) diff --git a/pkgs/by-name/xm/xmpp-bridge/package.nix b/pkgs/by-name/xm/xmpp-bridge/package.nix index 68f13d58c0b3..14dc4375de6c 100644 --- a/pkgs/by-name/xm/xmpp-bridge/package.nix +++ b/pkgs/by-name/xm/xmpp-bridge/package.nix @@ -7,14 +7,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xmpp-bridge"; version = "0.6.0"; src = fetchFromGitHub { owner = "majewsky"; repo = "xmpp-bridge"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-JXhVi2AiV/PmWPfoQJl/N92GAZQ9UxReAiCkiDxgdFY="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/xm/xmppc/package.nix b/pkgs/by-name/xm/xmppc/package.nix index 8489f71a5bf7..95ec0f3e21fe 100644 --- a/pkgs/by-name/xm/xmppc/package.nix +++ b/pkgs/by-name/xm/xmppc/package.nix @@ -10,7 +10,7 @@ gpgme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xmppc"; version = "0.1.2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "Anoxinon_e.V."; repo = "xmppc"; - rev = version; + rev = finalAttrs.version; sha256 = "07cy3j4g7vycagdiva3dqb59361lw7s5f2yydpczmyih29v7hkm8"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.jugendhacker ]; }; -} +}) diff --git a/pkgs/by-name/xm/xmrig-proxy/package.nix b/pkgs/by-name/xm/xmrig-proxy/package.nix index 1295be6a8407..70af5d2d7337 100644 --- a/pkgs/by-name/xm/xmrig-proxy/package.nix +++ b/pkgs/by-name/xm/xmrig-proxy/package.nix @@ -8,14 +8,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xmrig-proxy"; version = "6.24.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-4Kqxf9i5OTplWg72ihTJ4QHvwWC8r73EACErYNZ7wjc="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aij ]; }; -} +}) diff --git a/pkgs/by-name/xn/xnbd/package.nix b/pkgs/by-name/xn/xnbd/package.nix index a78ea536eb60..39b92afc9f26 100644 --- a/pkgs/by-name/xn/xnbd/package.nix +++ b/pkgs/by-name/xn/xnbd/package.nix @@ -8,16 +8,16 @@ jansson, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xnbd"; version = "0.4.0"; src = fetchurl { - url = "https://bitbucket.org/hirofuchi/xnbd/downloads/xnbd-${version}.tgz"; + url = "https://bitbucket.org/hirofuchi/xnbd/downloads/xnbd-${finalAttrs.version}.tgz"; sha256 = "00wkvsa0yaq4mabczcbfpj6rjvp02yahw8vdrq8hgb3wpm80x913"; }; - sourceRoot = "xnbd-${version}/trunk"; + sourceRoot = "xnbd-${finalAttrs.version}/trunk"; patches = [ ./0001-Fix-build-for-glibc-2.28.patch ]; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xn/xnotify/package.nix b/pkgs/by-name/xn/xnotify/package.nix index d7ec60ea24b7..f2a8d1a52a09 100644 --- a/pkgs/by-name/xn/xnotify/package.nix +++ b/pkgs/by-name/xn/xnotify/package.nix @@ -11,14 +11,14 @@ conf ? null, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xnotify"; version = "0.9.3"; src = fetchFromGitHub { owner = "phillbush"; repo = "xnotify"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-RfnmiAEFTPqQZursyVPDIZ6J3KBouvaaxyhTc1liqBc="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "xnotify"; }; -} +}) diff --git a/pkgs/by-name/xp/xpano/package.nix b/pkgs/by-name/xp/xpano/package.nix index e07014097bc8..28ca612953f3 100644 --- a/pkgs/by-name/xp/xpano/package.nix +++ b/pkgs/by-name/xp/xpano/package.nix @@ -14,14 +14,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xpano"; version = "0.19.3"; src = fetchFromGitHub { owner = "krupkat"; repo = "xpano"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-f2qoBpZ5lPBocPas8KMsY5bSYL20gO+ZHLz2R66qSig="; fetchSubmodules = true; }; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { description = "Panorama stitching tool"; mainProgram = "Xpano"; homepage = "https://krupkat.github.io/xpano/"; - changelog = "https://github.com/krupkat/xpano/releases/tag/v${version}"; + changelog = "https://github.com/krupkat/xpano/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ krupkat ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xp/xplugd/package.nix b/pkgs/by-name/xp/xplugd/package.nix index 1d7cea09fc74..a4367578dec3 100644 --- a/pkgs/by-name/xp/xplugd/package.nix +++ b/pkgs/by-name/xp/xplugd/package.nix @@ -10,14 +10,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xplugd"; version = "1.4"; src = fetchFromGitHub { owner = "troglobit"; repo = "xplugd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "11vjr69prrs4ir9c267zwq4g9liipzrqi0kmw1zg95dbn7r7zmql"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ akho ]; mainProgram = "xplugd"; }; -} +}) diff --git a/pkgs/by-name/xp/xprompt/package.nix b/pkgs/by-name/xp/xprompt/package.nix index d7ea92df2de6..e36ee63af878 100644 --- a/pkgs/by-name/xp/xprompt/package.nix +++ b/pkgs/by-name/xp/xprompt/package.nix @@ -11,14 +11,14 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xprompt"; version = "2.5.0"; src = fetchFromGitHub { owner = "phillbush"; repo = "xprompt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-pOayKngUlrMY3bFsP4Fi+VsOLKCUQU3tdkZ+0OY1SCo="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "xprompt"; }; -} +}) diff --git a/pkgs/by-name/xq/xqilla/package.nix b/pkgs/by-name/xq/xqilla/package.nix index d5a242eb1f96..a76ccea14a00 100644 --- a/pkgs/by-name/xq/xqilla/package.nix +++ b/pkgs/by-name/xq/xqilla/package.nix @@ -6,12 +6,12 @@ xercesc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xqilla"; version = "2.3.4"; src = fetchurl { - url = "mirror://sourceforge/xqilla/XQilla-${version}.tar.gz"; + url = "mirror://sourceforge/xqilla/XQilla-${finalAttrs.version}.tar.gz"; sha256 = "0m9z7diw7pdyb4qycbqyr2x55s13v8310xsi7yz0inpw27q4vzdd"; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ obadz ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix index d497b6edb27a..a0cfb45c08cc 100644 --- a/pkgs/by-name/xr/xreader/package.nix +++ b/pkgs/by-name/xr/xreader/package.nix @@ -35,14 +35,14 @@ ], }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xreader"; version = "4.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xreader"; - rev = version; + rev = finalAttrs.version; hash = "sha256-lVJFNOiayAai/Lg4tl8lNaK5fdTlZ0ptzstUzciH1mA="; }; @@ -93,4 +93,4 @@ document formats like PDF and Postscript"; platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/xr/xrectsel/package.nix b/pkgs/by-name/xr/xrectsel/package.nix index 38d431b73632..d02d0a086dd8 100644 --- a/pkgs/by-name/xr/xrectsel/package.nix +++ b/pkgs/by-name/xr/xrectsel/package.nix @@ -6,14 +6,14 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xrectsel"; version = "0.3.2"; src = fetchFromGitHub { owner = "ropery"; repo = "xrectsel"; - rev = version; + rev = finalAttrs.version; sha256 = "0prl4ky3xzch6xcb673mcixk998d40ngim5dqc5374b1ls2r6n7l"; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xrectsel"; }; -} +}) diff --git a/pkgs/by-name/xr/xrestop/package.nix b/pkgs/by-name/xr/xrestop/package.nix index b25686132946..1c29ac6c8d42 100644 --- a/pkgs/by-name/xr/xrestop/package.nix +++ b/pkgs/by-name/xr/xrestop/package.nix @@ -9,12 +9,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xrestop"; version = "0.6"; src = fetchurl { - url = "https://xorg.freedesktop.org/archive/individual/app/xrestop-${version}.tar.xz"; + url = "https://xorg.freedesktop.org/archive/individual/app/xrestop-${finalAttrs.version}.tar.xz"; hash = "sha256-Li7BEcSyeYtdwtwrPsevT2smGUbpA7jhTbBGgx0gOyk="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "xrestop"; }; -} +}) diff --git a/pkgs/by-name/xs/xsane/package.nix b/pkgs/by-name/xs/xsane/package.nix index 0e953e621821..26a580f0d76b 100644 --- a/pkgs/by-name/xs/xsane/package.nix +++ b/pkgs/by-name/xs/xsane/package.nix @@ -15,7 +15,7 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xsane"; version = "0.999"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "frontend"; group = "sane-project"; repo = "xsane"; - rev = version; + rev = finalAttrs.version; hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM="; }; @@ -143,4 +143,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xs/xschem/package.nix b/pkgs/by-name/xs/xschem/package.nix index ebaf08026704..b0b569705770 100644 --- a/pkgs/by-name/xs/xschem/package.nix +++ b/pkgs/by-name/xs/xschem/package.nix @@ -12,14 +12,14 @@ tk, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xschem"; version = "3.4.7"; src = fetchFromGitHub { owner = "StefanSchippers"; repo = "xschem"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ye97VJQ+2F2UbFLmGrZ8xSK9xFeF+Yies6fJKurPOD0="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ fbeffa ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/xs/xsecurelock/package.nix b/pkgs/by-name/xs/xsecurelock/package.nix index 4711bdaf623b..7a7c205d45f9 100644 --- a/pkgs/by-name/xs/xsecurelock/package.nix +++ b/pkgs/by-name/xs/xsecurelock/package.nix @@ -19,14 +19,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xsecurelock"; version = "1.9.0"; src = fetchFromGitHub { owner = "google"; repo = "xsecurelock"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-OPasi5zmvmcWnVCj/dU2KprzNmar51zDElD23750yk4="; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { preConfigure = '' cat > version.c <<'EOF' - const char *const git_version = "${version}"; + const char *const git_version = "${finalAttrs.version}"; EOF ''; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "xsecurelock"; }; -} +}) diff --git a/pkgs/by-name/xs/xsettingsd/package.nix b/pkgs/by-name/xs/xsettingsd/package.nix index 69d5fc5a591d..88564193e0cb 100644 --- a/pkgs/by-name/xs/xsettingsd/package.nix +++ b/pkgs/by-name/xs/xsettingsd/package.nix @@ -7,14 +7,14 @@ libX11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xsettingsd"; version = "1.0.2"; src = fetchFromGitHub { owner = "derat"; repo = "xsettingsd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-CIYshZqJICuL8adKHIN4R6nudaqWOCK2UPrGhsKf9pE="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xsettingsd"; }; -} +}) diff --git a/pkgs/by-name/xs/xskat/package.nix b/pkgs/by-name/xs/xskat/package.nix index 0011c70a3b2a..6e8115c3a04a 100644 --- a/pkgs/by-name/xs/xskat/package.nix +++ b/pkgs/by-name/xs/xskat/package.nix @@ -7,7 +7,7 @@ gccmakedep, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xskat"; version = "4.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://web.archive.org/web/20220331112433if_/https://www.xskat.de/xskat-${version}.tar.gz"; + url = "https://web.archive.org/web/20220331112433if_/https://www.xskat.de/xskat-${finalAttrs.version}.tar.gz"; sha256 = "8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { longDescription = "Play the german card game Skat against the AI or over IRC."; homepage = "https://web.archive.org/web/20221003060115/https://www.xskat.de/xskat.html"; }; -} +}) diff --git a/pkgs/by-name/xs/xsnow/package.nix b/pkgs/by-name/xs/xsnow/package.nix index 6843638ed7ef..6a6246af0c6c 100644 --- a/pkgs/by-name/xs/xsnow/package.nix +++ b/pkgs/by-name/xs/xsnow/package.nix @@ -13,12 +13,12 @@ libxkbcommon, gsl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xsnow"; version = "3.9.0"; src = fetchurl { - url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; + url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${finalAttrs.version}.tar.gz"; sha256 = "sha256-PMZsxZUmVHZwU6+KBPMq8sjyt42jlrXazgk7DGc9bvo="; }; @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/xs/xsos/package.nix b/pkgs/by-name/xs/xsos/package.nix index 8416d6abea93..7433646599c4 100644 --- a/pkgs/by-name/xs/xsos/package.nix +++ b/pkgs/by-name/xs/xsos/package.nix @@ -23,14 +23,14 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xsos"; version = "0.7.33"; src = fetchFromGitHub { owner = "ryran"; repo = "xsos"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-VEOY422/+4veMlN9HOtPB/THDiFLNnRfbUJpKjc/cqE="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { ]; maintainers = [ lib.maintainers.nixinator ]; }; -} +}) diff --git a/pkgs/by-name/xs/xssproxy/package.nix b/pkgs/by-name/xs/xssproxy/package.nix index fbe4d210cd77..362586c1dc5c 100644 --- a/pkgs/by-name/xs/xssproxy/package.nix +++ b/pkgs/by-name/xs/xssproxy/package.nix @@ -9,14 +9,14 @@ dbus, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xssproxy"; version = "1.1.2"; src = fetchFromGitHub { owner = "vincentbernat"; repo = "xssproxy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-6M82gQZcgjqZBGw4YszAF0DmS+JXgFp6hl2gOF1RWAs="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ benley ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/xs/xsuspender/package.nix b/pkgs/by-name/xs/xsuspender/package.nix index 70ad20efe2a0..95db286b02fb 100644 --- a/pkgs/by-name/xs/xsuspender/package.nix +++ b/pkgs/by-name/xs/xsuspender/package.nix @@ -10,14 +10,14 @@ procps, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xsuspender"; version = "1.3"; src = fetchFromGitHub { owner = "kernc"; repo = "xsuspender"; - rev = version; + rev = finalAttrs.version; sha256 = "1c6ab1s9bbkjbmcfv2mny273r66dlz7sgxsmzfwi0fm2vcb2lwim"; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ offline ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xs/xsynth_dssi/package.nix b/pkgs/by-name/xs/xsynth_dssi/package.nix deleted file mode 100644 index 09ee1880fcb9..000000000000 --- a/pkgs/by-name/xs/xsynth_dssi/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - alsa-lib, - autoconf, - automake, - dssi, - gtk2, - libjack2, - ladspaH, - ladspaPlugins, - liblo, - pkg-config, -}: - -stdenv.mkDerivation rec { - pname = "xsynth-dssi"; - version = "0.9.4"; - - src = fetchurl { - url = "mirror://sourceforge/dssi/${pname}-${version}.tar.gz"; - sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; - }; - - nativeBuildInputs = [ - autoconf - automake - pkg-config - ]; - buildInputs = [ - alsa-lib - dssi - gtk2 - libjack2 - ladspaH - ladspaPlugins - liblo - ]; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/lib - cp src/Xsynth_gtk $out/bin - cp src/.libs/* $out/lib - ''; - - meta = { - description = "Classic-analog (VCOs-VCF-VCA) style software synthesizer"; - mainProgram = "Xsynth_gtk"; - longDescription = '' - Xsynth-DSSI is a classic-analog (VCOs-VCF-VCA) style software - synthesizer which operates as a plugin for the DSSI Soft Synth - Interface. DSSI is a plugin API for software instruments (soft - synths) with user interfaces, permitting them to be hosted - in-process by audio applications. - ''; - homepage = "https://dssi.sourceforge.net/download.html#Xsynth-DSSI"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/by-name/xt/xteddy/package.nix b/pkgs/by-name/xt/xteddy/package.nix index dca7ac5c9caf..07561e7e5cdb 100644 --- a/pkgs/by-name/xt/xteddy/package.nix +++ b/pkgs/by-name/xt/xteddy/package.nix @@ -9,14 +9,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xteddy"; version = "2.2-5"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "games-team"; repo = "xteddy"; - rev = "debian/${version}"; + rev = "debian/${finalAttrs.version}"; sha256 = "0rm7w78d6qajq4fvi4agyqm0c70f3c1i0cy2jdb6kqql2k8w78qy"; }; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { ]; patches = [ - "${src}/debian/patches/10_libXext.patch" - "${src}/debian/patches/wrong-man-page-section.patch" + "${finalAttrs.src}/debian/patches/10_libXext.patch" + "${finalAttrs.src}/debian/patches/wrong-man-page-section.patch" ]; postPatch = '' @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.xaverdh ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/xt/xtermcontrol/package.nix b/pkgs/by-name/xt/xtermcontrol/package.nix index ad7fdf0ba1d8..31fa41c84f95 100644 --- a/pkgs/by-name/xt/xtermcontrol/package.nix +++ b/pkgs/by-name/xt/xtermcontrol/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.10"; pname = "xtermcontrol"; src = fetchurl { - url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; + url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${finalAttrs.version}.tar.gz"; sha256 = "sha256-Prl7HZ2KrhutT+LEHKOj27ENLWfmykWZqh9jGkBQPe4="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.derchris ]; mainProgram = "xtermcontrol"; }; -} +}) diff --git a/pkgs/by-name/xt/xtitle/package.nix b/pkgs/by-name/xt/xtitle/package.nix index 964ec14490ff..6c4893ac1836 100644 --- a/pkgs/by-name/xt/xtitle/package.nix +++ b/pkgs/by-name/xt/xtitle/package.nix @@ -8,14 +8,14 @@ git, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xtitle"; version = "0.4.4"; src = fetchFromGitHub { owner = "baskerville"; repo = "xtitle"; - rev = version; + rev = finalAttrs.version; hash = "sha256-SVfM2vCCacgchXj0c0sPk3VR6DUI4R0ofFnxJSY4oDg="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xtitle"; }; -} +}) diff --git a/pkgs/by-name/xt/xtrace/package.nix b/pkgs/by-name/xt/xtrace/package.nix index 662ae159293b..51af4adeead9 100644 --- a/pkgs/by-name/xt/xtrace/package.nix +++ b/pkgs/by-name/xt/xtrace/package.nix @@ -8,7 +8,7 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xtrace"; version = "1.4.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "debian"; repo = "xtrace"; - rev = "xtrace-${version}"; + rev = "xtrace-${finalAttrs.version}"; sha256 = "1yff6x847nksciail9jly41mv70sl8sadh0m5d847ypbjmxcwjpq"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; mainProgram = "xtrace"; }; -} +}) diff --git a/pkgs/by-name/xt/xtris/package.nix b/pkgs/by-name/xt/xtris/package.nix index 424d6a30206f..d0a189acc515 100644 --- a/pkgs/by-name/xt/xtris/package.nix +++ b/pkgs/by-name/xt/xtris/package.nix @@ -4,12 +4,12 @@ fetchzip, libx11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xtris"; version = "1.15"; src = fetchzip { - url = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris-${version}.tar.gz"; + url = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris-${finalAttrs.version}.tar.gz"; sha256 = "1vqva99lyv7r6f9c7yikk8ahcfh9aq3clvwm4pz964wlbr9mj1v6"; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/xt/xtuner/package.nix b/pkgs/by-name/xt/xtuner/package.nix index 74d3b3102dc7..0e3770b7285d 100644 --- a/pkgs/by-name/xt/xtuner/package.nix +++ b/pkgs/by-name/xt/xtuner/package.nix @@ -13,14 +13,14 @@ fftwFloat, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xtuner"; version = "1.0"; src = fetchFromGitHub { owner = "brummer10"; repo = "XTuner"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "1i5chfnf3hcivwzni9z6cn9pb68qmwsx8bf4z7d29a5vig8kbhrv"; fetchSubmodules = true; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xtuner"; }; -} +}) diff --git a/pkgs/by-name/xv/xva-img/package.nix b/pkgs/by-name/xv/xva-img/package.nix index 32ba5ad35fd1..3f5d910d722e 100644 --- a/pkgs/by-name/xv/xva-img/package.nix +++ b/pkgs/by-name/xv/xva-img/package.nix @@ -7,14 +7,14 @@ xxHash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xva-img"; version = "1.5"; src = fetchFromGitHub { owner = "eriklax"; repo = "xva-img"; - tag = version; + tag = finalAttrs.version; hash = "sha256-YyWfN6VcEABmzHkkoA/kRehLum1UxsNJ58XBs1pl+c8="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "xva-img"; }; -} +}) diff --git a/pkgs/by-name/xv/xviewer/package.nix b/pkgs/by-name/xv/xviewer/package.nix index f1e3b2a45077..9347aed1b81c 100644 --- a/pkgs/by-name/xv/xviewer/package.nix +++ b/pkgs/by-name/xv/xviewer/package.nix @@ -27,14 +27,14 @@ xapp-symbolic-icons, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xviewer"; version = "3.4.16"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xviewer"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ayd91gVLuSUVlCxaPSBbx7hg4tthVTaBEnl5V9YYbQw="; }; @@ -93,4 +93,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ tu-maurice ]; teams = [ lib.teams.cinnamon ]; }; -} +}) diff --git a/pkgs/by-name/xv/xvkbd/package.nix b/pkgs/by-name/xv/xvkbd/package.nix index 40ca170fb90d..84c65b6f53e1 100644 --- a/pkgs/by-name/xv/xvkbd/package.nix +++ b/pkgs/by-name/xv/xvkbd/package.nix @@ -12,11 +12,11 @@ Xaw3d, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xvkbd"; version = "4.1"; src = fetchurl { - url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-${version}.tar.gz"; + url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-${finalAttrs.version}.tar.gz"; sha256 = "1x5yldv9y99cw5hzzs73ygdn1z80zns9hz0baa355r711zghfbcm"; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xvkbd"; }; -} +}) diff --git a/pkgs/by-name/xw/xwallpaper/package.nix b/pkgs/by-name/xw/xwallpaper/package.nix index 1e2a9af5ab01..182721cc68ff 100644 --- a/pkgs/by-name/xw/xwallpaper/package.nix +++ b/pkgs/by-name/xw/xwallpaper/package.nix @@ -14,14 +14,14 @@ libXpm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xwallpaper"; version = "0.7.6"; src = fetchFromGitHub { owner = "stoeckmann"; repo = "xwallpaper"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-8VRQFH00yXplvhCqBuMGrwvOB7bJhfe50Ii6h8kvDMM="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xwallpaper"; }; -} +}) diff --git a/pkgs/by-name/xw/xwinmosaic/package.nix b/pkgs/by-name/xw/xwinmosaic/package.nix index 75ffc31d4bd5..c8e67dbd17e5 100644 --- a/pkgs/by-name/xw/xwinmosaic/package.nix +++ b/pkgs/by-name/xw/xwinmosaic/package.nix @@ -9,14 +9,14 @@ libXdamage, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.4.2"; pname = "xwinmosaic"; src = fetchFromGitHub { owner = "soulthreads"; repo = "xwinmosaic"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr"; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xwinmosaic"; }; -} +}) diff --git a/pkgs/by-name/xw/xwinwrap/package.nix b/pkgs/by-name/xw/xwinwrap/package.nix index 39e56baeaab9..f61c85d8a8cb 100644 --- a/pkgs/by-name/xw/xwinwrap/package.nix +++ b/pkgs/by-name/xw/xwinwrap/package.nix @@ -7,13 +7,13 @@ libx11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xwinwrap"; version = "4"; src = fetchbzr { url = "https://code.launchpad.net/~shantanu-goel/xwinwrap/devel"; - rev = version; + rev = finalAttrs.version; sha256 = "1annhqc71jcgx5zvcy31c1c488ygx4q1ygrwyy2y0ww743smbchw"; }; @@ -65,4 +65,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xwinwrap"; }; -} +}) diff --git a/pkgs/by-name/xx/xxHash/package.nix b/pkgs/by-name/xx/xxHash/package.nix index e18b5e714049..bb6ef12918a2 100644 --- a/pkgs/by-name/xx/xxHash/package.nix +++ b/pkgs/by-name/xx/xxHash/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xxHash"; version = "0.8.3"; src = fetchFromGitHub { owner = "Cyan4973"; repo = "xxHash"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-h6kohM+NxvQ89R9NEXZcYBG2wPOuB4mcyPfofKrx9wQ="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { "libxxhash" ]; }; -} +}) diff --git a/pkgs/by-name/xx/xxkb/package.nix b/pkgs/by-name/xx/xxkb/package.nix index 7ac2529e5886..4b5a00d9aba4 100644 --- a/pkgs/by-name/xx/xxkb/package.nix +++ b/pkgs/by-name/xx/xxkb/package.nix @@ -15,12 +15,12 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xxkb"; version = "1.11.1"; src = fetchurl { - url = "mirror://sourceforge/xxkb/xxkb-${version}-src.tar.gz"; + url = "mirror://sourceforge/xxkb/xxkb-${finalAttrs.version}-src.tar.gz"; sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf"; }; @@ -71,4 +71,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xxkb"; }; -} +}) diff --git a/pkgs/by-name/xz/xzgv/package.nix b/pkgs/by-name/xz/xzgv/package.nix index 4fe8f8cdfa21..8439c3176a9e 100644 --- a/pkgs/by-name/xz/xzgv/package.nix +++ b/pkgs/by-name/xz/xzgv/package.nix @@ -8,11 +8,11 @@ texinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xzgv"; version = "0.9.2"; src = fetchurl { - url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; + url = "mirror://sourceforge/xzgv/xzgv-${finalAttrs.version}.tar.gz"; sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5"; }; nativeBuildInputs = [ @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "xzgv"; }; -} +}) diff --git a/pkgs/by-name/ya/yacas/package.nix b/pkgs/by-name/ya/yacas/package.nix index 40a0784299a7..7f63de413cae 100644 --- a/pkgs/by-name/ya/yacas/package.nix +++ b/pkgs/by-name/ya/yacas/package.nix @@ -17,14 +17,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yacas"; version = "1.9.1"; src = fetchFromGitHub { owner = "grzegorzmazur"; repo = "yacas"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0dqgqvsb6ggr8jb3ngf0jwfkn6xwj2knhmvqyzx3amc74yd3ckqx"; }; @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/ya/yacreader/package.nix b/pkgs/by-name/ya/yacreader/package.nix index b020317313a4..605d3d41caed 100644 --- a/pkgs/by-name/ya/yacreader/package.nix +++ b/pkgs/by-name/ya/yacreader/package.nix @@ -8,14 +8,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yacreader"; version = "9.15.0"; src = fetchFromGitHub { owner = "YACReader"; repo = "yacreader"; - tag = version; + tag = finalAttrs.version; hash = "sha256-5vCjr8WRwa7Q/84Itgg07K1CJKGnWA1z53et2IxxReE="; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { mainProgram = "YACReader"; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ya/yad/package.nix b/pkgs/by-name/ya/yad/package.nix index 241be40dfe43..8f4a653ebc2b 100644 --- a/pkgs/by-name/ya/yad/package.nix +++ b/pkgs/by-name/ya/yad/package.nix @@ -11,14 +11,14 @@ netpbm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yad"; version = "14.1"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Y7bp20fkNdSgBcSV1kPEpWEP7ASwZcScVRaPauwI72M="; }; @@ -69,4 +69,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ smironov ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/by-name/ya/yafetch/package.nix similarity index 84% rename from pkgs/tools/misc/yafetch/default.nix rename to pkgs/by-name/ya/yafetch/package.nix index b9a453737bff..a52d9d0660cb 100644 --- a/pkgs/tools/misc/yafetch/default.nix +++ b/pkgs/by-name/ya/yafetch/package.nix @@ -1,18 +1,18 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, }: -stdenv.mkDerivation rec { +clangStdenv.mkDerivation (finalAttrs: { pname = "yafetch"; version = "unstable-2022-04-20"; src = fetchFromGitHub { owner = "kira64xyz"; - repo = pname; + repo = "yafetch"; rev = "a118cfc13f0b475db7c266105c10138d838788b8"; - sha256 = "bSJlerfbJG6h5dDwWQKHnVLH6DEuvuUyqaRuJ7jvOsA="; + hash = "sha256-bSJlerfbJG6h5dDwWQKHnVLH6DEuvuUyqaRuJ7jvOsA="; }; # Use the provided NixOS logo automatically @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "yafetch"; }; -} +}) diff --git a/pkgs/by-name/ya/yaft/package.nix b/pkgs/by-name/ya/yaft/package.nix index ceab3d6d8610..e697aa1f3d84 100644 --- a/pkgs/by-name/ya/yaft/package.nix +++ b/pkgs/by-name/ya/yaft/package.nix @@ -5,7 +5,7 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.2.9"; pname = "yaft"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "uobikiemukot"; repo = "yaft"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0l1ig8wm545kpn4l7186rymny83jkahnjim290wsl7hsszfq1ckd"; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.matthiasbeyer ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/by-name/ya/yallback/package.nix b/pkgs/by-name/ya/yallback/package.nix index 0cbb013a49c6..2a401f39918b 100644 --- a/pkgs/by-name/ya/yallback/package.nix +++ b/pkgs/by-name/ya/yallback/package.nix @@ -7,13 +7,13 @@ bashInteractive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.2.0"; pname = "yallback"; src = fetchFromGitHub { owner = "abathur"; repo = "yallback"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-t+fdnDJMFiFqN23dSY3TnsZsIDcravtwdNKJ5MiZosE="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ abathur ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ya/yamdi/package.nix b/pkgs/by-name/ya/yamdi/package.nix index 3bdb3563f7dd..485efcf611c0 100644 --- a/pkgs/by-name/ya/yamdi/package.nix +++ b/pkgs/by-name/ya/yamdi/package.nix @@ -4,14 +4,14 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yamdi"; version = "1.9"; # Source repo is also available here: # https://github.com/ioppermann/yamdi src = fetchurl { - url = "mirror://sourceforge/yamdi/yamdi-${version}.tar.gz"; + url = "mirror://sourceforge/yamdi/yamdi-${finalAttrs.version}.tar.gz"; sha256 = "4a6630f27f6c22bcd95982bf3357747d19f40bd98297a569e9c77468b756f715"; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.ryanartecona ]; mainProgram = "yamdi"; }; -} +}) diff --git a/pkgs/by-name/ya/yaml-filter/package.nix b/pkgs/by-name/ya/yaml-filter/package.nix index 56884cd7ec40..ff91ba1890d9 100644 --- a/pkgs/by-name/ya/yaml-filter/package.nix +++ b/pkgs/by-name/ya/yaml-filter/package.nix @@ -6,7 +6,7 @@ libyaml, pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yaml-filter"; version = "0.2.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "OpenSCAP"; repo = "yaml-filter"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-HDHjOapMFjuDcWW5+opKD2tllbwz4YBw/EI4W7Wf/6g="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { mainProgram = "yamlp"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ya/yank/package.nix b/pkgs/by-name/ya/yank/package.nix index 4bbe34188100..e17572fdd032 100644 --- a/pkgs/by-name/ya/yank/package.nix +++ b/pkgs/by-name/ya/yank/package.nix @@ -5,14 +5,14 @@ xsel, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yank"; version = "1.3.0"; src = fetchFromGitHub { owner = "mptre"; repo = "yank"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-sZiZki2Zl0Tfmls5KrLGxT94Bdf9TA9EwoaLoFOX9B4="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { mainProgram = "yank"; }; -} +}) diff --git a/pkgs/by-name/ya/yarn-bash-completion/package.nix b/pkgs/by-name/ya/yarn-bash-completion/package.nix index cc156303c0a3..5e8081f1b6d0 100644 --- a/pkgs/by-name/ya/yarn-bash-completion/package.nix +++ b/pkgs/by-name/ya/yarn-bash-completion/package.nix @@ -5,14 +5,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yarn-bash-completion"; version = "0.17.0"; src = fetchFromGitHub { owner = "dsifford"; repo = "yarn-completion"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0xflbrbwskjqv3knvc8jqygpvfxh5ak66q7w22d1ng8gwrfqzcng"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ DamienCassou ]; }; -} +}) diff --git a/pkgs/by-name/ya/yarp/package.nix b/pkgs/by-name/ya/yarp/package.nix index 9bff445fae5e..1fb45436ceee 100644 --- a/pkgs/by-name/ya/yarp/package.nix +++ b/pkgs/by-name/ya/yarp/package.nix @@ -8,13 +8,13 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yarp"; version = "3.12.2"; src = fetchFromGitHub { owner = "robotology"; repo = "yarp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Lx9ZCTFrSvO/PCB9lrz3f0avBzDAzEZINoqzlH2F6Xw="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.nico202 ]; }; -} +}) diff --git a/pkgs/by-name/ya/yaru-theme/package.nix b/pkgs/by-name/ya/yaru-theme/package.nix index 95f6bcf70737..9474dfbdde83 100644 --- a/pkgs/by-name/ya/yaru-theme/package.nix +++ b/pkgs/by-name/ya/yaru-theme/package.nix @@ -15,14 +15,14 @@ hicolor-icon-theme, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yaru"; version = "25.10.3"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; - rev = version; + rev = finalAttrs.version; hash = "sha256-3cSVPObfmr62S6yTD2c8AO3s7lxb9KFVuYSydTIJ1jE="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ moni ]; }; -} +}) diff --git a/pkgs/by-name/ya/yash/package.nix b/pkgs/by-name/ya/yash/package.nix index 43e46a03ed68..41736ab834a1 100644 --- a/pkgs/by-name/ya/yash/package.nix +++ b/pkgs/by-name/ya/yash/package.nix @@ -7,14 +7,14 @@ asciidoc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yash"; version = "2.60"; src = fetchFromGitHub { owner = "magicant"; repo = "yash"; - rev = version; + rev = finalAttrs.version; hash = "sha256-iHM1f+zdYsfuqmyel+vlFi+TQukmN91SyZCHJLXPnTs="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { }; passthru.shellPath = "/bin/yash"; -} +}) diff --git a/pkgs/by-name/ya/yasm/package.nix b/pkgs/by-name/ya/yasm/package.nix index b668eb70c4ad..a94373e558f8 100644 --- a/pkgs/by-name/ya/yasm/package.nix +++ b/pkgs/by-name/ya/yasm/package.nix @@ -5,12 +5,12 @@ buildPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yasm"; version = "1.3.0"; src = fetchurl { - url = "https://www.tortall.net/projects/yasm/releases/yasm-${version}.tar.gz"; + url = "https://www.tortall.net/projects/yasm/releases/yasm-${finalAttrs.version}.tar.gz"; sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ya/yaws/package.nix b/pkgs/by-name/ya/yaws/package.nix index 2d50d2498a30..f0fd09dbaa56 100644 --- a/pkgs/by-name/ya/yaws/package.nix +++ b/pkgs/by-name/ya/yaws/package.nix @@ -8,14 +8,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yaws"; version = "2.2.0"; src = fetchFromGitHub { owner = "erlyaws"; repo = "yaws"; - rev = "yaws-${version}"; + rev = "yaws-${finalAttrs.version}"; hash = "sha256-acO8Vc8sZJl22HUml2kTxVswLEirqMbqHQdRIbkkcvs="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ya/yazi/plugins/dupes/default.nix b/pkgs/by-name/ya/yazi/plugins/dupes/default.nix index c078d2eb70cc..3cc44f895081 100644 --- a/pkgs/by-name/ya/yazi/plugins/dupes/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/dupes/default.nix @@ -7,13 +7,13 @@ }: mkYaziPlugin { pname = "dupes.yazi"; - version = "0-unstable-2025-10-23"; + version = "0-unstable-2026-01-29"; src = fetchFromGitHub { owner = "mshnwq"; repo = "dupes.yazi"; - rev = "18a9395d38f42e406805b92834154fc7ad15a7b8"; - hash = "sha256-hBpUoMKGZgKrgxAOYZQ9CU4BKPSiYpYVWyuHYXHZ/Pc="; + rev = "1edf7a406410d5d18b4fbda7b3540e35ab3ad5d6"; + hash = "sha256-7x8N1heASHlYaLzzzdO4jm6IrTgqFbybp+I9EdF7c3M="; }; postPatch = '' diff --git a/pkgs/by-name/ya/yazi/plugins/git/default.nix b/pkgs/by-name/ya/yazi/plugins/git/default.nix index 029eef93a344..735c1a2753ef 100644 --- a/pkgs/by-name/ya/yazi/plugins/git/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/git/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "git.yazi"; - version = "25.12.29-unstable-2026-01-02"; + version = "25.12.29-unstable-2026-01-26"; src = fetchFromGitHub { owner = "yazi-rs"; repo = "plugins"; - rev = "03cdd4b5b15341b3c0d0f4c850d633fadd05a45f"; - hash = "sha256-5dMAJ6W/L66XuH4CCwRRFpKSLy0ZDFIABAYleFX0AsQ="; + rev = "e07bf41442a7f6fdd003069f380e1ae469a86211"; + hash = "sha256-aC8DUZpzNHEf9MW3tX3XcDYY/mWClAHkw+nZaxDQHp8="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/githead/default.nix b/pkgs/by-name/ya/yazi/plugins/githead/default.nix new file mode 100644 index 000000000000..e3b877ef2ff5 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/githead/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "githead.yazi"; + version = "0-unstable-2026-01-26"; + + src = fetchFromGitHub { + owner = "llanosrocas"; + repo = "githead.yazi"; + rev = "317d09f728928943f0af72ff6ce31ea335351202"; + hash = "sha256-o2EnQYOxp5bWn0eLn0sCUXcbtu6tbO9pdUdoquFCTVw="; + }; + + meta = { + description = "Git status header for yazi inspired by powerlevel10k "; + homepage = "https://github.com/llanosrocas/githead.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix index b44310426a03..e7581f8f1d02 100644 --- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "mediainfo.yazi"; - version = "25.5.31-unstable-2026-01-24"; + version = "25.5.31-unstable-2026-01-27"; src = fetchFromGitHub { owner = "boydaihungst"; repo = "mediainfo.yazi"; - rev = "ae2a1f18feb55ea9148032ce247109f2303ddbfd"; - hash = "sha256-QH1vvPjPYGbf47kSgxV97pxZrdSFcqAEyXtQbJhusLg="; + rev = "dc61636816e3f44bacacd6f2936f2588980d75fe"; + hash = "sha256-sNr5eW1K2r4NFvheEJ8UuYhVqCBqrXQQvRe1dBbAwas="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix index 07beec101965..157deb0e66e0 100644 --- a/pkgs/by-name/ya/yazi/plugins/mount/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "mount.yazi"; - version = "25.12.29-unstable-2025-12-29"; + version = "25.12.29-unstable-2026-01-26"; src = fetchFromGitHub { owner = "yazi-rs"; repo = "plugins"; - rev = "517619af126f25f3da096ff156ce46b561b54be3"; - hash = "sha256-j7fsUmx2nK4Tyj5KCamcCmfs99K6duV+okf8NvzccsI="; + rev = "0c95a0dac882e652f70c6fbc79655658c0cb6e74"; + hash = "sha256-DwHTpEIuING9cajq+O61OmHR93/tpKqgU+cM0//5TZ8="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/update.py b/pkgs/by-name/ya/yazi/plugins/update.py index 59fcb48dd13d..3d7599b11290 100755 --- a/pkgs/by-name/ya/yazi/plugins/update.py +++ b/pkgs/by-name/ya/yazi/plugins/update.py @@ -376,7 +376,7 @@ def commit_changes(updated_plugins: list[dict[str, str]]) -> None: if len(updated_plugins) == 1: plugin = updated_plugins[0] - commit_message = f"yaziPlugins.{plugin['name']}: update from {plugin['old_version']} to {plugin['new_version']}" + commit_message = f"yaziPlugins.{plugin['name']}: {plugin['old_version']} -> {plugin['new_version']}" compare_url = get_compare_url(plugin) if compare_url: commit_message += f"\n\nCompare: {compare_url}" diff --git a/pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix b/pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix index fbd722c2732e..c5a40a87058e 100644 --- a/pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "yatline-githead.yazi"; - version = "0-unstable-2025-05-31"; + version = "0-unstable-2026-01-30"; src = fetchFromGitHub { owner = "imsi32"; repo = "yatline-githead.yazi"; - rev = "f8f969e84c39ad4215334ea5012183a2a5a6160b"; - hash = "sha256-Cs8zSYtUfdCmKwIkJwQGyQNeSOmmpPvObCMnGm+32zg="; + rev = "25a068d78838e463a7c34f3674a6f3b986756968"; + hash = "sha256-1BrqMwFff3wH+RntYSQkeuRZiBMdgK5v1c9h+QQ8XF8="; }; meta = { diff --git a/pkgs/by-name/yc/ycm-cmake-modules/package.nix b/pkgs/by-name/yc/ycm-cmake-modules/package.nix index 8c532b714969..db57dbeb40a3 100644 --- a/pkgs/by-name/yc/ycm-cmake-modules/package.nix +++ b/pkgs/by-name/yc/ycm-cmake-modules/package.nix @@ -6,13 +6,13 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ycm-cmake-modules"; version = "0.18.4"; src = fetchFromGitHub { owner = "robotology"; repo = "ycm-cmake-modules"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Xmc23r3hmwg9v620KGfUV/s7feJUVVZD1OaT3TAQBBY="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/yd/yder/package.nix b/pkgs/by-name/yd/yder/package.nix index e3b2ad6a16eb..f6f15487c3ba 100644 --- a/pkgs/by-name/yd/yder/package.nix +++ b/pkgs/by-name/yd/yder/package.nix @@ -10,14 +10,14 @@ withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yder"; version = "1.4.20"; src = fetchFromGitHub { owner = "babelouest"; repo = "yder"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-BaCF1r5mOYxj0zKc11uoKI9gVKuxWd8GaneGcV+qIFg="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ johnazoidberg ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ym/ympd/package.nix b/pkgs/by-name/ym/ympd/package.nix index ed6775923ef6..688666e4834b 100644 --- a/pkgs/by-name/ym/ympd/package.nix +++ b/pkgs/by-name/ym/ympd/package.nix @@ -8,14 +8,14 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ympd"; version = "1.3.0"; src = fetchFromGitHub { owner = "notandy"; repo = "ympd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq"; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "ympd"; }; -} +}) diff --git a/pkgs/by-name/yo/yoda/package.nix b/pkgs/by-name/yo/yoda/package.nix index 8990711ad726..c341372ccd89 100644 --- a/pkgs/by-name/yo/yoda/package.nix +++ b/pkgs/by-name/yo/yoda/package.nix @@ -11,14 +11,14 @@ withRootSupport ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yoda"; version = "2.1.2"; src = fetchFromGitLab { owner = "hepcedar"; repo = "yoda"; - rev = "yoda-${version}"; + rev = "yoda-${finalAttrs.version}"; hash = "sha256-cgThoxqPX6dVyGNTLXatW3uQV+41o38fTfkvHXsDs9A="; }; @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { description = "Provides small set of data analysis (specifically histogramming) classes"; license = lib.licenses.gpl3Only; homepage = "https://yoda.hepforge.org"; - changelog = "https://gitlab.com/hepcedar/yoda/-/blob/yoda-${version}/ChangeLog"; + changelog = "https://gitlab.com/hepcedar/yoda/-/blob/yoda-${finalAttrs.version}/ChangeLog"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; }; -} +}) diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix index 902e3f3b75c5..6d71d2179ff7 100644 --- a/pkgs/by-name/yo/yoshimi/package.nix +++ b/pkgs/by-name/yo/yoshimi/package.nix @@ -21,18 +21,18 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yoshimi"; version = "2.3.5.2"; src = fetchFromGitHub { owner = "Yoshimi"; repo = "yoshimi"; - rev = version; + rev = finalAttrs.version; hash = "sha256-X4g4AhPHg2ezHnAm8fWunatZgr3/PZxibzACplWogo8="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' substituteInPlace Misc/Config.cpp --replace /usr $out @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "yoshimi"; }; -} +}) diff --git a/pkgs/by-name/yp/ypbind-mt/package.nix b/pkgs/by-name/yp/ypbind-mt/package.nix index 6c2a7b02a7f4..c52bca61a30f 100644 --- a/pkgs/by-name/yp/ypbind-mt/package.nix +++ b/pkgs/by-name/yp/ypbind-mt/package.nix @@ -11,12 +11,12 @@ systemdLibs, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ypbind-mt"; version = "2.7.2"; src = fetchurl { - url = "https://github.com/thkukuk/ypbind-mt/releases/download/v${version}/ypbind-mt-${version}.tar.xz"; + url = "https://github.com/thkukuk/ypbind-mt/releases/download/v${finalAttrs.version}/ypbind-mt-${finalAttrs.version}.tar.xz"; hash = "sha256-Bk8vGFZzxUk9+D9kALeZ86NZ3lYRi2ujfEMnER8vzYs="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ BarrOff ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index 1dc56dd327cb..6b66743d7c9d 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -21,23 +21,19 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2025.12.08"; + version = "2026.01.29"; pyproject = true; src = fetchFromGitHub { owner = "yt-dlp"; repo = "yt-dlp"; tag = version; - hash = "sha256-y06MDP+CrlHGrell9hcLOGlHp/gU2OOxs7can4hbj+g="; + hash = "sha256-nw/L71aoAJSCbW1y8ir8obrFPSbVlBA0UtlrxL6YtCQ="; }; postPatch = '' substituteInPlace yt_dlp/version.py \ --replace-fail "UPDATE_HINT = None" 'UPDATE_HINT = "Nixpkgs/NixOS likely already contain an updated version.\n To get it run nix-channel --update or nix flake update in your config directory."' - # Until yt-dlp supports curl-cffi 0.14.x, this patch is needed: - substituteInPlace yt_dlp/networking/_curlcffi.py \ - --replace-fail "if curl_cffi_version != (0, 5, 10) and not (0, 10) <= curl_cffi_version < (0, 14)" \ - "if curl_cffi_version != (0, 5, 10) and not (0, 10) <= curl_cffi_version" ${lib.optionalString javascriptSupport '' # deno is required for full YouTube support (since 2025.11.12). # This makes yt-dlp find deno even if it is used as a python dependency, i.e. in kodiPackages.sendtokodi. @@ -104,7 +100,10 @@ python3Packages.buildPythonApplication rec { ++ lib.optional rtmpSupport rtmpdump; in lib.optionals (packagesToBinPath != [ ]) [ - ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' + "--prefix" + "PATH" + ":" + ''"${lib.makeBinPath packagesToBinPath}"'' ]; checkPhase = '' diff --git a/pkgs/by-name/yt/ytfzf/package.nix b/pkgs/by-name/yt/ytfzf/package.nix index 28894333758f..2b39e1eb476d 100644 --- a/pkgs/by-name/yt/ytfzf/package.nix +++ b/pkgs/by-name/yt/ytfzf/package.nix @@ -14,14 +14,14 @@ yt-dlp, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ytfzf"; version = "2.6.2"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rwCVOdu9UfTArISt8ITQtLU4Gj2EZd07bcFKvxXQ7Bc="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dotlambda ]; mainProgram = "ytfzf"; }; -} +}) diff --git a/pkgs/by-name/yu/yubico-pam/package.nix b/pkgs/by-name/yu/yubico-pam/package.nix index 0ba24262bee8..9dc1897ce5fb 100644 --- a/pkgs/by-name/yu/yubico-pam/package.nix +++ b/pkgs/by-name/yu/yubico-pam/package.nix @@ -13,13 +13,13 @@ libykclient, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yubico-pam"; version = "2.27"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubico-pam"; - rev = version; + rev = finalAttrs.version; sha256 = "0hb773zlf11xz4bwmsqv2mq5d4aq2g0crdr5cp9xwc4ivi5gd4kg"; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix index 4a4731271186..cbc4571fe2f3 100644 --- a/pkgs/by-name/yu/yubihsm-shell/package.nix +++ b/pkgs/by-name/yu/yubihsm-shell/package.nix @@ -15,14 +15,14 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yubihsm-shell"; version = "2.7.0"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubihsm-shell"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ymGS35kjhNlFee3FEXF8n6Jm7NVaynjv+lpix6F75BQ="; }; @@ -80,4 +80,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/yu/yubikey-personalization/package.nix b/pkgs/by-name/yu/yubikey-personalization/package.nix index e6d0018d7384..d7095949b972 100644 --- a/pkgs/by-name/yu/yubikey-personalization/package.nix +++ b/pkgs/by-name/yu/yubikey-personalization/package.nix @@ -9,12 +9,12 @@ json_c, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yubikey-personalization"; version = "1.20.0"; src = fetchurl { - url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; + url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${finalAttrs.version}.tar.gz"; sha256 = "14wvlwqnwj0gllkpvfqiy8ns938bwvjsz8x1hmymmx32m074vj0f"; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd2; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/z-/z-lua/package.nix b/pkgs/by-name/z-/z-lua/package.nix index b1a53c57f2ca..ff005466e05c 100644 --- a/pkgs/by-name/z-/z-lua/package.nix +++ b/pkgs/by-name/z-/z-lua/package.nix @@ -6,14 +6,14 @@ makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "z-lua"; version = "1.8.24"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-1wsBXJd6QXgK4BCg+VTVDY95DP4+xFp0vAbKmztoREI="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; mainProgram = "z.lua"; }; -} +}) diff --git a/pkgs/by-name/z3/z3-tptp/package.nix b/pkgs/by-name/z3/z3-tptp/package.nix index b7ab814255b3..dc8c43362fb2 100644 --- a/pkgs/by-name/z3/z3-tptp/package.nix +++ b/pkgs/by-name/z3/z3-tptp/package.nix @@ -4,13 +4,13 @@ z3, cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "z3-tptp"; version = z3.version; src = z3.src; - sourceRoot = "${src.name}/examples/tptp"; + sourceRoot = "${finalAttrs.src.name}/examples/tptp"; nativeBuildInputs = [ cmake ]; buildInputs = [ z3 ]; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { description = "TPTP wrapper for Z3 prover"; maintainers = z3.meta.maintainers ++ [ lib.maintainers.raskin ]; }; -} +}) diff --git a/pkgs/by-name/za/zam-plugins/package.nix b/pkgs/by-name/za/zam-plugins/package.nix index 4a6641bb6677..ef3bc26a2874 100644 --- a/pkgs/by-name/za/zam-plugins/package.nix +++ b/pkgs/by-name/za/zam-plugins/package.nix @@ -16,14 +16,14 @@ libsamplerate, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zam-plugins"; version = "4.4"; src = fetchFromGitHub { owner = "zamaudio"; repo = "zam-plugins"; - tag = version; + tag = finalAttrs.version; hash = "sha256-pjnhDavKnyQjPF4nUO+j1J+Qtw8yIYMY9A5zBMb4zFU="; fetchSubmodules = true; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { # tries to run dpf/utils/lv2_ttl_generator (built for host) broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; -} +}) diff --git a/pkgs/by-name/za/zarchive/package.nix b/pkgs/by-name/za/zarchive/package.nix index 070157d754eb..4be39f059d6d 100644 --- a/pkgs/by-name/za/zarchive/package.nix +++ b/pkgs/by-name/za/zarchive/package.nix @@ -6,14 +6,14 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zarchive"; version = "0.1.2"; src = fetchFromGitHub { owner = "Exzap"; repo = "ZArchive"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-hX637O/mVLTzmG0a9swJu9w+3o26VHo+K/9RhMuf1lI="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ zhaofengli ]; mainProgram = "zarchive"; }; -} +}) diff --git a/pkgs/by-name/zd/zdbsp/package.nix b/pkgs/by-name/zd/zdbsp/package.nix index be210f400ae2..16e3218180c3 100644 --- a/pkgs/by-name/zd/zdbsp/package.nix +++ b/pkgs/by-name/zd/zdbsp/package.nix @@ -6,12 +6,12 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zdbsp"; version = "1.19"; src = fetchzip { - url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip"; + url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${finalAttrs.version}-src.zip"; sha256 = "sha256-DTj0jMNurvwRwMbo0L4+IeNlbfIwUbqcG1LKd68C08g="; stripRoot = false; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index f3d33f9322fa..f0c58f28b65e 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -106,7 +106,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.221.4"; + version = "0.221.5"; outputs = [ "out" @@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-Uiwfs80eCjbd/rnXkOmv85NY05XeY9Qu0vf8I+cDElo="; + hash = "sha256-1q0nwNsPbckGivm9MAXvGX8/SC0ioQVEB93W7Zpobcs="; }; postPatch = '' @@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-kwV6tejCUwkFLdBCClm/AOxTieSUXnE/dP2UERlLv7U="; + cargoHash = "sha256-vmG90W+MNUZ+3IiLltr5ok7h6fP7WfS7gwy3LloIAIw="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ze/zeitgeist/package.nix b/pkgs/by-name/ze/zeitgeist/package.nix index 56775451e6cb..79bb0c097aca 100644 --- a/pkgs/by-name/ze/zeitgeist/package.nix +++ b/pkgs/by-name/ze/zeitgeist/package.nix @@ -19,7 +19,7 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zeitgeist"; version = "1.0.4"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "zeitgeist"; repo = "zeitgeist"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "kG1N8DXgjYAJ8fbrGHsp7eTqB20H5smzRnW0PSRUYR0="; }; @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ze/zenoh-cpp/package.nix b/pkgs/by-name/ze/zenoh-cpp/package.nix index 76add02abb12..fcfd64f6f13b 100644 --- a/pkgs/by-name/ze/zenoh-cpp/package.nix +++ b/pkgs/by-name/ze/zenoh-cpp/package.nix @@ -6,14 +6,14 @@ zenoh-c, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zenoh-cpp"; version = "1.4.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-cpp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-rznvif87UZbYzZB4yHG4R850qm6Z3beJ1NSG4wrf58M="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ markuskowa ]; }; -} +}) diff --git a/pkgs/by-name/ze/zeroad-data/package.nix b/pkgs/by-name/ze/zeroad-data/package.nix index 1a96170595f0..3f78a9b42ccb 100644 --- a/pkgs/by-name/ze/zeroad-data/package.nix +++ b/pkgs/by-name/ze/zeroad-data/package.nix @@ -5,12 +5,12 @@ zeroad-unwrapped, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "0ad-data"; inherit (zeroad-unwrapped) version; src = fetchurl { - url = "https://releases.wildfiregames.com/0ad-${version}-unix-data.tar.xz"; + url = "https://releases.wildfiregames.com/0ad-${finalAttrs.version}-unix-data.tar.xz"; hash = "sha256-g34tbd8TiwJfwCAXJF11gaS7hP2UtCwOYF0yG3AXqZg="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; hydraPlatforms = [ ]; }; -} +}) diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix index 88b8637d90e9..c673eec68bf8 100644 --- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix +++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix @@ -40,12 +40,12 @@ # You can find more instructions on how to build 0ad here: # https://trac.wildfiregames.com/wiki/BuildInstructions -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "0ad"; version = "0.27.1"; src = fetchurl { - url = "https://releases.wildfiregames.com/0ad-${version}-unix-build.tar.xz"; + url = "https://releases.wildfiregames.com/0ad-${finalAttrs.version}-unix-build.tar.xz"; hash = "sha256-oKU1XutZaNJPKDdwc2FQ2XTa/sugd1TUZicH3BcBa/s="; }; @@ -176,4 +176,4 @@ stdenv.mkDerivation rec { platforms = lib.subtractLists lib.platforms.i686 lib.platforms.linux; mainProgram = "0ad"; }; -} +}) diff --git a/pkgs/by-name/ze/zexy/package.nix b/pkgs/by-name/ze/zexy/package.nix index 772dbebb4577..b4b01e246383 100644 --- a/pkgs/by-name/ze/zexy/package.nix +++ b/pkgs/by-name/ze/zexy/package.nix @@ -5,7 +5,7 @@ puredata, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zexy"; version = "2.4.3"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { domain = "git.iem.at"; owner = "pd"; repo = "zexy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9f0uYBDBq5lcN/N0uJwC/HBEFcj9b8ZtBHnPAce2s/A="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/zf/zfs-prune-snapshots/package.nix b/pkgs/by-name/zf/zfs-prune-snapshots/package.nix index 59679af9d1fb..bd93010cbe31 100644 --- a/pkgs/by-name/zf/zfs-prune-snapshots/package.nix +++ b/pkgs/by-name/zf/zfs-prune-snapshots/package.nix @@ -5,14 +5,14 @@ go-md2man, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.5.0"; pname = "zfs-prune-snapshots"; src = fetchFromGitHub { owner = "bahamas10"; repo = "zfs-prune-snapshots"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-gCf/ZIeIh84WQNs5wZO1/l3zpnl2sNxsFO7cOa92JUM="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.ymarkus ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/zf/zfsnap/package.nix b/pkgs/by-name/zf/zfsnap/package.nix index 145db32ac273..53a84c5ec0a3 100644 --- a/pkgs/by-name/zf/zfsnap/package.nix +++ b/pkgs/by-name/zf/zfsnap/package.nix @@ -6,14 +6,14 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.0.0-beta3"; pname = "zfsnap"; src = fetchFromGitHub { owner = "zfsnap"; repo = "zfsnap"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0670a5sghvqx32c9gfsird15mg9nqcvwxsrfcjrwc0sj7br9bd2g"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ woffs ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/zi/zimfw/package.nix b/pkgs/by-name/zi/zimfw/package.nix index 57af5fc794c7..51449fd11213 100644 --- a/pkgs/by-name/zi/zimfw/package.nix +++ b/pkgs/by-name/zi/zimfw/package.nix @@ -4,13 +4,13 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zimfw"; version = "1.18.0"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; hash = "sha256-qQViaQOpLp8F4zvJETbNp0lxpdVhM1Meg7WcMKkjJRQ="; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.joedevivo ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/zi/zimg/package.nix b/pkgs/by-name/zi/zimg/package.nix index 6eebf9bcbd23..4dc0d5cb078b 100644 --- a/pkgs/by-name/zi/zimg/package.nix +++ b/pkgs/by-name/zi/zimg/package.nix @@ -5,14 +5,14 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zimg"; version = "3.0.6"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "sha256-T+/wuTxPK+PLofqJm3dujGqGGXhpdGQLjAttTQPsgOI="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; unix ++ windows; maintainers = with lib.maintainers; [ rnhmjoj ]; }; -} +}) diff --git a/pkgs/by-name/zi/zip2hashcat/package.nix b/pkgs/by-name/zi/zip2hashcat/package.nix index 000c8a0634fd..6130cdb7e062 100644 --- a/pkgs/by-name/zi/zip2hashcat/package.nix +++ b/pkgs/by-name/zi/zip2hashcat/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zip2hashcat"; version = "1.0"; @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { description = "Processes input ZIP files into a format suitable for use with hashcat"; homepage = "https://github.com/hashstation/zip2hashcat"; license = lib.licenses.mit; - changelog = "https://github.com/hashstation/zip2hashcat/releases/tag/${version}"; + changelog = "https://github.com/hashstation/zip2hashcat/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ pyrox0 ]; mainProgram = "zip2hashcat"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/zi/zipkin/package.nix b/pkgs/by-name/zi/zipkin/package.nix index 905b6726b739..0f01ac5c6efa 100644 --- a/pkgs/by-name/zi/zipkin/package.nix +++ b/pkgs/by-name/zi/zipkin/package.nix @@ -5,21 +5,21 @@ makeWrapper, jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.28.1"; pname = "zipkin-server"; src = fetchurl { - url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${version}/zipkin-server-${version}-exec.jar"; + url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${finalAttrs.version}/zipkin-server-${finalAttrs.version}-exec.jar"; sha256 = "02369fkv0kbl1isq6y26fh2zj5wxv3zck522m5wypsjlcfcw2apa"; }; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/share/java - cp ${src} $out/share/java/zipkin-server-${version}-exec.jar + cp ${finalAttrs.src} $out/share/java/zipkin-server-${finalAttrs.version}-exec.jar mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/zipkin-server \ - --add-flags "-cp $out/share/java/zipkin-server-${version}-exec.jar org.springframework.boot.loader.JarLauncher" + --add-flags "-cp $out/share/java/zipkin-server-${finalAttrs.version}-exec.jar org.springframework.boot.loader.JarLauncher" ''; meta = { description = "Distributed tracing system"; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.hectorj ]; mainProgram = "zipkin-server"; }; -} +}) diff --git a/pkgs/by-name/zi/zix/package.nix b/pkgs/by-name/zi/zix/package.nix index 2dc7dfc4a651..c7e17d2305f9 100644 --- a/pkgs/by-name/zi/zix/package.nix +++ b/pkgs/by-name/zi/zix/package.nix @@ -7,14 +7,14 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zix"; version = "0.6.2"; src = fetchFromGitLab { owner = "drobilla"; repo = "zix"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-1fdW014QKvTYHaEmDsivUVPzF/vZgnW3Srk6edp6G1o="; }; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight C99 portability and data structure library"; homepage = "https://gitlab.com/drobilla/zix"; - changelog = "https://gitlab.com/drobilla/zix/-/blob/${src.rev}/NEWS"; + changelog = "https://gitlab.com/drobilla/zix/-/blob/${finalAttrs.src.rev}/NEWS"; license = lib.licenses.isc; platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/zl/zlib-ng/package.nix b/pkgs/by-name/zl/zlib-ng/package.nix index 0a8e4257d488..83dbfb8558b9 100644 --- a/pkgs/by-name/zl/zlib-ng/package.nix +++ b/pkgs/by-name/zl/zlib-ng/package.nix @@ -8,14 +8,14 @@ withZlibCompat ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zlib-ng"; version = "2.3.2"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; - rev = version; + rev = finalAttrs.version; hash = "sha256-lO6fO18Z74+wKF0O/JjfrhS8lyaNQ37eamWGThb39F8="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ izorkin ]; }; -} +}) diff --git a/pkgs/by-name/zm/zmap/package.nix b/pkgs/by-name/zm/zmap/package.nix index 9d48ed8ccb52..4cf0c58a5a1f 100644 --- a/pkgs/by-name/zm/zmap/package.nix +++ b/pkgs/by-name/zm/zmap/package.nix @@ -15,14 +15,14 @@ judy, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zmap"; version = "4.3.4"; src = fetchFromGitHub { owner = "zmap"; repo = "zmap"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-fHCVo8OwQUzpdDq7dMBxvK15Ojth5UmNoPTVuTGUP58="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/zm/zmusic/package.nix b/pkgs/by-name/zm/zmusic/package.nix index 36e7326f15a1..41106fe84bee 100644 --- a/pkgs/by-name/zm/zmusic/package.nix +++ b/pkgs/by-name/zm/zmusic/package.nix @@ -13,14 +13,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zmusic"; version = "1.3.0"; src = fetchFromGitHub { owner = "ZDoom"; repo = "ZMusic"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Lg0DN5p2xDB4j+kxa/TxM27rC+GPMK8kaPLajNDMvBg="; }; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { r4v3n6101 ]; }; -} +}) diff --git a/pkgs/by-name/zo/zoom/package.nix b/pkgs/by-name/zo/zoom/package.nix index d121947920be..c3cd88e01545 100644 --- a/pkgs/by-name/zo/zoom/package.nix +++ b/pkgs/by-name/zo/zoom/package.nix @@ -15,12 +15,12 @@ # !!! assert freetype == xorg.freetype -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zoom"; version = "1.1.5"; src = fetchurl { - url = "https://www.logicalshift.co.uk/unix/zoom/zoom-${version}.tar.gz"; + url = "https://www.logicalshift.co.uk/unix/zoom/zoom-${finalAttrs.version}.tar.gz"; hash = "sha256-8pZ/HAVV341K6QRDUC0UzzO2rGW2AvSZ++Pp445V27w="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "zoom"; }; -} +}) diff --git a/pkgs/by-name/zo/zotero/darwin.nix b/pkgs/by-name/zo/zotero/darwin.nix index 8d19a96d6ce8..6f27faac3d3f 100644 --- a/pkgs/by-name/zo/zotero/darwin.nix +++ b/pkgs/by-name/zo/zotero/darwin.nix @@ -7,11 +7,11 @@ undmg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { inherit pname version meta; src = fetchurl { - url = "https://download.zotero.org/client/release/${version}/Zotero-${version}.dmg"; + url = "https://download.zotero.org/client/release/${finalAttrs.version}/Zotero-${finalAttrs.version}.dmg"; hash = "sha256-lDf/jULLQyzxNVGRUKuF2df+FTbJK08z+fFQbVgwjsY="; }; sourceRoot = "."; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { runHook postInstall ''; -} +}) diff --git a/pkgs/by-name/zp/zpaq/package.nix b/pkgs/by-name/zp/zpaq/package.nix index c2c8142e2b00..ee9ebd2a53e2 100644 --- a/pkgs/by-name/zp/zpaq/package.nix +++ b/pkgs/by-name/zp/zpaq/package.nix @@ -5,14 +5,14 @@ perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zpaq"; version = "7.15"; src = fetchFromGitHub { owner = "zpaq"; repo = "zpaq"; - rev = version; + rev = finalAttrs.version; sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4"; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "zpaq"; }; -} +}) diff --git a/pkgs/by-name/zp/zpaqd/package.nix b/pkgs/by-name/zp/zpaqd/package.nix index 06df4b15aa4a..672453c22743 100644 --- a/pkgs/by-name/zp/zpaqd/package.nix +++ b/pkgs/by-name/zp/zpaqd/package.nix @@ -15,12 +15,12 @@ let ++ lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT" ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zpaqd"; version = "715"; src = fetchurl { - url = "http://mattmahoney.net/dc/zpaqd${version}.zip"; + url = "http://mattmahoney.net/dc/zpaqd${finalAttrs.version}.zip"; sha256 = "sha256-Mx87Zt0AASk0ZZCjyTzYbhlYJAXBlb59OpUWsqynyCA="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/zp/zplug/package.nix b/pkgs/by-name/zp/zplug/package.nix index f85cf7e9d59c..21cfbd77a401 100644 --- a/pkgs/by-name/zp/zplug/package.nix +++ b/pkgs/by-name/zp/zplug/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zplug"; version = "2.4.2"; src = fetchFromGitHub { owner = "zplug"; repo = "zplug"; - rev = version; + rev = finalAttrs.version; sha256 = "0hci1pbs3k5icwfyfw5pzcgigbh9vavprxxvakg1xm19n8zb61b3"; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { mainProgram = "zplug-env"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/zp/zps/package.nix b/pkgs/by-name/zp/zps/package.nix index 13b449e7dba8..c61b15706f9a 100644 --- a/pkgs/by-name/zp/zps/package.nix +++ b/pkgs/by-name/zp/zps/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zps"; version = "2.0.0"; src = fetchFromGitHub { owner = "orhun"; repo = "zps"; - rev = version; + rev = finalAttrs.version; hash = "sha256-t+y+m9cwngVlX5o7FQTI4FMj10bN0euH51DmAnOAvPc="; }; @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { meta = { description = "Small utility for listing and reaping zombie processes on GNU/Linux"; homepage = "https://github.com/orhun/zps"; - changelog = "https://github.com/orhun/zps/releases/tag/${version}"; + changelog = "https://github.com/orhun/zps/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "zps"; }; -} +}) diff --git a/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix b/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix index d0655101ed8b..fcfd1ae18781 100644 --- a/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix +++ b/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix @@ -9,14 +9,14 @@ }: # TODO: add a services entry for the /etc/zs-apc-spdu.conf file -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zs-apc-spdu-ctl"; version = "0.0.2"; src = fetchFromGitHub { owner = "fogti"; repo = "zs-apc-spdu-ctl"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "TMV9ETWBVeXq6tZ2e0CrvHBXoyKfOLCQurjBdf/iw/M="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "zs-apc-spdu-ctl"; }; -} +}) diff --git a/pkgs/by-name/zs/zsh-autosuggestions/package.nix b/pkgs/by-name/zs/zsh-autosuggestions/package.nix index 33d10f4a54d9..4eafd01d2b21 100644 --- a/pkgs/by-name/zs/zsh-autosuggestions/package.nix +++ b/pkgs/by-name/zs/zsh-autosuggestions/package.nix @@ -6,14 +6,14 @@ # To make use of this derivation, use the `programs.zsh.autosuggestions.enable` option -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zsh-autosuggestions"; version = "0.7.1"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-autosuggestions"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-vpTyYq9ZgfgdDsWzjxVAE7FZH4MALMNZIFyEOBLm5Qo="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.loskutov ]; }; -} +}) diff --git a/pkgs/by-name/zs/zsh-completions/package.nix b/pkgs/by-name/zs/zsh-completions/package.nix index d44b15c62701..6be2806c2c5a 100644 --- a/pkgs/by-name/zs/zsh-completions/package.nix +++ b/pkgs/by-name/zs/zsh-completions/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zsh-completions"; version = "0.35.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-completions"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-GFHlZjIHUWwyeVoCpszgn4AmLPSSE8UVNfRmisnhkpg="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.olejorgenb ]; }; -} +}) diff --git a/pkgs/by-name/zs/zsh-history-substring-search/package.nix b/pkgs/by-name/zs/zsh-history-substring-search/package.nix index 38d1ae888934..31e92fc29ddf 100644 --- a/pkgs/by-name/zs/zsh-history-substring-search/package.nix +++ b/pkgs/by-name/zs/zsh-history-substring-search/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zsh-history-substring-search"; version = "1.1.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-history-substring-search"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0vjw4s0h4sams1a1jg9jx92d6hd2swq4z908nbmmm2qnz212y88r"; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ qyliss ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/zs/zsh-navigation-tools/package.nix b/pkgs/by-name/zs/zsh-navigation-tools/package.nix index 66f2c1bbc801..6b342c3150ea 100644 --- a/pkgs/by-name/zs/zsh-navigation-tools/package.nix +++ b/pkgs/by-name/zs/zsh-navigation-tools/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zsh-navigation-tools"; version = "2.2.7"; src = fetchFromGitHub { owner = "psprint"; repo = "zsh-navigation-tools"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0c4kb19aprb868xnlyq8h1nd2d32r0zkrqblsrzvg7m9gx8vqps8"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ pSub ]; platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/zs/zsh-nix-shell/package.nix b/pkgs/by-name/zs/zsh-nix-shell/package.nix index bda935250a7e..4b787787d952 100644 --- a/pkgs/by-name/zs/zsh-nix-shell/package.nix +++ b/pkgs/by-name/zs/zsh-nix-shell/package.nix @@ -8,14 +8,14 @@ # To make use of this derivation, use # `programs.zsh.interactiveShellInit = "source ${pkgs.zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh";` -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zsh-nix-shell"; version = "0.8.0"; src = fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Z6EYQdasvpl1P78poj9efnnLj7QQg13Me8x1Ryyw+dM="; }; @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { meta = { description = "Zsh plugin that lets you use zsh in nix-shell shell"; - homepage = src.meta.homepage; + homepage = finalAttrs.src.meta.homepage; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aw ]; }; -} +}) diff --git a/pkgs/by-name/zs/zsh-vi-mode/package.nix b/pkgs/by-name/zs/zsh-vi-mode/package.nix index 6cbca83e92b4..41c8e00dc9e3 100644 --- a/pkgs/by-name/zs/zsh-vi-mode/package.nix +++ b/pkgs/by-name/zs/zsh-vi-mode/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zsh-vi-mode"; version = "0.12.0"; src = fetchFromGitHub { owner = "jeffreytse"; repo = "zsh-vi-mode"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-EYr/jInRGZSDZj+QVAc9uLJdkKymx1tjuFBWgpsaCFw="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ kyleondy ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/zs/zsync/package.nix b/pkgs/by-name/zs/zsync/package.nix index 338a86a7bbaf..934b54c8e36a 100644 --- a/pkgs/by-name/zs/zsync/package.nix +++ b/pkgs/by-name/zs/zsync/package.nix @@ -5,7 +5,7 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zsync"; version = "0.6.3-unstable-2025-05-29"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-gJs1P83AKWGipspeoFCSibZH+X6mmj3aL4+yjGO2YJo="; }; - sourceRoot = "${src.name}/c"; + sourceRoot = "${finalAttrs.src.name}/c"; patches = [ ./remove-inexisting-rsumtest.patch ]; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { ]; platforms = with lib.platforms; all; }; -} +}) diff --git a/pkgs/by-name/zu/zuki-themes/package.nix b/pkgs/by-name/zu/zuki-themes/package.nix index c3534acda67c..5fdb630bae06 100644 --- a/pkgs/by-name/zu/zuki-themes/package.nix +++ b/pkgs/by-name/zu/zuki-themes/package.nix @@ -11,14 +11,14 @@ gtk-engine-murrine, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zuki-themes"; version = "4.0"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "zuki-themes"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1q026wa8xgyb6f5k7pqpm5zav30dbnm3b8w59as3sh8rhfgpbf80"; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/zx/zxcvbn-c/package.nix b/pkgs/by-name/zx/zxcvbn-c/package.nix index 0eeb5050c828..d3c5c8d756d3 100644 --- a/pkgs/by-name/zx/zxcvbn-c/package.nix +++ b/pkgs/by-name/zx/zxcvbn-c/package.nix @@ -3,14 +3,14 @@ stdenv, fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zxcvbn-c"; version = "2.6"; src = fetchFromGitHub { owner = "tsyrogit"; repo = "zxcvbn-c"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/ATlpcx0XTtmzs6REA2YsnINKWz5xPNaetfhfyMuFP0="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ xurei ]; }; -} +}) diff --git a/pkgs/by-name/zy/zydis/package.nix b/pkgs/by-name/zy/zydis/package.nix index e358c8b9a1d3..4f107e21cfc3 100644 --- a/pkgs/by-name/zy/zydis/package.nix +++ b/pkgs/by-name/zy/zydis/package.nix @@ -12,14 +12,14 @@ let inherit stdenv fetchFromGitHub cmake; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zydis"; version = "4.1.1"; src = fetchFromGitHub { owner = "zyantific"; repo = "zydis"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-6J4pTUm3xQXwlQNBldjXVWRcse+auSFJtxGWaPRVzLg="; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://zydis.re/"; - changelog = "https://github.com/zyantific/zydis/releases/tag/v${version}"; + changelog = "https://github.com/zyantific/zydis/releases/tag/v${finalAttrs.version}"; description = "Fast and lightweight x86/x86-64 disassembler library"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/zy/zydis/zycore.nix b/pkgs/by-name/zy/zydis/zycore.nix index b55e4ec46f2e..c140d4f80552 100644 --- a/pkgs/by-name/zy/zydis/zycore.nix +++ b/pkgs/by-name/zy/zydis/zycore.nix @@ -4,14 +4,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zycore"; version = "1.5.2"; src = fetchFromGitHub { owner = "zyantific"; repo = "zycore-c"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-/RQl43gx3CO0OxH1syz4l3E4+/m46ql+HKVyuC1x4sA="; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; -} +}) diff --git a/pkgs/by-name/zz/zziplib/package.nix b/pkgs/by-name/zz/zziplib/package.nix index d1ff124fa1a7..a1279a798f70 100644 --- a/pkgs/by-name/zz/zziplib/package.nix +++ b/pkgs/by-name/zz/zziplib/package.nix @@ -11,14 +11,14 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zziplib"; version = "0.13.80"; src = fetchFromGitHub { owner = "gdraheim"; repo = "zziplib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vvPcQBRk1iIPNk5qI7N0Nv9JWndVfFH6oGxyr9ZIt0g="; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/gdraheim/zziplib"; - changelog = "https://github.com/gdraheim/zziplib/blob/v${version}/ChangeLog"; + changelog = "https://github.com/gdraheim/zziplib/blob/v${finalAttrs.version}/ChangeLog"; description = "Library to extract data from files archived in a zip file"; longDescription = '' The zziplib library is intentionally lightweight, it offers the ability to @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/zz/zzz/package.nix b/pkgs/by-name/zz/zzz/package.nix index 38b7ce7b1391..246565cf4247 100644 --- a/pkgs/by-name/zz/zzz/package.nix +++ b/pkgs/by-name/zz/zzz/package.nix @@ -4,14 +4,14 @@ lib, stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zzz"; version = "0.2.0"; src = fetchFromGitHub { owner = "jirutka"; repo = "zzz"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gm/fzhgGM2kns051PKY223uesctvMj9LmLc4btUsTt8="; }; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ aanderse ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/extensions/README.md b/pkgs/desktops/gnome/extensions/README.md index 3401efa6f739..c22f3f8a083c 100644 --- a/pkgs/desktops/gnome/extensions/README.md +++ b/pkgs/desktops/gnome/extensions/README.md @@ -1,32 +1,32 @@ # GNOME Shell extensions -All extensions are packaged automatically. They can be found in the `pkgs.gnomeXYExtensions` for XY being a GNOME version. The package names are the extension’s UUID, which can be a bit unwieldy to use. `pkgs.gnomeExtensions` is a set of manually curated extensions that match the current `pkgs.gnome-shell` versions. Their name is human-friendly, compared to the other extensions sets. Some of its extensions are manually packaged. +All extensions are packaged automatically. They can be found in the `pkgs.gnomeXYExtensions` where XY is a GNOME version. The package names are the extensions' UUIDs, which can be a bit unwieldy to use. `pkgs.gnomeExtensions` is a set of manually curated extensions that match the current `pkgs.gnome-shell` versions. Their names are human-friendly, compared to the other extension sets. Some of its extensions are manually packaged. ## Automatically packaged extensions -The actual packages are created by `buildGnomeExtension.nix`, provided the correct arguments are fed into it. The important extension data is stored in `extensions.json`, one line/item per extension. That file is generated by running `update-extensions.py`. Furthermore, the automatic generated names are dumped in `collisions.json` for manual inspection. `extensionRenames.nix` contains new names for all extensions that collide. +The actual packages are created by `buildGnomeExtension.nix`, provided the correct arguments are fed into it. The important extension data is stored in `extensions.json`, one line/item per extension. That file is generated by running `update-extensions.py`. Furthermore, the automatically generated names are dumped in `collisions.json` for manual inspection. `extensionRenames.nix` contains new names for all extensions that collide. ### Extensions updates -#### For everyday updates, +#### For everyday updates: 1. Run `update-extensions.py`. 2. Update `extensionRenames.nix` according to the comment at the top. -#### To package the extensions for new GNOME version, +#### To package the extensions for a new GNOME version: 1. Add a new `gnomeXYExtensions` set in `default.nix`. 2. Update `all-packages.nix` accordingly. (grep for `gnomeExtensions`) 3. Update `supported_versions` in `update-extensions.py`. 4. Follow the [For everyday updates](#for-everyday-updates) section. -#### For GNOME updates, +#### For GNOME updates: -1. Follow the [To package the extensions for new GNOME version](#to-package-the-extensions-for-new-gnome-version) section if required. +1. Follow the [To package the extensions for new GNOME version](#to-package-the-extensions-for-new-gnome-version) section, if required. 2. Update `versions_to_merge` variable in `./update-extensions.py`. 3. Run `update-extensions.py --skip-fetch`, and update `extensionRenames.nix` according to the comment at the top. 4. Update `gnomeExtensions` in `default.nix` to the new versions. ## Manually packaged extensions -Manually packaged extensions overwrite some of the automatically packaged ones in `pkgs.gnomeExtensions`. They are listed in `manuallyPackaged.nix`, every extension has its own sub-folder. +Manually packaged extensions overwrite some of the automatically packaged ones in `pkgs.gnomeExtensions`. They are listed in `manuallyPackaged.nix`; every extension has its own sub-folder. diff --git a/pkgs/development/compilers/elm/README.md b/pkgs/development/compilers/elm/README.md index 609d67c1a773..ed6e62ddb364 100644 --- a/pkgs/development/compilers/elm/README.md +++ b/pkgs/development/compilers/elm/README.md @@ -6,7 +6,7 @@ Modify revision in ./update.sh and run it The elm binary embeds a piece of pre-compiled elm code, used by 'elm reactor'. This means that the build process for 'elm' effectively -executes 'elm make'. that in turn expects to retrieve the elm +executes 'elm make'. That in turn expects to retrieve the elm dependencies of that code (elm/core, etc.) from package.elm-lang.org, as well as a cached bit of metadata (versions.dat). diff --git a/pkgs/development/compilers/elm/packages/README.md b/pkgs/development/compilers/elm/packages/README.md index 4ae2814b44de..ca6209a2edc4 100644 --- a/pkgs/development/compilers/elm/packages/README.md +++ b/pkgs/development/compilers/elm/packages/README.md @@ -7,6 +7,6 @@ Mixtures of useful Elm lang tooling containing both Haskell and Node.js based ut Haskell parts of the ecosystem are using [cabal2nix](https://github.com/NixOS/cabal2nix). Please refer to [nix documentation](https://nixos.org/nixpkgs/manual/#how-to-create-nix-builds-for-your-own-private-haskell-packages) and [cabal2nix readme](https://github.com/NixOS/cabal2nix#readme) for more information. Elm-format [update scripts](https://github.com/avh4/elm-format/tree/master/package/nix) -is part of its repository. +are part of its repository. Node dependencies are defined with [`buildNpmPackage`](https://nixos.org/manual/nixpkgs/stable/#javascript-buildNpmPackage). diff --git a/pkgs/development/compilers/flutter/versions/3_38/data.json b/pkgs/development/compilers/flutter/versions/3_38/data.json index 1767260d8c3c..51fece5e84b7 100644 --- a/pkgs/development/compilers/flutter/versions/3_38/data.json +++ b/pkgs/development/compilers/flutter/versions/3_38/data.json @@ -1,73 +1,73 @@ { - "version": "3.38.7", - "engineVersion": "78fc3012e45889657f72359b005af7beac47ba3d", + "version": "3.38.9", + "engineVersion": "587c18f873b8ab57330422bce09047420d9c7f42", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-bsC6dzVGf9JsfwGjn7FRC4EqjgBl6VDzpHDlgDTTZuI=", - "x86_64-linux": "sha256-bsC6dzVGf9JsfwGjn7FRC4EqjgBl6VDzpHDlgDTTZuI=" + "aarch64-linux": "sha256-qNd7MQstuebDt3QzNRMrBSog3/fvjxU6K5edb6afSiQ=", + "x86_64-linux": "sha256-qNd7MQstuebDt3QzNRMrBSog3/fvjxU6K5edb6afSiQ=" }, "x86_64-linux": { - "aarch64-linux": "sha256-Bl3xaFAWNj93Vxz6lM1g7mkU30eK9X+5aiO/Wj5wj5A=", - "x86_64-linux": "sha256-Bl3xaFAWNj93Vxz6lM1g7mkU30eK9X+5aiO/Wj5wj5A=" + "aarch64-linux": "sha256-PKz/vbuOizcA+VvUBp+n7CI9+gGQ5V/pAwWuNI2y9mE=", + "x86_64-linux": "sha256-PKz/vbuOizcA+VvUBp+n7CI9+gGQ5V/pAwWuNI2y9mE=" } }, - "dartVersion": "3.10.7", + "dartVersion": "3.10.8", "dartHash": { - "x86_64-linux": "sha256-PZPskpxD0ZsEgKGOov9maZmHbTp+AtnHW46RjLEJ+qs=", - "aarch64-linux": "sha256-IRcX1PBPzOhNcdcp9Ppa5S7lpsvaQwElQb014rRXDkQ=", - "x86_64-darwin": "sha256-L5zxNiNlUmv0jlehqWbKiIU2ckpcUR9lzby36L15VHU=", - "aarch64-darwin": "sha256-HdZWlVSDaohuTUnzN+H8q2kPssj7omxt6sWch/kkL+o=" + "x86_64-linux": "sha256-Rs3VfZ+ZtlGdqtTdiJ7Nx4+scNU2Hg444+3pIQ81hdk=", + "aarch64-linux": "sha256-bfxzGIdsRMm6v4CCweph1FKKh5vPmdC4CPZtkNegIkU=", + "x86_64-darwin": "sha256-HGL8S7BgQ7ktGjL/rsRsUUbolpFEe/Y9XAgmxsRYFjg=", + "aarch64-darwin": "sha256-XhTHNu6ctEp1+NydBjZREYARVtkptVo9TmdzoSV9z5I=" }, - "flutterHash": "sha256-rxAvZ1UdrP17nURjdm3ixkDwqLuCa0uAQKs/X/fcgpg=", + "flutterHash": "sha256-J1KCtyjrCfPAj/J6h0RPNvC72YnpkrDHKQ4aEi3lAko=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-KzBx+xKhW6emToEmxbQjuOlSTK1NMYpcL7Uuuc4gvik=", - "aarch64-linux": "sha256-hmpOFNtR8DiC8Fo77L1GDO+07nxolmLkYARoyC+yLVo=", - "x86_64-darwin": "sha256-KzBx+xKhW6emToEmxbQjuOlSTK1NMYpcL7Uuuc4gvik=", - "x86_64-linux": "sha256-hmpOFNtR8DiC8Fo77L1GDO+07nxolmLkYARoyC+yLVo=" + "aarch64-darwin": "sha256-xBkWoKnBjcFlOmfSKe+xls0fW9ZMy0NMXvA9UKjafdQ=", + "aarch64-linux": "sha256-2ddBzZ1MUUDom5hTCPZMdyg3UKS3Ie45LDbu8vzdvD0=", + "x86_64-darwin": "sha256-xBkWoKnBjcFlOmfSKe+xls0fW9ZMy0NMXvA9UKjafdQ=", + "x86_64-linux": "sha256-2ddBzZ1MUUDom5hTCPZMdyg3UKS3Ie45LDbu8vzdvD0=" }, "fuchsia": { - "aarch64-darwin": "sha256-RRs/AyOAGH14/dIi21X33brN4rlL6XdoiwcoACjm2QY=", - "aarch64-linux": "sha256-RRs/AyOAGH14/dIi21X33brN4rlL6XdoiwcoACjm2QY=", - "x86_64-darwin": "sha256-RRs/AyOAGH14/dIi21X33brN4rlL6XdoiwcoACjm2QY=", - "x86_64-linux": "sha256-RRs/AyOAGH14/dIi21X33brN4rlL6XdoiwcoACjm2QY=" + "aarch64-darwin": "sha256-wV1GrRSTkb1c/HroHdJ3DTX25X2TRa0NqUjJSF/cm8s=", + "aarch64-linux": "sha256-wV1GrRSTkb1c/HroHdJ3DTX25X2TRa0NqUjJSF/cm8s=", + "x86_64-darwin": "sha256-wV1GrRSTkb1c/HroHdJ3DTX25X2TRa0NqUjJSF/cm8s=", + "x86_64-linux": "sha256-wV1GrRSTkb1c/HroHdJ3DTX25X2TRa0NqUjJSF/cm8s=" }, "ios": { - "aarch64-darwin": "sha256-CVVwxlJf4RHxTgyuQnRm/LCUeJmOPBgWNyuDomHSctw=", - "aarch64-linux": "sha256-CVVwxlJf4RHxTgyuQnRm/LCUeJmOPBgWNyuDomHSctw=", - "x86_64-darwin": "sha256-CVVwxlJf4RHxTgyuQnRm/LCUeJmOPBgWNyuDomHSctw=", - "x86_64-linux": "sha256-CVVwxlJf4RHxTgyuQnRm/LCUeJmOPBgWNyuDomHSctw=" + "aarch64-darwin": "sha256-WSmhUyRNJVsLhr/CVJxY3YOYIq5ljcHZUSsPFR0NNeY=", + "aarch64-linux": "sha256-WSmhUyRNJVsLhr/CVJxY3YOYIq5ljcHZUSsPFR0NNeY=", + "x86_64-darwin": "sha256-WSmhUyRNJVsLhr/CVJxY3YOYIq5ljcHZUSsPFR0NNeY=", + "x86_64-linux": "sha256-WSmhUyRNJVsLhr/CVJxY3YOYIq5ljcHZUSsPFR0NNeY=" }, "linux": { - "aarch64-darwin": "sha256-O6fIR0wKUpHMFBxTFjzEws6u9vwZ3P5oWBdeM18IFlo=", - "aarch64-linux": "sha256-O6fIR0wKUpHMFBxTFjzEws6u9vwZ3P5oWBdeM18IFlo=", - "x86_64-darwin": "sha256-ZGAR+bjdAXrAxo0GJj5NYGb+uzPk1BV0n+JDwlpMltA=", - "x86_64-linux": "sha256-ZGAR+bjdAXrAxo0GJj5NYGb+uzPk1BV0n+JDwlpMltA=" + "aarch64-darwin": "sha256-b7hW5Civj6O/d8ttDI45ZeR3tDuwp8UoLwfA4ki/OP8=", + "aarch64-linux": "sha256-b7hW5Civj6O/d8ttDI45ZeR3tDuwp8UoLwfA4ki/OP8=", + "x86_64-darwin": "sha256-arjSrUA3wGHg7hFX5bqVOduEthhUm3Nb6VxiW+Otco4=", + "x86_64-linux": "sha256-arjSrUA3wGHg7hFX5bqVOduEthhUm3Nb6VxiW+Otco4=" }, "macos": { - "aarch64-darwin": "sha256-HQeMgmuBcZemxDgG2ykqmENj7I2kjp82pCwGIGW1ES4=", - "aarch64-linux": "sha256-HQeMgmuBcZemxDgG2ykqmENj7I2kjp82pCwGIGW1ES4=", - "x86_64-darwin": "sha256-HQeMgmuBcZemxDgG2ykqmENj7I2kjp82pCwGIGW1ES4=", - "x86_64-linux": "sha256-HQeMgmuBcZemxDgG2ykqmENj7I2kjp82pCwGIGW1ES4=" + "aarch64-darwin": "sha256-ANWA2g802hNskwO62gvOt2FavV5d2+0zUE8Vkir7gfY=", + "aarch64-linux": "sha256-ANWA2g802hNskwO62gvOt2FavV5d2+0zUE8Vkir7gfY=", + "x86_64-darwin": "sha256-ANWA2g802hNskwO62gvOt2FavV5d2+0zUE8Vkir7gfY=", + "x86_64-linux": "sha256-ANWA2g802hNskwO62gvOt2FavV5d2+0zUE8Vkir7gfY=" }, "universal": { - "aarch64-darwin": "sha256-+bCK5vVzOwe49nMQ8fnLvjVOl9eoLuK9kGUYIn+M45g=", - "aarch64-linux": "sha256-Bm2ts/9S1LFka5GzmpzcOXc6PtW9wUKuKf/vIb5dOE8=", - "x86_64-darwin": "sha256-/VhgsmG5TxPi/GN01nUWM1gn75pUSnOxF9jgbucDOrQ=", - "x86_64-linux": "sha256-5r3cTuUkTwZNcQ0I/Erf7c22qek9gM/glhAX4H6DK1M=" + "aarch64-darwin": "sha256-RCxd3GLmfllijsmgo5KZN5dHsQGJ6rUyLe4pbKgwM2o=", + "aarch64-linux": "sha256-6Ucv4NzG3t3KbVq/oAkDakLnxp5wUt5K5Ob098RIpJ0=", + "x86_64-darwin": "sha256-a3yJAHT/fkPQ2IW+ukgbzO8/SSMKDN3gHa4igjYJk/Y=", + "x86_64-linux": "sha256-IkzIxvOQmTrVoMAnoGV3x5keu1yFi7DJqTrUGw9MhHc=" }, "web": { - "aarch64-darwin": "sha256-zig2dDj0duSJjEgMJw4FqKFp9tSoCsp4UfjFxJXOo7I=", - "aarch64-linux": "sha256-zig2dDj0duSJjEgMJw4FqKFp9tSoCsp4UfjFxJXOo7I=", - "x86_64-darwin": "sha256-zig2dDj0duSJjEgMJw4FqKFp9tSoCsp4UfjFxJXOo7I=", - "x86_64-linux": "sha256-zig2dDj0duSJjEgMJw4FqKFp9tSoCsp4UfjFxJXOo7I=" + "aarch64-darwin": "sha256-pjVDBHNXLZZzETh3f+Xj0bH83kZ8U23l50mO7owtETA=", + "aarch64-linux": "sha256-pjVDBHNXLZZzETh3f+Xj0bH83kZ8U23l50mO7owtETA=", + "x86_64-darwin": "sha256-pjVDBHNXLZZzETh3f+Xj0bH83kZ8U23l50mO7owtETA=", + "x86_64-linux": "sha256-pjVDBHNXLZZzETh3f+Xj0bH83kZ8U23l50mO7owtETA=" }, "windows": { - "x86_64-darwin": "sha256-GcIW0ulTqFgnHKqkcQynhbsSQ4HKdDTtjc3SKCuOJL8=", - "x86_64-linux": "sha256-GcIW0ulTqFgnHKqkcQynhbsSQ4HKdDTtjc3SKCuOJL8=" + "x86_64-darwin": "sha256-K4YqHcsxHwdTWdC6dX8wF7vlA6Q1Xj+NAkOjO6G7O1Q=", + "x86_64-linux": "sha256-K4YqHcsxHwdTWdC6dX8wF7vlA6Q1Xj+NAkOjO6G7O1Q=" } }, "pubspecLock": { diff --git a/pkgs/development/compilers/llvm/README.md b/pkgs/development/compilers/llvm/README.md index 9d6bc1773d97..aee6851c8256 100644 --- a/pkgs/development/compilers/llvm/README.md +++ b/pkgs/development/compilers/llvm/README.md @@ -1,7 +1,7 @@ ## How to upgrade llvm_git - Run `update-git.py`. - This will set the github revision and sha256 for `llvmPackages_git.llvm` to whatever the latest chromium build is using. + This will set the GitHub revision and sha256 for `llvmPackages_git.llvm` to whatever the latest chromium build is using. For a more recent commit, run `nix-prefetch-github` and change the rev and sha256 accordingly. - That was the easy part. @@ -41,12 +41,12 @@ The lines above show us that the `purity.patch` failed on `lib/Driver/ToolChains/Gnu.cpp` when compiling `clang`. 3. The task now is to cross reference the hunks in the purity patch with - `lib/Driver/ToolCahins/Gnu.cpp.orig` to see why the patch failed. + `lib/Driver/ToolChains/Gnu.cpp.orig` to see why the patch failed. The `.orig` file will be in the build directory referenced in the line `note: keeping build directory ...`; this message results from the `--keep-failed` flag. 4. Now you should be able to open whichever patch failed, and the `foo.orig` file that it failed on. - Correct the patch by adapting it to the new code and be mindful of whitespace; + Correct the patch by adapting it to the new code and be mindful of whitespace, which can be an easily missed reason for failures. For cases where the hunk is no longer needed you can simply remove it from the patch. diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 5bb32d8496cd..8c1437f80a28 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -339,6 +339,7 @@ stdenv.mkDerivation { inherit (builtins) storeDir; } } + patch -p1 -d swift -i ${./patches/swift-Frontend-Fix-a-small-unique_ptr-array-access.patch} # This patch needs to know the lib output location, so must be substituted # in the same derivation as the compiler. diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-Frontend-Fix-a-small-unique_ptr-array-access.patch b/pkgs/development/compilers/swift/compiler/patches/swift-Frontend-Fix-a-small-unique_ptr-array-access.patch new file mode 100644 index 000000000000..0059c7f7c9ee --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-Frontend-Fix-a-small-unique_ptr-array-access.patch @@ -0,0 +1,35 @@ +From 1a2293c7593e4eeb3fbad74fa8d362abafb43b56 Mon Sep 17 00:00:00 2001 +From: Tony Allevato +Date: Wed, 9 Oct 2024 13:54:43 -0400 +Subject: [PATCH] [Frontend] Fix a small `unique_ptr` array access. + +When the size of the array accessed here is zero, retrieving the +address of the zero-th element here is undefined. When the frontend +is linked against a libc++ that has the `unique_ptr` hardening in +[this commit](https://github.com/llvm/llvm-project/commit/18df9d23ea390eaa50b41f3083a42f700a2b0e39) +enabled, it traps here. + +Instead, simply call `.get()` to retrieve the address of the +array, which works even when it is a zero-byte allocation. + +(cherry picked from commit bdf40184ab40eb59642cd825781d71d0711493eb) +--- + lib/FrontendTool/FrontendTool.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp +index afbc57cdf2f..ba64a306494 100644 +--- a/lib/FrontendTool/FrontendTool.cpp ++++ b/lib/FrontendTool/FrontendTool.cpp +@@ -2202,7 +2202,7 @@ int swift::performFrontend(ArrayRef Args, + std::make_unique[]>( + configurationFileBuffers.size()); + for_each(configurationFileBuffers.begin(), configurationFileBuffers.end(), +- &configurationFileStackTraces[0], ++ configurationFileStackTraces.get(), + [](const std::unique_ptr &buffer, + llvm::Optional &trace) { + trace.emplace(*buffer); +-- +2.52.0 + diff --git a/pkgs/development/cuda-modules/README.md b/pkgs/development/cuda-modules/README.md index 8b1b1856cb3f..a37d0125df8e 100644 --- a/pkgs/development/cuda-modules/README.md +++ b/pkgs/development/cuda-modules/README.md @@ -42,7 +42,7 @@ not straightforward to include. These packages are: - `libnvidia_nscq`: NVSwitch software - `libnvsdm`: NVSwitch software - `cublasmp`: - - `libcublasmp`: `nvshmem` isnt' packaged. + - `libcublasmp`: `nvshmem` isn't packaged. - `cudnn`: - `cudnn_samples`: requires FreeImage, which is abandoned and not packaged. @@ -91,9 +91,9 @@ sandbox when building, which can't find those (a second minor issue is that still take precedence). The current solution is to do something similar to `addOpenGLRunpathHook`: the -`addCudaCompatRunpathHook` prepends to the path to `cuda_compat`'s `libcuda.so` +`addCudaCompatRunpathHook` prepends the path to `cuda_compat`'s `libcuda.so` to the `DT_RUNPATH` of whichever package includes the hook as a dependency, and -we include the hook by default for packages in `cudaPackages` (by adding it as a -inputs in `genericManifestBuilder`). We also make sure it's included after +we include the hook by default for packages in `cudaPackages` (by adding it as an +input in `genericManifestBuilder`). We also make sure it's included after `addOpenGLRunpathHook`, so that it appears _before_ in the `DT_RUNPATH` and takes precedence. diff --git a/pkgs/development/cuda-modules/packages/nvpl_blas.nix b/pkgs/development/cuda-modules/packages/nvpl_blas.nix index 94661a67067d..114bb9a436f8 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_blas.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_blas.nix @@ -1,6 +1,6 @@ { buildRedist }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_blas"; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/nvpl_common.nix b/pkgs/development/cuda-modules/packages/nvpl_common.nix index 86330f5187ed..2a391d5f4f36 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_common.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_common.nix @@ -1,6 +1,6 @@ { buildRedist }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_common"; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/nvpl_fft.nix b/pkgs/development/cuda-modules/packages/nvpl_fft.nix index 30eb09ff9a11..624eac9d7724 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_fft.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_fft.nix @@ -1,6 +1,6 @@ { buildRedist }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_fft"; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/nvpl_lapack.nix b/pkgs/development/cuda-modules/packages/nvpl_lapack.nix index 64637f45d9b5..f51a3c01632a 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_lapack.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_lapack.nix @@ -1,6 +1,6 @@ { buildRedist, nvpl_blas }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_lapack"; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/nvpl_rand.nix b/pkgs/development/cuda-modules/packages/nvpl_rand.nix index f65e6f15f0ee..5a5e93f07343 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_rand.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_rand.nix @@ -1,6 +1,6 @@ { buildRedist }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_rand"; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix b/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix index d9bf55082b6c..ba9aa0719e4e 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix @@ -1,6 +1,6 @@ { buildRedist }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_scalapack"; outputs = [ diff --git a/pkgs/development/cuda-modules/packages/nvpl_sparse.nix b/pkgs/development/cuda-modules/packages/nvpl_sparse.nix index 3bd6985e66e0..007b14447dc4 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_sparse.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_sparse.nix @@ -1,6 +1,6 @@ { buildRedist }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_sparse"; outputs = [ @@ -8,7 +8,6 @@ buildRedist { "dev" "include" "lib" - "static" ]; meta = { diff --git a/pkgs/development/cuda-modules/packages/nvpl_tensor.nix b/pkgs/development/cuda-modules/packages/nvpl_tensor.nix index 177c267465bd..e5ed3fb52144 100644 --- a/pkgs/development/cuda-modules/packages/nvpl_tensor.nix +++ b/pkgs/development/cuda-modules/packages/nvpl_tensor.nix @@ -1,6 +1,6 @@ { buildRedist, nvpl_blas }: buildRedist { - redistName = "cuda"; + redistName = "nvpl"; pname = "nvpl_tensor"; outputs = [ diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 56f72e92abb1..8d3091f880e6 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -14,9 +14,9 @@ workflow. The workflow generally proceeds in three main steps: -1. create the initial `haskell-updates` PR, and update Stackage and Hackage snapshots -1. wait for contributors to fix newly broken Haskell packages -1. merge `haskell-updates` into `staging` +1. Create the initial `haskell-updates` PR, and update Stackage and Hackage snapshots +1. Wait for contributors to fix newly broken Haskell packages +1. Merge `haskell-updates` into `staging` Each of these steps is described in a separate section. @@ -106,7 +106,7 @@ always keep these building. We should be proactive in working with maintainers to keep their packages building. -Steps to fix Haskell packages that are failing to build is out of scope for +Steps to fix Haskell packages that are failing to build are out of scope for this document, but it usually requires fixing up dependencies that are now out-of-bounds. @@ -274,7 +274,7 @@ Here are some additional tips that didn't fit in above. You might want to do this if a user contributes a fix to `cabal2nix` that will immediately fix a Haskell package in Nixpkgs. First, merge in - the PR to `cabal2nix`, then run `update-cabal2nix-upstable.sh`. Finally, run + the PR to `cabal2nix`, then run `update-cabal2nix-unstable.sh`. Finally, run [`regenerate-hackage-packages.sh`](../../../maintainers/scripts/haskell/regenerate-hackage-packages.sh) to regenerate the Hackage package set with the updated version of `hackage2nix`. diff --git a/pkgs/development/interpreters/python/catch_conflicts/README.md b/pkgs/development/interpreters/python/catch_conflicts/README.md index d144b80e3385..a59df5f92fb8 100644 --- a/pkgs/development/interpreters/python/catch_conflicts/README.md +++ b/pkgs/development/interpreters/python/catch_conflicts/README.md @@ -3,8 +3,8 @@ catch_conflicts.py ================== -The file catch_conflicts.py is in a subdirectory because, if it isn't, the -/nix/store/ directory is added to sys.path causing a delay when building. +The file `catch_conflicts.py` is in a subdirectory because, if it isn't, the +`/nix/store/` directory is added to `sys.path`, causing a delay when building. Pointers: diff --git a/pkgs/development/julia-modules/tests/README.md b/pkgs/development/julia-modules/tests/README.md index 1be3487161e6..55fc6b52a57e 100644 --- a/pkgs/development/julia-modules/tests/README.md +++ b/pkgs/development/julia-modules/tests/README.md @@ -1,7 +1,7 @@ # Testing `julia.withPackages` -This folder contains a test suite for ensuring that the top N most popular Julia packages (as measured by download count) work properly. The key parts are +This folder contains a test suite for ensuring that the top N most popular Julia packages (as measured by download count) work properly. The key parts are: * `top-julia-packages.nix`: an impure derivation for fetching Julia download data and processing it into a file called `top-julia-packages.yaml`. This YAML file contains an array of objects with fields "name", "uuid", and "count", and is sorted in decreasing order of count. * `julia-top-n`: a small Haskell program which reads `top-julia-packages.yaml` and builds a `julia.withPackages` environment for each package, with a nice interactive display and configurable parallelism. It also tests whether evaluating `using ` works in the resulting environment. @@ -18,7 +18,7 @@ This folder contains a test suite for ensuring that the top N most popular Julia ## Options -You can run `./run_tests.sh --help` to see additional options for the test harness. The main ones are +You can run `./run_tests.sh --help` to see additional options for the test harness. The main ones are: * `-n`/`--top-n`: how many of the top packages to build (default: 100). * `-p`/`--parallelism`: how many builds to run at once (default: 10). diff --git a/pkgs/development/libraries/agda/1lab/default.nix b/pkgs/development/libraries/agda/1lab/default.nix index d2e040416952..5282de13e398 100644 --- a/pkgs/development/libraries/agda/1lab/default.nix +++ b/pkgs/development/libraries/agda/1lab/default.nix @@ -2,11 +2,12 @@ lib, mkDerivation, fetchFromGitHub, + unstableGitUpdater, }: mkDerivation { pname = "1lab"; - version = "unstable-2025-07-01"; + version = "0-unstable-2025-07-01"; src = fetchFromGitHub { owner = "the1lab"; @@ -25,6 +26,8 @@ mkDerivation { sed -Ei '/OPTIONS/s/ -v ?[^ #]+//g' "''${files[@]}" ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Formalised, cross-linked reference resource for mathematics done in Homotopy Type Theory "; homepage = "https://github.com/the1lab/1lab"; diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 7053e26b40af..5cc9f21b9515 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -2,10 +2,11 @@ lib, mkDerivation, fetchFromGitHub, + unstableGitUpdater, }: mkDerivation { - version = "unstable-2024-08-22"; + version = "0-unstable-2024-08-22"; pname = "agda-prelude"; src = fetchFromGitHub { @@ -15,6 +16,8 @@ mkDerivation { hash = "sha256-ab+KojzRbkUTAFNH5OA78s0F5SUuXTbliai6badveg4="; }; + passthru.updateScript = unstableGitUpdater { }; + meta = { homepage = "https://github.com/UlfNorell/agda-prelude"; description = "Programming library for Agda"; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 97bab2a6df9a..963d642fa0ad 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -67,6 +67,9 @@ stdenv.mkDerivation rec { openexr ]; + # Gcc blindly tries to optimize all float operations instead of just marked ones. + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=122304 + CXXFLAGS = "-ffp-contract=on"; cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" "-DOCIO_USE_SSE2NEON=OFF" diff --git a/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch new file mode 100644 index 000000000000..2c98ccfa7ed0 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h +index 329ef62..9a8df64 100644 +--- a/include/internal/cryptlib.h ++++ b/include/internal/cryptlib.h +@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM); + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + # else diff --git a/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch new file mode 100644 index 000000000000..67d199681f96 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h +index 329ef62..9a8df64 100644 +--- a/include/internal/cryptlib.h ++++ b/include/internal/cryptlib.h +@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM); + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + # else diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index b4aff30cb3c0..c89360283e10 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -417,7 +417,10 @@ in ./1.1/nix-ssl-cert-file.patch ( - if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch + if stdenv.hostPlatform.isDarwin then + ./1.1/use-etc-ssl-certs-darwin.patch + else + ./1.1/use-etc-ssl-certs.patch ) ]; withDocs = true; diff --git a/pkgs/development/misc/resholve/README.md b/pkgs/development/misc/resholve/README.md index 4b317460b208..cef687d69a29 100644 --- a/pkgs/development/misc/resholve/README.md +++ b/pkgs/development/misc/resholve/README.md @@ -32,7 +32,7 @@ Each "solution" (k=v pair) in this attrset describes one resholve invocation. > solutions to resolve the scripts separately, but produce a single package. `resholve.writeScript` and `resholve.writeScriptBin` support a _single_ -`solution` attrset. This is basically the same as any single solution in `resholve.mkDerivation`, except that it doesn't need a `scripts` attr (it is automatically added). `resholve.phraseSolution` also only accepts a single solution--but it _does_ still require the `scripts` attr. +`solution` attrset. This is basically the same as any single solution in `resholve.mkDerivation`, except that it doesn't need a `scripts` attr (it is automatically added). `resholve.phraseSolution` also only accepts a single solution, but it _does_ still require the `scripts` attr. ## Basic `resholve.mkDerivation` Example @@ -129,7 +129,7 @@ trivial, so I'll also link to some real-world examples: ## Basic `resholve.phraseSolution` example -This function has a similar API to `writeScript` and `writeScriptBin`, except it does require a `scripts` attr. It is intended to make resholve a little easier to mix into more types of build. This example is a little +This function has a similar API to `writeScript` and `writeScriptBin`, except it does require a `scripts` attr. It is intended to make resholve a little easier to mix into more types of builds. This example is a little trivial for now. If you have a real usage that you find helpful, please PR it. ```nix @@ -210,7 +210,7 @@ handle any potential problems it encounters with directives. There are currently - dynamic (variable) arguments to commands known to accept/run other commands > NOTE: resholve has a (growing) number of directives detailed in `man resholve` -> via `nixpkgs.resholve` (though protections against run-time use of python2 in nixpkgs mean you'll have to set `NIXPKGS_ALLOW_INSECURE=1` to pull resholve into nix-shell). +> via `nixpkgs.resholve` (though protections against run-time use of Python 2 in Nixpkgs mean you'll have to set `NIXPKGS_ALLOW_INSECURE=1` to pull resholve into `nix-shell`). Each of these 3 types is represented by its own attrset, where you can think of the key as a scope. The value should be: diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index 8f82ad73a0fc..5f5d28475aec 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -18,7 +18,7 @@ If your package uses native addons, you need to examine what kind of native buil - `node-gyp-builder` - `node-pre-gyp` -After you have identified the correct system, you need to override your package expression while adding in build system as a build input. +After you have identified the correct system, you need to override your package expression while adding the build system as a build input. For example, `dat` requires `node-gyp-build`, so we override its expression in [pkgs/development/node-packages/overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/overrides.nix): ```nix @@ -54,7 +54,7 @@ To add a package from npm to Nixpkgs: nix-build -A nodePackages. ``` - To build against the latest stable Current Node.js version (e.g. 18.x): + To build against the latest stable current Node.js version (e.g. 18.x): ```sh nix-build -A nodePackages_latest. diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index aff96e3b8396..aedd3983e04b 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -13,13 +13,13 @@ }: php.buildComposerProject2 (finalAttrs: { pname = "composer"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "composer"; repo = "composer"; tag = finalAttrs.version; - hash = "sha256-OzruOfYKiNgHx7bj6dVY+QtfSUzLEIqBhwATaWV1YAQ="; + hash = "sha256-e9z0H6Bw3yIaLjgEbspgi6skIpUJs1s0KNkcgFqoy34="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ php.buildComposerProject2 (finalAttrs: { inherit (finalAttrs.passthru) pharHash; }; - vendorHash = "sha256-EHvZfRL3xM2oG8m/8nHTOSjDIlp1FuMH+eYtbaqMz+Y="; + vendorHash = "sha256-Tqtpz/IV4PGOaye0doWZgY9u7SuvS94eH22wM2+myqU="; postInstall = '' wrapProgram $out/bin/composer \ diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix index 28d54f7a2520..ee24508e0aa2 100644 --- a/pkgs/development/python-modules/aiohomematic/default.nix +++ b/pkgs/development/python-modules/aiohomematic/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiohomematic"; - version = "2026.1.50"; + version = "2026.1.54"; pyproject = true; src = fetchFromGitHub { owner = "SukramJ"; repo = "aiohomematic"; tag = version; - hash = "sha256-/KUfbBjcV6WirzlIs8J8fvLXXTaT3ypEzqe9X0borq4="; + hash = "sha256-EAdadToeqT3H65kSWboCrzUogK38whDEzbuA3C6wmoo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/binwalk3/default.nix b/pkgs/development/python-modules/binwalk3/default.nix new file mode 100644 index 000000000000..7f7538d283dd --- /dev/null +++ b/pkgs/development/python-modules/binwalk3/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "binwalk3"; + version = "3.1.3"; + pyproject = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-Ro1HkQGg6BBu2nm5IfpWiu8XESCCQI/XOsvWLeoonQI="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "binwalk" ]; + + # Tests are not available on PyPI + doCheck = false; + + meta = { + description = "Binwalk v3 with v2-compatible Python API"; + homepage = "https://pypi.org/project/binwalk3/"; + changelog = "https://github.com/ZachFlint/Binwalk3/blob/master/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/development/python-modules/busypie/default.nix b/pkgs/development/python-modules/busypie/default.nix index 2659c8b86424..788d833dd7c8 100644 --- a/pkgs/development/python-modules/busypie/default.nix +++ b/pkgs/development/python-modules/busypie/default.nix @@ -6,30 +6,26 @@ pytest-timeout, pytestCheckHook, setuptools, - wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "busypie"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "rockem"; repo = "busypie"; - tag = "v${version}"; - hash = "sha256-dw0Sc/a27/EYY7LVMQqDkYuxrUFYK+N6XLk6A7A/eS8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LaPgK36ieHKAbm9btx6t//dMdSGdzcaDJVou96D6J3U="; }; postPatch = '' substituteInPlace setup.py \ - --replace "pytest-runner" "" + --replace-fail "pytest-runner" "" ''; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytest-asyncio @@ -42,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Expressive busy wait for Python"; homepage = "https://github.com/rockem/busypie"; - changelog = "https://github.com/rockem/busypie/releases/tag/v${version}"; + changelog = "https://github.com/rockem/busypie/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/dbt-protos/default.nix b/pkgs/development/python-modules/dbt-protos/default.nix index c85ccb7d58c3..42312404d9e4 100644 --- a/pkgs/development/python-modules/dbt-protos/default.nix +++ b/pkgs/development/python-modules/dbt-protos/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dbt-protos"; - version = "1.0.421"; + version = "1.0.424"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "proto-python-public"; tag = "v${version}"; - hash = "sha256-FBbsAP9nvUZnFg2xY6Z1on9sazB0FlG5yKcovw2fBMA="; + hash = "sha256-h9NxxMxUnV7P5sEwbwyDA13SEcpyC+gcUlxCjUCV2o4="; }; build-system = [ diff --git a/pkgs/development/python-modules/dvc-webdav/default.nix b/pkgs/development/python-modules/dvc-webdav/default.nix index e6b3dcffcd43..2a727e8032c0 100644 --- a/pkgs/development/python-modules/dvc-webdav/default.nix +++ b/pkgs/development/python-modules/dvc-webdav/default.nix @@ -8,14 +8,15 @@ webdav4, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dvc-webdav"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-Zefu8uvINBWo3b3LV5vyGaN5fGfnpi1FaMXILeK2pQg="; + pname = "dvc_webdav"; + inherit (finalAttrs) version; + hash = "sha256-PA0Er7CYWiwVbwtxn0uUN85KzTRmR9j2/uBDtekXx24"; }; # Prevent circular dependency @@ -40,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 25112d0dab63..268ec30ab89d 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.3.8"; + version = "0.3.9"; pyproject = true; src = fetchFromGitHub { owner = "breezy-team"; repo = "fastbencode"; tag = "v${version}"; - hash = "sha256-vpo8OVhIm9/niMY6A878FRJ+zU98z9CJe/p5UxmvrLo="; + hash = "sha256-TZGIFcWm037h4Xs6e5a9j24FqhNxP9H71QVtL1homjQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-N4diwjHZkJk+Tzu609ueRipfIXyNhXhLG7hpnG1gRa4="; + hash = "sha256-4DP8WOho4CKESfQHynZlosafcGPFqjpaOiZfLkcML3A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix index 6bd35c71d50e..627126bbd205 100644 --- a/pkgs/development/python-modules/freebox-api/default.nix +++ b/pkgs/development/python-modules/freebox-api/default.nix @@ -8,16 +8,16 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "freebox-api"; - version = "1.2.2"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "hacf-fr"; repo = "freebox-api"; - tag = "v${version}"; - hash = "sha256-piPC3F63Yqk1rYPYyIoEHSpC8TS4HyIVa8XbQlAgcqA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-3rmOIHneGUtaLw+0Z0UTKoCSoJs70KKLjDPi0gOtV6I="; }; build-system = [ poetry-core ]; @@ -36,9 +36,9 @@ buildPythonPackage rec { meta = { description = "Python module to interact with the Freebox OS API"; homepage = "https://github.com/hacf-fr/freebox-api"; - changelog = "https://github.com/hacf-fr/freebox-api/releases/tag/v${version}"; + changelog = "https://github.com/hacf-fr/freebox-api/releases/tag/v${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "freebox_api"; }; -} +}) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 43a10120eb74..02d534ddef05 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.24.2"; + version = "3.24.3"; pyproject = true; src = fetchFromGitHub { owner = "IBM"; repo = "python-sdk-core"; tag = "v${version}"; - hash = "sha256-xw7jEDr/5Qmd4+riAqFzTTFfmX/gQdlbzNZ8pua0hIs="; + hash = "sha256-S4GKOJ7H0a4zWaqzXR3yT5xRSLuRCDm9uR7G3A9QR9c="; }; pythonRelaxDeps = [ "requests" ]; diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 2221286d7f3c..4bbda2597a23 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "11.1.0"; + version = "11.2.0"; pyproject = true; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; tag = "v${version}"; - hash = "sha256-6xifendLRHekTOXDGEpyYxzucg9hRf85gwxS1FyBkCc="; + hash = "sha256-z+sGfYbPZcHQh6JGdVC2DDFHd0VIgC2GmvGvN+hrXU0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ihcsdk/default.nix b/pkgs/development/python-modules/ihcsdk/default.nix index f9ff1090c99b..c3bbe36d7e3c 100644 --- a/pkgs/development/python-modules/ihcsdk/default.nix +++ b/pkgs/development/python-modules/ihcsdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ihcsdk"; - version = "2.8.9"; + version = "2.8.10"; pyproject = true; src = fetchFromGitHub { owner = "dingusdk"; repo = "PythonIhcSdk"; tag = "v${version}"; - hash = "sha256-WI9RjVR2KdLaqklGtIUJErV4pBfffXx3odu3hdoyLWc="; + hash = "sha256-mJHRnvG3bUd/KjGu55dZEx899blLT3WP0fTXCFHlRec="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 9b4170f3045c..28f7828f9fa3 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -12,16 +12,16 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "internetarchive"; - version = "5.7.1"; + version = "5.7.2"; pyproject = true; src = fetchFromGitHub { owner = "jjjake"; repo = "internetarchive"; - tag = "v${version}"; - hash = "sha256-SNzscVFFuvRyG976lWtktPobcIvfQgk4tAQ8+NXu4yw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-eBTUKJs3j8LmQJSIBKAlDOjUglLHrjwtGx5O9Wn5C8Y="; }; build-system = [ setuptools ]; @@ -60,9 +60,9 @@ buildPythonPackage rec { meta = { description = "Python and Command-Line Interface to Archive.org"; homepage = "https://github.com/jjjake/internetarchive"; - changelog = "https://github.com/jjjake/internetarchive/blob/${src.tag}/HISTORY.rst"; + changelog = "https://github.com/jjjake/internetarchive/blob/${finalAttrs.src.tag}/HISTORY.rst"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ pyrox0 ]; mainProgram = "ia"; }; -} +}) diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix index 4a3783819b24..675833d6ec06 100644 --- a/pkgs/development/python-modules/lerobot/default.nix +++ b/pkgs/development/python-modules/lerobot/default.nix @@ -39,27 +39,16 @@ buildPythonPackage (finalAttrs: { pname = "lerobot"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "lerobot"; tag = "v${finalAttrs.version}"; - hash = "sha256-qBbXFvVQ+cESBrNy8NIoT6GR6dqzeLbRNe3JmcpiiTw="; + hash = "sha256-3z8gyK9bx5GpFXM/kLbxume/e8F2U84yUTUhmn57mLs="; }; - # ValueError: mutable default for field value is not allowed: use default_factory - postPatch = '' - substituteInPlace tests/processor/test_pipeline.py \ - --replace-fail \ - "from dataclasses import dataclass" \ - "from dataclasses import dataclass, field" \ - --replace-fail \ - "value: PolicyFeature = PolicyFeature(type=FeatureType.STATE, shape=(1,))" \ - "value: PolicyFeature = field(default_factory=lambda: PolicyFeature(type=FeatureType.STATE, shape=(1,)))" - ''; - build-system = [ cmake setuptools @@ -68,6 +57,7 @@ buildPythonPackage (finalAttrs: { pythonRelaxDeps = [ "av" + "datasets" "draccus" "gymnasium" "rerun-sdk" @@ -123,6 +113,8 @@ buildPythonPackage (finalAttrs: { # Require internet access "test_act_backbone_lr" "test_backward_compatibility" + "test_convert_image_to_video_dataset" + "test_convert_image_to_video_dataset_subset_episodes" "test_dataset_initialization" "test_factory" "test_from_pretrained_nonexistent_path" diff --git a/pkgs/development/python-modules/llama-stack-client/default.nix b/pkgs/development/python-modules/llama-stack-client/default.nix index adc6db0391a9..0f9039870244 100644 --- a/pkgs/development/python-modules/llama-stack-client/default.nix +++ b/pkgs/development/python-modules/llama-stack-client/default.nix @@ -32,13 +32,13 @@ buildPythonPackage (finalAttrs: { pname = "llama-stack-client"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; src = fetchPypi { pname = "llama_stack_client"; inherit (finalAttrs) version; - hash = "sha256-Ene/VjUx2bxHbjBfLSvq2ZAJhtQmouMsmt9LakZIBMM="; + hash = "sha256-y4B74lggbo/t615c66e+cQjTutsx10GZQGgIw9FnnDU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index cd0aa4e37545..0dbb2dac845d 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -20,14 +20,14 @@ buildPythonPackage (finalAttrs: { pname = "mdformat-mkdocs"; - version = "5.1.3"; + version = "5.1.4"; pyproject = true; src = fetchFromGitHub { owner = "KyleKing"; repo = "mdformat-mkdocs"; tag = "v${finalAttrs.version}"; - hash = "sha256-PklT9LlaIQFG194zhHQhzR8kVe084Q+1Bo9180eOMd0="; + hash = "sha256-Li+nXYs+JZHgV/RBMpxJGP1P7sXp9E7xqSvjHZRlev4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/memray/default.nix b/pkgs/development/python-modules/memray/default.nix new file mode 100644 index 000000000000..ea641b8e3c48 --- /dev/null +++ b/pkgs/development/python-modules/memray/default.nix @@ -0,0 +1,93 @@ +{ + lib, + buildPythonPackage, + cython, + distutils, + fetchFromGitHub, + greenlet, + ipython, + jinja2, + pkg-config, + pkgconfig, + pkgs, + pytest-cov-stub, + pytest-textual-snapshot, + pytestCheckHook, + pythonOlder, + rich, + setuptools, + textual, +}: + +buildPythonPackage (finalAttrs: { + pname = "memray"; + version = "1.19.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bloomberg"; + repo = "memray"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RdOtgNSkFIVl8Uve2iaJ7G0X1IHJ/Yo4h8hWP3pTV8g="; + }; + + build-system = [ + distutils + setuptools + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + cython + pkgs.elfutils # for `-ldebuginfod` + pkgs.libunwind + pkgs.lz4 + ]; + + dependencies = [ + pkgconfig + textual + jinja2 + rich + ]; + + nativeCheckInputs = [ + ipython + pytest-cov-stub + pytest-textual-snapshot + pytestCheckHook + ] + ++ lib.optionals (pythonOlder "3.14") [ greenlet ]; + + pythonImportsCheck = [ "memray" ]; + + disabledTests = [ + # Import issue + "test_header_allocator" + "test_hybrid_stack_of_allocations_inside_ceval" + + # The following snapshot tests started failing since updating textual to 3.5.0 + "TestTUILooks" + "test_merge_threads" + "test_tui_basic" + "test_tui_gradient" + "test_tui_pause" + "test_unmerge_threads" + ]; + + disabledTestPaths = [ + # Very time-consuming and some tests fails (performance-related?) + "tests/integration/test_main.py" + ]; + + meta = { + description = "Memory profiler for Python"; + homepage = "https://bloomberg.github.io/memray/"; + changelog = "https://github.com/bloomberg/memray/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + platforms = lib.platforms.linux; + mainProgram = "memray"; + }; +}) diff --git a/pkgs/development/python-modules/mlx-lm/default.nix b/pkgs/development/python-modules/mlx-lm/default.nix index e9f388fb1b77..78abdade37e5 100644 --- a/pkgs/development/python-modules/mlx-lm/default.nix +++ b/pkgs/development/python-modules/mlx-lm/default.nix @@ -24,14 +24,14 @@ buildPythonPackage (finalAttrs: { pname = "mlx-lm"; - version = "0.30.4"; + version = "0.30.5"; pyproject = true; src = fetchFromGitHub { owner = "ml-explore"; repo = "mlx-lm"; tag = "v${finalAttrs.version}"; - hash = "sha256-ncDg7C84d1tAgk1300N7wY6kD1BocNNIqDUl0xBLhqY="; + hash = "sha256-GXz9VtNJ0ldh8aDAyBvSR2DhZq/NctpPup58WLrIt6Y="; }; build-system = [ diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 05867d8c3b7f..b2832485eae8 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -41,23 +41,34 @@ typing-extensions, vispy, wrapt, + + # tests + hypothesis, + pretend, + pyautogui, + pytest-pretty, + pytest-qt, + pytestCheckHook, + writableTmpDirAsHomeHook, + xarray, + zarr, }: mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.6.4"; + version = "0.6.6"; pyproject = true; src = fetchFromGitHub { owner = "napari"; repo = "napari"; tag = "v${version}"; - hash = "sha256-SmFDIj170CWRuQ/rQX+Nc3cME4GCItNGkxIPPWIn7AA="; + hash = "sha256-F0l6GWyZ6n4HNZW7XyUk4ZBPQfrAW4DWixCaRHViDPI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "scikit-image[data]>=0.19.1" "scikit-image" + --replace-fail '"--maxfail=5", ' "" ''; build-system = [ @@ -67,6 +78,11 @@ mkDerivationWith buildPythonPackage rec { nativeBuildInputs = [ wrapQtAppsHook ]; + pythonRelaxDeps = [ + "app-model" + "psygnal" + "vispy" + ]; dependencies = [ app-model appdirs @@ -104,6 +120,82 @@ mkDerivationWith buildPythonPackage rec { wrapQtApp $out/bin/napari ''; + preCheck = '' + rm src/napari/__init__.py + ''; + + nativeCheckInputs = [ + hypothesis + pretend + pyautogui + pytest-pretty + pytest-qt + pytestCheckHook + writableTmpDirAsHomeHook + xarray + zarr + ]; + + disabledTestPaths = [ + # Require DISPLAY access + "src/napari/_qt/" + + # AttributeError: 'Selection' object has no attribute 'replace_selection' + "src/napari/layers/shapes/_tests/test_shapes.py" + "src/napari/layers/shapes/_tests/test_shapes_key_bindings.py" + "src/napari/layers/shapes/_tests/test_shapes_mouse_bindings.py" + + # Fatal Python error: Aborted + "src/napari/_tests/test_adding_removing.py" + "src/napari/_tests/test_advanced.py" + "src/napari/_tests/test_cli.py" + "src/napari/_tests/test_conftest_fixtures.py" + "src/napari/_tests/test_function_widgets.py" + "src/napari/_tests/test_key_bindings.py" + "src/napari/_tests/test_layer_utils_with_qt.py" + "src/napari/_tests/test_mouse_bindings.py" + "src/napari/_tests/test_multiple_viewers.py" + "src/napari/_tests/test_notebook_display.py" + "src/napari/_tests/test_top_level_availability.py" + "src/napari/_tests/test_with_screenshot.py" + "src/napari/_vispy/" + ]; + + enabledTestPaths = [ + "src/napari/_tests/" + ]; + + disabledTests = [ + # Failed: DID NOT WARN. No warnings of type (,) were emitted. + "test_PublicOnlyProxy" + + # NameError: name 'utils' is not defined + "test_create_func_deprecated" + "test_create_func_renamed" + "test_create_func" + + # AttributeError: 'Selection' object has no attribute 'replace_selection' + "test_add_empty_shapes_layer" + "test_update_data_updates_layer_extent_cache" + + # Fatal Python error: Aborted + "test_add_layer_data_to_viewer_optional" + "test_from_layer_data_tuple_accept_deprecating_dict" + "test_layers_populate_immediately" + "test_magicgui_add_data" + "test_magicgui_add_future_data" + "test_magicgui_add_layer" + "test_magicgui_add_layer_inheritance" + "test_magicgui_add_threadworker" + "test_magicgui_data_updated" + "test_magicgui_get_data" + "test_magicgui_get_viewer" + "test_make_napari_viewer" + "test_singlescreen_window_settings" + "test_sys_info" + "test_view" + ]; + meta = { description = "Fast, interactive, multi-dimensional image viewer"; homepage = "https://github.com/napari/napari"; diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 3d5d6cf6ac84..6dbb5898aebf 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -16,16 +16,16 @@ tenacity, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nibe"; - version = "2.21.0"; + version = "2.22.0"; pyproject = true; src = fetchFromGitHub { owner = "yozik04"; repo = "nibe"; - tag = version; - hash = "sha256-I4Qgwdx5alkNso0FMz4wRWZffbDQm5VblmPdwtU/jXg="; + tag = finalAttrs.version; + hash = "sha256-mbLasfHPPrZvL+PheMutqvIiyQQoew7dGIPGekuk0Oo="; }; pythonRelaxDeps = [ "async-modbus" ]; @@ -53,15 +53,15 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); pythonImportsCheck = [ "nibe" ]; meta = { description = "Library for the communication with Nibe heatpumps"; homepage = "https://github.com/yozik04/nibe"; - changelog = "https://github.com/yozik04/nibe/releases/tag/${src.tag}"; + changelog = "https://github.com/yozik04/nibe/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix index 573310856a83..fad32ba6fc29 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "oelint-data"; - version = "1.3.4"; + version = "1.3.5"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-data"; tag = finalAttrs.version; - hash = "sha256-TN37FfLPBRrVZ8BKqp7If9EBK8JkyUAdwztHjIJX2Bc="; + hash = "sha256-Gn8iddrZj6dRv5Lz68Qq375zKAf2uOSMX2l35WkdQ9k="; }; build-system = [ diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 2b8eb7ced9dc..5b55844b1feb 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "oelint-parser"; - version = "8.7.2"; + version = "8.8.1"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-parser"; tag = finalAttrs.version; - hash = "sha256-F17THZo8fXoFP4b2DJnDjbZfT5xUX9+MMSxBa9sIy5c="; + hash = "sha256-r2MleUgfElyUyq/lEoOOJqdxlTkmY1zlgi2RcW70LzI="; }; pythonRelaxDeps = [ "regex" ]; diff --git a/pkgs/development/python-modules/onigurumacffi/default.nix b/pkgs/development/python-modules/onigurumacffi/default.nix index a1acbe85a653..c89374f1eae9 100644 --- a/pkgs/development/python-modules/onigurumacffi/default.nix +++ b/pkgs/development/python-modules/onigurumacffi/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { pname = "onigurumacffi"; - version = "1.4.1"; + version = "1.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-W/vB725dEXniJFP4JDeoJPnVdx4M5l86csprnGEiZTY="; + hash = "sha256-1Pqb7kSm04qYsiN8Z9ms3yftDDLWwhgSX+RmgaXt6k0="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 8aa8e2c37bf2..ea6acc23c54d 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -4,15 +4,18 @@ version = 4 [[package]] name = "arc-swap" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" +checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e" +dependencies = [ + "rustversion", +] [[package]] name = "async-lock" -version = "3.4.1" +version = "3.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" +checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" dependencies = [ "event-listener", "event-listener-strategy", @@ -44,9 +47,9 @@ checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "cfg-if" @@ -115,9 +118,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "js-sys", @@ -149,15 +152,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "js-sys" -version = "0.3.83" +version = "0.3.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" +checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" dependencies = [ "once_cell", "wasm-bindgen", @@ -165,9 +168,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.178" +version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "lock_api" @@ -226,22 +229,22 @@ checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "portable-atomic" -version = "1.11.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" +checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] name = "pycrdt" -version = "0.12.44" +version = "0.12.45" dependencies = [ "pyo3", "serde_json", @@ -311,9 +314,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.42" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" dependencies = [ "proc-macro2", ] @@ -333,12 +336,6 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - [[package]] name = "scopeguard" version = "1.2.0" @@ -377,15 +374,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -405,9 +402,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "syn" -version = "2.0.111" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", @@ -416,24 +413,24 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" +checksum = "b1dd07eb858a2067e2f3c7155d54e929265c264e6f37efe3ee7a8d1b5a1dd0ba" [[package]] name = "thiserror" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", @@ -460,9 +457,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasm-bindgen" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" +checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" dependencies = [ "cfg-if", "once_cell", @@ -473,9 +470,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" +checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -483,9 +480,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" +checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" dependencies = [ "bumpalo", "proc-macro2", @@ -496,9 +493,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" dependencies = [ "unicode-ident", ] @@ -526,3 +523,9 @@ dependencies = [ "smallvec", "thiserror", ] + +[[package]] +name = "zmij" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02aae0f83f69aafc94776e879363e9771d7ecbffe2c7fbb6c14c5e00dfe88439" diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index da505140c3e4..425148e72879 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -6,8 +6,12 @@ # nativeBuildInputs rustPlatform, - # tests + # dependencies anyio, + pythonOlder, + exceptiongroup, + + # tests objsize, pydantic, pytestCheckHook, @@ -16,16 +20,16 @@ nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pycrdt"; - version = "0.12.44"; + version = "0.12.45"; pyproject = true; src = fetchFromGitHub { owner = "y-crdt"; repo = "pycrdt"; - tag = version; - hash = "sha256-7kfLi0am/rE4QwLdLCGDjfMhAjrKBPNH+3yPRoYxTtA="; + tag = finalAttrs.version; + hash = "sha256-4J8aEjpO4kTXSOYI9JcFmu4kz8c2Mk3AZB6tTy8I2fM="; }; postPatch = '' @@ -39,7 +43,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - dependencies = [ anyio ]; + dependencies = [ anyio ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; pythonImportsCheck = [ "pycrdt" ]; @@ -60,8 +64,8 @@ buildPythonPackage rec { meta = { description = "CRDTs based on Yrs"; homepage = "https://github.com/jupyter-server/pycrdt"; - changelog = "https://github.com/jupyter-server/pycrdt/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/jupyter-server/pycrdt/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; teams = [ lib.teams.jupyter ]; }; -} +}) diff --git a/pkgs/development/python-modules/pymitsubishi/default.nix b/pkgs/development/python-modules/pymitsubishi/default.nix index 181e2a716eeb..7fdf2047d722 100644 --- a/pkgs/development/python-modules/pymitsubishi/default.nix +++ b/pkgs/development/python-modules/pymitsubishi/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pymitsubishi"; - version = "0.4.2"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "pymitsubishi"; repo = "pymitsubishi"; tag = "v${version}"; - hash = "sha256-frqyAXAP2O8TZzXx5ephcLSLJA9p0P74KJrPoSKPYYo="; + hash = "sha256-Y+peVtaPWuvgM+2x7bIuwCicscv6xkZHzqpFSyiJQWQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix index 75da8f07a351..876644f8719b 100644 --- a/pkgs/development/python-modules/pyotgw/default.nix +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -8,16 +8,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyotgw"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; src = fetchFromGitHub { owner = "mvn23"; repo = "pyotgw"; - tag = version; - hash = "sha256-BQgRWXBSmB9AzpPeTJP7motJeKF2G0tyqJpbwIwnxwk="; + tag = finalAttrs.version; + hash = "sha256-0F+UBIPk+A9z0YJtLVlJAqzMre8GZAio720SCi2dorE="; }; build-system = [ setuptools ]; @@ -39,8 +39,8 @@ buildPythonPackage rec { meta = { description = "Python module to interact the OpenTherm Gateway"; homepage = "https://github.com/mvn23/pyotgw"; - changelog = "https://github.com/mvn23/pyotgw/blob/${version}/CHANGELOG.md"; - license = with lib.licenses; [ gpl3Plus ]; + changelog = "https://github.com/mvn23/pyotgw/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix index d2ef003fab1f..aae838dc228c 100644 --- a/pkgs/development/python-modules/pyportainer/default.nix +++ b/pkgs/development/python-modules/pyportainer/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "pyportainer"; - version = "1.0.23"; + version = "1.0.24"; pyproject = true; src = fetchFromGitHub { owner = "erwindouna"; repo = "pyportainer"; tag = "v${finalAttrs.version}"; - hash = "sha256-bPVAqL25kJ5EsnM7bUA+sqn0Q5uTOuFuKzneviK6078="; + hash = "sha256-RuoOkmiEndS2NpNKWRD+ZScNLwGl9Ud2sGvg5IWb7JI="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix index 64053f27e3e0..21b9368f103d 100644 --- a/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/pkgs/development/python-modules/pysiaalarm/default.nix @@ -5,38 +5,33 @@ dataclasses-json, pycryptodome, setuptools-scm, - pytest-asyncio_0, + pytest-asyncio, pytest-cases, pytest-cov-stub, pytestCheckHook, pytz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysiaalarm"; - version = "3.1.1"; + version = "3.2.2"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-q42bsBeAwU9lt7wtYGFJv23UBND+aMXZJlSWyTfZDQE="; + inherit (finalAttrs) pname version; + hash = "sha256-9icZnEpSaezVj9EH5s1u2mB2h9jP/oZcpkVE0WFM4W8="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "==" ">=" - ''; - build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dataclasses-json pycryptodome pytz ]; nativeCheckInputs = [ - pytest-asyncio_0 + pytest-asyncio pytest-cases pytest-cov-stub pytestCheckHook @@ -50,8 +45,8 @@ buildPythonPackage rec { meta = { description = "Python package for creating a client that talks with SIA-based alarm systems"; homepage = "https://github.com/eavanvalkenburg/pysiaalarm"; - changelog = "https://github.com/eavanvalkenburg/pysiaalarm/releases/tag/v${version}"; + changelog = "https://github.com/eavanvalkenburg/pysiaalarm/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 15c6e61f1f2b..d733f784a03d 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "25.12.0"; + version = "26.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ansible"; repo = "pytest-ansible"; tag = "v${version}"; - hash = "sha256-2mrz+DADelydnwNf3ytGa3igSTlybQdZ7kdlWfoG8Io="; + hash = "sha256-uCuGDAEIiVAB9lfYf2X60nIA8IsmEJ9Dola0eFBNC+U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-pretty/default.nix b/pkgs/development/python-modules/pytest-pretty/default.nix new file mode 100644 index 000000000000..7bb258892d93 --- /dev/null +++ b/pkgs/development/python-modules/pytest-pretty/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + pytest, + rich, + + # tests + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "pytest-pretty"; + version = "1.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "samuelcolvin"; + repo = "pytest-pretty"; + tag = "v${finalAttrs.version}"; + hash = "sha256-vJ75zpY0xlTQbi7qTHyqHZ7AMb7bLlM6SNq2b7zcQYs="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + pytest + rich + ]; + + pythonImportsCheck = [ "pytest_pretty" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Pytest plugin for pretty printing the test summary"; + homepage = "https://github.com/samuelcolvin/pytest-pretty"; + changelog = "https://github.com/samuelcolvin/pytest-pretty/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 6995d57601d2..35b5d5f0eb99 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -17,16 +17,16 @@ typeguard, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "renault-api"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; src = fetchFromGitHub { owner = "hacf-fr"; repo = "renault-api"; - tag = "v${version}"; - hash = "sha256-7ZvUg2Dgu9hSG1VXDT+YC6PBbylsR4d12ZR66UrPlyE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-L5Ld6CyMapW2qX5YmExQzfWddQkQjSHgy7sz3OtL4TQ="; }; build-system = [ poetry-core ]; @@ -53,16 +53,16 @@ buildPythonPackage rec { syrupy typeguard ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); pythonImportsCheck = [ "renault_api" ]; meta = { description = "Python library to interact with the Renault API"; homepage = "https://github.com/hacf-fr/renault-api"; - changelog = "https://github.com/hacf-fr/renault-api/releases/tag/v${version}"; + changelog = "https://github.com/hacf-fr/renault-api/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "renault-api"; }; -} +}) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 9cbf67d7a86c..77c446724991 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.40"; + version = "3.1.41"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = finalAttrs.version; - hash = "sha256-3040m7RGQDcVRR6x03+bKCmbBNXtbBmu208k8ADjZ24="; + hash = "sha256-egzZfCjTeMViZKe7hoMcvQjexOsTNNkIQu+Ms0M3UnA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/throttler/default.nix b/pkgs/development/python-modules/throttler/default.nix index 7c3281338126..6908fff18ed8 100644 --- a/pkgs/development/python-modules/throttler/default.nix +++ b/pkgs/development/python-modules/throttler/default.nix @@ -7,16 +7,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "throttler"; - version = "1.2.2"; + version = "1.2.3"; pyproject = true; src = fetchFromGitHub { owner = "uburuntu"; repo = "throttler"; - tag = "v${version}"; - hash = "sha256-fE35zPjBUn4e1VRkkIUMtYJ/+LbnUxnxyfnU+UEPwr4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-zcKhHA1PDEpfp+I/zHaGeg1x1F2LM0m7GxMLGDscCsw="; }; build-system = [ setuptools ]; @@ -34,10 +34,10 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/uburuntu/throttler/releases/tag/${src.tag}"; + changelog = "https://github.com/uburuntu/throttler/releases/tag/${finalAttrs.src.tag}"; description = "Zero-dependency Python package for easy throttling with asyncio support"; homepage = "https://github.com/uburuntu/throttler"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ renatoGarcia ]; }; -} +}) diff --git a/pkgs/development/python-modules/trafilatura/default.nix b/pkgs/development/python-modules/trafilatura/default.nix index 57d236ffeb03..d730a54ab051 100644 --- a/pkgs/development/python-modules/trafilatura/default.nix +++ b/pkgs/development/python-modules/trafilatura/default.nix @@ -75,6 +75,10 @@ buildPythonPackage rec { "test_queue" "test_redirection" "test_whole" + + # AssertionError: assert ['deflate', 'gzip', 'zstd'] == ['deflate', 'gzip'] + # https://github.com/adbar/trafilatura/issues/823 + "test_config" ]; pythonImportsCheck = [ "trafilatura" ]; @@ -83,6 +87,7 @@ buildPythonPackage rec { description = "Python package and command-line tool designed to gather text on the Web"; homepage = "https://trafilatura.readthedocs.io"; changelog = "https://github.com/adbar/trafilatura/blob/v${version}/HISTORY.md"; + downloadPage = "https://github.com/adbar/trafilatura"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jokatzke ]; mainProgram = "trafilatura"; diff --git a/pkgs/development/python-modules/yt-dlp-ejs/default.nix b/pkgs/development/python-modules/yt-dlp-ejs/default.nix index 156b6cd48f8b..ad015a8fbcf3 100644 --- a/pkgs/development/python-modules/yt-dlp-ejs/default.nix +++ b/pkgs/development/python-modules/yt-dlp-ejs/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "yt-dlp-ejs"; - version = "0.3.2"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "yt-dlp"; repo = "ejs"; tag = version; - hash = "sha256-o6qf4rfj42mCyvCBb+wyJmZKg3Q+ojsqbCcBfIJnTPg="; + hash = "sha256-/qq069SD7ESg+7pK4PC1EGLLI8zqjWUse7cArN4YuXE="; }; pnpmDeps = fetchPnpmDeps { diff --git a/pkgs/development/python2-modules/README.md b/pkgs/development/python2-modules/README.md index 2d3a7cbb2b8e..97252d996691 100644 --- a/pkgs/development/python2-modules/README.md +++ b/pkgs/development/python2-modules/README.md @@ -1,7 +1,7 @@ # Python 2 is Not Supported -Packages, applications, and services based on Python 2 are no longer supported and are being removed. If you require a Python 2 based package, you can include that package in your own local repository. +Packages, applications, and services based on Python 2 are no longer supported and are being removed. If you require a Python 2-based package, you can include that package in your own local repository. -Some packages may continue to be maintained for internal use by nixpkgs, but they should not be used by new public packages. +Some packages may continue to be maintained for internal use by Nixpkgs, but they should not be used by new public packages. For more details, see [Issue #201859](https://github.com/NixOS/nixpkgs/pull/201859). diff --git a/pkgs/development/tools/build-managers/gradle/README.md b/pkgs/development/tools/build-managers/gradle/README.md index 4598b0302391..3e4da0d4ff95 100644 --- a/pkgs/development/tools/build-managers/gradle/README.md +++ b/pkgs/development/tools/build-managers/gradle/README.md @@ -2,7 +2,7 @@ ## Introduction -Gradle build scripts are written in a DSL, computing the list of Gradle +Gradle build scripts are written in a DSL; computing the list of Gradle dependencies is a Turing-complete task, not just in theory but also in practice. Fetching all of the dependencies often requires building some native code, running some commands to check the host platform, or just @@ -35,7 +35,7 @@ the Gradle derivation to access these files. (Reference: [Repository Layout](https://cwiki.apache.org/confluence/display/MAVENOLD/Repository+Layout+-+Final)) -Most of Gradle dependencies are fetched from Maven repositories. For +Most Gradle dependencies are fetched from Maven repositories. For each dependency, Gradle finds the first repo where it can successfully fetch that dependency, and uses that repo for it. Different repos might actually return different files for the same artifact because of e.g. @@ -128,7 +128,7 @@ Second, for figuring out where to download the snapshot, Gradle consults (Reference: [Maven Metadata](https://maven.apache.org/repositories/metadata.html), -[Metadata](https://maven.apache.org/ref/3.9.8/maven-repository-metadata/repository-metadata.html) +[Metadata](https://maven.apache.org/ref/3.9.8/maven-repository-metadata/repository-metadata.html)) Maven metadata files are called `maven-metadata.xml`. @@ -139,7 +139,7 @@ G level metadata is currently unsupported. It's only used for Maven plugins, which Gradle presumably doesn't use. A level metadata is used for getting the version list for an artifact. -It's an xml with the following items: +It's an XML file with the following items: - `` - group ID - `` - artifact ID diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/README.md b/pkgs/development/tools/parsing/tree-sitter/grammars/README.md index 623763cccbad..e2b0e8750d39 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/README.md +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/README.md @@ -1,6 +1,6 @@ # Tree-sitter Grammars -Use [grammar-sources.nix](grammar-sources.nix) to define tree-sitter grammars sources. +Use [grammar-sources.nix](grammar-sources.nix) to define tree-sitter grammar sources. Tree-sitter grammars follow a common form for compatibility with the [`tree-sitter` CLI](https://tree-sitter.github.io/tree-sitter/cli/index.html). This uniformity enables consistent packaging through shared tooling. @@ -44,7 +44,7 @@ Each entry is passed to [buildGrammar](../build-grammar.nix), which in turn popu Attempt to build the new grammar: `nix-build -A tree-sitter-grammars.tree-sitter-latex`. This will fail due to the invalid hash. -Review the downloaded source then update the source definition with the printed source `hash`. +Review the downloaded source, then update the source definition with the printed source `hash`. ## Pinning Grammar Sources diff --git a/pkgs/misc/documentation-highlighter/README.md b/pkgs/misc/documentation-highlighter/README.md index 569c90affed9..62009879ed49 100644 --- a/pkgs/misc/documentation-highlighter/README.md +++ b/pkgs/misc/documentation-highlighter/README.md @@ -6,13 +6,13 @@ This file was generated with pkgs/misc/documentation-highlighter/update.sh **This package contains only the CDN build assets of highlight.js.** -This may be what you want if you'd like to install the pre-built distributable highlight.js client-side assets via NPM. If you're wanting to use highlight.js mainly on the server-side you likely want the [highlight.js][1] package instead. +This may be what you want if you'd like to install the pre-built distributable highlight.js client-side assets via NPM. If you want to use highlight.js mainly on the server-side, you likely want the [highlight.js][1] package instead. To access these files via CDN:
https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@latest/build/ -**If you just want a single .js file with the common languages built-in: -** +**If you just want a single .js file with the common languages built-in:** + --- diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 873d5ec4c91d..1eea6657259f 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -3,7 +3,6 @@ lib, buildPackages, fetchurl, - fetchpatch, fetchFromGitLab, enableStatic ? stdenv.hostPlatform.isStatic, enableMinimal ? false, diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 93718dfd95e7..9dc388ff2414 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" + "man" "apparmor" ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e38ec3202941..5962bb521893 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -72,7 +72,9 @@ let # Reduced debug info conflict with BTF and have been enabled in # aarch64 defconfig since 5.13 DEBUG_INFO_REDUCED = whenAtLeast "5.13" (option no); - DEBUG_INFO_BTF = option yes; + # Intermittently breaks on 5.10 for unknown reasons. + # https://lore.kernel.org/r/6dd6eef7-15cb-00a3-c216-d6eaaa5cbf54@est.tech + DEBUG_INFO_BTF = whenAtLeast "5.11" (option yes); # Allow loading modules with mismatched BTFs # FIXME: figure out how to actually make BTFs reproducible instead # See https://github.com/NixOS/nixpkgs/pull/181456 for details. diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 596f230b0541..ddb925e9d5b7 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.19-rc6", - "hash": "sha256:0cpdgpvs2j7i42196z65kdqr13cvr86f19is95919w73vjb47pd9", + "version": "6.19-rc7", + "hash": "sha256:03isv8zwasq8shq06wryyzii1zvf1kqzs310mvyqbq22iifm71f7", "lts": false }, "6.1": { @@ -20,18 +20,18 @@ "lts": true }, "6.6": { - "version": "6.6.121", - "hash": "sha256:1fhl9pr02s10j4b5nli0isy7ps644cpbmjqzkwf5mk14rr7rvbvn", + "version": "6.6.122", + "hash": "sha256:1mlrna10449cf7whz86wgj3bijlbahj03nqbfjwjzvsbw2fhv3nl", "lts": true }, "6.12": { - "version": "6.12.67", - "hash": "sha256:0cn42b7pam5ssk740s3d42sp3cggl923yvs67y5fz98z5v35v00n", + "version": "6.12.68", + "hash": "sha256:1dr58bfp883g4dnxak5gr25hib6hs8jq3c0ys06m5nnl9d8cfryk", "lts": true }, "6.18": { - "version": "6.18.7", - "hash": "sha256:07lgbc0w7fd9akxmazhkpjgxhd3ffwh7in2nkchhdbprbk8s89mp", + "version": "6.18.8", + "hash": "sha256:1zwczw98ylqa3nhlqnvjbylaaqg8jn3z0j3xx02ddha2qbawbw1p", "lts": false } } diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix index 4bb222197bd1..28bb0a8085f9 100644 --- a/pkgs/os-specific/windows/mcfgthreads/default.nix +++ b/pkgs/os-specific/windows/mcfgthreads/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mcfgthread"; - version = "2.2.2"; + version = "2.3.1"; src = fetchFromGitHub { owner = "lhmouse"; repo = "mcfgthread"; tag = "v${lib.versions.majorMinor finalAttrs.version}-ga.${lib.versions.patch finalAttrs.version}"; - hash = "sha256-KI/FweYPKe6mxK+oktIqRN9dltGg7jSgWsoIwDg7xEE="; + hash = "sha256-x20wmqm675+pFx+eOu2zWA3BZsG+TXgBTwOoc6+I7WA="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md index 81edbb043fd7..b80baf258c92 100644 --- a/pkgs/servers/home-assistant/custom-components/README.md +++ b/pkgs/servers/home-assistant/custom-components/README.md @@ -3,12 +3,12 @@ ## buildHomeAssistantComponent Custom components should be packaged using the - `buildHomeAssistantComponent` function, that is provided at top-level. + `buildHomeAssistantComponent` function that is provided at top-level. It builds upon `buildPythonPackage` but uses a custom install and check phase. Python runtime dependencies can be directly consumed as unqualified -function arguments. Pass them into `dependencies`, for them to +function arguments. Pass them into `dependencies` for them to be available to Home Assistant. Out-of-tree components need to use Python packages from 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 9300735a5e5f..aac22a84596a 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.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "SukramJ"; repo = "custom_homematic"; tag = version; - hash = "sha256-aILnBc163oB0NgBAubbqQTP8wwrLN8AcvGP21sc1314="; + hash = "sha256-vdzQtF+5CH1gqLOnNaoUDDSJvJPqpORQdDKosmQ1xv0="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix index 1c97df2331e6..251e73faf132 100644 --- a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix +++ b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix @@ -11,21 +11,19 @@ buildHomeAssistantComponent rec { owner = "pymitsubishi"; domain = "mitsubishi"; - version = "0.4.3"; + version = "0.5.3"; src = fetchFromGitHub { owner = "pymitsubishi"; repo = "homeassistant-mitsubishi"; tag = "v${version}"; - hash = "sha256-jhcclDealb1T84zNse2tpT3MDvDaOqhTMGrBhiUXHPc="; + hash = "sha256-yVj3QPH00u7WEvhK3pHKmrNx6o9ybK9LgRhq51OvjAc="; }; dependencies = [ pymitsubishi ]; - doCheck = false; # TODO: remove in the next release after 0.4.0 - nativeCheckInputs = [ pytest-cov-stub pytestCheckHook diff --git a/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix index fc61d6cdd648..3fc46de15789 100644 --- a/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "mweinelt"; domain = "prometheus_sensor"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mweinelt"; repo = "ha-prometheus-sensor"; tag = version; - hash = "sha256-ju63ptI1fXycbsE/26LxF/9Dxn93JixvDwb+hTXX/O4="; + hash = "sha256-uXPUBNxF9DnVBTIPYS/3P1JK78Vozodmf7Ds7C6p+nQ="; }; meta = { diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix index 2af9cbdabe97..2f78a29eee51 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "5.0.9"; + version = "5.0.10"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-E2JHURCRAupP1cKPMA99cBkWnXjDu6uow4hJosqfeHs="; + hash = "sha256-AjHBYjhuux10YOqLDmlA7qEMnVZC+2aS3j5GueLXioY="; }; - npmDepsHash = "sha256-FtliQ+J5vIIw/TS7FyBTp3Qdu7R5ul9YoS5RO8JiC6g="; + npmDepsHash = "sha256-6OpENvqB9bORnVm1n4aE5fTVwqAN5zw49czMtqN4qKM="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 7d3a384d1a9c..6253dcd70a63 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -65,8 +65,8 @@ in }; tomcat10 = common { - version = "10.1.50"; - hash = "sha256-90+fGnrCz27u3ixQ9FCI2cPlX3fVd3+fcDPtPUPvUpw="; + version = "10.1.52"; + hash = "sha256-XTWDBhCF1BLVEyo2xUIq2WrcjVvVhpAT1wepIGlslFc="; }; tomcat11 = common { diff --git a/pkgs/servers/kanidm/README.md b/pkgs/servers/kanidm/README.md index 8a66eee9b404..d22f71e68cf6 100644 --- a/pkgs/servers/kanidm/README.md +++ b/pkgs/servers/kanidm/README.md @@ -29,7 +29,7 @@ For example, when upgrading from 1.4 -> 1.5 ## Remove release -Kanidm versions are supported for 30 days after the release of new versions. Following the example above, 1.5.x superseding 1.4.x in 30 days, do the following near the end of the 30-day window +Kanidm versions are supported for 30 days after the release of new versions. Following the example above, 1.5.x superseding 1.4.x in 30 days, do the following near the end of the 30-day window: 1. Update `pkgs/by-name/ka/kanidm/1_4.nix` by adding `unsupported = true;` 1. Update `pkgs/top-level/release.nix` and add `kanidm_1_4-1.4.6` and `kanidmWithSecretProvisioning_1_4-1.4.6` to `permittedInsecurePackages` diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix index 92b882907fc4..f83a5c99949e 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-lokiexplore-app"; - version = "1.0.31"; - zipHash = "sha256-IFt2w4DYgxYw86XngS8xfSAMqMdbf3fxml/KwGB8lLY="; + version = "1.0.34"; + zipHash = "sha256-koWDaYT9LLBSTieRl1ODdGQrU6n+72diWQRfiGFmPvQ="; meta = { description = "Browse Loki logs without the need for writing complex queries"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/nextcloud/packages/README.md b/pkgs/servers/nextcloud/packages/README.md index 93d1436b25b2..bb345d99fdd0 100644 --- a/pkgs/servers/nextcloud/packages/README.md +++ b/pkgs/servers/nextcloud/packages/README.md @@ -19,7 +19,7 @@ file with the id of the app: The app must be available in the official [Nextcloud app store](https://apps.nextcloud.com). -https://apps.nextcloud.com. The id corresponds to the last part in the app url, +The id corresponds to the last part in the app url, for example `breezedark` for the app with the url `https://apps.nextcloud.com/apps/breezedark`. @@ -46,7 +46,7 @@ Using it together with the Nextcloud module could look like this: hostName = "localhost"; config.adminpassFile = "${pkgs.writeText "adminpass" "hunter2"}"; extraApps = with pkgs.nextcloud31Packages.apps; { - inherit mail calendar contact; + inherit mail calendar contacts; }; extraAppsEnable = true; }; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 1dbfd1528467..1560e32c89b5 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -81,11 +81,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "samba"; - version = "4.22.6"; + version = "4.22.7"; src = fetchurl { url = "https://download.samba.org/pub/samba/stable/samba-${finalAttrs.version}.tar.gz"; - hash = "sha256-jmvrDM6H+zx2OvlMLcIf1HuP0C1Gs8sd6ypy35JZxCU="; + hash = "sha256-EhlYEdRUL2YVNukFW0TVjFMCBBK+r6riBeInv3L2pJc="; }; outputs = [ diff --git a/pkgs/servers/web-apps/discourse/how_to_update.md b/pkgs/servers/web-apps/discourse/how_to_update.md index c402325babc8..bff636dc7ec2 100644 --- a/pkgs/servers/web-apps/discourse/how_to_update.md +++ b/pkgs/servers/web-apps/discourse/how_to_update.md @@ -1,4 +1,4 @@ -To update discourse, do the following: +To update Discourse, do the following: 1. Switch to and work from the `master` branch and the directory this file is in. @@ -16,7 +16,7 @@ To update discourse, do the following: step 4 and 5 again. 7. Run `./update.py update-plugins`. 8. Run `nix build -L -f ../../../../ discourseAllPlugins.tests` to - make sure the plugins build and discourse starts with them. Also + make sure the plugins build and Discourse starts with them. Also test manually, if possible. 9. If the update works, commit it. If not, apply necessary fixes and commit. No manual fixes that would be overwritten by the diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index f49036c24914..9d2496e8c24c 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -8,7 +8,7 @@ }: let - version = "5.0.4"; + version = "5.1.1"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz"; - hash = "sha256-AhW1AF6IFK3BDRQqTkJom08IwEABZdeh8r+ro4P0Res="; + hash = "sha256-J8lFIsPD41mOYSYyUAu15Dhd58b+JovZd8byVwXKWsE="; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/servers/web-apps/wordpress/packages/README.md b/pkgs/servers/web-apps/wordpress/packages/README.md index 814ed8d0468e..5c2732c06ffe 100644 --- a/pkgs/servers/web-apps/wordpress/packages/README.md +++ b/pkgs/servers/web-apps/wordpress/packages/README.md @@ -8,13 +8,13 @@ file with the codename of the package: - `wordpress-plugins.json` for plugins The codename is the last part in the url of the plugin or theme page, for -example `cookie-notice` in in the url +example `cookie-notice` in the url `https://wordpress.org/plugins/cookie-notice/` or `twentytwenty` in `https://wordpress.org/themes/twentytwenty/`. In case of language packages, the name consists of country and language codes. For example `de_DE` for country code `de` (Germany) and language `DE` (German). -For available translations and language codes see [upstream translation repository](https://translate.wordpress.org). +For available translations and language codes see the [upstream translation repository](https://translate.wordpress.org). To regenerate the nixpkgs wordpressPackages set, run: diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix deleted file mode 100644 index b8424c75b3bf..000000000000 --- a/pkgs/shells/nushell/plugins/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - config, - newScope, - dbus, - versionCheckHook, - nushell, - runCommand, -}: - -lib.makeScope newScope ( - self: - - lib.mapAttrs - ( - _n: p: - let - # add two checks: - # - `versionCheckhook`, checks wether it's a binary that is able to - # display its own version - # - A check which loads the plugin into the current version of nushell, - # to detect incompatibilities (plugins are compiled for very specific - # versions of nushell). If this fails, either update the plugin or mark - # as broken. - withChecks = p.overrideAttrs ( - final: _prev: { - doInstallCheck = true; - nativeInstallCheckInputs = [ versionCheckHook ]; - - passthru.tests.loadCheck = - let - nu = lib.getExe nushell; - plugin = lib.getExe withChecks; - in - runCommand "test-load-${final.pname}" { } '' - touch $out - ${nu} -n -c "plugin add --plugin-config $out ${plugin}" - ${nu} -n -c "plugin use --plugin-config $out ${plugin}" - ''; - } - ); - in - withChecks - ) - ( - with self; - { - gstat = callPackage ./gstat.nix { }; - formats = callPackage ./formats.nix { }; - polars = callPackage ./polars.nix { }; - query = callPackage ./query.nix { }; - net = callPackage ./net.nix { }; - units = callPackage ./units.nix { }; - highlight = callPackage ./highlight.nix { }; - dbus = callPackage ./dbus.nix { - inherit dbus; - }; - skim = callPackage ./skim.nix { }; - semver = callPackage ./semver.nix { }; - hcl = callPackage ./hcl.nix { }; - desktop_notifications = callPackage ./desktop_notifications.nix { }; - } - // lib.optionalAttrs config.allowAliases { - regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release."; - } - ) -) diff --git a/pkgs/stdenv/darwin/README.md b/pkgs/stdenv/darwin/README.md index df0641868f58..89933b62866f 100644 --- a/pkgs/stdenv/darwin/README.md +++ b/pkgs/stdenv/darwin/README.md @@ -16,8 +16,8 @@ There are effectively two steps when updating the standard environment: 1. Update the definition of llvmPackages in `all-packages.nix` for Darwin to match the value of llvmPackages.latest in `all-packages.nix`. Timing-wise, this is done currently using the spring - release of LLVM and once llvmPackages.latest has been updated to match. If the LLVM project - has announced a release schedule of patch updates, wait until those are in nixpkgs. Otherwise, + release of LLVM and once `llvmPackages.latest` has been updated to match. If the LLVM project + has announced a release schedule of patch updates, wait until those are in Nixpkgs. Otherwise, the LLVM updates will have to go through staging instead of being merged into master; and 2. Fix the resulting breakage. Most things break due to additional warnings being turned into errors or additional strictness applied by LLVM. Fixes may come in the form of disabling those diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index ae868ab14ac1..4f314801a749 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -373,15 +373,6 @@ let unfree = bool; unsupported = bool; insecure = bool; - tests = { - name = "test"; - verify = - x: - x == { } - || - # Accept {} for tests that are unsupported - (isDerivation x && x ? meta.timeout); - }; timeout = int; knownVulnerabilities = listOf str; badPlatforms = platforms; diff --git a/pkgs/tools/package-management/nix/README.md b/pkgs/tools/package-management/nix/README.md index 922d2970bd87..a45e38f749bd 100644 --- a/pkgs/tools/package-management/nix/README.md +++ b/pkgs/tools/package-management/nix/README.md @@ -21,7 +21,7 @@ And to build all important NixOS tests, run: nix-build nixVersions.nix_$version.tests ``` -Be sure to also update the `nix-fallback-paths` whenever you do a patch release for `nixVersions.stable` +Be sure to also update the `nix-fallback-paths` whenever you do a patch release for `nixVersions.stable`. ``` # Replace $version with the actual Nix version @@ -30,7 +30,7 @@ curl https://releases.nixos.org/nix/nix-$version/fallback-paths.nix > nixos/modu ## Major Version Bumps -If you're updating `nixVersions.stable`, follow all the steps mentioned above, but use the **staging** branch for your pull request (or **staging-next** after coordinating with the people in matrix `#staging:nixos.org`) +If you're updating `nixVersions.stable`, follow all the steps mentioned above, but use the **staging** branch for your pull request (or **staging-next** after coordinating with the people in Matrix `#staging:nixos.org`). This is necessary because, at the end of the staging-next cycle, the NixOS tests are built through the [staging-next-small](https://hydra.nixos.org/jobset/nixos/staging-next-small) jobset. Especially NixOS installer tests are important to look at here. diff --git a/pkgs/tools/typesetting/tex/texlive/UPGRADING.md b/pkgs/tools/typesetting/tex/texlive/UPGRADING.md index 78f9bd9c6eec..635d69873b10 100644 --- a/pkgs/tools/typesetting/tex/texlive/UPGRADING.md +++ b/pkgs/tools/typesetting/tex/texlive/UPGRADING.md @@ -41,7 +41,7 @@ Finally, replace `tlpdb.nix` with the generated file. Note that if the `00texlive.config` package), TeX Live packages will not evaluate. The test `pkgs.tests.texlive.tlpdbNix` verifies that the file `tlpdb.nix` -in Nixpkgs matches the one that generated from `texlive.tlpdb.xz`. +in Nixpkgs matches the one generated from `texlive.tlpdb.xz`. ### Build packages locally and generate fix hashes @@ -91,7 +91,7 @@ license lists reported by the test into `default.nix`. ### Running the testsuite -There are a some other useful tests that haven't been mentioned before. Build them with +There are some other useful tests that haven't been mentioned before. Build them with ``` nix-build ../../../../.. -A tests.texlive --no-out-link ``` @@ -113,11 +113,11 @@ Most `tlType == "bin"` containers consist of links to scripts distributed in `$TEXMFDIST/scripts` with a number of patches applied within `default.nix`. At each upgrade, please run the tests `tests.texlive.shebangs` to verify that -all shebangs have been patched and in case add the relevant interpreters, and +all shebangs have been patched, add the relevant interpreters if necessary, and use `tests.texlive.binaries` to check if basic execution of all binaries works. Please review manually all binaries in the `broken` and `ignored` lists of -`tests.texlive.binaries` at least once for major TeX Live release. +`tests.texlive.binaries` at least once for each major TeX Live release. Since the tests cannot catch all runtime dependencies, you should grep the `$TEXMFDIST/scripts` folder for common cases, for instance (where `$scripts` diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c296683900cf..5d5b73eb9e32 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -500,6 +500,7 @@ mapAliases { cotton = throw "'cotton' has been removed since it is vulnerable to CVE-2025-62518 and upstream is unmaintained"; # Added 2025-10-26 cpp-ipfs-api = throw "'cpp-ipfs-api' has been renamed to/replaced by 'cpp-ipfs-http-client'"; # Converted to throw 2025-10-27 cpr = warnAlias "'cpr' has been renamed to/replaced by 'libcpr'" libcpr; # Added 2025-11-17 + cqrlog = throw "'cqrlog' was removed due to lack of maintenance and relying on gtk2"; # Added 2025-12-02 crabfit-api = throw "'crabfit-api' has been removed because it is unmaintained upstream and insecure."; # Added 2025-11-29 crabfit-frontend = throw "'crabfit-frontend' has been removed because it is unmaintained upstream and it is to be used with 'crabfit-api', which is insecure."; # Added 2025-11-29 create-cycle-app = throw "'create-cycle-app' has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01 @@ -1396,6 +1397,7 @@ mapAliases { percona-xtrabackup_innovation = throw "'percona-xtrabackup_innovation' has been renamed to/replaced by 'percona-xtrabackup'"; # Converted to throw 2025-10-27 percona-xtrabackup_lts = throw "'percona-xtrabackup_lts' has been renamed to/replaced by 'percona-xtrabackup'"; # Converted to throw 2025-10-27 peruse = throw "'peruse' has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 + petrifoo = throw "'petrifoo' was remove due to lack of maintenance and relying on gtk2"; # Added 2025-12-02 pg_cron = throw "'pg_cron' has been removed. Use 'postgresqlPackages.pg_cron' instead."; # Added 2025-07-19 pg_hll = throw "'pg_hll' has been removed. Use 'postgresqlPackages.pg_hll' instead."; # Added 2025-07-19 pg_repack = throw "'pg_repack' has been removed. Use 'postgresqlPackages.pg_repack' instead."; # Added 2025-07-19 @@ -1626,6 +1628,7 @@ mapAliases { sonusmix = throw "'sonusmix' has been removed due to lack of maintenance"; # Added 2025-08-27 soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07 soundkonverter = throw "'soundkonverter' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20 + soundmodem = throw "'soundmodem' was removed due to lack of maintenance and relying on gtk2"; # Added 2025-12-02 soundOfSorting = throw "'soundOfSorting' has been renamed to/replaced by 'sound-of-sorting'"; # Converted to throw 2025-10-27 source-han-sans-japanese = throw "'source-han-sans-japanese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27 source-han-sans-korean = throw "'source-han-sans-korean' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27 @@ -1657,6 +1660,7 @@ mapAliases { spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet spark2014 = throw "'spark2014' has been renamed to/replaced by 'gnatprove'"; # Converted to throw 2025-10-27 sparkle = throw "'sparkle' has been removed because upstream repository source code has been deleted"; # Added 2025-12-29 + spectrojack = throw "'spectrojack' was remove due to lack of upstream maintenance and relying on gtk2"; # Added 2025-12-02 speed_dreams = speed-dreams; # Added 2026-01-19 spidermonkey_91 = throw "'spidermonkey_91 is EOL since 2022/09"; # Added 2025-08-26 spoof = throw "'spoof' has been removed, as it is broken with the latest MacOS versions and is unmaintained upstream"; # Added 2025-11-14 @@ -1940,6 +1944,7 @@ mapAliases { xorgdocs = xorg-docs; # Added 2026-01-19 xorgsgmldoctools = xorg-sgml-doctools; # Added 2026-01-19 xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22 + xsynth-dssi = throw "'xsynth-dssi' was removed due to lack of upstream maintenance and relying on gtk2"; # Added 2025-12-02 xtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13 xulrunner = throw "'xulrunner' has been renamed to/replaced by 'firefox-unwrapped'"; # Converted to throw 2025-10-27 xxgdb = throw "'xxgdb' seems inactive and doesn't compile with glibc 2.42"; # Added 2025-09-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1d32861a943..13ce3260d34a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1089,10 +1089,6 @@ with pkgs; wine = wineWowPackages.yabridge; }; - yafetch = callPackage ../tools/misc/yafetch { - stdenv = clangStdenv; - }; - ### APPLICATIONS/VERSION-MANAGEMENT # The full-featured Git. @@ -9365,12 +9361,24 @@ with pkgs; inherit modules; }; - nushell = callPackage ../shells/nushell { }; - - nushellPlugins = recurseIntoAttrs ( - callPackage ../shells/nushell/plugins { - } - ); + nushellPlugins = recurseIntoAttrs { + gstat = callPackage ../by-name/nu/nushell-plugin-gstat/package.nix { }; + formats = callPackage ../by-name/nu/nushell-plugin-formats/package.nix { }; + polars = callPackage ../by-name/nu/nushell-plugin-polars/package.nix { }; + query = callPackage ../by-name/nu/nushell-plugin-query/package.nix { }; + net = callPackage ../by-name/nu/nushell-plugin-net/package.nix { }; + units = callPackage ../by-name/nu/nushell-plugin-units/package.nix { }; + highlight = callPackage ../by-name/nu/nushell-plugin-highlight/package.nix { }; + dbus = callPackage ../by-name/nu/nushell-plugin-dbus/package.nix { + inherit dbus; + }; + skim = callPackage ../by-name/nu/nushell-plugin-skim/package.nix { }; + semver = callPackage ../by-name/nu/nushell-plugin-semver/package.nix { }; + hcl = callPackage ../by-name/nu/nushell-plugin-hcl/package.nix { }; + desktop_notifications = + callPackage ../by-name/nu/nushell-plugin-desktop_notifications/package.nix + { }; + }; net-tools = # some platforms refer back to this from unixtools, so this is needed to @@ -9632,7 +9640,7 @@ with pkgs; zfs_2_4 zfs_unstable ; - zfs = zfs_2_3; + zfs = zfs_2_4; ### DATA @@ -9974,10 +9982,6 @@ with pkgs; cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk2"; }; cudatext = cudatext-qt; - cqrlog = callPackage ../applications/radio/cqrlog { - hamlib = hamlib_4; - }; - darcs = haskell.lib.compose.disableCabalFlag "library" ( haskell.lib.compose.justStaticExecutables haskellPackages.darcs ); @@ -12409,9 +12413,7 @@ with pkgs; hdf5 = hdf5-fortran; }; - siesta = callPackage ../applications/science/chemistry/siesta { }; - - siesta-mpi = callPackage ../applications/science/chemistry/siesta { useMpi = true; }; + siesta-mpi = callPackage ../by-name/si/siesta/package.nix { useMpi = true; }; ### SCIENCE/BIOLOGY diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59c82a25096f..6d6d27c99c64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2014,6 +2014,8 @@ self: super: with self; { binsync = callPackage ../development/python-modules/binsync { }; + binwalk3 = callPackage ../development/python-modules/binwalk3 { }; + biocframe = callPackage ../development/python-modules/biocframe { }; biocutils = callPackage ../development/python-modules/biocutils { }; @@ -9557,6 +9559,8 @@ self: super: with self; { memory-tempfile = callPackage ../development/python-modules/memory-tempfile { }; + memray = callPackage ../development/python-modules/memray { }; + meraki = callPackage ../development/python-modules/meraki { }; mercadopago = callPackage ../development/python-modules/mercadopago { }; @@ -15102,6 +15106,8 @@ self: super: with self; { pytest-postgresql = callPackage ../development/python-modules/pytest-postgresql { }; + pytest-pretty = callPackage ../development/python-modules/pytest-pretty { }; + pytest-pudb = callPackage ../development/python-modules/pytest-pudb { }; pytest-pycodestyle = callPackage ../development/python-modules/pytest-pycodestyle { }; diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index 4aea1b23e347..1d93417d23a6 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -160,6 +160,7 @@ let }; logger = { linux = pkgs.util-linux; + darwin = pkgs.darwin.remote_cmds; }; more = { linux = pkgs.util-linux; @@ -243,6 +244,7 @@ let }; wall = { linux = pkgs.util-linux; + darwin = pkgs.darwin.remote_cmds; }; watch = { linux = pkgs.procps;