gador/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:
nixpkgs-ci[bot]
2025-10-23 06:07:20 +00:00
committed by GitHub
parent 902ff96990 387a92d18b
commit e5545080a0
31 changed files with 153 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
doc/release-notes/rl-2511.section.md
View File

@@ -42,6 +42,11 @@
- Everything related to `bower` was removed, as it is deprecated and not used by anything in nixpkgs.
- `reaction` has been updated to version 2, which includes some breaking changes.
For more information, [check the release article](https://blog.ppom.me/en-reaction-v2).
- `mealie` has been updated to 3.0.2: This update introduces breaking changes in some API endpoints (see the [release changelog](https://github.com/mealie-recipes/mealie/releases/tag/v3.0.0)).
- The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
- `installShellFiles`: Allow installManPage to take a piped input, add the `--name` flag for renaming the file when installed. Can also append `--` to opt-out of all subsequent parsing.
@@ -196,6 +201,8 @@
- `proton-caller` has been removed due to lack of upstream maintenance.
- `android-udev-rules` has been removed, as it is effectively superseded by built-in uaccess rules in systemd.
- `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.
- `mongodb-6_0` was removed as it is end of life as of 2025-07-31.
@@ -282,6 +289,13 @@
- The systemd initrd will now respect `x-systemd.wants` and `x-systemd.requires` for reliably unlocking multi-disk bcachefs volumes.
- `neovim`: Added support for the `vim.o.exrc` option, the `VIMINIT` environment variable, and sourcing of `sysinit.vim`.
See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).
- `cloudflare-ddns`: Added package cloudflare-ddns.
- [`homebox` 0.20.0](https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0) changed how assets are stored and hashed. It is recommended to back up your database before this update. In particular, `--storage-data` was replaced with `--storage-conn-string` and `--storage-prefix-path`. If your configuration set `HBOX_STORAGE_DATA` manually, you must migrate it to `HBOX_STORAGE_CONN_STRING` and `HBOX_STORAGE_PREFIX_PATH`.
- GIMP now defaults to version 3. Use `gimp2` for the old version.
@@ -341,13 +355,8 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- `mealie` has been updated to 3.0.2: This update introduces breaking changes in some API endpoints (see the [release changelog](https://github.com/mealie-recipes/mealie/releases/tag/v3.0.0)).
### Breaking changes {#sec-nixpkgs-release-25.11-lib-breaking}
- `reaction` has been updated to version 2, which includes some breaking changes.
For more information, [check the release article](https://blog.ppom.me/en-reaction-v2).
- `lib.mapAttrsFlatten` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.mapAttrsToList` instead.
- `lib.attrsets.cartesianProductOfSets` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.cartesianProduct` instead.
@@ -363,9 +372,6 @@
and called `setup.py` from the source tree, which is deprecated.
The modern alternative is to configure `pyproject = true` with `build-system = [ setuptools ]`.
- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`.
If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly.
### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations}
- `lib.options.mkAliasOptionModuleMD` is now obsolete; use the identical [`lib.options.mkAliasOptionModule`] instead.
@@ -382,10 +388,4 @@
### Additions and Improvements {#sec-nixpkgs-release-25.11-lib-additions-improvements}
- `neovim`: Added support for the `vim.o.exrc` option, the `VIMINIT` environment variable, and sourcing of `sysinit.vim`.
See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).
- `cloudflare-ddns`: Added package cloudflare-ddns.
- `lib.cli.toCommandLine`, `lib.cli.toCommandLineShell`, `lib.cli.toCommandLineGNU` and `lib.cli.toCommandLineShellGNU` have been added to address multiple issues in `lib.cli.toGNUCommandLine` and `lib.cli.toGNUCommandLineShell`.

3
nixos/doc/manual/release-notes/rl-2511.section.md
View File

@@ -180,6 +180,9 @@
- The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream.
- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`.
If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly.
- `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information.
- `virtualisation.libvirtd` now uses OVMF images shipped with QEMU for UEFI machines. `virtualisation.libvirtd.qemu.ovmf` has been removed.

4
nixos/modules/programs/adb.nix
View File

@@ -16,8 +16,6 @@
type = lib.types.bool;
description = ''
Whether to configure system to use Android Debug Bridge (adb).
To grant access to a user, it must be part of adbusers group:
`users.users.alice.extraGroups = ["adbusers"];`
'';
};
};
@@ -25,8 +23,6 @@
###### implementation
config = lib.mkIf config.programs.adb.enable {
services.udev.packages = [ pkgs.android-udev-rules ];
environment.systemPackages = [ pkgs.android-tools ];
users.groups.adbusers = { };
};
}

