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

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-08-05 18:06:18 +00:00
committed by GitHub
parent 701fbe6ff3 be57485fff
commit 51bce87675
58 changed files with 693 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci/default.nix
+18 -3
View File
@@ -75,6 +75,23 @@ let
includes = [ "*" ];
priority = 1;
};
# TODO: Upstream this into treefmt-nix eventually:
# https://github.com/numtide/treefmt-nix/issues/387
settings.formatter.markdown-code-runner = {
command = pkgs.lib.getExe pkgs.markdown-code-runner;
options =
let
config = pkgs.writers.writeTOML "markdown-code-runner-config" {
presets.nixfmt = {
language = "nix";
command = [ (pkgs.lib.getExe pkgs.nixfmt) ];
};
};
in
[ "--config=${config}" ];
includes = [ "*.md" ];
};
};
fs = pkgs.lib.fileset;
nixFilesSrc = fs.toSource {
@@ -124,8 +141,6 @@ rec {
};
officialRelease = false;
inherit pkgs lib-tests;
# 2.28 / 2.29 take 9x longer than 2.30 or Lix.
# TODO: Switch back to nixVersions.latest
nix = pkgs.lix;
nix = pkgs.nixVersions.latest;
};
}
ci/pinned.json
+6 -6
View File
@@ -9,9 +9,9 @@
},
"branch": "nixpkgs-unstable",
"submodules": false,
"revision": "2baf8e1658cba84a032c3a8befb1e7b06629242a",
"url": "https://github.com/NixOS/nixpkgs/archive/2baf8e1658cba84a032c3a8befb1e7b06629242a.tar.gz",
"hash": "0l48zkf2zs7r53fjq46j770vpb5avxihyfypra3fv429akqnsmm1"
"revision": "6a489c9482ca676ce23c0bcd7f2e1795383325fa",
"url": "https://github.com/NixOS/nixpkgs/archive/6a489c9482ca676ce23c0bcd7f2e1795383325fa.tar.gz",
"hash": "0vsvkhy3gb8yzq62vazhmpqixssmd4xinnll7w73l4vrqd611wlf"
},
"treefmt-nix": {
"type": "Git",
@@ -22,9 +22,9 @@
},
"branch": "main",
"submodules": false,
"revision": "421b56313c65a0815a52b424777f55acf0b56ddf",
"url": "https://github.com/numtide/treefmt-nix/archive/421b56313c65a0815a52b424777f55acf0b56ddf.tar.gz",
"hash": "1l57hzz704s7izkkcl3xsg77xjfza57cl0fchs24rdpdhmry2dmp"
"revision": "58bd4da459f0a39e506847109a2a5cfceb837796",
"url": "https://github.com/numtide/treefmt-nix/archive/58bd4da459f0a39e506847109a2a5cfceb837796.tar.gz",
"hash": "01bg9b4xzlv6s5q1q78vib6l2csw02b3rk5bm5yj4gx2sk2hvmrq"
}
},
"version": 5
doc/doc-support/package.nix
-1
View File
@@ -137,7 +137,6 @@ stdenvNoCC.mkDerivation (
tests = {
manpage-urls = callPackage ../tests/manpage-urls.nix { };
check-nix-code-blocks = callPackage ../tests/check-nix-code-blocks.nix { };
};
};
}
doc/tests/check-nix-code-blocks.nix
-32
View File
@@ -1,32 +0,0 @@
{
runCommand,
markdown-code-runner,
nixfmt-rfc-style,
}:
runCommand "manual_check-nix-code-blocks"
{
nativeBuildInputs = [
markdown-code-runner
nixfmt-rfc-style
];
}
''
set +e
mdcr --check --config ${./mdcr-config.toml} ${./..}
if [ $? -ne 0 ]; then
cat <<EOF
Error: `mdcr` command failed. Please make sure the Nix code snippets in Markdown files are correctly formatted.
Run this command from the Nixpkgs repository root for automatic formatting:
mdcr --log debug --config ${toString ./..}/tests/mdcr-config.toml ${toString ./..}
EOF
exit 1
fi
touch "$out"
''
doc/tests/mdcr-config.toml
-3
View File
@@ -1,3 +0,0 @@
[presets.nixfmt]
language = "nix"
command = ["nixfmt"]
maintainers/maintainer-list.nix
+6
View File
@@ -20460,6 +20460,12 @@
github = "provokateurin";
githubId = 26026535;
};
ProxyVT = {
email = "tikit.us@outlook.com";
github = "ProxyVT";
githubId = 86965169;
name = "Ulad Tiknyus";
};
prrlvr = {
email = "po@prrlvr.fr";
github = "prrlvr";
nixos/doc/manual/development/modular-services.md
+9 -2
View File
@@ -45,11 +45,18 @@ So note that the default value of `system.services.<name>` is not a complete ser
It is possible to write service modules that are portable. This is done by either avoiding the `systemd` option tree, or by defining process-manager-specific definitions in an optional way:
```nix
{ config, options, lib, ... }: {
{
config,
options,
lib,
...
}:
{
_class = "service";
config = {
process.argv = [ (lib.getExe config.foo.program) ];
} // lib.optionalAttrs (options?systemd) {
}
// lib.optionalAttrs (options ? systemd) {
# ... systemd-specific definitions ...
};
}
nixos/modules/services/mail/mailman.md
+2 -2
View File
@@ -19,8 +19,8 @@ For a basic configuration with Postfix as the MTA, the following settings are su
local_recipient_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ];
relay_domains = [ "hash:/var/lib/mailman/data/postfix_domains" ];
smtpd_tls_chain_files = [
config.security.acme.certs."lists.example.org".directory + "/full.pem"
config.security.acme.certs."lists.example.org".directory + "/key.pem"
(config.security.acme.certs."lists.example.org".directory + "/full.pem")
(config.security.acme.certs."lists.example.org".directory + "/key.pem")
];
};
};
pkgs/applications/backup/timeshift/default.nix
+2
View File
@@ -3,6 +3,7 @@
btrfs-progs,
coreutils,
cron,
debianutils,
grubPackage,
mount,
psmisc,
@@ -17,6 +18,7 @@ in
btrfs-progs
coreutils
cron
debianutils
grubPackage
mount
psmisc
pkgs/applications/backup/timeshift/unwrapped.nix
+3 -5
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "timeshift";
version = "24.06.6";
version = "25.07.4";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "timeshift";
rev = version;
hash = "sha256-umMekxP9bvV01KzfIh2Zxa9Xb+tR5x+tG9dOnBIOkjY=";
hash = "sha256-yrLpEhSt7QB0qWCXjIjTVeXKRpgue2pVdV+6hSixeuA=";
};
postPatch = ''
@@ -37,10 +37,8 @@ stdenv.mkDerivation rec {
--replace-fail "/usr/share" "$out/share"
# Substitute app_command to look for the `timeshift-gtk` in $out.
# Substitute the `pkexec ...` as a hack to run a GUI application like Timeshift as root without setting up the corresponding pkexec policy.
substituteInPlace ./src/timeshift-launcher \
--replace-fail "app_command='timeshift-gtk'" "app_command=$out/bin/timeshift-gtk" \
--replace-fail ${lib.escapeShellArg ''pkexec ''${app_command}''} ${lib.escapeShellArg ''pkexec env DISPLAY="$DISPLAY" XAUTHORITY="$XAUTHORITY" "''${app_command}"''}
--replace-fail "app_command='timeshift-gtk'" "app_command=$out/bin/timeshift-gtk"
'';
nativeBuildInputs = [
pkgs/applications/editors/android-studio/default.nix
+2 -2
View File
@@ -16,8 +16,8 @@ let
inherit tiling_wm;
};
stableVersion = {
version = "2025.1.1.14"; # "Android Studio Narwhal | 2025.1.1 Patch 1"
sha256Hash = "sha256-rTZOvLl1Lqc0zXNiTmVoMnLEAwWOEDW5MJg8ysiiyBo=";
version = "2025.1.2.11"; # "Android Studio Narwhal Feature Drop | 2025.1.2"
sha256Hash = "sha256-jzh0xrEZU4zdlse8tlVV/uqBEz4lH2k2XSHd13d3vng=";
};
betaVersion = {
version = "2025.1.2.10"; # "Android Studio Narwhal Feature Drop | 2025.1.2 RC 1"
pkgs/applications/emulators/libretro/cores/beetle-psx.nix
+3 -3
View File
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "mednafen-psx" + lib.optionalString withHw "-hw";
version = "0-unstable-2025-07-18";
version = "0-unstable-2025-08-01";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-psx-libretro";
rev = "ae0daef1e6f6d5aa36c3d358c7e52c7d007e3b04";
hash = "sha256-2hq5wbFi0FoxPYza0zxL1FcF+dtu/HRNmIPRUhDNRu8=";
rev = "6eafe85d672ace484bd6b29eeb94eb84f0b41ee1";
hash = "sha256-+gja4vMD+o78BxCR1SY4wLks6zOjKfU7M3a7cYg+2lc=";
};
extraBuildInputs = lib.optionals withHw [
pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
+8 -8
View File
@@ -1,18 +1,18 @@
{
"airgap-images-amd64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "0517c1a3bec942b78ab456643b614700296aba1bd0ca2399883aadeb22b6de5d"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-amd64.tar.zst",
"sha256": "9bda99cde833c4e13fb4d35fa46fd57d4b1a2eefc33e00fa352ce686c871c842"
},
"airgap-images-arm": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "d8f77b6121d40ea19c6f0658d82158a782507730ba183ebe76643d90d67f736f"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm.tar.zst",
"sha256": "d40a78ff14b40547bca6d05db3d7e767b272bb9257628ebd3905d1659bc49bd5"
},
"airgap-images-arm64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "7edb77c4c586f661b9bf156aea4f5d35b5b390a315bae11140f425cd3ed729eb"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm64.tar.zst",
"sha256": "6561f91f14c8419c9d1c20fb9af7948757d87bd91855b376058d9f2e16010452"
},
"images-list": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s1/k3s-images.txt",
"sha256": "ebe55bbef8ec772071bf736c9671e444aa31ac259e86bfb65180d2405b314c5e"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-images.txt",
"sha256": "1f87ad26acac5e553279a64942c0e3eeef5c026cc2f82661d358990848672584"
}
}
pkgs/applications/networking/cluster/k3s/1_30/versions.nix
+4 -4
View File
@@ -1,8 +1,8 @@
{
k3sVersion = "1.30.14+k3s1";
k3sCommit = "a7f3d379effef5e0979996339172adb4f87d78df";
k3sRepoSha256 = "0kgsfv9bva440a79xgwwdjvhqswzx91mzgf8qishvlwrrw1w0vcm";
k3sVendorHash = "sha256-y1UCvafEdFozMlWWd0Yunu4oIkLsHnV4IMTq1RLJ87M=";
k3sVersion = "1.30.14+k3s2";
k3sCommit = "071b1ead43641c6803e0b9fce6473baeb12357cf";
k3sRepoSha256 = "0lldw9kgzpr1073zsr5y4jxmh1c8ah4giyxzb10rfcwx06mglmir";
k3sVendorHash = "sha256-qEvdBT3noOtKdIdHDJZChowXzQMpVpY/l1ioTJCGVJ4=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.1";
pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
+8 -8
View File
@@ -1,18 +1,18 @@
{
"airgap-images-amd64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "86fd5e5cceee3ab6743b1257ed39e62ef73b20475c12495888589e68199210a3"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "c98ad7590af33ef7e148920eb809dfd0f8145a623fdd8d32c6efeecab6088412"
},
"airgap-images-arm": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "0bb5712817ea3c98c69b51eb5925e37ad47a5b2851a0fd72868502a70ef5c3e6"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "c1bd7557836538592dbd59f798e7a4b91d7aef74c8f9f71631060c96a5288dd6"
},
"airgap-images-arm64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "4e34adcadba448524851d8b1ea98bc918105eb7b1717c7d8cb8866749373b060"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "97f0db38f57a2dc63167795620ba34a89348d874ecc91fbf3d8d962dc1392e47"
},
"images-list": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.10%2Bk3s1/k3s-images.txt",
"sha256": "ebe55bbef8ec772071bf736c9671e444aa31ac259e86bfb65180d2405b314c5e"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-images.txt",
"sha256": "1f87ad26acac5e553279a64942c0e3eeef5c026cc2f82661d358990848672584"
}
}
pkgs/applications/networking/cluster/k3s/1_31/versions.nix
+6 -6
View File
@@ -1,15 +1,15 @@
{
k3sVersion = "1.31.10+k3s1";
k3sCommit = "c02ce139f6409f455775004d235d98fc9bee849b";
k3sRepoSha256 = "1ap91j0vwgayis1g7j8rh4dxq4g5fn1kkf1dfa2wg0kxfkcldp0x";
k3sVendorHash = "sha256-URczHgCfkg2XoX9XNxW7GxPQcfMraLkFCTEbGafyTEI=";
k3sVersion = "1.31.11+k3s1";
k3sCommit = "17cfde1c82427535f0d3b6fe15caef1a0e62e82f";
k3sRepoSha256 = "17dmk8r1rjv2wv4kfyrsdyb9xp696ckq79lzjkvh89x8g31b6p1h";
k3sVendorHash = "sha256-ogyFEWnTBYjpz9clO3v5DyO23mHPhUS+JC587kLJ5Ck=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.1";
k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
k3sCNIVersion = "1.7.1-k3s1";
k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
containerdVersion = "2.0.5-k3s1.32";
containerdSha256 = "1la7ygx5caqfqk025wyrxmhjb0xbpkzwnxv52338p33g68sb3yb0";
containerdVersion = "2.0.5-k3s2.32";
containerdSha256 = "1q285ijgxhf4w9xgqqg7yi29mb4jqpifk6bqkjih456qxxkiyk2z";
criCtlVersion = "1.31.0-k3s2";
}
pkgs/applications/networking/cluster/k3s/1_32/images-versions.json
+8 -8
View File
@@ -1,18 +1,18 @@
{
"airgap-images-amd64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "11350d97016e084bff9d0410e3abfb0ed5dd5920378565584e88996b0a6e2da4"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "965f5767c08cffc96bf0967813e7c3fec4c41309e9952a480f0a50865bebd039"
},
"airgap-images-arm": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "1aa4286b30b5418df7b94782b70bcf79644da6c2d77bc5ab643da9c69e0290ac"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "57ab9c306cc96f8dd925bc788c80e49c2d13ee7a222a12235fb525529ad25ac0"
},
"airgap-images-arm64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "cff2d5270b5702b5813f662af7e1f0a741ea3a1052cc81629de6eee1d5a767bd"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "1aa05a55492ba0872fa8a0ff518d6e947869bea32dc2b8e5223bdcf53450c7f9"
},
"images-list": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.6%2Bk3s1/k3s-images.txt",
"sha256": "637ccb5f5a8f4a7d13991cb3060f05b8c7c46e7351e0edae351f9ad23bb51631"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-images.txt",
"sha256": "e786e9a6f0331a92a2257a12995028761bfee1b5bfaac866025b64162e69bfe0"
}
}
pkgs/applications/networking/cluster/k3s/1_32/versions.nix
+6 -6
View File
@@ -1,15 +1,15 @@
{
k3sVersion = "1.32.6+k3s1";
k3sCommit = "eb603acd1530edcaf79a4a8ed3da54e9e03d9967";
k3sRepoSha256 = "05py458rdrys1hkw8rg62c98lnwjij5zby8n2zkl1kbfqy12adln";
k3sVendorHash = "sha256-K8vlX8rucbAOCxHbgrWHsMBWiRc/98IJVCYS8UD+ZsI=";
k3sVersion = "1.32.7+k3s1";
k3sCommit = "ab99e9da82c7072e4d9efbfa9464e343846fae72";
k3sRepoSha256 = "0srs8nrmnqsxlyhbbd7i18vbk5c55c16xg278958wi3lbwang0b2";
k3sVendorHash = "sha256-vKTujaFATguUtIorfa7bY8lSQsx6RhFx0sdWencR2nc=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.1";
k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
k3sCNIVersion = "1.7.1-k3s1";
k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
containerdVersion = "2.0.5-k3s1.32";
containerdSha256 = "1la7ygx5caqfqk025wyrxmhjb0xbpkzwnxv52338p33g68sb3yb0";
containerdVersion = "2.0.5-k3s2.32";
containerdSha256 = "1q285ijgxhf4w9xgqqg7yi29mb4jqpifk6bqkjih456qxxkiyk2z";
criCtlVersion = "1.31.0-k3s2";
}
pkgs/applications/networking/cluster/k3s/1_33/images-versions.json
+8 -8
View File
@@ -1,18 +1,18 @@
{
"airgap-images-amd64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "aa52e035f7e2fff17f4cb59cdaa60d117770bfa7b5c67be655c1d1fa4f261137"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "51b6ddeafa465e542f0707272736100916886dd49abcb1420ee52878dd3638a9"
},
"airgap-images-arm": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "670743ad088ada4a72966e30cbf10c7c3b0cc1fe7775f709647820c32b8d3b05"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "339dd2b33b40f03bf95ee2e5dcb8e543ab6852e156cb8aaebe3885717a2966b5"
},
"airgap-images-arm64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "3f2b8c54702018362c24266daaa39b582742c8612cf16ac53c04fb778193884b"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "c12ec7b122f34eb1f89310b05e66b500a2f49522d7cd4ceb3475a675cab6ebc6"
},
"images-list": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.2%2Bk3s1/k3s-images.txt",
"sha256": "637ccb5f5a8f4a7d13991cb3060f05b8c7c46e7351e0edae351f9ad23bb51631"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-images.txt",
"sha256": "e786e9a6f0331a92a2257a12995028761bfee1b5bfaac866025b64162e69bfe0"
}
}
pkgs/applications/networking/cluster/k3s/1_33/versions.nix
+6 -6
View File
@@ -1,15 +1,15 @@
{
k3sVersion = "1.33.2+k3s1";
k3sCommit = "6e38c8b55284c0d68f64a9e603fb645a32ecd232";
k3sRepoSha256 = "1s2ibbq2ivy1w3dkqlwnipg6cphiji0ax96fagfxgzwyjhxkyvxh";
k3sVendorHash = "sha256-MLntaqh1uwJ4cfvHW4lJxUzxtlq87DWCfhU4X6aRbxI=";
k3sVersion = "1.33.3+k3s1";
k3sCommit = "236cbf257332b293f444abe6f24d699ff628173e";
k3sRepoSha256 = "163brwnz4af1rjv5pcghlzjnwr27b087y73bv6pri0fyqd3mwiim";
k3sVendorHash = "sha256-rU+rpExb9LVIROPj3MN924r7Hk8sK/5P8JSssOoIWTU=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.1";
k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
k3sCNIVersion = "1.7.1-k3s1";
k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
containerdVersion = "2.0.5-k3s1";
containerdSha256 = "1c3hv22zx8y94zwmv5r59bnwgqyhxd10zkinm0jrcvny32ijqdfj";
containerdVersion = "2.0.5-k3s2";
containerdSha256 = "0011p1905jsswz1zqzkylzjfvi50mc60ifgjnjxwnjrk2rnwbmbz";
criCtlVersion = "1.31.0-k3s2";
}
pkgs/build-support/fetchurl/default.nix
+4 -1
View File
@@ -203,7 +203,10 @@ let
else
throw "unknown mirror:// site ${mirrorName}";
in
if mirrorName == null then url else "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}";
if mirrorSplit == null || mirrorName == null then
url
else
"${lib.head mirrorList}${lib.elemAt mirrorSplit 1}";
in
assert
pkgs/by-name/bl/bloop/package.nix
+4 -4
View File
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "bloop";
version = "2.0.12";
version = "2.0.13";
platform =
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
sha256 =
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
"sha256-vsPzoZLEeBLVDkKpFzJ2qCfGxZNRedlGI96X3uSmqkw="
"sha256-d6Fz87qvjIHhcU3sL6PalZGbkt1hZIMJEbiqJtRb2/0="
else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
"sha256-JNX+uyGynl/QokSB1gwY75c/im8+UZwM/pg7X+rFLbU="
"sha256-LuX8LFYNzrcqJl9RTLLjQTDsdQg2KmJ+ijKwmi34E3A="
else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then
"sha256-Ry9VRrJe6ThKAKQNgD1RSsT7mVxoPpP1Tzq3bwcPxTM="
"sha256-jH7zHVns7pDlrRRAGO2nZ5VW71Wyuz0a0oBmXZ4fOAA="
else
throw "unsupported platform";
};
pkgs/by-name/ca/cargo-nextest/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-nextest";
version = "0.9.101";
version = "0.9.102";
src = fetchFromGitHub {
owner = "nextest-rs";
repo = "nextest";
rev = "cargo-nextest-${version}";
hash = "sha256-yaRwHQopkkZ8gLEhuJuzAiY/enWNdL3B+POGV2ykOWA=";
hash = "sha256-NaWEJEmE8LW1qankVu2Z8eU2yj4/P4DKDLrCEDXPfOc=";
};
cargoHash = "sha256-F26/IDq3/Il6BBCkKUy59T47sI20DAabeSjt3Kdqu+Y=";
cargoHash = "sha256-plZYGm/Sh+pKx1srRPXpZPTZ4k9k/rWZreJqJKFmiG4=";
cargoBuildFlags = [
"-p"
pkgs/by-name/gr/grimblast/package.nix
+3 -3
View File
@@ -18,13 +18,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "grimblast";
version = "0.1-unstable-2025-07-18";
version = "0.1-unstable-2025-07-23";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "contrib";
rev = "481175e17e155f19a3b31416530b6edf725e7034";
hash = "sha256-usBNOT/uzFdsKDe5Ik+C36zqL+BfT7Lp2rqKWrpQuqk=";
rev = "6839b23345b71db17cd408373de4f5605bf589b8";
hash = "sha256-PFAJoEqQWMlo1J+yZb+4HixmhbRVmmNl58e/AkLYDDI=";
};
strictDeps = true;
pkgs/by-name/ha/harbor-cli/package.nix
+1 -1
View File
@@ -15,7 +15,7 @@ buildGoModule (finalAttrs: {
src = fetchFromGitHub {
owner = "goharbor";
repo = "harbor-cli";
rev = "v${finalAttrs.version}";
tag = "v${finalAttrs.version}";
hash = "sha256-7Fi4FeWsLwTtNZhD8TfSBTMr/LKzUm6UO4aWC0eJFtQ=";
};
pkgs/by-name/jj/jjui/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
}:
buildGoModule (finalAttrs: {
pname = "jjui";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "idursun";
repo = "jjui";
tag = "v${finalAttrs.version}";
hash = "sha256-FTFryzlU7PsrU2SkOdxYLunVrRKUauAwmzIkJe3xKlk=";
hash = "sha256-XWsHkfakSVQZtmN21exUc62is6qT3jw/1FF9RNaW0Uo=";
};
vendorHash = "sha256-oswFlMuoaTHfgpr2+o8EX80hl82H9JewPFk3khm8Il4=";
vendorHash = "sha256-2rlfR5HLFJyLVSRiUGTCwQDFWRBt4jmL6sdZcq7blaE=";
ldflags = [ "-X main.Version=${finalAttrs.version}" ];
pkgs/by-name/la/ladybird/package.nix
+16 -56
View File
@@ -2,19 +2,16 @@
lib,
stdenv,
fetchFromGitHub,
cacert,
unicode-emoji,
unicode-character-database,
unicode-idna,
publicsuffix-list,
cmake,
copyDesktopItems,
makeDesktopItem,
ninja,
pkg-config,
curl,
libavif,
libGL,
angle, # libEGL
libjxl,
libpulseaudio,
libwebp,
@@ -23,6 +20,7 @@
python3,
qt6Packages,
woff2,
fast-float,
ffmpeg,
fontconfig,
simdutf,
@@ -33,19 +31,15 @@
libtommath,
}:
let
# Note: The cacert version is synthetic and must match the version in the package's CMake
cacert_version = "2025-05-20";
in
stdenv.mkDerivation (finalAttrs: {
pname = "ladybird";
version = "0-unstable-2025-06-27";
version = "0-unstable-2025-08-04";
src = fetchFromGitHub {
owner = "LadybirdWebBrowser";
repo = "ladybird";
rev = "831ba5d6550fd9dfaf90153876ff42396f7165ac";
hash = "sha256-7feXPFKExjuOGbitlAkSEEzYNEZb6hGSDUZW1EJGIW8=";
rev = "e4b2e7b131140072416d4301d5f60dea6d79b86d";
hash = "sha256-d3IRIzukntabRqWbOjjx8WgaiTMnFpFJT2tbMt5ws40=";
};
postPatch = ''
@@ -62,9 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
# Note that the versions of the input data packages must match the
# expected version in the package's CMake.
# Check that the versions match
grep -F 'set(CACERT_VERSION "${cacert_version}")' Meta/CMake/ca_certificates_data.cmake || (echo cacert_version mismatch && exit 1)
mkdir -p build/Caches
cp -r ${unicode-character-database}/share/unicode build/Caches/UCD
@@ -74,17 +65,12 @@ stdenv.mkDerivation (finalAttrs: {
echo -n ${unicode-character-database.version} > build/Caches/UCD/version.txt
chmod -w build/Caches/UCD
mkdir build/Caches/CACERT
cp ${cacert}/etc/ssl/certs/ca-bundle.crt build/Caches/CACERT/cacert-${cacert_version}.pem
echo -n ${cacert_version} > build/Caches/CACERT/version.txt
mkdir build/Caches/PublicSuffix
cp ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat build/Caches/PublicSuffix
'';
nativeBuildInputs = [
cmake
copyDesktopItems
ninja
pkg-config
python3
@@ -94,10 +80,11 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
curl
fast-float
ffmpeg
fontconfig
libavif
libGL
angle # libEGL
libjxl
libwebp
libxcrypt
@@ -110,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
# https://github.com/LadybirdBrowser/ladybird/commit/af3d46dc06829dad65309306be5ea6fbc6a587ec
# https://github.com/LadybirdBrowser/ladybird/commit/4d7b7178f9d50fff97101ea18277ebc9b60e2c7c
# Remove when/if this gets upstreamed in skia.
"extra_cflags+=[\"-DSKCMS_API=__attribute__((visibility(\\\"default\\\")))\"]"
"extra_cflags+=[\"-DSKCMS_API=[[gnu::visibility(\\\"default\\\")]]\"]"
];
}))
woff2
@@ -127,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
# Takes an enormous amount of resources, even with mold
(lib.cmakeBool "ENABLE_LTO_FOR_RELEASE" false)
# Disable network operations
"-DSERENITY_CACHE_DIR=Caches"
"-DLADYBIRD_CACHE_DIR=Caches"
"-DENABLE_NETWORK_DOWNLOADS=OFF"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -141,41 +128,11 @@ stdenv.mkDerivation (finalAttrs: {
# https://github.com/LadybirdBrowser/ladybird/issues/371#issuecomment-2616415434
env.NIX_LDFLAGS = "-lGL -lfontconfig";
postInstall = ''
for size in 48x48 128x128; do
mkdir -p $out/share/icons/hicolor/$size/apps
ln -s $out/share/Lagom/icons/$size/app-browser.png \
$out/share/icons/hicolor/$size/apps/ladybird.png
done
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications $out/bin
mv $out/bundle/Ladybird.app $out/Applications
'';
desktopItems = [
(makeDesktopItem {
name = "ladybird";
desktopName = "Ladybird";
exec = "Ladybird -- %U";
icon = "ladybird";
categories = [
"Network"
"WebBrowser"
];
mimeTypes = [
"text/html"
"application/xhtml+xml"
"x-scheme-handler/http"
"x-scheme-handler/https"
];
actions.new-window = {
name = "New Window";
exec = "Ladybird --new-window -- %U";
};
})
];
# Only Ladybird and WebContent need wrapped, if Qt is enabled.
# On linux we end up wraping some non-Qt apps, like headless-browser.
dontWrapQtApps = stdenv.hostPlatform.isDarwin;
@@ -186,11 +143,14 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
meta = {
description = "Browser using the SerenityOS LibWeb engine with a Qt or Cocoa GUI";
homepage = "https://ladybird.org";
license = licenses.bsd2;
maintainers = with maintainers; [ fgaz ];
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [
fgaz
jk
];
platforms = [
"x86_64-linux"
"aarch64-linux"
pkgs/by-name/la/lagrange/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lagrange";
version = "1.18.5";
version = "1.18.6";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
tag = "v${finalAttrs.version}";
hash = "sha256-NlnT8dGh05dDjSMxjaBnW7x/KjLgf2Ma0nbaiR7MpiY=";
hash = "sha256-KII0Rnas0H3iODEn89DD5BN96Ao7Aq0cTC4uhtuvNt4=";
};
nativeBuildInputs = [
pkgs/by-name/li/libgphoto2/package.nix
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "libgphoto2";
version = "2.5.31";
version = "2.5.32";
src = fetchFromGitHub {
owner = "gphoto";
repo = "libgphoto2";
rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release";
sha256 = "sha256-UmyDKEaPP9VJqi8f+y6JZcTlQomhMTN+/C//ODYx6/w=";
sha256 = "sha256-gUw3D/bHnKoiTInJVAzMCs5urWz4UHWywTLZUuRROqw=";
};
depsBuildBuild = [ pkg-config ];
pkgs/by-name/li/lightdm-slick-greeter/package.nix
+2 -6
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "lightdm-slick-greeter";
version = "2.2.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "slick-greeter";
rev = version;
hash = "sha256-AErY8Gy1AkYY/vpXoSE8zhyJd/nboMw+9BO3j6N7CNc=";
hash = "sha256-32H2Q/JdT5v0xrdsZfSJobJ4Dxx63LPgbiB9OKIyc1U=";
};
nativeBuildInputs = [
@@ -69,10 +69,6 @@ stdenv.mkDerivation rec {
substituteInPlace data/x.dm.slick-greeter.gschema.xml \
--replace-fail "/usr/share/onboard" "/run/current-system/sw/share/onboard"
# This image is really just a fallback.
substituteInPlace src/user-prompt-box.vala \
--replace-fail "/usr/share/cinnamon/faces/" "/run/current-system/sw/share/cinnamon/faces/"
patchShebangs files/usr/bin/*
'';
pkgs/by-name/lu/lux-cli/package.nix
+3 -3
View File
@@ -17,18 +17,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lux-cli";
version = "0.11.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "nvim-neorocks";
repo = "lux";
tag = "v${finalAttrs.version}";
hash = "sha256-yjd8nqrypgdS2UtAANv1TtuGtZPaWm7LhVrHPghf5hg=";
hash = "sha256-tx4sgh8G5R3odpBBVl0qLFWnTcmk1YYfGYkAJtHL9wE=";
};
buildAndTestSubdir = "lux-cli";
cargoHash = "sha256-iKZ4FJ0IL1lnKuYTmFvx8umoB0z8M8xnvgb/GMfGKkI=";
cargoHash = "sha256-dLhfDDoz2jFShk3ksxmQ8FEKc9JE/NPF4zSUV5kvgj8=";
nativeInstallCheckInputs = [
versionCheckHook
pkgs/by-name/mp/mpd-small/package.nix
+43
View File
@@ -0,0 +1,43 @@
{
lib,
stdenv,
mpd,
}:
mpd.override {
features = [
"webdav"
"curl"
"mms"
"bzip2"
"zzip"
"nfs"
"audiofile"
"faad"
"flac"
"gme"
"mpg123"
"opus"
"vorbis"
"vorbisenc"
"lame"
"libsamplerate"
"shout"
"libmpdclient"
"id3tag"
"expat"
"pcre"
"sqlite"
"qobuz"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
"alsa"
"systemd"
"syslog"
"io_uring"
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
"mad"
"jack"
];
}
pkgs/by-name/mp/mpd/package.nix
+289
View File
@@ -0,0 +1,289 @@
{
lib,
stdenv,
fetchFromGitHub,
meson,
ninja,
pkg-config,
glib,
systemd,
fmt,
buildPackages,
# Inputs
curl,
libcdio,
libcdio-paranoia,
libmms,
libnfs,
liburing,
samba,
# Archive support
bzip2,
zziplib,
# Codecs
audiofile,
faad2,
ffmpeg,
flac,
fluidsynth,
game-music-emu,
libmad,
libmikmod,
mpg123,
libopus,
libvorbis,
lame,
# Filters
libsamplerate,
soxr,
# Outputs
alsa-lib,
libao,
libjack2,
libpulseaudio,
libshout,
pipewire,
# Misc
icu,
sqlite,
avahi,
dbus,
pcre2,
libgcrypt,
expat,
nlohmann_json,
zlib,
libupnp,
# Client support
libmpdclient,
# Tag support
libid3tag,
nixosTests,
# For documentation
doxygen,
python3Packages, # for sphinx-build
# For tests
gtest,
zip,
# Features list
features ? null,
}:
let
concatAttrVals = nameList: set: lib.concatMap (x: set.${x} or [ ]) nameList;
featureDependencies = {
# Storage plugins
udisks = [ dbus ];
webdav = [
curl
expat
];
# Input plugins
cdio_paranoia = [
libcdio
libcdio-paranoia
];
curl = [ curl ];
io_uring = [ liburing ];
mms = [ libmms ];
nfs = [ libnfs ];
smbclient = [ samba ];
# Archive support
bzip2 = [ bzip2 ];
zzip = [ zziplib ];
# Decoder plugins
audiofile = [ audiofile ];
faad = [ faad2 ];
ffmpeg = [ ffmpeg ];
flac = [ flac ];
fluidsynth = [ fluidsynth ];
gme = [ game-music-emu ];
mad = [ libmad ];
mikmod = [ libmikmod ];
mpg123 = [
libid3tag
mpg123
];
opus = [ libopus ];
vorbis = [ libvorbis ];
# Encoder plugins
vorbisenc = [ libvorbis ];
lame = [ lame ];
# Filter plugins
libsamplerate = [ libsamplerate ];
soxr = [ soxr ];
# Output plugins
alsa = [ alsa-lib ];
ao = [ libao ];
jack = [ libjack2 ];
pipewire = [ pipewire ];
pulse = [ libpulseaudio ];
shout = [ libshout ];
# Commercial services
qobuz = [
curl
libgcrypt
nlohmann_json
];
# Client support
libmpdclient = [ libmpdclient ];
# Tag support
id3tag = [
libid3tag
zlib
];
# Misc
dbus = [ dbus ];
expat = [ expat ];
icu = [ icu ];
pcre = [ pcre2 ];
sqlite = [ sqlite ];
syslog = [ ];
systemd = [ systemd ];
zeroconf = [
avahi
dbus
];
};
nativeFeatureDependencies = {
documentation = [
doxygen
python3Packages.sphinx
];
};
# Disable platform specific features if needed
# using libmad to decode mp3 files on darwin is causing a segfault -- there
# is probably a solution, but I'm disabling it for now
platformMask =
lib.optionals stdenv.hostPlatform.isDarwin [
"mad"
"pulse"
"jack"
"smbclient"
]
++ lib.optionals (!stdenv.hostPlatform.isLinux) [
"alsa"
"pipewire"
"io_uring"
"systemd"
"syslog"
];
knownFeatures =
builtins.attrNames featureDependencies ++ builtins.attrNames nativeFeatureDependencies;
platformFeatures = lib.subtractLists platformMask knownFeatures;
features_ =
if (features == null) then
platformFeatures
else
let
unknown = lib.subtractLists knownFeatures features;
in
if (unknown != [ ]) then
throw "Unknown feature(s): ${lib.concatStringsSep " " unknown}"
else
let
unsupported = lib.subtractLists platformFeatures features;
in
if (unsupported != [ ]) then
throw "Feature(s) ${lib.concatStringsSep " " unsupported} are not supported on ${stdenv.hostPlatform.system}"
else
features;
in
stdenv.mkDerivation (finalAttrs: {
pname = "mpd";
version = "0.24.5";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${finalAttrs.version}";
sha256 = "sha256-MgepOQeOl+n65+7b8zXe2u0fCHFAviSqL1aNu2iSXiM=";
};
buildInputs = [
glib
fmt
# According to the configurePhase of meson, gtest is considered a
# runtime dependency. Quoting:
#
# Run-time dependency GTest found: YES 1.10.0
gtest
libupnp
]
++ concatAttrVals features_ featureDependencies;
nativeBuildInputs = [
meson
ninja
pkg-config
]
++ concatAttrVals features_ nativeFeatureDependencies;
depsBuildBuild = [ buildPackages.stdenv.cc ];
postPatch =
lib.optionalString
(stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0")
''
substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \
--replace kAudioObjectPropertyElement{Main,Master} \
--replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume
'';
# Otherwise, the meson log says:
#
# Program zip found: NO
nativeCheckInputs = [ zip ];
doCheck = true;
mesonAutoFeatures = "disabled";
outputs = [
"out"
"doc"
]
++ lib.optional (builtins.elem "documentation" features_) "man";
CXXFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [
"-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0"
];
mesonFlags = [
"-Dtest=true"
"-Dmanpages=true"
"-Dhtml_manual=true"
]
++ map (x: "-D${x}=enabled") features_
++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures)
++ lib.optional (builtins.elem "zeroconf" features_) (
"-Dzeroconf=" + (if stdenv.hostPlatform.isDarwin then "bonjour" else "avahi")
)
++ lib.optional (builtins.elem "systemd" features_) "-Dsystemd_system_unit_dir=etc/systemd/system"
++ lib.optional (builtins.elem "qobuz" features_) "-Dnlohmann_json=enabled";
passthru.tests.nixos = nixosTests.mpd;
meta = {
description = "Flexible, powerful daemon for playing music";
homepage = "https://www.musicpd.org/";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [
tobim
];
platforms = lib.platforms.unix;
mainProgram = "mpd";
longDescription = ''
Music Player Daemon (MPD) is a flexible, powerful daemon for playing
music. Through plugins and libraries it can play a variety of sound
files while being controlled by its network protocol.
'';
};
})
pkgs/by-name/ok/okteto/package.nix
+1 -1
View File
@@ -14,7 +14,7 @@ buildGoModule (finalAttrs: {
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
rev = finalAttrs.version;
tag = finalAttrs.version;
hash = "sha256-gGtQrhetIWV7ZvnmPYcGzz718uGyAdRiraiKODrJS4w=";
};
pkgs/by-name/ol/ollama/package.nix
+2 -2
View File
@@ -116,13 +116,13 @@ in
goBuild (finalAttrs: {
pname = "ollama";
# don't forget to invalidate all hashes each update
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "ollama";
repo = "ollama";
tag = "v${finalAttrs.version}";
hash = "sha256-BoT4WUapxakETHAlHP64okcReMIhQ+PzKaSVpELvrcI=";
hash = "sha256-fBoSt/chnxnlD6/HsWeMX9TR7Du7RCOmWcqCKamyK7A=";
fetchSubmodules = true;
};
pkgs/by-name/ph/phoenixd/package.nix
+5 -5
View File
@@ -11,7 +11,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "phoenixd";
version = "0.6.1";
version = "0.6.2";
src =
let
@@ -28,10 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
fetchurl {
url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip";
hash = selectSystem {
aarch64-darwin = "sha256-kPM82YcgTfcXnkE8ihEVKERAlFDSqZQZVmhPkThjtDk=";
x86_64-darwin = "sha256-mQ44LOm5tSBSSazkp1RW7Krncfo/O5VOZHtg7m6Uf0Y=";
x86_64-linux = "sha256-j6PhXo4q6UZY6hNylZJCBtFE03UcKHgWZbg7+2pO1N4=";
aarch64-linux = "sha256-IH/QngEUv2YKzIK1tJORFNZ/gM9a+0VYiqcvVrJhqT8=";
aarch64-darwin = "sha256-M1zcd1ZyqnRVTaH0pGUPPKcke5nx2Hd45t911j6EObQ=";
x86_64-darwin = "sha256-sYl51UC9AwCUzshF91npR4dZ6gmaF6n9+zLFm9IeSLQ=";
x86_64-linux = "sha256-qJKCKCquCTAE3Oc4esLYWXiKJk+NUuCVyD3MjWcbXEo=";
aarch64-linux = "sha256-H9KvrNJ/jBuZbJlNsnM5HTF/OCYgdScgaBi0G4gRkEY=";
};
};
pkgs/by-name/po/portfolio/package.nix
+2 -2
View File
@@ -34,11 +34,11 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "PortfolioPerformance";
version = "0.77.3";
version = "0.78.0";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
hash = "sha256-e+1W2jT2YUM+udegvvupUv8RR+nHZSK/NMjMeu01uR8=";
hash = "sha256-f5xPXBzwa9VOutiG5uYQ5FqC6Avd+VAIyDlLW7db82Y=";
};
nativeBuildInputs = [
pkgs/by-name/rs/rshim-user-space/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "rshim-user-space";
version = "2.4.2";
version = "2.4.4";
src = fetchFromGitHub {
owner = "Mellanox";
repo = "rshim-user-space";
rev = "rshim-${version}";
hash = "sha256-J/gCACqpUY+KraVOLWpd+UVyZ1f2o77EfpAgUVtZL9w=";
hash = "sha256-w2+1tUDWYmgDC0ycWGdtVfdbkZCmtvwXm47qK5PCCfg=";
};
nativeBuildInputs = [
pkgs/by-name/sn/snac2/package.nix
+2 -2
View File
@@ -10,14 +10,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "snac2";
version = "2.80";
version = "2.81";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "grunfink";
repo = "snac2";
tag = finalAttrs.version;
hash = "sha256-8f9JesQgdRwholsa0p1TP0L4vPd1HHLEMwfxVlGm99o=";
hash = "sha256-ozK+T8V4KNqNhkLYw4yJd0u56I3wsxl9ctWFmfJplos=";
};
buildInputs = [
pkgs/by-name/vs/vsce/package.nix
+1 -1
View File
@@ -17,7 +17,7 @@ buildNpmPackage (finalAttrs: {
src = fetchFromGitHub {
owner = "microsoft";
repo = "vscode-vsce";
rev = "v${finalAttrs.version}";
tag = "v${finalAttrs.version}";
hash = "sha256-6Tt7IewbCLHG8DVoD8PV6VmrNu3MCUHITgYFq9smvOo=";
};
pkgs/desktops/xfce/default.nix
+2
View File
@@ -111,6 +111,8 @@ makeScopeWithSplicing' {
#### PANEL PLUGINS
xfce4-alsa-plugin = callPackage ./panel-plugins/xfce4-alsa-plugin { };
xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { };
xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { };
pkgs/desktops/xfce/panel-plugins/xfce4-alsa-plugin/default.nix
+51
View File
@@ -0,0 +1,51 @@
{
lib,
stdenv,
fetchFromGitHub,
meson,
vala,
pkg-config,
gettext,
ninja,
alsa-lib,
xfce4-panel,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xfce4-alsa-plugin";
version = "0.4.0";
src = fetchFromGitHub {
owner = "equeim";
repo = "xfce4-alsa-plugin";
tag = finalAttrs.version;
hash = "sha256-95uVHDyXji8dut7qfE5V/uBBt6DPYF/YfudHe7HJcE8=";
};
strictDeps = true;
nativeBuildInputs = [
meson
vala
pkg-config
gettext
ninja
];
buildInputs = [
alsa-lib
xfce4-panel
];
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/equeim/xfce4-alsa-plugin";
description = "Simple ALSA volume control for xfce4-panel";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ProxyVT ];
teams = [ lib.teams.xfce ];
};
})
pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix
+2
View File
@@ -32,6 +32,7 @@ mkCoqDerivation {
lib.switch
[ coq.coq-version mathcomp-algebra.version ]
[
(case (range "8.20" "9.1") (isGe "2.4") "1.2.6")
(case (range "8.20" "9.1") (isGe "2.4") "1.2.5")
(case (range "8.16" "9.0") (isGe "2.0") "1.2.4")
(case (range "8.16" "8.18") (isGe "2.0") "1.2.2")
@@ -46,6 +47,7 @@ mkCoqDerivation {
release."1.2.3".sha256 = "sha256-6uc1VEfDv+fExEfBR2c0/Q/KjrkX0TbEMCLgeYcpkls=";
release."1.2.4".sha256 = "sha256-BRxt0LGPz2u3kJRjcderaZqCfs8M8qKAAwNSWmIck7Q=";
release."1.2.5".sha256 = "sha256-wTfe+g7ljWs1S+g02VQutnJGLVIOzNX1lm1HTMXeUUA=";
release."1.2.6".sha256 = "sha256-D7EEiLeCJMgxsYvlAFyL7QZyx/KJAKesVE+vyfzqzkU=";
propagatedBuildInputs = [
mathcomp-ssreflect
pkgs/development/ocaml-modules/elpi/default.nix
+2 -1
View File
@@ -18,7 +18,7 @@
coqPackages,
version ?
if lib.versionAtLeast ocaml.version "4.13" then
"2.0.7"
"3.0.1"
else if lib.versionAtLeast ocaml.version "4.08" then
"1.20.0"
else
@@ -34,6 +34,7 @@ in
let
fetched = coqPackages.metaFetch ({
release."3.0.1".sha256 = "sha256-r4B0xn6UCVslVW4dHiqq8NBMGfNz44kZy48KDWeGquc=";
release."2.0.7".sha256 = "sha256-gCM+vZK6vWlhSO1VMjiWHse23mvxVwRarhxwkIQK7e0=";
release."2.0.6".sha256 = "sha256-tRUYXQZ0VXrjIZBZ1skdzieUsww4rSNEe5ik+iKpk3U=";
release."2.0.5".sha256 = "sha256-cHgERFqrfSg5WtUX3UxR6L+QkzS7+t6n4V+wweiEacc=";
pkgs/development/ocaml-modules/jsont/default.nix
+18 -9
View File
@@ -1,9 +1,13 @@
{
lib,
fetchzip,
topkg,
buildTopkgPackage,
withBrr ? true,
brr,
withBytesrw ? true,
bytesrw,
withCmdliner ? true,
cmdliner,
}:
@@ -18,17 +22,22 @@ buildTopkgPackage rec {
hash = "sha256-dXHl+bLuIrlrQ5Np37+uVuETFBb3j8XeDVEK9izoQFk=";
};
# docs say these dependendencies are optional, but buildTopkgPackage doesn’t
# handle missing dependencies
buildInputs = lib.optional withCmdliner cmdliner;
buildInputs = [
cmdliner
];
propagatedBuildInputs = lib.optional withBrr brr ++ lib.optional withBytesrw bytesrw;
propagatedBuildInputs = [
brr
bytesrw
];
buildPhase = "${topkg.run} build ${
lib.escapeShellArgs [
"--with-brr"
(lib.boolToString withBrr)
"--with-bytesrw"
(lib.boolToString withBytesrw)
"--with-cmdliner"
(lib.boolToString withCmdliner)
]
}";
meta = {
description = "Declarative JSON data manipulation";
pkgs/development/python-modules/auditwheel/default.nix
+2 -2
View File
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "auditwheel";
version = "6.4.0";
version = "6.4.2";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-IJkMyyQW/bgZg+9lTRDfcvnyWziOMBBbw9l7Btauyvs=";
hash = "sha256-t6Ya/JGDtrXGYd5ZylhvnHIARFpAnFjN8gSdb3FjbVE=";
};
build-system = [ setuptools-scm ];
pkgs/development/python-modules/coredis/default.nix
+2 -2
View File
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "coredis";
version = "4.23.1";
version = "4.24.0";
pyproject = true;
src = fetchFromGitHub {
owner = "alisaifee";
repo = "coredis";
tag = version;
hash = "sha256-5Ho9X2VCOwKo079M2ReJ93jqEpG2ZV6vKM5/qrgzjxM=";
hash = "sha256-vqgxj366x+TphGxUBXUHJpEM0zAdr6Ia4pDPKGWUx14=";
};
postPatch = ''
pkgs/development/python-modules/dateparser/default.nix
+3 -3
View File
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "dateparser";
version = "1.2.1";
version = "1.2.2";
disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "scrapinghub";
repo = "dateparser";
tag = "v${version}";
hash = "sha256-O0FsLWbH0kGjwGCTklBMVVqosxXlXRyS9aAcggtBLsA=";
hash = "sha256-cUbY6c0JFzs1oZJOTnMXz3uCah2f50g8/3uWQXtwiGY=";
};
nativeBuildInputs = [ setuptools ];
@@ -83,7 +83,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "dateparser" ];
meta = with lib; {
changelog = "https://github.com/scrapinghub/dateparser/blob/${src.rev}/HISTORY.rst";
changelog = "https://github.com/scrapinghub/dateparser/blob/${src.tag}/HISTORY.rst";
description = "Date parsing library designed to parse dates from HTML pages";
homepage = "https://github.com/scrapinghub/dateparser";
license = licenses.bsd3;
pkgs/development/python-modules/oci/default.nix
+2 -2
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "oci";
version = "2.154.1";
version = "2.157.0";
pyproject = true;
src = fetchFromGitHub {
owner = "oracle";
repo = "oci-python-sdk";
tag = "v${version}";
hash = "sha256-jkB7P0T12ybSqR73Z2wcBcGCep7eFlX5MYNX4E2qnMY=";
hash = "sha256-Ly94Tiyk0yeH9EPMfR3jkeZNhQBjeiS5rbY5IFBeYOs=";
};
pythonRelaxDeps = [
pkgs/development/python-modules/retrying/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "retrying";
version = "1.3.4";
version = "1.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-NF2oxXZb2YKx0ZFd65EC/T0fetFr2EqXALhfZNJOjz4=";
hash = "sha256-TSBuDtKv9e8vPNhnq7lRHp6PMRJ8Wsog8dUkbkdpA7A=";
};
propagatedBuildInputs = [ six ];
pkgs/development/python-modules/transitions/default.nix
+2 -2
View File
@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "transitions";
version = "0.9.2";
version = "0.9.3";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-L4SQ29vUGTZs7xUWAyqwbQfMtYOe9UkF6EKkcmktQgQ=";
hash = "sha256-iB+3W7FlTtVdhgYLsGfyxxb44VX1e7c/1ETlNxOq/sg=";
};
build-system = [ setuptools ];
pkgs/development/rocq-modules/hierarchy-builder/default.nix
+2
View File
@@ -17,8 +17,10 @@ let
in
with lib.versions;
lib.switch rocq-core.rocq-version [
(case (range "9.0" "9.1") "1.10.0")
(case (range "9.0" "9.1") "1.9.1")
] null;
release."1.10.0".sha256 = "sha256-c52nS8I0tia7Q8lZTFJyHVPVabW9xv55m7w6B7y3+e8=";
release."1.9.1".sha256 = "sha256-AiS0ezMyfIYlXnuNsVLz1GlKQZzJX+ilkrKkbo0GrF0=";
releaseRev = v: "v${v}";
pkgs/development/rocq-modules/rocq-elpi/default.nix
+3
View File
@@ -17,6 +17,7 @@ let
in
with lib.versions;
lib.switch rocq-core.rocq-version [
(case (range "9.0" "9.1") "3.0.1")
(case (range "9.0" "9.1") "2.0.7")
] { };
elpi = rocq-core.ocamlPackages.elpi.override { version = default-elpi-version; };
@@ -35,9 +36,11 @@ let
in
with lib.versions;
lib.switch rocq-core.rocq-version [
(case (range "9.0" "9.1") "3.0.0")
(case (range "9.0" "9.1") "2.6.0")
(case ("9.0") "2.5.2")
] null;
release."3.0.0".sha256 = "sha256-YMe2is7duGcvAHjM4joUE90EloibjSxqfZThsJhstdU=";
release."2.6.0".sha256 = "sha256-23BHq1NFUkI3ayXnGUwiGFySLyY3EuH4RyMgAhQqI4g=";
release."2.5.2".sha256 = "sha256-lLzjPrbVB3rrqox528YiheUb0u89R84Xmrgkn0oplOs=";
releaseRev = v: "v${v}";
pkgs/servers/mpd/default.nix
-334
View File
@@ -1,334 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
meson,
ninja,
pkg-config,
glib,
systemd,
fmt,
buildPackages,
# Inputs
curl,
libcdio,
libcdio-paranoia,
libmms,
libnfs,
liburing,
samba,
# Archive support
bzip2,
zziplib,
# Codecs
audiofile,
faad2,
ffmpeg,
flac,
fluidsynth,
game-music-emu,
libmad,
libmikmod,
mpg123,
libopus,
libvorbis,
lame,
# Filters
libsamplerate,
soxr,
# Outputs
alsa-lib,
libao,
libjack2,
libpulseaudio,
libshout,
pipewire,
# Misc
icu,
sqlite,
avahi,
dbus,
pcre2,
libgcrypt,
expat,
nlohmann_json,
zlib,
libupnp,
# Client support
libmpdclient,
# Tag support
libid3tag,
nixosTests,
# For documentation
doxygen,
python3Packages, # for sphinx-build
# For tests
gtest,
zip,
}:
let
concatAttrVals = nameList: set: lib.concatMap (x: set.${x} or [ ]) nameList;
featureDependencies = {
# Storage plugins
udisks = [ dbus ];
webdav = [
curl
expat
];
# Input plugins
cdio_paranoia = [
libcdio
libcdio-paranoia
];
curl = [ curl ];
io_uring = [ liburing ];
mms = [ libmms ];
nfs = [ libnfs ];
smbclient = [ samba ];
# Archive support
bzip2 = [ bzip2 ];
zzip = [ zziplib ];
# Decoder plugins
audiofile = [ audiofile ];
faad = [ faad2 ];
ffmpeg = [ ffmpeg ];
flac = [ flac ];
fluidsynth = [ fluidsynth ];
gme = [ game-music-emu ];
mad = [ libmad ];
mikmod = [ libmikmod ];
mpg123 = [
libid3tag
mpg123
];
opus = [ libopus ];
vorbis = [ libvorbis ];
# Encoder plugins
vorbisenc = [ libvorbis ];
lame = [ lame ];
# Filter plugins
libsamplerate = [ libsamplerate ];
soxr = [ soxr ];
# Output plugins
alsa = [ alsa-lib ];
ao = [ libao ];
jack = [ libjack2 ];
pipewire = [ pipewire ];
pulse = [ libpulseaudio ];
shout = [ libshout ];
# Commercial services
qobuz = [
curl
libgcrypt
nlohmann_json
];
# Client support
libmpdclient = [ libmpdclient ];
# Tag support
id3tag = [
libid3tag
zlib
];
# Misc
dbus = [ dbus ];
expat = [ expat ];
icu = [ icu ];
pcre = [ pcre2 ];
sqlite = [ sqlite ];
syslog = [ ];
systemd = [ systemd ];
zeroconf = [
avahi
dbus
];
};
nativeFeatureDependencies = {
documentation = [
doxygen
python3Packages.sphinx
];
};
run =
{
features ? null,
}:
let
# Disable platform specific features if needed
# using libmad to decode mp3 files on darwin is causing a segfault -- there
# is probably a solution, but I'm disabling it for now
platformMask =
lib.optionals stdenv.hostPlatform.isDarwin [
"mad"
"pulse"
"jack"
"smbclient"
]
++ lib.optionals (!stdenv.hostPlatform.isLinux) [
"alsa"
"pipewire"
"io_uring"
"systemd"
"syslog"
];
knownFeatures =
builtins.attrNames featureDependencies ++ builtins.attrNames nativeFeatureDependencies;
platformFeatures = lib.subtractLists platformMask knownFeatures;
features_ =
if (features == null) then
platformFeatures
else
let
unknown = lib.subtractLists knownFeatures features;
in
if (unknown != [ ]) then
throw "Unknown feature(s): ${lib.concatStringsSep " " unknown}"
else
let
unsupported = lib.subtractLists platformFeatures features;
in
if (unsupported != [ ]) then
throw "Feature(s) ${lib.concatStringsSep " " unsupported} are not supported on ${stdenv.hostPlatform.system}"
else
features;
in
stdenv.mkDerivation rec {
pname = "mpd";
version = "0.24.5";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${version}";
sha256 = "sha256-MgepOQeOl+n65+7b8zXe2u0fCHFAviSqL1aNu2iSXiM=";
};
buildInputs = [
glib
fmt
# According to the configurePhase of meson, gtest is considered a
# runtime dependency. Quoting:
#
# Run-time dependency GTest found: YES 1.10.0
gtest
libupnp
]
++ concatAttrVals features_ featureDependencies;
nativeBuildInputs = [
meson
ninja
pkg-config
]
++ concatAttrVals features_ nativeFeatureDependencies;
depsBuildBuild = [ buildPackages.stdenv.cc ];
postPatch =
lib.optionalString
(stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0")
''
substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \
--replace kAudioObjectPropertyElement{Main,Master} \
--replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume
'';
# Otherwise, the meson log says:
#
# Program zip found: NO
nativeCheckInputs = [ zip ];
doCheck = true;
mesonAutoFeatures = "disabled";
outputs = [
"out"
"doc"
]
++ lib.optional (builtins.elem "documentation" features_) "man";
CXXFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [
"-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0"
];
mesonFlags = [
"-Dtest=true"
"-Dmanpages=true"
"-Dhtml_manual=true"
]
++ map (x: "-D${x}=enabled") features_
++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures)
++ lib.optional (builtins.elem "zeroconf" features_) (
"-Dzeroconf=" + (if stdenv.hostPlatform.isDarwin then "bonjour" else "avahi")
)
++ lib.optional (builtins.elem "systemd" features_) "-Dsystemd_system_unit_dir=etc/systemd/system"
++ lib.optional (builtins.elem "qobuz" features_) "-Dnlohmann_json=enabled";
passthru.tests.nixos = nixosTests.mpd;
meta = with lib; {
description = "Flexible, powerful daemon for playing music";
homepage = "https://www.musicpd.org/";
license = licenses.gpl2Only;
maintainers = with maintainers; [
tobim
];
platforms = platforms.unix;
mainProgram = "mpd";
longDescription = ''
Music Player Daemon (MPD) is a flexible, powerful daemon for playing
music. Through plugins and libraries it can play a variety of sound
files while being controlled by its network protocol.
'';
};
};
in
{
mpd = run { };
mpd-small = run {
features = [
"webdav"
"curl"
"mms"
"bzip2"
"zzip"
"nfs"
"audiofile"
"faad"
"flac"
"gme"
"mpg123"
"opus"
"vorbis"
"vorbisenc"
"lame"
"libsamplerate"
"shout"
"libmpdclient"
"id3tag"
"expat"
"pcre"
"sqlite"
"qobuz"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
"alsa"
"systemd"
"syslog"
"io_uring"
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
"mad"
"jack"
];
};
mpdWithFeatures = run;
}
pkgs/servers/nextcloud/packages/30.json
+52 -52
View File
File diff suppressed because one or more lines are too long
pkgs/servers/nextcloud/packages/31.json
+52 -52
View File
File diff suppressed because one or more lines are too long
pkgs/top-level/aliases.nix
+1
View File
@@ -1333,6 +1333,7 @@ mapAliases {
mpc-cli = mpc; # Added 2024-10-14
mpc_cli = mpc; # Added 2024-10-14
mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17
mpdWithFeatures = lib.warnOnInstantiate "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08
mpdevil = plattenalbum; # Added 2024-05-22
mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10
mq-cli = throw "'mq-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
pkgs/top-level/all-packages.nix
-8
View File
@@ -10220,14 +10220,6 @@ with pkgs;
mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
inherit
(callPackages ../servers/mpd {
})
mpd
mpd-small
mpdWithFeatures
;
mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { };
moodle = callPackage ../servers/web-apps/moodle { };