qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-05-28 18:02:01 +00:00 committed by GitHub
commit 77347136f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
49 changed files with 703 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
maintainers/maintainer-list.nix
View File

@ -1174,6 +1174,15 @@
githubId = 858965;
name = "Andrew Morsillo";
};
amyipdev = {
email = "amy@amyip.net";
github = "amyipdev";
githubId = 46307646;
name = "Amy Parker";
keys = [{
fingerprint = "7786 034B D521 49F5 1B0A 2A14 B112 2F04 E962 DDC5";
}];
};
amz-x = {
email = "mail@amz-x.com";
github = "amz-x";
@ -12931,6 +12940,12 @@
fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E";
}];
};
maxstrid = {
email = "mxwhenderson@gmail.com";
github = "maxstrid";
githubId = 115441224;
name = "Maxwell Henderson";
};
maxux = {
email = "root@maxux.net";
github = "maxux";

76
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -22,13 +22,13 @@ In addition to numerous new and upgraded packages, this release has the followin
This makes `nix run nixpkgs#hello` and `nix-build '<nixpkgs>' -A hello` work out of the box with no added configuration, reusing dependencies already on the system.
This may be undesirable if nix commands are not going to be run on the built system since it adds nixpkgs to the system closure. For such closure-size-constrained non-interactive systems, this setting should be disabled.
This may be undesirable if Nix commands are not going to be run on the built system since it adds nixpkgs to the system closure. For such closure-size-constrained non-interactive systems, this setting should be disabled.
To disable this, set [nixpkgs.flake.setNixPath](#opt-nixpkgs.flake.setNixPath) and [nixpkgs.flake.setFlakeRegistry](#opt-nixpkgs.flake.setFlakeRegistry) to false.
To disable it, set [nixpkgs.flake.setNixPath](#opt-nixpkgs.flake.setNixPath) and [nixpkgs.flake.setFlakeRegistry](#opt-nixpkgs.flake.setFlakeRegistry) to false.
- NixOS AMIs are now uploaded regularly to a new AWS Account.
Instructions on how to use them can be found on <https://nixos.github.io/amis>.
We are working on integration the data into the NixOS homepage.
We are working on integrating the data into the NixOS homepage.
The list in `nixos/modules/virtualisation/amazon-ec2-amis.nix` will stop
being updated and will be removed in the future.
@ -45,9 +45,9 @@ In addition to numerous new and upgraded packages, this release has the followin
- Lomiri (formerly known as Unity8) desktop mode, using Mir 2.x to function as a Wayland compositor, is now available and can be installed with `services.desktopManager.lomiri.enable = true`. Note that some core applications, services and indicators have yet to be packaged, and some functions may remain incomplete, but the base experience should be there.
- MATE has been updated to 1.28.
- To properly support panel plugins built with Wayland (in-process) support, we are introducing `services.xserver.desktopManager.mate.extraPanelApplets` option, please use that for installing panel applets.
- Similarly, please use `services.xserver.desktopManager.mate.extraCajaExtensions` option for installing Caja extensions.
- To use the Wayland session, enable `services.xserver.desktopManager.mate.enableWaylandSession`. This is opt-in for now as it is in early stage and introduces a new set of Wayfire closure. Due to [known issues with LightDM](https://github.com/canonical/lightdm/issues/63), we suggest using SDDM for display manager.
- To properly support panel plugins built with Wayland (in-process) support, we are introducing the `services.xserver.desktopManager.mate.extraPanelApplets` option, please use that for installing panel applets.
- Similarly, please use the `services.xserver.desktopManager.mate.extraCajaExtensions` option for installing Caja extensions.
- To use the Wayland session, enable `services.xserver.desktopManager.mate.enableWaylandSession`. This is opt-in for now as it is in early an stage and introduces a new set of Wayfire closures. Due to [known issues with LightDM](https://github.com/canonical/lightdm/issues/63), we suggest using SDDM as the display manager.
- Plasma 6 is now available and can be installed with `services.xserver.desktopManager.plasma6.enable = true;`. Plasma 5 will likely be deprecated in the next release (24.11). Note that Plasma 6 runs as Wayland by default, and the X11 session needs to be explicitly selected if necessary.
@ -65,7 +65,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- [armagetronad](https://wiki.armagetronad.org), a mid-2000s 3D lightcycle game widely played at iD Tech Camps. You can define multiple servers using `services.armagetronad.<server>.enable`.
- [BenchExec](https://github.com/sosy-lab/benchexec), a framework for reliable benchmarking and resource measurement, available as [programs.benchexec](#opt-programs.benchexec.enable),
As well as related programs
as well as related programs
[CPU Energy Meter](https://github.com/sosy-lab/cpu-energy-meter), available as [programs.cpu-energy-meter](#opt-programs.cpu-energy-meter.enable), and
[PQoS Wrapper](https://gitlab.com/sosy-lab/software/pqos-wrapper), available as [programs.pqos-wrapper](#opt-programs.pqos-wrapper.enable).
@ -111,7 +111,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- [Jottacloud Command-line Tool](https://docs.jottacloud.com/en/articles/1436834-jottacloud-command-line-tool), a CLI for the [Jottacloud](https://jottacloud.com/) cloud storage provider. Available as [services.jotta-cli](#opt-services.jotta-cli.enable).
- [keto](https://www.ory.sh/keto/), a permission & access control server, the first open source implementation of ["Zanzibar: Google's Consistent, Global Authorization System"](https://research.google/pubs/zanzibar-googles-consistent-global-authorization-system/).
- [keto](https://www.ory.sh/keto/), a permission & access control server, the first open source implementation of [*Zanzibar: Google's Consistent, Global Authorization System*](https://research.google/pubs/zanzibar-googles-consistent-global-authorization-system/).
- [manticoresearch](https://manticoresearch.com), easy to use open source fast database for search. Available as [services.manticore](#opt-services.manticore.enable).
@ -153,7 +153,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- [private-gpt](https://github.com/zylon-ai/private-gpt), a service to interact with your documents using the power of LLMs, 100% privately, no data leaks. Available as [services.private-gpt](#opt-services.private-gpt.enable).
- [Prometheus DNSSEC Exporter](https://github.com/chrj/prometheus-dnssec-exporter), check for validity and expiration in DNSSEC signatures and expose metrics for Prometheus. Available as [services.prometheus.exporters.dnssec](#opt-services.prometheus.exporters.dnssec.enable).
- [Prometheus DNSSEC Exporter](https://github.com/chrj/prometheus-dnssec-exporter): check for validity and expiration in DNSSEC signatures and expose metrics for Prometheus. Available as [services.prometheus.exporters.dnssec](#opt-services.prometheus.exporters.dnssec.enable).
- [prometheus-nats-exporter](https://github.com/nats-io/prometheus-nats-exporter), a Prometheus exporter for NATS. Available as [services.prometheus.exporters.nats](#opt-services.prometheus.exporters.nats.enable).
@ -233,7 +233,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `chromium` and `ungoogled-chromium` had a long-standing issue regarding Widevine DRM handling in nixpkgs fixed.
`chromium` now no longer automatically downloads Widevine when encountering DRM protected content.
To be able to play DRM protected content in `chromium` now, you have to explicitly opt-in as originally intended using `chromium.override { enableWideVine = true; }`.
To be able to play DRM protected content in `chromium`, you now have to explicitly opt-in as originally intended using `chromium.override { enableWideVine = true; }`.
This override was added almost 10 years ago.
- `craftos-pc` package has been updated to v2.8, which includes [breaking changes](https://github.com/MCJack123/craftos2/releases/tag/v2.8).
@ -259,13 +259,13 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
such as tensorflow. The original runfile-based `cudatoolkit` is still
available as `cudatoolkit-legacy-runfile`.
- `cudaPackages.nsight_systems` now has most vendored third party-libraries removed, though we now only ship it for `cudaPackages_11_8` and later, due to outdated dependencies. Users comfortable with the vendored dependencies may use `overrideAttrs` to amend the `postPatch` phase and the `meta.broken` correspondingly. Alternatively, one could package the deprecated `boost170` locally, as required for `cudaPackages_11_4.nsight_systems`.
- `cudaPackages.nsight_systems` now has most vendored third-party libraries removed, though we now only ship it for `cudaPackages_11_8` and later, due to outdated dependencies. Users comfortable with the vendored dependencies may use `overrideAttrs` to amend the `postPatch` phase and the `meta.broken` correspondingly. Alternatively, one could package the deprecated `boost170` locally, as required for `cudaPackages_11_4.nsight_systems`.
- `cudaPackages.autoFixElfFiles` has been deprecated for `pkgs.autoFixElfFiles`. Functionality has not changed, but the setuphook has been renamed and moved to the top-level package scope.
- `davfs2`'s `services.davfs2.extraConfig` setting has been deprecated and converted to the free-form type option named `services.davfs2.settings` according to RFC42.
- `dwarf-fortress` has been updated to version 50, and its derivations continue to menace with spikes of Nix and bash [TODO what does this mean?]. Version 50 is identical to the version on Steam, but without the paid elements like tilepacks.
- `dwarf-fortress` has been updated to version 50, which is identical to the version on Steam, but without the paid elements like tilepacks.
dfhack and Dwarf Therapist still work, and older versions are still packaged in case you'd like to roll back. Note that DF 50 saves will not be compatible with DF 0.47 and earlier.
See [Bay 12 Games](http://www.bay12games.com/dwarves/) for more details on what's new in Dwarf Fortress.
@ -275,14 +275,14 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `erlang-ls` package no longer ships the `els_dap` binary as of v0.51.0.
- `erlang_node_short_name`, `erlang_node_name`, `port` and `options` configuration parameters are gone, and have been replaced with an `environment` parameter.
- `erlang_node_short_name`, `erlang_node_name`: `port` and `options` configuration parameters are gone, and have been replaced with an `environment` parameter.
Use the appropriate [environment variables](https://hexdocs.pm/livebook/readme.html#environment-variables) inside `environment` to configure the service instead.
- `firefox-devedition`, `firefox-beta`, `firefox-esr` executable file names for now match their package names, which is consistent with the `firefox-*-bin` packages. The desktop entries are also updated so that you can have multiple editions of firefox in your app launcher.
- `gauge` now supports installing plugins using nix. For the old imperative approach, switch to `gauge-unwrapped`.
- `gauge` now supports installing plugins using Nix. For the old imperative approach, switch to `gauge-unwrapped`.
You can load plugins from an existing gauge manifest file using `gauge.fromManifest ./path/to/manifest.json` or
specify plugins in nix using `gauge.withPlugins (p: with p; [ js html-report xml-report ])`.
specify plugins in Nix using `gauge.withPlugins (p: with p; [ js html-report xml-report ])`.
- `gitea` has been updated to 1.21, which introduces several breaking changes, including:
- Custom themes and other assets that were previously stored in `custom/public/*` now belong in `custom/public/assets/*`
@ -308,7 +308,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `himalaya` has been updated to v1.0.0-beta.4, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.4) for details.
- `halloy` has been updated to 2024.5, which introduced a breaking change by switching the config format from YAML to TOML. See https://github.com/squidowl/halloy/releases/tag/2024.5 for details.
- `halloy` has been updated to 2024.5, which introduced a breaking change by switching the config format from YAML to TOML. See <https://github.com/squidowl/halloy/releases/tag/2024.5> for details.
- `hvm` was updated to version 2.
@ -316,7 +316,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `idris2` was updated to v0.7.0. This version introduces breaking changes. Check out the [changelog](https://github.com/idris-lang/Idris2/blob/v0.7.0/CHANGELOG.md#v070) for details.
- `inetutils` now has a lower priority to avoid shadowing the commonly used `util-linux`. If one wishes to restore the default priority, simply use `lib.setPrio 5 inetutils` or override with `meta.priority = 5`.
- `inetutils` now has a lower priority to avoid shadowing the commonly-used `util-linux`. If one wishes to restore the default priority, simply use `lib.setPrio 5 inetutils` or override with `meta.priority = 5`.
- `jdt-language-server` package now uses upstream's provided python wrapper instead of our own custom wrapper. This results in the following breaking and notable changes:
@ -328,7 +328,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `julia` environments can now be built with arbitrary packages from the ecosystem using the `.withPackages` function. For example: `julia.withPackages ["Plots"]`.
- `k3s` has been updated to version [v1.30](https://github.com/k3s-io/k3s/releases/tag/v1.30.0%2Bk3s1), previous supported versions are available under release specific names (e.g. k3s_1_27, k3s_1_28, and k3s_1_29) and present to help you migrate to the latest supported version. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.30.md#changelog-since-v1290) for more information.
- `k3s` has been updated to version [v1.30](https://github.com/k3s-io/k3s/releases/tag/v1.30.0%2Bk3s1), previous supported versions are available under release-specific names (e.g. k3s_1_27, k3s_1_28, and k3s_1_29) in order to help you migrate to the latest supported version. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.30.md#changelog-since-v1290) for more information.
- `k9s` was updated to v0.31. There have been various breaking changes in the config file format,
check out the changelog of [v0.29](https://github.com/derailed/k9s/releases/tag/v0.29.0),
@ -342,12 +342,12 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `livebook` package is now built as a `mix release` instead of an `escript`.
This means that configuration now has to be done using [environment variables](https://hexdocs.pm/livebook/readme.html#environment-variables) instead of command line arguments.
This has the further implication that the `livebook` service configuration has changed.
This has the further consequence that the `livebook` service configuration has changed.
- `lua` interpreters default LUA_PATH and LUA_CPATH are not overriden by nixpkgs
anymore, we patch LUA_ROOT instead which is more respectful to upstream.
- `luarocks-packages-updater`'s .csv format used to define lua packages to be updated, has changed: `src` (URL of a git repository) has now become `rockspec` (URL of a rockspec) to remove ambiguity regarding which rockspec to use and simplify implementation.
- `luarocks-packages-updater`'s .csv format, used to define lua packages to be updated, has changed: `src` (URL of a git repository) has now become `rockspec` (URL of a rockspec) to remove ambiguity regarding which rockspec to use and simplify implementation.
- `mkosi` was updated to v22. Parts of the user interface have changed. Consult the
release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19),
@ -357,7 +357,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `mongodb-4_4` has been removed as it has reached end of life. Consequently, `unifi7` and `unifi8` now use MongoDB 5.0 by default.
- `mongodb-5_0` and newer requires a cpu with the avx instruction set to run.
- `mongodb-5_0` and newer requires a cpu with the AVX instruction set to run.
- `neo4j` has been updated to version 5. You may want to read the [release notes for Neo4j 5](https://neo4j.com/release-notes/database/neo4j-5/).
@ -377,7 +377,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
`CONFIG_FILE_NAME` includes `bpf_pinning`, `ematch_map`, `group`, `nl_protos`, `rt_dsfield`, `rt_protos`, `rt_realms`, `rt_scopes`, and `rt_tables`.
- `nextcloud26` has been removed since it's not maintained anymore by upstream. The latest available version of Nextcloud is now v29 (available as `pkgs.nextcloud29`). The installation logic is as follows:
- If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**)
- If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**).
- If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud29` will be installed by default.
- If [`system.stateVersion`](#opt-system.stateVersion) is >=23.11, `pkgs.nextcloud27` will be installed by default.
- Please note that an upgrade from v27 (or older) to v29 directly is not possible. Please upgrade to `nextcloud28` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud28;`](options.html#opt-services.nextcloud.package).
@ -414,7 +414,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `pipewire` and `wireplumber` modules have removed support for using
`environment.etc."pipewire/..."` and `environment.etc."wireplumber/..."`.
Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for PipeWire and
`services.pipewire.wireplumber.configPackages` for WirePlumber instead."
`services.pipewire.wireplumber.configPackages` for WirePlumber instead.
- `power.ups` now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS.
@ -446,7 +446,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
- `frr` was updated to 10.0, which introduces the default of `enforce-first-as` for BGP. Please disable again if needed.
- `services.aria2.rpcSecret` has been replaced with `services.aria2.rpcSecretFile`.
This was done so that secrets aren't stored in the world-readable nix store.
This was done so that secrets aren't stored in the world-readable Nix store.
To migrate, you will have to create a file with the same exact string, and change
your module options to point to that file. For example, `services.aria2.rpcSecret =
"mysecret"` becomes `services.aria2.rpcSecretFile = "/path/to/secret_file"`
@ -458,7 +458,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
- `services.frp.settings` now generates the frp configuration file in TOML format as [recommended by upstream](https://github.com/fatedier/frp#configuration-files), instead of the legacy INI format. This has also introduced other changes in the configuration file structure and options:
- The `settings.common` section in the configuration is no longer valid and all the options form inside it now go directly under `settings`.
- Configuration option names have been changed from snake_case to camelCase. For example: `server_addr` becomes `serverAddr`, `server_port` becomes `serverPort` etc.
- Proxies are now defined with a new option `settings.proxies` which takes a list of proxies.
- Proxies are now defined with a new option, `settings.proxies`, which takes a list of proxies.
- Consult the [upstream documentation](https://github.com/fatedier/frp#example-usage) for more details on the changes.
- `services.hledger-web.capabilities` options has been replaced by a new option `services.hledger-web.allow`.
@ -518,13 +518,11 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
- to get previous behaviour of upstream defaults, set it to `null`
- default value has changed from `[]` to `null`, in order to preserve default behaviour
can now be used to disable the upstream fallback servers entirely by setting it to an empty list. To get the previous behaviour of the upstream defaults set it to null, the new default, instead.
- `services.vikunja` systemd service now uses `vikunja` as dynamic user instead of `vikunja-api`. Database users might need to be changed.
- `services.vikunja.setupNginx` setting has been removed. Users now need to set up the webserver configuration on their own with a proxy pass to the vikunja service.
- `services.vmagent` module deprecates `dataDir`, `group` and `user` setting in favor of systemd provided CacheDirectory and DynamicUser.
- `services.vmagent` module deprecates `dataDir`, `group` and `user` settings in favor of the systemd-provided CacheDirectory and DynamicUser.
- `services.vmagent.remoteWriteUrl` setting has been renamed to `services.vmagent.remoteWrite.url` and now defaults to `null`.
@ -546,9 +544,9 @@ can now be used to disable the upstream fallback servers entirely by setting it
- Remove swap policy. This helps prevent killing processes when user's swap is small.
- Expand the memory pressure policy to `system.slice`, `user-.slice`, and all user owned slices. Reference: [commit](https://src.fedoraproject.org/rpms/systemd/c/7665e1796f915dedbf8e014f0a78f4f576d609bb).
- Expand the memory pressure policy to `system.slice`, `user-.slice`, and all user-owned slices. Reference: [commit](https://src.fedoraproject.org/rpms/systemd/c/7665e1796f915dedbf8e014f0a78f4f576d609bb).
- `systemd.oomd.enableUserServices` is renamed to `systemd.oomd.enableUserSlices`.
- Rename `systemd.oomd.enableUserServices` to `systemd.oomd.enableUserSlices`.
- `systemd.sysusers.enable` option was added. If enabled, users and
groups are created with systemd-sysusers instead of with a custom perl script.
@ -577,11 +575,11 @@ can now be used to disable the upstream fallback servers entirely by setting it
- `xxd` has been moved from `vim` default output to its own output to reduce closure size. The canonical way to reference it across all platforms is `unixtools.xxd`.
- `youtrack` is bumped to 2023.3. The update is not performed automatically, it requires manual interaction. See the YouTrack section in the manual for details.
- `youtrack` was bumped to 2023.3. The update is not performed automatically, it requires manual interaction. See the YouTrack section in the manual for details.
- Ada packages (libraries and tools) have been moved into the `gnatPackages` scope. `gnatPackages` uses the default GNAT compiler, `gnat12Packages` and `gnat13Packages` use the respective matching compiler version.
- Paths provided as `restartTriggers` and `reloadTriggers` for systemd units will now be copied into the nix store to make the behavior consistent.
- Paths provided as `restartTriggers` and `reloadTriggers` for systemd units will now be copied into the Nix store to make the behavior consistent.
Previously, `restartTriggers = [ ./config.txt ]`, if defined in a flake, would trigger a restart when any part of the flake changed; and if not defined in a flake, would never trigger a restart even if the contents of `config.txt` changed.
- A warning has been added for services that are
@ -621,16 +619,16 @@ can now be used to disable the upstream fallback servers entirely by setting it
- `castopod` has some migration actions to be taken in case of a S3 setup. Some new features may also need some manual migration actions. See [https://code.castopod.org/adaures/castopod/-/releases](https://code.castopod.org/adaures/castopod/-/releases) for more information.
- `cinnamon` has been updated to 6.0. Please beware that the [Wayland session](https://blog.linuxmint.com/?p=4591) is still experimental in this release and could potentially [affect Xorg sessions](https://blog.linuxmint.com/?p=4639). We suggest a reboot when switching between sessions.
- `cinnamon` has been updated to 6.0. Please be aware that the [Wayland session](https://blog.linuxmint.com/?p=4591) is still experimental in this release and could potentially [affect Xorg sessions](https://blog.linuxmint.com/?p=4639). We suggest a reboot when switching between sessions.
- `documentation.man.mandoc` now uses `MANPATH` by defaultwas to set the directories where mandoc will search for manual pages.
- `documentation.man.mandoc` now, by default, uses `MANPATH` to set the directories where mandoc will search for manual pages.
This enables mandoc to find manual pages in Nix profiles. To set the manual search paths via the `mandoc.conf` configuration file like before, use `documentation.man.mandoc.settings.manpath` instead.
- `drbd` out-of-tree Linux kernel driver has been added in version 9.2.7. With it the DRBD 9.x features can be used instead of the 8.x features provided by the 8.4.11 in-tree driver.
- `garage` has been updated to v1.x.x. Users should read the [upstream release notes](https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v1.0.0) and follow the documentation when changing over their `services.garage.package` and performing this manual upgrade.
- `hardware.pulseaudio` module now sets permission of pulse user home directory to 755 when running in "systemWide" mode. It fixes [issue 114399](https://github.com/NixOS/nixpkgs/issues/114399).
- `hardware.pulseaudio` module now sets permissions of pulse user home directory to 755 when running in systemWide mode. It fixes [issue 114399](https://github.com/NixOS/nixpkgs/issues/114399).
- `kavita` has been updated to 0.8.0, requiring a manual forced library scan on all libraries for migration. Refer to upstream's [release notes](https://github.com/Kareadita/Kavita/releases/tag/v0.8.0) for details.
@ -638,7 +636,7 @@ can now be used to disable the upstream fallback servers entirely by setting it
- `libass` now uses the native CoreText backend on Darwin, which may fix subtitle rendering issues with `mpv`, `ffmpeg`, etc.
- `libjxl` version bumped from 0.8.2 to 0.9.1 [dropped support for the butteraugli API](https://github.com/libjxl/libjxl/pull/2576). You will no longer be able to set `enableButteraugli` on `libaom`.
- `libjxl` version was bumped from 0.8.2 to 0.9.1 [dropped support for the butteraugli API](https://github.com/libjxl/libjxl/pull/2576). You will no longer be able to set `enableButteraugli` on `libaom`.
- [`lilypond`](https://lilypond.org/index.html) and [`denemo`](https://www.denemo.org) are now compiled with Guile 3.0.
@ -651,9 +649,9 @@ can now be used to disable the upstream fallback servers entirely by setting it
- `mpich` now requires `withPm` to be a list, e.g. `"hydra:gforker"` becomes `[ "hydra" "gforker" ]`.
- `nextcloud-setup.service` no longer changes the group of each file & directory inside `/var/lib/nextcloud/{config,data,store-apps}` if one of these directories has the wrong owner group. This was part of transitioning the group used for `/var/lib/nextcloud`, but isn't necessary anymore.
- `nextcloud-setup.service` no longer changes the group of each file and directory inside `/var/lib/nextcloud/{config,data,store-apps}` if one of these directories has the wrong owner group. This was part of transitioning the group used for `/var/lib/nextcloud`, but isn't necessary anymore.
- `oils-for-unix`, the oil shell's c++ version is now available. The python version is still available as `oil`.
- `oils-for-unix`, the oil shell's C++ version is now available. The Python version is still available as `oil`.
- `pkgsExtraHardening`, a new top-level package set, was added. This is a set of packages built with stricter hardening flags - those that have not yet received enough testing to be applied universally, those that are more likely to cause build failures or those that have drawbacks to their use (e.g. performance or required hardware features).
@ -722,7 +720,7 @@ can now be used to disable the upstream fallback servers entirely by setting it
- `services.zfs.zed.enableMail` now uses the global `sendmail` wrapper defined by an email module
(such as msmtp or Postfix). It no longer requires using a special ZFS build with email support.
- `sonarr` version bumped to from 3.0.10 to 4.0.3. Consequently existing config database files will be upgraded automatically, but note that some old apparently-working configs [might actually be corrupt and fail to upgrade cleanly](https://forums.sonarr.tv/t/sonarr-v4-released/33089).
- `sonarr` version was bumped to from 3.0.10 to 4.0.3. Consequently existing config database files will be upgraded automatically, but note that some old apparently-working configs [might actually be corrupt and fail to upgrade cleanly](https://forums.sonarr.tv/t/sonarr-v4-released/33089).
- `stdenv`: The `--replace` flag in `substitute`, `substituteInPlace`, `substituteAll`, `substituteAllStream`, and `substituteStream` is now deprecated if favor of the new `--replace-fail`, `--replace-warn` and `--replace-quiet`. The deprecated `--replace` equates to `--replace-warn`.

8
nixos/modules/services/hardware/nvidia-container-toolkit/default.nix
View File

@ -69,14 +69,18 @@
virtualisation.docker.daemon.settings = lib.mkIf
(config.hardware.nvidia-container-toolkit.enable &&
(lib.versionAtLeast config.virtualisation.docker.package.version "25")) {
features.cdi = true;
};
features.cdi = true;
};
hardware.nvidia-container-toolkit.mounts = let
nvidia-driver = config.hardware.nvidia.package;
in (lib.mkMerge [
[{ hostPath = pkgs.addDriverRunpath.driverLink;
containerPath = pkgs.addDriverRunpath.driverLink; }
{ hostPath = "${lib.getLib nvidia-driver}/etc";
containerPath = "${lib.getLib nvidia-driver}/etc"; }
{ hostPath = "${lib.getLib nvidia-driver}/share";
containerPath = "${lib.getLib nvidia-driver}/share"; }
{ hostPath = "${lib.getLib pkgs.glibc}/lib";
containerPath = "${lib.getLib pkgs.glibc}/lib"; }
{ hostPath = "${lib.getLib pkgs.glibc}/lib64";

8
nixos/modules/services/misc/devpi-server.nix
View File

@ -74,8 +74,9 @@ in
# have 0600 permissions.
preStart =
''
cp ${cfg.secretFile} ${runtimeDir}/${secretsFileName}
chmod 0600 ${runtimeDir}/*${secretsFileName}
${optionalString (!isNull cfg.secretFile)
"install -Dm 0600 \${CREDENTIALS_DIRECTORY}/devpi-secret ${runtimeDir}/${secretsFileName}"
}
if [ -f ${serverDir}/.nodeinfo ]; then
# already initialized the package index, exit gracefully
@ -85,6 +86,9 @@ in
+ strings.optionalString cfg.replica "--role=replica --master-url=${cfg.primaryUrl}";
serviceConfig = {
LoadCredential = lib.mkIf (! isNull cfg.secretFile) [
"devpi-secret:${cfg.secretFile}"
];
Restart = "always";
ExecStart =
let

33
nixos/modules/services/misc/ollama.nix
View File

@ -11,6 +11,11 @@ let
};
in
{
imports = [
(lib.mkRemovedOptionModule [ "services" "ollama" "listenAddress" ]
"Use `services.ollama.host` and `services.ollama.port` instead.")
];
options = {
services.ollama = {
enable = lib.mkEnableOption "ollama server for local large language models";
@ -64,12 +69,20 @@ in
See also `services.ollama.sandbox`.
'';
};
listenAddress = lib.mkOption {
host = lib.mkOption {
type = types.str;
default = "127.0.0.1:11434";
example = "0.0.0.0:11111";
default = "127.0.0.1";
example = "0.0.0.0";
description = ''
The address which the ollama server HTTP interface binds and listens to.
The host address which the ollama server HTTP interface listens to.
'';
};
port = lib.mkOption {
type = types.nullOr types.ints.u16;
default = 11434;
example = 11111;
description = ''
Which port the ollama server listens to. Set to `null` to not specify a port.
'';
};
acceleration = lib.mkOption {
@ -80,9 +93,9 @@ in
What interface to use for hardware acceleration.
- `null`: default behavior
if `nixpkgs.config.rocmSupport` is enabled, uses `"rocm"`
if `nixpkgs.config.cudaSupport` is enabled, uses `"cuda"`
otherwise defaults to `false`
- if `nixpkgs.config.rocmSupport` is enabled, uses `"rocm"`
- if `nixpkgs.config.cudaSupport` is enabled, uses `"cuda"`
- otherwise defaults to `false`
- `false`: disable GPU, only use CPU
- `"rocm"`: supported by most modern AMD GPUs
- `"cuda"`: supported by most modern NVIDIA GPUs
@ -114,7 +127,11 @@ in
environment = cfg.environmentVariables // {
HOME = cfg.home;
OLLAMA_MODELS = cfg.models;
OLLAMA_HOST = cfg.listenAddress;
OLLAMA_HOST =
if cfg.port == null then
cfg.host
else
"${cfg.host}:${toString cfg.port}";
};
serviceConfig = {
ExecStart = "${lib.getExe ollamaPackage} serve";

8
nixos/tests/ollama.nix
View File

@ -1,10 +1,10 @@
import ./make-test-python.nix ({ pkgs, lib, ... }:
let
mainPort = "11434";
altPort = "11435";
mainPort = 11434;
altPort = 11435;
curlRequest = port: request:
"curl http://127.0.0.1:${port}/api/generate -d '${builtins.toJSON request}'";
"curl http://127.0.0.1:${toString port}/api/generate -d '${builtins.toJSON request}'";
prompt = {
model = "tinydolphin";
@ -38,7 +38,7 @@ in
altAddress = { ... }: {
services.ollama.enable = true;
services.ollama.listenAddress = "127.0.0.1:${altPort}";
services.ollama.port = altPort;
};
};

6
pkgs/applications/networking/cluster/argocd/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
version = "2.11.1";
version = "2.11.2";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
hash = "sha256-v3Y85e0I5CCL4+cT4O/VhKRIHKiw088XbqjuwZr0CeM=";
hash = "sha256-lePMdjWq4qFQcxFZzfLyTsMwgcmjIoBmosZs5G4CWvc=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-+YRLIQWInGCV2ORuABvM4cCjiMznENmAmE2jF9Eql6w=";
vendorHash = "sha256-atgNLlHoX+KBtJcYZNqNsYBK0cVGI/k2mXvmcr6wWN4=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

4
pkgs/applications/networking/cluster/tftui/default.nix
View File

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "tftui";
version = "0.13.1";
version = "0.13.2";
pyproject = true;
src = fetchFromGitHub {
owner = "idoavrah";
repo = "terraform-tui";
rev = "refs/tags/v${version}";
hash = "sha256-5eMOd+jpJh5jxthzk5JCl3vvri0PtffolSzdHY/3nbg=";
hash = "sha256-/y1dgQtpaIRVvhb/esJns3UPwKU1bAFHSQ8tCWzIuIw=";
};
pythonRelaxDeps = [

4
pkgs/applications/office/qownnotes/default.nix
View File

@ -21,14 +21,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "24.5.4";
version = "24.5.8";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-OxCkIN596Zzjd2ldRn7MRpSupb2fhbZH4Hwr16Mz6Fo=";
hash = "sha256-ciTgJxDRQdPiQuXsiesYgvwSIdtJnkzYwQhvoKYS6mo=";
};
nativeBuildInputs = [

6
pkgs/applications/video/mpv/scripts/videoclip.nix
View File

@ -10,13 +10,13 @@
}:
buildLua {
pname = "videoclip";
version = "0-unstable-2024-03-08";
version = "0-unstable-2024-05-26";
src = fetchFromGitHub {
owner = "Ajatt-Tools";
repo = "videoclip";
rev = "0e3f2245b03e888c14c093a50261e0f54ecdf8e8";
hash = "sha256-Sg6LHU9OVmVx3cTs8Y0WL8wACb5BlVyeBRccoX+7BXY=";
rev = "4fd40d66c95905ed828ca77b7120732014b93ac5";
hash = "sha256-Q40a7BBY4c7I5g9HkeV6Twv/PDPBDKTlnxkILw99pxU=";
};
patchPhase =

4
pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
View File

@ -31,13 +31,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "ayatana-indicator-datetime";
version = "24.2.0";
version = "24.5.0";
src = fetchFromGitHub {
owner = "AyatanaIndicators";
repo = "ayatana-indicator-datetime";
rev = finalAttrs.version;
hash = "sha256-J3Yp7Dx4UvvdlM8Cp1sPe4Ftm/aAmNzpo4re/jF7pRo=";
hash = "sha256-lY49v2uZ7BawQoN/hmN6pbetHlSGjMHbS6S8Wl1bDmQ=";
};
postPatch = ''

36
pkgs/by-name/bo/bombsquad/package.nix
View File

@ -16,13 +16,14 @@
copyDesktopItems,
writeShellApplication,
commandLineArgs ? "",
genericUpdater,
}:
let
archive =
{
x86_64-linux = {
name = "BombSquad_Linux_x86_64";
hash = "sha256-VLNO0TxI/KBj8RkpGjo9Rx40f7fuV3pK2kIoKff9sRU=";
hash = "sha256-YrbDhdVtNtxeE3fIRPIODwVO3lrxz7OAAYc7doBBQj8=";
};
aarch-64-linux = {
name = "BombSquad_Linux_Arm64";
@ -33,7 +34,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
name = "bombsquad";
version = "1.7.34";
version = "1.7.35";
sourceRoot = ".";
src = fetchurl {
url = "https://files.ballistica.net/bombsquad/builds/${archive.name}_${finalAttrs.version}.tar.gz";
@ -86,18 +87,20 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
passthru.updateScript = lib.getExe (writeShellApplication {
name = "bombsquad-versionLister";
runtimeInputs = [
curl
gnugrep
];
text = ''
curl -sL "https://files.ballistica.net/bombsquad/builds/CHANGELOG.md" \
| grep -oP '^### \K\d+\.\d+\.\d+' \
| head -n 1
'';
});
passthru.updateScript = genericUpdater {
versionLister = lib.getExe (writeShellApplication {
name = "bombsquad-versionLister";
runtimeInputs = [
curl
gnugrep
];
text = ''
curl -sL "https://files.ballistica.net/bombsquad/builds/CHANGELOG.md" \
| grep -oP '^### \K\d+\.\d+\.\d+' \
| head -n 1
'';
});
};
meta = {
description = "A free, multiplayer, arcade-style game for up to eight players that combines elements of fighting games and first-person shooters (FPS)";
@ -107,7 +110,10 @@ stdenv.mkDerivation (finalAttrs: {
mit
unfree
];
maintainers = with lib.maintainers; [ syedahkam coffeeispower ];
maintainers = with lib.maintainers; [
syedahkam
coffeeispower
];
mainProgram = "bombsquad";
platforms = lib.platforms.linux;
};

37
pkgs/by-name/ha/havn/package.nix Normal file
View File

@ -0,0 +1,37 @@
{
lib,
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "havn";
version = "0.1.11";
src = fetchFromGitHub {
owner = "mrjackwills";
repo = "havn";
rev = "refs/tags/v${version}";
hash = "sha256-iotSSKId2y3Y7Dh8iSW1/y3xDbXHHPl6RQ3uA/+JdE8=";
};
cargoHash = "sha256-Tec1YeP1zwE8nurQOYxa9hzGBy3uxkjDUFlh0BppUTo=";
checkFlags = [
# Skip tests that require network access
"--skip=scanner::tests::test_scanner_1000_80_443"
"--skip=scanner::tests::test_scanner_all_80"
"--skip=scanner::tests::test_scanner_port_80"
"--skip=terminal::print::tests::test_terminal_monochrome_false"
];
meta = {
homepage = "https://github.com/mrjackwills/havn";
description = "A fast configurable port scanner with reasonable defaults";
changelog = "https://github.com/mrjackwills/havn/blob/v${version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
mainProgram = "havn";
platforms = lib.platforms.linux;
};
}

154
pkgs/by-name/ko/koboldcpp/package.nix Normal file
View File

@ -0,0 +1,154 @@
{
lib,
fetchFromGitHub,
stdenv,
makeWrapper,
gitUpdater,
python311Packages,
tk,
darwin,
koboldLiteSupport ? true,
config,
cudaPackages ? { },
openblasSupport ? !stdenv.isDarwin,
openblas,
cublasSupport ? config.cudaSupport,
clblastSupport ? stdenv.isLinux,
clblast,
ocl-icd,
vulkanSupport ? true,
vulkan-loader,
metalSupport ? stdenv.isDarwin && stdenv.isAarch64,
# You can find list of x86_64 options here: https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
# For ARM here: https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html
# If you set "march" to "native", specify "mtune" as well; otherwise, it will be set to "generic". (credit to: https://lemire.me/blog/2018/07/25/it-is-more-complicated-than-i-thought-mtune-march-in-gcc/)
# For example, if you have an AMD Ryzen CPU, you will set "march" to "x86-64" and "mtune" to "znver2"
march ? "",
mtune ? "",
}:
let
makeBool = option: bool: (if bool then "${option}=1" else "");
effectiveStdenv = if cublasSupport then cudaPackages.backendStdenv else stdenv;
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "koboldcpp";
version = "1.66";
src = fetchFromGitHub {
owner = "LostRuins";
repo = "koboldcpp";
rev = "refs/tags/v${finalAttrs.version}";
sha256 = "sha256-3Gsbfxh3K3xa6Ofs9M9cfKWg0sxrolL8Ivx40iqvlA8=";
};
enableParallelBuilding = true;
nativeBuildInputs = [
makeWrapper
python311Packages.wrapPython
];
pythonInputs = builtins.attrValues { inherit (python311Packages) tkinter customtkinter packaging; };
buildInputs =
[ tk ]
++ finalAttrs.pythonInputs
++ lib.optionals effectiveStdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.Accelerate
darwin.apple_sdk_11_0.frameworks.CoreVideo
darwin.apple_sdk_11_0.frameworks.CoreGraphics
darwin.apple_sdk_11_0.frameworks.CoreServices
]
++ lib.optionals metalSupport [
darwin.apple_sdk_11_0.frameworks.MetalKit
darwin.apple_sdk_11_0.frameworks.Foundation
darwin.apple_sdk_11_0.frameworks.MetalPerformanceShaders
]
++ lib.optionals openblasSupport [ openblas ]
++ lib.optionals cublasSupport [
cudaPackages.libcublas
cudaPackages.cuda_nvcc
cudaPackages.cuda_cudart
cudaPackages.cuda_cccl
]
++ lib.optionals clblastSupport [
clblast
ocl-icd
]
++ lib.optionals vulkanSupport [ vulkan-loader ];
pythonPath = finalAttrs.pythonInputs;
darwinLdFlags = lib.optionals stdenv.isDarwin [
"-F${darwin.apple_sdk_11_0.frameworks.CoreServices}/Library/Frameworks"
"-F${darwin.apple_sdk_11_0.frameworks.Accelerate}/Library/Frameworks"
"-framework CoreServices"
"-framework Accelerate"
];
metalLdFlags = lib.optionals metalSupport [
"-F${darwin.apple_sdk_11_0.frameworks.Foundation}/Library/Frameworks"
"-F${darwin.apple_sdk_11_0.frameworks.Metal}/Library/Frameworks"
"-framework Foundation"
"-framework Metal"
];
env.NIX_LDFLAGS = lib.concatStringsSep " " (finalAttrs.darwinLdFlags ++ finalAttrs.metalLdFlags);
env.NIX_CFLAGS_COMPILE =
lib.optionalString (march != "") "-march=${march}" + lib.optionalString (mtune != "") "-mtune=${mtune}";
makeFlags = [
(makeBool "LLAMA_OPENBLAS" openblasSupport)
(makeBool "LLAMA_CUBLAS" cublasSupport)
(makeBool "LLAMA_CLBLAST" clblastSupport)
(makeBool "LLAMA_VULKAN" vulkanSupport)
(makeBool "LLAMA_METAL" metalSupport)
];
installPhase = ''
runHook preInstall
mkdir -p "$out/bin"
install -Dm755 koboldcpp.py "$out/bin/koboldcpp.unwrapped"
cp *.so "$out/bin"
cp *.embd "$out/bin"
${lib.optionalString (!koboldLiteSupport) ''
rm "$out/bin/kcpp_docs.embd"
rm "$out/bin/klite.embd"
''}
runHook postInstall
'';
postFixup = ''
wrapPythonProgramsIn "$out/bin" "$pythonPath"
makeWrapper "$out/bin/koboldcpp.unwrapped" "$out/bin/koboldcpp" \
--prefix PATH ${lib.makeBinPath [ tk ]}
'';
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = {
description = "A way to run various GGML and GGUF models";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [
maxstrid
donteatoreo
];
mainProgram = "koboldcpp";
platforms = lib.platforms.unix;
};
})

32
pkgs/by-name/ku/kube-state-metrics/package.nix Normal file
View File

@ -0,0 +1,32 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "kube-state-metrics";
version = "2.12.0";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kube-state-metrics";
rev = "v${version}";
hash = "sha256-EBSlufgzT4zgxTO5B0/RHHJJ2GgtU3U9ypd1QjC3knE=";
};
vendorHash = "sha256-A/oiFEWM3TOtk4V3xpehJ+5oKSyzYKZHVlp3wjykFRA=";
excludedPackages = [
"./tests/e2e"
"./tools"
];
meta = {
homepage = "https://github.com/kubernetes/kube-state-metrics";
description = "Add-on agent to generate and expose k8s cluster-level metrics";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.eskytthe ];
platforms = lib.platforms.unix;
};
}

85
pkgs/by-name/le/letterpress/package.nix Normal file
View File

@ -0,0 +1,85 @@
{
lib,
stdenv,
fetchFromGitLab,
fetchpatch,
wrapGAppsHook4,
appstream,
blueprint-compiler,
desktop-file-utils,
gettext,
gobject-introspection,
jp2a,
libadwaita,
meson,
ninja,
pkg-config,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "letterpress";
version = "2.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "letterpress";
rev = version;
hash = "sha256-9U8iH3V4WMljdtWLmb0RlexLeAN5StJ0c9RlEB2E7Xs=";
};
patches = [
# Fix application segmentation fault on file chooser dialog opening
# https://gitlab.gnome.org/World/Letterpress/-/merge_requests/16
(fetchpatch {
url = "https://gitlab.gnome.org/World/Letterpress/-/commit/15059eacca14204d1092a6e32ef30c6ce4df6d36.patch";
hash = "sha256-pjg/O9advtkZ0l73GQtL/GYcTWeOs5l3VGOdnsZCWI0=";
})
];
runtimeDeps = [
jp2a
];
buildInputs = [
libadwaita
];
nativeBuildInputs = [
appstream
blueprint-compiler
desktop-file-utils
gettext
gobject-introspection
meson
ninja
pkg-config
wrapGAppsHook4
];
dependencies = with python3Packages; [
pillow
pygobject3
];
pyproject = false; # built by meson
dontWrapGApps = true; # prevent double wrapping
preFixup = ''
makeWrapperArgs+=(''${gappsWrapperArgs[@]} --prefix PATH : ${ lib.makeBinPath runtimeDeps })
'';
meta = with lib; {
description = "Create beautiful ASCII art";
longDescription = ''
Letterpress converts your images into a picture made up of ASCII characters.
You can save the output to a file, copy it, and even change its resolution!
High-res output can still be viewed comfortably by lowering the zoom factor.
'';
homepage = "https://apps.gnome.org/Letterpress/";
license = licenses.gpl3Plus;
maintainers = [ maintainers.dawidd6 ];
platforms = platforms.linux;
mainProgram = "letterpress";
};
}

32
pkgs/by-name/li/libitl/package.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, fetchpatch
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libitl";
version = "0.1.8-unstable-2024-05-26";
nativeBuildInputs = [ cmake ];
src = fetchFromGitHub {
owner = "arabeyes-org";
repo = "ITL";
rev = "07de1851722d0818d1f981df234e1b585eb60e05";
hash = "sha256-bhejnA7FfuopR27heliaE/vNd1Rqvnjj3n/vkjmimAw=";
};
meta = with lib; {
description = "Islamic Tools and Libraries (ITL)";
longDescription = ''
The Islamic Tools and Libraries (ITL) project provides
a fully featured library for performing common Islamic calculations.
'';
homepage = "https://www.arabeyes.org/ITL";
license = licenses.lgpl21Only;
platforms = platforms.all;
maintainers = with maintainers; [ amyipdev ];
};
})

6
pkgs/by-name/li/lint-staged/package.nix
View File

@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "lint-staged";
version = "15.2.4";
version = "15.2.5";
src = fetchFromGitHub {
owner = "okonet";
repo = "lint-staged";
rev = "v${version}";
hash = "sha256-TGJz1jWXTNlTfHe1ed4jjR6SBlXriIAQJXQ4W6b7dQU=";
hash = "sha256-Mr8Gtm5kXv+ZcLAMCe8JadJwlTRjD29xojN6Tyzdfb8=";
};
npmDepsHash = "sha256-2Lv7k41hWVHF5PGdpYlMoFAj/zDPuRg6ydXaWTpUR/g=";
npmDepsHash = "sha256-BAVxloOuHodxPLoN5iMQcL04rdmkIEL6UYPnp2HbTe0=";
dontNpmBuild = true;

36
pkgs/by-name/li/live555/package.nix
View File

@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "live555";
version = "2024.05.05";
version = "2024.05.15";
src = fetchurl {
urls = [
@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
"https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz"
"mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz"
];
hash = "sha256-jGT1jg5pa4bwIcxUy7/svIhU2HCxx2TNMkWvBfN33nM=";
hash = "sha256-Mgkf5XiFBEEDTTx+YlV12wE4zpmPPqaUPv9KcEK38D0=";
};
patches = [
@ -38,11 +38,24 @@ stdenv.mkDerivation (finalAttrs: {
openssl
];
makeFlags = [
"PREFIX=${placeholder "out"}"
"C_COMPILER=$(CC)"
"CPLUSPLUS_COMPILER=$(CXX)"
"LIBRARY_LINK=$(AR) cr "
"LINK=$(CXX) -o "
];
# Since NIX_CFLAGS_COMPILE affects both C and C++ toolchains, we set CXXFLAGS
# directly
env.CXXFLAGS = "-std=c++20";
strictDeps = true;
# Since NIX_CFLAGS_COMPILE does not differentiate C and C++ toolchains, we
# set CXXFLAGS directly
env.CXXFLAGS = "-std=c++20";
enableParallelBuilding = true;
# required for whitespaces in makeFlags
__structuredAttrs = true;
postPatch = ''
substituteInPlace config.macosx-catalina \
@ -75,19 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
runHook postConfigure
'';
makeFlags = [
"PREFIX=${placeholder "out"}"
"C_COMPILER=$(CC)"
"CPLUSPLUS_COMPILER=$(CXX)"
"LIBRARY_LINK=$(AR) cr "
"LINK=$(CXX) -o "
];
# required for whitespaces in makeFlags
__structuredAttrs = true;
enableParallelBuilding = true;
passthru.tests = {
# Downstream dependency
inherit vlc;

8
pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix
View File

@ -23,11 +23,11 @@ effectiveStdenv.mkDerivation (finalAttrs: {
version = "0-unstable-2023-10-09";
src = fetchFromGitHub {
owner = "Cryolitia";
owner = "MaaAssistantArknights";
repo = "FastDeploy";
# follows https://github.com/MaaAssistantArknights/MaaDeps/blob/master/vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake#L4
rev = "2e68908141f6950bc5d22ba84f514e893cc238ea";
hash = "sha256-BWO4lKZhwNG6mbkC70hPgMNjabTnEV5XMo0bLV/gvQs=";
# follows but not fully follows https://github.com/MaaAssistantArknights/MaaDeps/blob/master/vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake#L4
rev = "0db6000aaac250824266ac37451f43ce272d80a3";
hash = "sha256-5TItnPDc5WShpZAgBYeqgI9KKkk3qw/M8HPMlq/H4BM=";
};
outputs = [ "out" "cmake" ];

21
pkgs/by-name/ma/maa-assistant-arknights/package.nix
View File

@ -29,27 +29,6 @@ stdenv.mkDerivation (finalAttr: {
hash = if isBeta then sources.beta.hash else sources.stable.hash;
};
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=maa-assistant-arknights
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail 'RUNTIME DESTINATION .' ' ' \
--replace-fail 'LIBRARY DESTINATION .' ' ' \
--replace-fail 'PUBLIC_HEADER DESTINATION .' ' '
substituteInPlace CMakeLists.txt \
--replace-fail 'find_package(asio ' '# find_package(asio ' \
--replace-fail 'asio::asio' ' '
shopt -s globstar nullglob
substituteInPlace src/MaaCore/**/{*.h,*.cpp,*.hpp,*.cc} \
--replace 'onnxruntime/core/session/' ""
substituteInPlace CMakeLists.txt \
--replace-fail 'ONNXRuntime' 'onnxruntime'
cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/
'';
nativeBuildInputs = [
asio
cmake

8
pkgs/by-name/ma/maa-assistant-arknights/pin.json
View File

@ -1,10 +1,10 @@
{
"stable": {
"version": "5.2.3",
"hash": "sha256-fjlvP5PPmSSNYefYRrEBVdhbN3yZ0pCbvIe763U5y5o="
"version": "5.3.1",
"hash": "sha256-4Bz9r4UcaUI5v1upwdD0HclXIUBcNpfnA2iWwofk1zw="
},
"beta": {
"version": "5.2.3",
"hash": "sha256-fjlvP5PPmSSNYefYRrEBVdhbN3yZ0pCbvIe763U5y5o="
"version": "5.3.1",
"hash": "sha256-4Bz9r4UcaUI5v1upwdD0HclXIUBcNpfnA2iWwofk1zw="
}
}

4
pkgs/by-name/pe/peergos/package.nix
View File

@ -9,10 +9,10 @@
stdenv.mkDerivation rec {
pname = "peergos";
version = "0.17.0";
version = "0.18.0";
src = fetchurl {
url = "https://github.com/Peergos/web-ui/releases/download/v${version}/Peergos.jar";
hash = "sha256-sQPEKvtQDRQ4dF22tZjPhK7DLtDVAcudxoA4+GOeeZA=";
hash = "sha256-qscNGuptkRd7bQhIq51bJ/cH2Gzn60lB4IUT9RK6eIo=";
};
dontUnpack = true;

4
pkgs/by-name/sa/sarasa-gothic/package.nix
View File

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sarasa-gothic";
version = "1.0.12";
version = "1.0.13";
src = fetchurl {
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
hash = "sha256-icZT/CEvCCbDTklcca3LjtX7wnvx35wg4RyK1jHDmwk=";
hash = "sha256-dsYYzE5NrJgFCzV8fp6eUD+8bDf6qDP8/tBNRKhnytY=";
};
sourceRoot = ".";

4
pkgs/by-name/st/sttr/package.nix
View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "sttr";
version = "0.2.20";
version = "0.2.21";
src = fetchFromGitHub {
owner = "abhimanyu003";
repo = "sttr";
rev = "v${version}";
hash = "sha256-8xIVLUbqk7bPjDTO2tdU9dGslBEorQusaJSAuFhRZYw=";
hash = "sha256-XBg/t2hspKdgkRgU95VLfi74cnA9OZ03x4deFOu+2do=";
};
vendorHash = "sha256-OuPPK4ordP/yzH+0sCRKO9szJ81LUbvM2Z8U88O6Qwc=";

14
pkgs/data/fonts/monocraft/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, lib, fetchurl }:
{ stdenvNoCC, lib, fetchurl }:
let
version = "2.4";
version = "3.0";
relArtifact = name: hash: fetchurl {
inherit name hash;
url = "https://github.com/IdreesInc/Monocraft/releases/download/v${version}/${name}";
};
in
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
pname = "monocraft";
inherit version;
@ -18,16 +18,14 @@ stdenv.mkDerivation {
(relArtifact "Monocraft-nerd-fonts-patched.ttf" "sha256-QxMp8UwcRjWySNHWoNeX2sX9teZ4+tCFj+DG41azsXw=")
];
sourceRoot = ".";
unpackCmd = ''cp "$curSrc" $(basename $curSrc)'';
dontUnpack = true;
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
install -Dm644 -t $out/share/fonts/opentype *.otf
install -Dm644 -t $out/share/fonts/truetype *.ttf
find $srcs -name '*.otf' -exec install -Dm644 --target $out/share/fonts/opentype {} +
find $srcs -name '*.ttf' -exec install -Dm644 --target $out/share/fonts/truetype {} +
runHook postInstall
'';

22
pkgs/development/python-modules/aioshutil/default.nix
View File

@ -10,18 +10,23 @@
buildPythonPackage rec {
pname = "aioshutil";
version = "1.3";
format = "pyproject";
version = "1.4";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "kumaraditya303";
repo = pname;
rev = "v${version}";
hash = "sha256-XIGjiLjoyS/7vUDIyBPvHNMyHOBa0gsg/c/vGgrhZAg=";
repo = "aioshutil";
rev = "refs/tags/v${version}";
hash = "sha256-OGxD7GusRcHpz7FdUpa/dJ6/jIAVexbTvXfouVw0C+I=";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace-fail " --cov aioshutil --cov-report xml" ""
'';
nativeBuildInputs = [ setuptools-scm ];
nativeCheckInputs = [
@ -29,17 +34,12 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.cfg \
--replace " --cov aioshutil --cov-report xml" ""
'';
pythonImportsCheck = [ "aioshutil" ];
meta = with lib; {
description = "Asynchronous version of function of shutil module";
homepage = "https://github.com/kumaraditya303/aioshutil";
license = with licenses; [ bsd3 ];
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/heatzypy/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "heatzypy";
version = "2.5.4";
version = "2.5.5";
pyproject = true;
disabled = pythonOlder "3.11";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Cyr-ius";
repo = "heatzypy";
rev = "refs/tags/${version}";
hash = "sha256-A01e3duNQmVv9vyOs6+gF/BdevLiYi/uXSq5bKmuRao=";
hash = "sha256-S1wIVeUTbtF5omImt38YNvZEutyCEYMGExccs0FIK44=";
};
build-system = [

4
pkgs/development/python-modules/pytest-testinfra/default.nix
View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "pytest-testinfra";
version = "10.1.0";
version = "10.1.1";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-93Qzm5R3Ws3zqMSjeTqOrS6N/HD/NLd4vhWquhQPoZ4=";
hash = "sha256-qHbxRToBtY2U2dk23VA0TCwBrHiAorQdFb3yM67Zzx8=";
};
build-system = [ setuptools-scm ];

4
pkgs/development/python-modules/resend/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "resend";
version = "1.1.0";
version = "2.0.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "resend";
repo = "resend-python";
rev = "refs/tags/v${version}";
hash = "sha256-xLrqkOHdynlwuY3+9aHWgCz8TX9v4RiVCvvPtu6k14c=";
hash = "sha256-3dYs3U3UaD3eiLs5s71VfivSurp5R3BiA1r0L5Py7XY=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1154";
version = "3.0.1156";
pyproject = true;
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-rVNmNnLRtW7ZhJgNUoZvYlbU9dkiXXOv7/vBAvaQ18w=";
hash = "sha256-evhgB8MljJBru+6ovMaUMIwSRcVA+zG+EHYtubSVr7o=";
};
build-system = [ setuptools ];

13
pkgs/development/python-modules/yara-python/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "yara-python";
version = "4.5.0";
version = "4.5.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,18 +18,18 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "VirusTotal";
repo = "yara-python";
rev = "v${version}";
hash = "sha256-RcrzzJQdzn+BXEp5M3ziGL6qSgfUN3wJ3JxwgjzVeuk=";
rev = "refs/tags/v${version}";
hash = "sha256-P+OQljzp+ZwVOXAgJqK7GNrqBep40MyVtMKDtT4ZUr8=";
};
# undefined symbol: yr_finalize
# https://github.com/VirusTotal/yara-python/issues/7
postPatch = ''
substituteInPlace setup.py \
--replace "include_dirs=['yara/libyara/include', 'yara/libyara/', '.']" "libraries = ['yara']"
--replace-fail "include_dirs=['yara/libyara/include', 'yara/libyara/', '.']" "libraries = ['yara']"
'';
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
buildInputs = [ yara ];
@ -44,7 +44,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python interface for YARA";
homepage = "https://github.com/VirusTotal/yara-python";
license = with licenses; [ asl20 ];
changelog = "https://github.com/VirusTotal/yara-python/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

160
pkgs/development/tools/misc/ctags/wrapped.nix
View File

@ -1,78 +1,90 @@
{ pkgs, ctags }:
with pkgs.lib;
# define some ctags wrappers adding support for some not that common languages
# customization:
# a) add stuff here
# b) override asLang, phpLang, ... using packageOverrides
# c) use ctagsWrapped.override {args = [ your liste ];}
# install using -iA ctagsWrapped.ctagsWrapped
{
lib,
ctags,
writeTextFile,
runtimeShell,
ctagsWrapped,
name ? "${ctags.name}-wrapped",
args ? lib.concatLists [
ctagsWrapped.defaultArgs
ctagsWrapped.phpLang
ctagsWrapped.jsLang
ctagsWrapped.nixLang
ctagsWrapped.asLang
ctagsWrapped.rubyLang
],
}:
# the derivation. use language extensions specified by args
ctagsWrapped = makeOverridable ( {args, name} : pkgs.writeScriptBin name ''
#!${pkgs.runtimeShell}
exec ${pkgs.ctags}/bin/ctags ${concatStringsSep " " (map escapeShellArg args)} "$@"
'') {
args = let x = pkgs.ctagsWrapped; in concatLists [
x.defaultArgs x.phpLang x.jsLang x.nixLang x.asLang x.rubyLang
];
name = "${ctags.name}-wrapped";
# Define a ctags wrapper derivation adding support for some not-that-common languages customization.
# Override this to provide different args.
writeTextFile {
inherit name;
executable = true;
destination = "/bin/${name}";
text = ''
#!${runtimeShell}
exec ${ctags}/bin/ctags ${lib.concatStringsSep " " (map lib.escapeShellArg args)} "$@"
'';
derivationArgs = {
# Inherit the metadata from the parent `ctags` derivation.
inherit (ctags) meta;
passthru = {
# `ctagsWrapped` exists for backwards compatibility; ctagsWrapped used to be an attrset and
# now is a derivation, so keep supporting the use of `ctagsWrapped.ctagsWrapped`.
inherit ctagsWrapped;
### language arguments
# don't scan version control directories
defaultArgs = [
"--exclude=.svn"
"--exclude=.hg"
"--exclude=.git"
"--exclude=_darcs"
"--sort=yes"
];
# actionscript
asLang = [
"--langdef=ActionScript"
"--langmap=ActionScript:.as"
"--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/"
"--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/"
"--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/"
"--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/"
"--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/"
];
# PHP
phpLang = [
"--langmap=PHP:.php"
"--regex-PHP=/abstract class ([^ ]*)/\\1/c/"
"--regex-PHP=/interface ([^ ]*)/\\1/i/"
"--regex-PHP=/function[ \\t]+([^ (]*)/\\1/f/"
];
# Javascript: also find unnamed functions and functions being passed within a dict.
# the dict properties is used to implement duck typing in frameworks
# var foo = function () { ... }
# {
# a : function () {}
# only recognize names up 100 characters. Else you'll be in trouble scanning compressed .js files.
jsLang = [ "--regex-JavaScript=/([^ \\t]{1,100})[ \\t]*:[ \\t]*function[ \\t]*\\(/\\1/f/" ];
# find foo in "foo =", don't think we can do a lot better
nixLang = [
"--langdef=NIX"
"--langmap=NIX:.nix"
"--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/"
];
rubyLang = [
"--langmap=RUBY:.rb"
"--regex-RUBY=/class ([^ ]*)/\\1/c/"
"--regex-RUBY=/^[ ]*module[ ]*([^ ]*)/\\1/m/"
];
};
};
### language arguments
# don't scan version control directories
defaultArgs = [
"--exclude=.svn"
"--exclude=.hg"
"--exclude=.git"
"--exclude=_darcs"
"--sort=yes"
];
# actionscript
asLang = [
"--langdef=ActionScript"
"--langmap=ActionScript:.as"
"--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/"
"--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/"
"--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/"
"--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/"
"--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/"
];
# PHP
phpLang = [
"--langmap=PHP:.php"
"--regex-PHP=/abstract class ([^ ]*)/\\1/c/"
"--regex-PHP=/interface ([^ ]*)/\\1/i/"
"--regex-PHP=/function[ \\t]+([^ (]*)/\\1/f/"
];
# Javascript: also find unnamed functions and functions being passed within a dict.
# the dict properties is used to implement duck typing in frameworks
# var foo = function () { ... }
# {
# a : function () {}
# only recognize names up 100 characters. Else you'll be in trouble scanning compressed .js files.
jsLang = [
"--regex-JavaScript=/([^ \\t]{1,100})[ \\t]*:[ \\t]*function[ \\t]*\\(/\\1/f/"
];
# find foo in "foo =", don't think we can do a lot better
nixLang = [
"--langdef=NIX"
"--langmap=NIX:.nix"
"--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/"
];
rubyLang = [
"--langmap=RUBY:.rb"
"--regex-RUBY=/class ([^ ]*)/\\1/c/"
"--regex-RUBY=/^[ ]*module[ ]*([^ ]*)/\\1/m/"
];
}

5
pkgs/games/minetest/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, gitUpdater
, cmake
, irrlichtmt
, coreutils
@ -128,6 +129,10 @@ stdenv.mkDerivation (finalAttrs: {
mv $out/minetest.app $out/Applications
'';
passthru.updateScript = gitUpdater {
ignoredVersions = "^[^.]+$|.*-android$";
};
meta = with lib; {
homepage = "https://minetest.net/";
description = "Infinite-world block sandbox game";

6
pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix
View File

@ -4,18 +4,18 @@
callPackage ./generic.nix rec {
pname = "experienced-pixel-dungeon";
version = "2.17.2";
version = "2.18";
src = fetchFromGitHub {
owner = "TrashboxBobylev";
repo = "Experienced-Pixel-Dungeon-Redone";
rev = "ExpPD-${version}";
hash = "sha256-eX+wPw2Bi37yQZ+ftjEkiGzvheJZingqDqy1481ABvs=";
hash = "sha256-jOKHBd9LaDn3oqLdQWqAcJnicktlbkDGw00nT8JveoI=";
};
postPatch = ''
substituteInPlace build.gradle \
--replace-fail "gdxControllersVersion = '2.2.3-SNAPSHOT'" "gdxControllersVersion = '2.2.3'"
--replace-fail "gdxControllersVersion = '2.2.4-SNAPSHOT'" "gdxControllersVersion = '2.2.3'"
'';
depsHash = "sha256-PyBEhlOOVD3/YH4SWs1yMkdg3U96znk1/VV6SAr8S30=";

6
pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix
View File

@ -4,13 +4,13 @@
callPackage ./generic.nix rec {
pname = "shorter-pixel-dungeon";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "TrashboxBobylev";
repo = "Shorter-Pixel-Dungeon";
rev = "Short-${version}";
hash = "sha256-dfBFAXlMjazTjvvRZ87H48OmitZuHhaa3qUF81pF4wc=";
hash = "sha256-iG90T/Ho8/JY3HgkACiBnGdbUGsVRlfxXbcNFHhzZi4=";
};
postPatch = ''
@ -18,7 +18,7 @@ callPackage ./generic.nix rec {
--replace-fail "gdxControllersVersion = '2.2.4-SNAPSHOT'" "gdxControllersVersion = '2.2.3'"
'';
depsHash = "sha256-MUUeWZUCVPakK1MJwn0lPnjAlLpPWB/J17Ad68XRcHg=";
depsHash = "sha256-PyBEhlOOVD3/YH4SWs1yMkdg3U96znk1/VV6SAr8S30=";
desktopName = "Shorter Pixel Dungeon";

12
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -441,7 +441,8 @@ let
# (stable) amdgpu support for bonaire and newer chipsets
DRM_AMDGPU_CIK = yes;
# Allow device firmware updates
DRM_DP_AUX_CHARDEV = yes;
DRM_DP_AUX_CHARDEV = whenOlder "6.10" yes;
DRM_DISPLAY_DP_AUX_CHARDEV = whenAtLeast "6.10" yes;
# amdgpu display core (DC) support
DRM_AMD_DC_DCN1_0 = whenOlder "5.6" yes;
DRM_AMD_DC_DCN2_0 = whenBetween "5.3" "5.6" yes;
@ -470,7 +471,8 @@ let
MEDIA_CEC_RC = whenAtLeast "5.10" yes;
# Enable CEC over DisplayPort
DRM_DP_CEC = yes;
DRM_DP_CEC = whenOlder "6.10" yes;
DRM_DISPLAY_DP_AUX_CEC = whenAtLeast "6.10" yes;
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
# Intel GVT-g graphics virtualization supports 64-bit only
DRM_I915_GVT = yes;
@ -927,8 +929,10 @@ let
# i686 issues: https://github.com/NixOS/nixpkgs/pull/117961#issuecomment-812106375
useZstd = stdenv.buildPlatform.is64bit && versionAtLeast version "5.9";
in {
KERNEL_XZ = mkIf (!useZstd) yes;
KERNEL_ZSTD = mkIf useZstd yes;
# stdenv.hostPlatform.linux-kernel.target assumes uncompressed on RISC-V.
KERNEL_UNCOMPRESSED = mkIf stdenv.hostPlatform.isRiscV yes;
KERNEL_XZ = mkIf (!stdenv.hostPlatform.isRiscV && !useZstd) yes;
KERNEL_ZSTD = mkIf (!stdenv.hostPlatform.isRiscV && useZstd) yes;
HID_BATTERY_STRENGTH = yes;
# enabled by default in x86_64 but not arm64, so we do that here

80
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@ -2,81 +2,81 @@
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.314-hardened1.patch",
"sha256": "18k8rvcfqjdrjv4a8lbfxdi5nipn0widarncxgmbaykc2x37q4vr",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.314-hardened1/linux-hardened-4.19.314-hardened1.patch"
"name": "linux-hardened-4.19.315-hardened1.patch",
"sha256": "1w17mwsv618pw5bkahmz6in0i5zjjxd3d14gggafqdd3dgfr1h8q",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.315-hardened1/linux-hardened-4.19.315-hardened1.patch"
},
"sha256": "0nvrpg5aj2q4h2drmczprqaprcc2zhcrijfri77b830ms8rg4y2a",
"version": "4.19.314"
"sha256": "1j1j8awy0237jp2r211qpa305c10y7rlcbkxkzdvzbgyhwy4spkc",
"version": "4.19.315"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.217-hardened1.patch",
"sha256": "1isql7dsky91kp856gcwczzd4vwyfi0xxdgv7s0987v4p6ih3gbz",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.217-hardened1/linux-hardened-5.10.217-hardened1.patch"
"name": "linux-hardened-5.10.218-hardened1.patch",
"sha256": "1ah4pznha17ngg3w7l0j74h4910gjv8qj503adrap7plvapf82m4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.218-hardened1/linux-hardened-5.10.218-hardened1.patch"
},
"sha256": "0qhzqrjci45vcbzjch7vq75i6hpyap6yb7jw6g71phcnqgzw2ay5",
"version": "5.10.217"
"sha256": "1mmj5hwm5i16gc1y4nzr1cs882vi6vrihrincdcivv63x11v4dlw",
"version": "5.10.218"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.159-hardened1.patch",
"sha256": "1dscwbzjajb2wph0m0kijhagmclg5jz614mgah98nkj9b4sbgzli",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.159-hardened1/linux-hardened-5.15.159-hardened1.patch"
"name": "linux-hardened-5.15.160-hardened1.patch",
"sha256": "1r10ylx886rslsmrixlijjm4crhwzkl3wj6kpyn2344qik1gxpqr",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.160-hardened1/linux-hardened-5.15.160-hardened1.patch"
},
"sha256": "1ia1nfci2wkx4nhnldfczpcq47mp7y7g657ikkh8i72y498gwy1l",
"version": "5.15.159"
"sha256": "018v19a7rhzc4szybzzn86jlnk42x7jm6xkadfd2d3xq6f7727pl",
"version": "5.15.160"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.276-hardened1.patch",
"sha256": "1hhy6jhq1h5v69319cjz5vidaqm4paiqvb62rairsdbabd2ycgvl",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.276-hardened1/linux-hardened-5.4.276-hardened1.patch"
"name": "linux-hardened-5.4.277-hardened1.patch",
"sha256": "1zjw5wl8lj69j402qm8dg3m4dxgq3ppx2jyz8jks976vyhh8fsg4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.277-hardened1/linux-hardened-5.4.277-hardened1.patch"
},
"sha256": "01vfx19n8rv9fgjjzvi78125md71zgn5jrinbarabzr18jyjwwg2",
"version": "5.4.276"
"sha256": "0l8zq3k07hdprfpvw69ykkf2pdg8wiv28xz733yxsjcfb0l5n7vy",
"version": "5.4.277"
},
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.1.91-hardened1.patch",
"sha256": "0rsrsrzjwiwkhr0hhcf1h56g5a0ymwl4h20452s2h7jvh2l8gi6j",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.91-hardened1/linux-hardened-6.1.91-hardened1.patch"
"name": "linux-hardened-6.1.92-hardened1.patch",
"sha256": "0cw87ygmisi823y3f7xrck12b6zh3mq1qmb7lcmr3hg6w3xskmn3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.92-hardened1/linux-hardened-6.1.92-hardened1.patch"
},
"sha256": "1v2d5syxwwqlhvjzxk003qz9sr18r0n8dgg976vbi492r9iww2l8",
"version": "6.1.91"
"sha256": "1j9n8gk76nn4gw42iba5zgghr360gb9n1mslr5dyv76wpwkz86ch",
"version": "6.1.92"
},
"6.6": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.6.31-hardened1.patch",
"sha256": "1asn2q825ffinx59czidhs8fhj31mw5sin7bd11jg2z5n6xi3a08",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.31-hardened1/linux-hardened-6.6.31-hardened1.patch"
"name": "linux-hardened-6.6.32-hardened1.patch",
"sha256": "19362a6lxs3cnaw19jvda7n791y95lfgn9ki4wmaxnw2qbpi0bgg",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.32-hardened1/linux-hardened-6.6.32-hardened1.patch"
},
"sha256": "080wwrc231fbf43hvvygddmdxdspyw23jc5vnd6fr5ccdybgzv6n",
"version": "6.6.31"
"sha256": "1qbc8dqmk2xs1cz968rysw5xvhq3lj8g0pxp48fr2qbzy3m29a5a",
"version": "6.6.32"
},
"6.8": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.8.10-hardened1.patch",
"sha256": "0671ylf01gsgbgxd1baswj0h6hwgxxkgrvd03qh81kp3pmr2bpb3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.8.10-hardened1/linux-hardened-6.8.10-hardened1.patch"
"name": "linux-hardened-6.8.11-hardened1.patch",
"sha256": "08i03dmri9h6jxcjd9g6s7pv0spqi3f4fgch1ars68cgngikvbpq",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.8.11-hardened1/linux-hardened-6.8.11-hardened1.patch"
},
"sha256": "0xjirg2w5fc2w2q6wr702akszq32m31lk4q5nbjq10zqhbcr5fxh",
"version": "6.8.10"
"sha256": "1di8kr596sf68sm61kp5rz6bn3sb0q5ag1qc5hm8f9dpyq4wv3dp",
"version": "6.8.11"
},
"6.9": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.9.1-hardened1.patch",
"sha256": "1zp0qwri43v4h234x1vqbwcbd50hryshi7i717xandzkpxvq72l2",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.9.1-hardened1/linux-hardened-6.9.1-hardened1.patch"
"name": "linux-hardened-6.9.2-hardened1.patch",
"sha256": "0ph1m0pnlqrhvddz2mjgcwvs0ddcpzigz8kgi9zi063qinlfbm3q",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.9.2-hardened1/linux-hardened-6.9.2-hardened1.patch"
},
"sha256": "0jn0qp22vx7xf2mgaj7cwf8agqhahvrwlda4ak6rw67xk2x19d01",
"version": "6.9.1"
"sha256": "1yg5j284y1gz7zwxjz2abvlnas259m1y1vzd9lmcqqar5kgmnv6l",
"version": "6.9.2"
}
}

4
pkgs/os-specific/linux/kernel/kernels-org.json
View File

@ -1,7 +1,7 @@
{
"testing": {
"version": "6.9-rc6",
"hash": "sha256:075l5vhk8zmwln4jks7gr5n5k67s65qvs07l2rpbc7a75fdp6c14"
"version": "6.10-rc1",
"hash": "sha256:006frl76cwi9a4mw7x6vsyazgrjfiz1gn4q4hvpykqql5mar3a05"
},
"6.1": {
"version": "6.1.92",

4
pkgs/os-specific/linux/kernel/linux-libre.nix
View File

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19569";
sha256 = "0nm3vzzfwx3g8scgwyszjbf7sa08kwd1xyq4v1m5py63pma7p80r";
rev = "19575";
sha256 = "1f826x8a6nmqcjcplg5x4rcqkr3p886abxhyqir8a102ymnh7wkw";
}
, ...
}:

6
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
View File

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.216-rt108"; # updated by ./update-rt.sh
version = "5.10.217-rt109"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -17,14 +17,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0lg1zfb9y4ps86q85mlnyalb3s90zix003z62jb9bw139f65h473";
sha256 = "0qhzqrjci45vcbzjch7vq75i6hpyap6yb7jw6g71phcnqgzw2ay5";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0p0qmyz3g7fqlz4f638dlcp37az8lpq5yqw2fy5zqqs3qagy018j";
sha256 = "1cszl9414vbycswx2gjv12wdghhw5s6amd9mjmx619r2a1r0gnb7";
};
}; in [ rt-patch ] ++ kernelPatches;

6
pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
View File

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "6.1.91-rt31"; # updated by ./update-rt.sh
version = "6.1.92-rt32"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "1v2d5syxwwqlhvjzxk003qz9sr18r0n8dgg976vbi492r9iww2l8";
sha256 = "1j9n8gk76nn4gw42iba5zgghr360gb9n1mslr5dyv76wpwkz86ch";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1p8i0rv4vzm1h50g08mm7a5zbxyaibqs2894nwvalhb4dfj1vas7";
sha256 = "00qa6l4jvkdny276jnwnra5dkagnp3qr43amf2mpqx3kdfw28g1q";
};
}; in [ rt-patch ] ++ kernelPatches;

6
pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
View File

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "6.6.31-rt31"; # updated by ./update-rt.sh
version = "6.6.32-rt32"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "080wwrc231fbf43hvvygddmdxdspyw23jc5vnd6fr5ccdybgzv6n";
sha256 = "1qbc8dqmk2xs1cz968rysw5xvhq3lj8g0pxp48fr2qbzy3m29a5a";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0pj4j420ac9khw7wk6k3bcgdvcmi7p3lwycaa896q2fscz47zf01";
sha256 = "0hv2z6d2gw7hqfzw6dgrzxlirk4yifcxbmx71hxlvd9l2vgp72q5";
};
}; in [ rt-patch ] ++ kernelPatches;

4
pkgs/os-specific/linux/kernel/zen-kernels.nix
View File

@ -11,9 +11,9 @@ let
};
# ./update-zen.py lqx
lqxVariant = {
version = "6.8.10"; #lqx
version = "6.8.11"; #lqx
suffix = "lqx1"; #lqx
sha256 = "1j1n3r497wfdpichp38wqcg7sps3nymchdx41i7gq5nlnfwk290q"; #lqx
sha256 = "1dj4znir4wp6jqs680dcxn8z6p02d518993rmrx54ch04jyy5brj"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

4
pkgs/os-specific/linux/lttng-modules/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lttng-modules-${kernel.version}";
version = "2.13.10";
version = "2.13.13";
src = fetchFromGitHub {
owner = "lttng";
repo = "lttng-modules";
rev = "v${version}";
hash = "sha256-R5qwB1ayw0KueMBSSxm0TwINt78N6w356kY7WGBX0zM=";
hash = "sha256-iA3B838EUU5rFWCL8BAubkTrTO1itDFp5d1653OPnS0=";
};
nativeBuildInputs = kernel.moduleBuildDependencies;

4
pkgs/tools/misc/fluent-bit/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fluent-bit";
version = "3.0.4";
version = "3.0.6";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${finalAttrs.version}";
hash = "sha256-XMfUMyoI2mK0imvz/5HTO8CHyKubyPGSTN69v79fkjg=";
hash = "sha256-o48qnyYAiV2gt81hC8/ja+/JWNFlMb47QsBt6BD7VjA=";
};
nativeBuildInputs = [ cmake flex bison ];

4
pkgs/tools/text/crowdin-cli/default.nix
View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "crowdin-cli";
version = "3.19.4";
version = "4.0.0";
src = fetchurl {
url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
hash = "sha256-SD4D9wW+Tdr3mD91SJKm5K3gktH0ywQBRh0d1TMeLDs=";
hash = "sha256-7KyQUnl2O/raQLcP5VsMCX3084Mn6HFfxjJmksAkWBc=";
};
nativeBuildInputs = [ installShellFiles makeWrapper unzip ];

8
pkgs/tools/text/percollate/default.nix
View File

@ -2,21 +2,21 @@
buildNpmPackage rec {
pname = "percollate";
version = "4.2.0";
version = "4.2.1";
src = fetchFromGitHub {
owner = "danburzo";
repo = pname;
rev = "v${version}";
hash = "sha256-AmvdigxLZA3lgT48Z9EVEWOC92kWNA2ve37RMJTR0UA=";
hash = "sha256-vGBGw9dUOSvSqM4WN53bb2LRduLjR6fW99C0ScdMVXk=";
};
npmDepsHash = "sha256-21Q47puHZ8/jXIlLFrro87hOYahBjov8Pbg/Z2wgt+g=";
npmDepsHash = "sha256-Qne4XjUmJS5e6x380CFY3Kd7/5coXHMxniMfqYIHQcQ=";
dontNpmBuild = true;
# Dev dependencies include an unnecessary Java dependency (epubchecker)
# https://github.com/danburzo/percollate/blob/v4.2.0/package.json#L40
# https://github.com/danburzo/percollate/blob/v4.2.1/package.json#L40
npmInstallFlags = [ "--omit=dev" ];
nativeBuildInputs = [ makeWrapper ];

1
pkgs/top-level/linux-kernels.nix
View File

@ -213,7 +213,6 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.rust_1_77-6_9
];
};
latest = packageAliases.linux_latest.kernel;