1
nixos/modules/programs/envision.nix
View File

@@ -34,7 +34,6 @@ in
services.udev = {
enable = true;
packages = with pkgs; [
android-udev-rules
xr-hardware
];
};

1
nixos/modules/services/video/wivrn.nix
View File

@@ -217,7 +217,6 @@ in
};
services = {
udev.packages = with pkgs; [ android-udev-rules ];
avahi = {
enable = true;
publish = {

1
pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix
View File

@@ -60,6 +60,7 @@ melpaBuild (finalAttrs: {
eafPythonDeps =
ps: with ps; [
pysocks
pycookiecheat
];
};

44
pkgs/by-name/an/android-udev-rules/package.nix
View File

@@ -1,44 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
udevCheckHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "android-udev-rules";
version = "20250525";
src = fetchFromGitHub {
owner = "M0Rf30";
repo = "android-udev-rules";
rev = finalAttrs.version;
hash = "sha256-4ODU9EoVYV+iSu6+M9ePed45QkOZgWkDUlFTlWJ8ttQ=";
};
installPhase = ''
runHook preInstall
install -D 51-android.rules $out/lib/udev/rules.d/51-android.rules
runHook postInstall
'';
nativeBuildInputs = [
udevCheckHook
];
doInstallCheck = true;
meta = {
homepage = "https://github.com/M0Rf30/android-udev-rules";
description = "Android udev rules list aimed to be the most comprehensive on the net";
longDescription = ''
Android udev rules list aimed to be the most comprehensive on the net.
To use on NixOS, simply add this package to services.udev.packages:
```nix
services.udev.packages = [ pkgs.android-udev-rules ];
```
'';
platforms = lib.platforms.linux;
license = lib.licenses.gpl3Plus;
maintainers = [ ];
teams = [ lib.teams.android ];
};
})

4
pkgs/by-name/ar/art/package.nix
View File

@@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "art";
version = "1.25.9";
version = "1.25.10";
src = fetchFromGitHub {
owner = "artpixls";
repo = "ART";
tag = version;
hash = "sha256-dg0msZ0aeyl4L7RqqGur9Lalu1QtE0igEc54WT5F+SQ=";
hash = "sha256-qGrkRsdQppfIolxAhxWnJrbYotELKga6X7CFY55xCKk=";
};
# Fix the build with CMake 4.

5
pkgs/by-name/be/beszel/package.nix
View File

@@ -77,7 +77,10 @@ buildGoModule rec {
homepage = "https://github.com/henrygd/beszel";
changelog = "https://github.com/henrygd/beszel/releases/tag/v${version}";
description = "Lightweight server monitoring hub with historical data, docker stats, and alerts";
maintainers = with lib.maintainers; [ bot-wxt1221 ];
maintainers = with lib.maintainers; [
bot-wxt1221
arunoruto
];
license = lib.licenses.mit;
};
}

4
pkgs/by-name/bl/bluemap/package.nix
View File

@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec {
pname = "bluemap";
version = "5.12";
version = "5.13";
src = fetchurl {
url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar";
hash = "sha256-k+tSIlgOj7o7aHPdJzXSW1zxx2pZ67TB3aJ4Fv7U0pM=";
hash = "sha256-NDnslNJ3B6Cjxr6qem9xRX71ddHP014cGynJZdiFDpE=";
};
dontUnpack = true;

6
pkgs/by-name/ha/harbor-cli/package.nix
View File

@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "harbor-cli";
version = "0.0.12";
version = "0.0.13";
src = fetchFromGitHub {
owner = "goharbor";
repo = "harbor-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-wdUXLgmdxkWzvLCuIJSkos1z7nyETZv3mNzGtBBJVUM=";
hash = "sha256-TVuWSbBPRXq9icfMXEg0wONaqD5S2ge5DQiDHSlrADk=";
};
vendorHash = "sha256-OJTyX+HXyC6avsgUCzEfU0ej493J8p77r59j+X/Vqwk=";
vendorHash = "sha256-Pj573V6S2LaytQMK0jGVyLMX/GBZ1GOmYV/LPO1ScS4=";
excludedPackages = [
"dagger"

18
pkgs/by-name/mi/mirrord/manifest.json
View File

@@ -1,21 +1,21 @@
{
"version": "3.165.0",
"version": "3.167.0",
"assets": {
"x86_64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_linux_x86_64",
"hash": "sha256-XLmI42PHs15KFwsKzVRohdVcQiwRncuoI375OlnhrRM="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_linux_x86_64",
"hash": "sha256-7LxoI0y82Hy2Vi7SveKgkKw1Bv5AzcMceBbV1FDhock="
},
"aarch64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_linux_aarch64",
"hash": "sha256-IWEE2Vi/OIbL5hgOAkXhz/lJix7qjKD9yQrT2lNW4uY="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_linux_aarch64",
"hash": "sha256-a4SuVF1e02IjAt//DgSdJ3dy4GfDaNhOHOwrZHio7OY="
},
"aarch64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_mac_universal",
"hash": "sha256-xRFLI/97yFpM4mt+SSbCHo4CLY0ClWLrG3jUvIRO9CQ="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_mac_universal",
"hash": "sha256-pqIjHduZMwsR6zXEURkKfixkY+FLy4oIE+aPPUX904M="
},
"x86_64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_mac_universal",
"hash": "sha256-xRFLI/97yFpM4mt+SSbCHo4CLY0ClWLrG3jUvIRO9CQ="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_mac_universal",
"hash": "sha256-pqIjHduZMwsR6zXEURkKfixkY+FLy4oIE+aPPUX904M="
}
}
}

6
pkgs/by-name/op/openapi-generator-cli/package.nix
View File

@@ -9,7 +9,7 @@
let
jre = jre_headless;
version = "7.15.0";
version = "7.16.0";
mainProgram = "openapi-generator-cli";
this = maven.buildMavenPackage {
inherit version;
@@ -20,10 +20,10 @@ let
owner = "OpenAPITools";
repo = "openapi-generator";
tag = "v${version}";
hash = "sha256-IgjlMOHMASijIt5nMqOZcUpxecbWljHh9rA1YUwUmwM=";
hash = "sha256-CoztWf2H2rXcx4d8Av8cBXzMqIZsrSCgx21i3+o2ufo=";
};
mvnHash = "sha256-woHPf7vPja70cNj6Glqr0OGAR8CV8qWiRu0hkmCcCrA=";
mvnHash = "sha256-5Kzv9h3X5s/1D0Gd1XQRvNGVAyf44QcriJFvS07wdZo=";
mvnParameters = "-Duser.home=$TMPDIR";
doCheck = false;

4
pkgs/by-name/qo/qownnotes/package.nix
View File

@@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "25.10.3";
version = "25.10.4";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-hXqfo+67m1yEr8q7UQ+Er+BuJrIB3Z8M+x39PpmUdxA=";
hash = "sha256-taYrPrirSIu1CGs8GeX2lhSS8R1l3mr8YPqpkH4Y/bk=";
};
nativeBuildInputs = [

6
pkgs/by-name/ri/riffdiff/package.nix
View File

@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "riffdiff";
version = "3.4.1";
version = "3.5.0";
src = fetchFromGitHub {
owner = "walles";
repo = "riff";
tag = version;
hash = "sha256-IpEgWbmWFW4X09EeAfWadncH4ptzSom2+7kvh8h3hcM=";
hash = "sha256-qA20sLiGqDtIPWBNww+WXM5AG162RPTdkUPoJ0PLiYY=";
};
cargoHash = "sha256-I0hBh9FFoy+RhEUAHfgQa+UiSgOS0mYJy+2W/0/9kG4=";
cargoHash = "sha256-omwKOstRXIAUDgLUFqmtxu77JJzAOASzbjLEImad1cE=";
passthru = {
tests.version = testers.testVersion { package = riffdiff; };

6
pkgs/by-name/se/server-box/gitHashes.json
View File

@@ -1,11 +1,11 @@
{
"circle_chart": "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk=",
"computer": "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=",
"dartssh2": "sha256-XlbruyraMmZGNRppQdBLS89Qyd7mm5Noiap2BhZjEPw=",
"dartssh2": "sha256-Bl5eLrYU2YnpRcleff3wVXiTS9wuo2A1neiLUClvbGU=",
"fl_build": "sha256-e2BUk4WmwFzFrA2iHg4dG8fRqWhNt8KFuTEZgWL7H4g=",
"fl_lib": "sha256-gK9eJ3GiM9fRVUew1xrd/WYf9ITHi++yR0Bt6qlFm98=",
"fl_lib": "sha256-0Dg21LBVIyTH5MLt/v+kGzfOK8PFVYfNiK6P/jcy2jI=",
"gtk": "sha256-nt7d2MvIfizxezWhQNm2/yHEzYuPKDvfHGM9Bnq3f04=",
"plain_notification_token": "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I=",
"watch_connectivity": "sha256-9TyuElr0PNoiUvbSTOakdw1/QwWp6J2GAwzVHsgYWtM=",
"xterm": "sha256-VxAWV40R+rSvYyS9LZoD7GL1K1gwjMnpoKd7hfb48Wo="
"xterm": "sha256-ujR2aRB9TbaSoGB0vmx75X6683f/tu+Ptj+BFJ2WWVs="
}

4
pkgs/by-name/se/server-box/package.nix
View File

@@ -12,13 +12,13 @@
}:
let
version = "1.0.1262";
version = "1.0.1270";
src = fetchFromGitHub {
owner = "lollipopkit";
repo = "flutter_server_box";
tag = "v${version}";
hash = "sha256-2UJgqNLwVttmc/D4DEhC7oe2yhFNdkvFnOCRVV3WVFk=";
hash = "sha256-3erwb2e9iINe4MVuOQKzBuBdUJyBgW2zIImZwVyll6Q=";
};
in
flutter335.buildFlutterApplication {

12
pkgs/by-name/se/server-box/pubspec.lock.json
View File

@@ -466,8 +466,8 @@
"dependency": "direct main",
"description": {
"path": ".",
"ref": "v1.0.285",
"resolved-ref": "18fb1ad15ee6d2c8c5ec67722bf8b90fe0f4746d",
"ref": "v1.0.293",
"resolved-ref": "3eedfd55916eede70aeb28605469a43623a9791b",
"url": "https://github.com/lollipopkit/dartssh2"
},
"source": "git",
@@ -628,8 +628,8 @@
"dependency": "direct main",
"description": {
"path": ".",
"ref": "v1.0.355",
"resolved-ref": "73d5f2603859a9f70459d798ed2d267b1d9a86e5",
"ref": "v1.0.358",
"resolved-ref": "c8e55d054875bb3ccdab9894a01fe82d173dc54e",
"url": "https://github.com/lppcg/fl_lib"
},
"source": "git",
@@ -2322,8 +2322,8 @@
"dependency": "direct main",
"description": {
"path": ".",
"ref": "v4.0.4",
"resolved-ref": "5747837cdb7b113ef733ce0104e4f2bfa1eb4a36",
"ref": "v4.0.13",
"resolved-ref": "6343b0e5f744d2c11090d34690ad5049ebbc599b",
"url": "https://github.com/lollipopkit/xterm.dart"
},
"source": "git",

4
pkgs/by-name/sp/spacectl/package.nix
View File

@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "spacectl";
version = "1.16.1";
version = "1.17.0";
src = fetchFromGitHub {
owner = "spacelift-io";
repo = "spacectl";
rev = "v${version}";
hash = "sha256-elr7SG8naxz5w15Advr2tcQxPJ1tBL4G7Do7LNT4kqY=";
hash = "sha256-j9c8RZfm5RWcXAy8LUtIZrztfVhXiAWmCJ/Rwq5IiKo=";
};
vendorHash = "sha256-g5Y6NuG8z2Pnh3Ng690FcwOrEU2EOhftZbM8oUFj4B4=";

6
pkgs/by-name/te/terragrunt/package.nix
View File

@@ -7,13 +7,13 @@
}:
buildGo125Module (finalAttrs: {
pname = "terragrunt";
version = "0.90.0";
version = "0.91.1";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = "terragrunt";
tag = "v${finalAttrs.version}";
hash = "sha256-tc+3+H/u/6IpkmvlwObzVjUnJzBzElme0tT+zktGfkw=";
hash = "sha256-GbPPBEl41p3sI31WuGquvnI+pVQ5zXpGey7zHjsKfw8=";
};
nativeBuildInputs = [
@@ -25,7 +25,7 @@ buildGo125Module (finalAttrs: {
make generate-mocks
'';
vendorHash = "sha256-+4mDmC1B4YmExOJqS/vlTxBiI5/rKcn3Vyw53BfvAxA=";
vendorHash = "sha256-iMzoee3MkOgU0Or0F+FVxNs1g5+306W4vC5wOh61mzw=";
doCheck = false;

6
pkgs/by-name/vi/victoriametrics/package.nix
View File

@@ -13,13 +13,13 @@
buildGoModule (finalAttrs: {
pname = "VictoriaMetrics";
version = "1.127.0";
version = "1.128.0";
src = fetchFromGitHub {
owner = "VictoriaMetrics";
repo = "VictoriaMetrics";
tag = "v${finalAttrs.version}";
hash = "sha256-j0PikCV0VWSfp2rvwssXwvkRGQzFNd6hidZv3bufUuI=";
hash = "sha256-X1TkE0lJNu68iETf8M8U5IZvRadtIPR6LqP61uzhD3Y=";
};
vendorHash = null;
@@ -53,7 +53,7 @@ buildGoModule (finalAttrs: {
# Allow older go versions
substituteInPlace go.mod \
--replace-fail "go 1.25.1" "go ${finalAttrs.passthru.go.version}"
--replace-fail "go 1.25.3" "go ${finalAttrs.passthru.go.version}"
# Increase timeouts in tests to prevent failure on heavily loaded builders
substituteInPlace lib/storage/storage_test.go \

4
pkgs/by-name/xl/xlights/package.nix
View File

@@ -6,11 +6,11 @@
appimageTools.wrapType2 rec {
pname = "xlights";
version = "2025.10.2";
version = "2025.11";
src = fetchurl {
url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
hash = "sha256-LfT1AQktBklN1IUiJdqxFY4bM/CQEBg/5sxEvWUQkGQ=";
hash = "sha256-k5HGk5t/ujPuOU/GlxhA+yKKXy0lq8YkxcQkTUVBYXM=";
};
meta = {

4
pkgs/by-name/yt/yt-dlp/package.nix
View File

@@ -19,14 +19,14 @@ 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.10.14";
version = "2025.10.22";
pyproject = true;
src = fetchFromGitHub {
owner = "yt-dlp";
repo = "yt-dlp";
tag = version;
hash = "sha256-x7vpuXUihlC4jONwjmWnPECFZ7xiVAOFSDUgBNvl+aA=";
hash = "sha256-jQaENEflaF9HzY/EiMXIHgUehAJ3nnDT9IbaN6bDcac=";
};
postPatch = ''

11
pkgs/development/compilers/mozart/default.nix
View File

@@ -76,6 +76,17 @@ stdenv.mkDerivation rec {
tk
];
postPatch = ''
substituteInPlace {vm,.}/CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
substituteInPlace vm/vm/test/gtest/{googletest,.}/CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.6.4)" "cmake_minimum_required(VERSION 3.10)"
substituteInPlace bootcompiler/CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
substituteInPlace {boosthost,opi,wish,stdlib}/CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.8.6)" "cmake_minimum_required(VERSION 3.10)"
'';
meta = with lib; {
description = "Open source implementation of Oz 3";
maintainers = with maintainers; [

19
pkgs/development/python-modules/colorlog/default.nix
View File

@@ -1,19 +1,21 @@
{
lib,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
setuptools,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "colorlog";
version = "6.9.0";
version = "6.10.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-v7pUobk7lPVOH0/kg5VyWj2S/SpK9wL2vXCUa9wMasI=";
src = fetchFromGitHub {
owner = "borntyping";
repo = "python-colorlog";
tag = "v${version}";
hash = "sha256-vb7OzIVcEIfnhJGpO0DgeEdhL6NCKlrynoNMxNp8Yg4=";
};
build-system = [ setuptools ];
@@ -22,10 +24,11 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
meta = {
changelog = "https://github.com/borntyping/python-colorlog/releases/tag/${src.tag}";
description = "Log formatting with colors";
homepage = "https://github.com/borntyping/python-colorlog";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

6
pkgs/development/python-modules/pysmhi/default.nix
View File

@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pysmhi";
version = "1.0.2";
version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "gjohansson-ST";
repo = "pysmhi";
tag = "v${version}";
hash = "sha256-9jsSvitxcjH2oFCdSm1203UwG5xjOwQDTaU4Z9Cqs+A=";
hash = "sha256-n2eDQ9fbELGvO/SYqdrwT+lZNIZs5GgihmrimvI3a1w=";
};
build-system = [ poetry-core ];
@@ -39,6 +39,8 @@ buildPythonPackage rec {
syrupy
];
__darwinAllowLocalNetworking = true;
meta = {
changelog = "https://github.com/gjohansson-ST/pysmhi/releases/tag/${src.tag}";
description = "Retrieve open data from SMHI api";

11
pkgs/development/python-modules/python-bsblan/default.nix
View File

@@ -14,7 +14,6 @@
pytest-cov-stub,
pytest-mock,
pytestCheckHook,
pythonOlder,
yarl,
}:
@@ -23,8 +22,6 @@ buildPythonPackage rec {
version = "2.2.5";
pyproject = true;
disabled = pythonOlder "3.12";
src = fetchFromGitHub {
owner = "liudger";
repo = "python-bsblan";
@@ -33,18 +30,16 @@ buildPythonPackage rec {
};
postPatch = ''
sed -i "/ruff/d" pyproject.toml
substituteInPlace pyproject.toml \
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
'';
env.PACKAGE_VERSION = version;
build-system = [ hatchling ];
pythonRelaxDeps = [ "async-timeout" ];
dependencies = [
aiohttp
async-timeout
backoff
mashumaro
orjson
@@ -60,6 +55,8 @@ buildPythonPackage rec {
pytestCheckHook
];
__darwinAllowLocalNetworking = true;
pythonImportsCheck = [ "bsblan" ];
meta = with lib; {

2
pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix
View File

@@ -19,8 +19,6 @@ mkAppleDerivation (finalAttrs: {
./patches/0001-Support-setting-an-upper-bound-on-versions.patch
];
noCC = true;
nativeBuildInputs = [ unifdef ];
buildPhase = ''

118
pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
View File

@@ -8,83 +8,67 @@ in
fetchFromGitHub,
meson,
ninja,
stdenv,
stdenvNoCC,
xcodeProjectCheckHook,
}:
let
hasBasenamePrefix = prefix: file: lib.hasPrefix prefix (baseNameOf file);
in
lib.makeOverridable (
attrs:
let
attrs' = if lib.isFunction attrs then attrs else _: attrs;
attrsFixed = lib.fix attrs';
stdenv' =
if attrsFixed.noCC or false then
stdenvNoCC
else if attrsFixed.noBootstrap or false then
stdenv
else
bootstrapStdenv;
in
stdenv'.mkDerivation (
lib.extends (
self: super:
assert super ? releaseName;
let
inherit (super) releaseName;
info = versions.${releaseName};
files = lib.filesystem.listFilesRecursive (lib.path.append ./. releaseName);
mesonFiles = lib.filter (hasBasenamePrefix "meson") files;
in
# You have to have at least `meson.build.in` when using xcodeHash to trigger the Meson
# build support in `mkAppleDerivation`.
assert super ? xcodeHash -> lib.length mesonFiles > 0;
{
pname = super.pname or releaseName;
inherit (info) version;
lib.extendMkDerivation {
constructDrv = bootstrapStdenv.mkDerivation;
extendDrvArgs =
finalAttrs: args:
assert args ? releaseName;
let
inherit (args) releaseName;
info = versions.${releaseName};
files = lib.filesystem.listFilesRecursive (lib.path.append ./. releaseName);
mesonFiles = lib.filter (hasBasenamePrefix "meson") files;
in
# You have to have at least `meson.build.in` when using xcodeHash to trigger the Meson
# build support in `mkAppleDerivation`.
assert args ? xcodeHash -> lib.length mesonFiles > 0;
{
pname = args.pname or releaseName;
inherit (info) version;
src = super.src or fetchFromGitHub {
owner = "apple-oss-distributions";
repo = releaseName;
rev = info.rev or "${releaseName}-${info.version}";
inherit (info) hash;
};
src = args.src or fetchFromGitHub {
owner = "apple-oss-distributions";
repo = releaseName;
rev = info.rev or "${releaseName}-${info.version}";
inherit (info) hash;
};
strictDeps = true;
__structuredAttrs = true;
strictDeps = true;
__structuredAttrs = true;
meta = {
homepage = "https://opensource.apple.com/releases/";
license = lib.licenses.apple-psl20;
teams = [ lib.teams.darwin ];
platforms = lib.platforms.darwin;
}
// super.meta or { };
meta = {
homepage = "https://opensource.apple.com/releases/";
license = lib.licenses.apple-psl20;
teams = [ lib.teams.darwin ];
platforms = lib.platforms.darwin;
}
// lib.optionalAttrs (super ? xcodeHash) {
postUnpack =
super.postUnpack or ""
+ lib.concatMapStrings (
file:
if baseNameOf file == "meson.build.in" then
"substitute ${lib.escapeShellArg "${file}"} \"$sourceRoot/meson.build\" --subst-var version\n"
else
"cp ${lib.escapeShellArg "${file}"} \"$sourceRoot/\"${lib.escapeShellArg (baseNameOf file)}\n"
) mesonFiles;
// args.meta or { };
}
// lib.optionalAttrs (args ? xcodeHash) {
postUnpack =
args.postUnpack or ""
+ lib.concatMapStrings (
file:
if baseNameOf file == "meson.build.in" then
"substitute ${lib.escapeShellArg "${file}"} \"$sourceRoot/meson.build\" --subst-var version\n"
else
"cp ${lib.escapeShellArg "${file}"} \"$sourceRoot/\"${lib.escapeShellArg (baseNameOf file)}\n"
) mesonFiles;
xcodeProject = super.xcodeProject or "${releaseName}.xcodeproj";
xcodeProject = args.xcodeProject or "${releaseName}.xcodeproj";
nativeBuildInputs = super.nativeBuildInputs or [ ] ++ [
meson
ninja
xcodeProjectCheckHook
];
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
meson
ninja
xcodeProjectCheckHook
];
mesonBuildType = "release";
}
) attrs'
)
)
mesonBuildType = "release";
};
}

4
pkgs/os-specific/linux/zfs/unstable.nix
View File

@@ -16,14 +16,14 @@ callPackage ./generic.nix args {
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
version = "2.4.0-rc2";
version = "2.4.0-rc3";
# rev = "";
tests = {
inherit (nixosTests.zfs) unstable;
};
hash = "sha256-NoY8lXQ/qxO0cQLmU0tIjqqWUThfWzVioigpS2crbeE=";
hash = "sha256-VfCeQqgahNNQA4jsiFHTdUjgXIH26k5r3q/Rpo2JrCc=";
extraLongDescription = ''
This is "unstable" ZFS, and will usually be a pre-release version of ZFS.

1
pkgs/top-level/aliases.nix
View File

@@ -434,6 +434,7 @@ mapAliases {
alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17
amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30
amdvlk = throw "'amdvlk' has been removed since it was deprecated by AMD. Its replacement, RADV, is enabled by default."; # Added 2025-09-20
android-udev-rules = throw "'android-udev-rules' has been removed due to being superseded by built-in systemd uaccess rules."; # Added 2025-10-21
angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17
animeko = throw "'animeko' has been removed since it is unmaintained"; # Added 2025-08-20
ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11