Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2026-10-01 06:17:33 +00:00
committed by GitHub
46 changed files with 278 additions and 159 deletions

View File

@@ -30,6 +30,7 @@ let
cosmic-launcher
cosmic-notifications
cosmic-osd
cosmic-osk
cosmic-panel
cosmic-session
cosmic-settings
@@ -90,6 +91,7 @@ in
cosmic-reader
cosmic-screenshot
cosmic-term
cosmic-viewer
cosmic-wallpapers
cosmic-sound-theme
glib
@@ -134,6 +136,11 @@ in
open-sans
];
qt = {
enable = lib.mkDefault true;
platformTheme = lib.mkDefault "qt5ct";
};
# Required options for the COSMIC DE
environment.sessionVariables.X11_BASE_RULES_XML = "${config.services.xserver.xkb.dir}/rules/base.xml";
environment.sessionVariables.X11_EXTRA_RULES_XML = "${config.services.xserver.xkb.dir}/rules/base.extras.xml";
@@ -164,6 +171,7 @@ in
hardware.system76.power-daemon.enable = lib.mkDefault (
!config.services.power-profiles-daemon.enable && !config.services.tuned.enable
);
services.switcherooControl.enable = lib.mkDefault true;
warnings = lib.optionals (cfg.showExcludedPkgsWarning && excludedCorePkgs != [ ]) [
''

View File

@@ -171,25 +171,33 @@ in
serviceConfig =
let
btrfsCmd = getExe pkgs.btrfs-progs;
btrfsCancelCmd = pkgs.writers.writePython3 "btrfs-scrub-maybe-cancel" { } ''
import subprocess
import sys
btrfsCancelCmd =
pkgs.writers.writePython3 "btrfs-scrub-maybe-cancel"
{
flakeIgnore = [
# `btrfsCmd` may exceed 80-character line length for some platforms
"E501"
];
}
''
import subprocess
import sys
btrfs = "${escape [ "\"" "\\" ] btrfsCmd}"
result = subprocess.run(
[btrfs, "scrub", "cancel"] + sys.argv[1:],
stderr=subprocess.PIPE,
check=False,
shell=False
)
btrfs = "${escape [ "\"" "\\" ] btrfsCmd}"
result = subprocess.run(
[btrfs, "scrub", "cancel"] + sys.argv[1:],
stderr=subprocess.PIPE,
check=False,
shell=False
)
# ignore errors if there was no running scrub to cancel
if result.returncode == 2:
sys.exit(0)
# ignore errors if there was no running scrub to cancel
if result.returncode == 2:
sys.exit(0)
sys.stderr.buffer.write(result.stderr)
sys.exit(result.returncode)
'';
sys.stderr.buffer.write(result.stderr)
sys.exit(result.returncode)
'';
additionalScrubArgs = optionals (cfgScrub.limit != null) [
"--limit"
cfgScrub.limit

View File

@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-CftijAYW4hoMryxPSXfq/GffTZahAn8FeCParZcRHdM=";
hash = "sha256-+1jtHXyURBSDXPBKrcFuE0RTjQil1KWgeAinnxDQQG8=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-qaE5dSnOFECIK7PoJOgOYAuEqH7wEcewL5XhFaxyPu0=";
hash = "sha256-QwAeBSQNB/oT6LIyPTUjboVAm/HDcBcfqP060Xf6xMU=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-rOTO8zbsL+YrsrPhj1TN5PhQWp8y6XoJqn7z1ZJh5pw=";
hash = "sha256-Vxn9QOmKzpRVDcpjs9sARCieueiy/6AFHduhXKjueEk=";
};
};
in
{
name = "claude-code";
publisher = "anthropic";
version = "2.1.285";
version = "2.1.286";
}
// sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

View File

@@ -36,13 +36,13 @@
"vendorHash": "sha256-jrr657aGldXtq4XHfYYpgr1HQpe+cg1mWa7gwRj30io="
},
"akamai_akamai": {
"hash": "sha256-ui8w8z9kROptw0tCvtT645bbNJV/BRd10aVomwhl+hI=",
"hash": "sha256-6nKfNzNsqp5x6/C5hr1UNC2gz5eTV2DonNQ3olvGxIA=",
"homepage": "https://registry.terraform.io/providers/akamai/akamai",
"owner": "akamai",
"repo": "terraform-provider-akamai",
"rev": "v11.0.0",
"rev": "v11.1.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-d9hJUjHczxy2/3bOmEYjTxKDIRc6Cox4sr5k40ZHWFE="
"vendorHash": "sha256-HlX2EfTgDa7K7qkzmR/9Rsamyi/f4EXT3T7eaReGeK4="
},
"aliyun_alicloud": {
"hash": "sha256-u4u8p3+Gxwa+gCDgcqZqi1RXYG9c+O27uZoOlc+RoKc=",
@@ -1427,11 +1427,11 @@
"vendorHash": "sha256-CtqDFTVJqbPF5riVrEdtLZhOxtK1MU2SbTf8xClksQw="
},
"ucloud_ucloud": {
"hash": "sha256-cw/xAib+XlI4yV+4RaRsJYrNrYhhlF1ebVQeVhtsv1U=",
"hash": "sha256-kqBVVJW+rT8coZUDf64Dd0ljAOMxfAkr57WoeKB6Gs4=",
"homepage": "https://registry.terraform.io/providers/ucloud/ucloud",
"owner": "ucloud",
"repo": "terraform-provider-ucloud",
"rev": "v1.43.0",
"rev": "v1.45.0",
"spdx": "MPL-2.0",
"vendorHash": null
},

View File

@@ -2,7 +2,6 @@
lib,
rustPlatform,
fetchFromGitHub,
fetchpatch,
git,
pkg-config,
makeWrapper,
@@ -18,7 +17,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "agentaps";
version = "0.3.1";
version = "0.4.0";
__structuredAttrs = true;
@@ -26,19 +25,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "domenkozar";
repo = "agentaps";
tag = "v${finalAttrs.version}";
hash = "sha256-pHESE5ML5zeDylz07t8k1jJop/IGyIhTTffPN4dWrY0=";
hash = "sha256-/DIcohzFT0Rm6alPhBnuvJuKh6lAHwDkZJ3jwUCyDZA=";
};
cargoHash = "sha256-ko+ytnpQGLIA41+aurIcY5Rp0Aemf7Z4PFC5GdLFLvw=";
patches = [
# Add --version support until the next release.
(fetchpatch {
url = "https://github.com/domenkozar/agentaps/commit/1665c2792929226d675d427e0eef42cd3ede7a71.patch";
hash = "sha256-+wL5G6Ln9uuWxt2fRW2QPbD54Zif51hGxcNAC3Q3f84=";
includes = [ "src/main.rs" ];
})
];
cargoHash = "sha256-R2VPjxwElvLPbikwuxILwV7ShSOy3mJjqinaK8dNipk=";
nativeBuildInputs = [
makeWrapper

View File

@@ -18,6 +18,7 @@
n64recomp,
directx-shader-compiler,
bk_rom_compressor,
fetchpatch,
}:
let
@@ -55,6 +56,17 @@ llvmPackages_21.stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
__structuredAttrs = true;
patches = [
# Fix building with gcc16
(fetchpatch {
name = "rmlui-cstdint.patch";
url = "https://github.com/mikke89/RmlUi/commit/8c27b0a5cb601a3c57ecddc6ce8769ca93a97cb8.patch";
stripLen = 1;
extraPrefix = "lib/RecompFrontend/recompui/lib/RmlUi/";
hash = "sha256-G4Qzawd2HkBh19B3jpIp4QZcrQDnUCvkXlw23nkBKHo=";
})
];
nativeBuildInputs = [
cmake
copyDesktopItems

View File

@@ -8,16 +8,16 @@
php83.buildComposerProject2 (finalAttrs: {
pname = "bookstack";
version = "26.05.5";
version = "26.09.1";
src = fetchFromGitHub {
owner = "bookstackapp";
repo = "bookstack";
tag = "v${finalAttrs.version}";
hash = "sha256-9E0hewzzN4prXUOrokIY6vDZUttv1HpPEd2/sLc0mhM=";
hash = "sha256-wByVrXyDD/jQYoDYtjeflpfxlIJzkssuitECTFghROY=";
};
vendorHash = "sha256-usRZ70uiD54jlXkKcikvkNmFQbw7/r9F9Dg3QN/gdts=";
vendorHash = "sha256-mossk/PV7Qf0JTv3C+Vj4J6rcGcc+AB1fUQgFxvHHdU=";
passthru = {
phpPackage = php83;

View File

@@ -1,62 +1,61 @@
{
"version": "2.1.285",
"version": "2.1.286",
"manifestSignatureEnforcement": "flag",
"commit": "afb212976052ab038df25d5e871f6c049e094d3b",
"modsCommit": "dec92bc87ab6fe9c7be0fcba1f97966f902dd243",
"buildDate": "2026-09-29T01:46:59Z",
"commit": "f344a08993bbba4fc1ea9b295245324610f02c58",
"modsCommit": "732e167ee9d71296b4b63d6f529ac1334513826a",
"buildDate": "2026-09-30T15:57:03Z",
"platforms": {
"darwin-arm64": {
"binary": "claude.zst",
"checksum": "37ef7ca4ef6486c44b8f88b41af4f269ba8322c7dd8a62261e54e3271f56a6a0",
"size": 74510936,
"checksum": "b1be27fbd8fe95bef2418c09f60a307f91c8631dc444fe9a828a7ed2520e45b5",
"size": 75060478,
"bundle": {
"checksum": "c793e6a936a0afe77ee4b0b36abb463e7a54c696cf6f27ef3aa10e2ead33f806",
"size": 74521855
"checksum": "f2326db618029608409be774a5f4d5fde8a032d319d6aa58c3043afda393dd96",
"size": 75074255
}
},
"darwin-x64": {
"binary": "claude.zst",
"checksum": "cd31b4ba8368bac728fdf75de6654df8f47d2023cd3cd16da49b429ae4d24648",
"size": 78669066,
"checksum": "e2bbc2a329924533319d0eb4f5a33e2488ce921f60329ab333bca10b0e4c02f2",
"size": 79220957,
"bundle": {
"checksum": "59130413242ea7f3290ac59919cf9586473d8bc9837fc4928c204ae30b83cc12",
"size": 78670967
"checksum": "fda00b160da41c43716c36fbd4f21729108f898911eea5ede701b10305bca5eb",
"size": 79224277
}
},
"linux-arm64": {
"binary": "claude.zst",
"checksum": "df8bb286ad870d8db316fc6c8b34932598c1127d14f739d1fc995610204eb4d2",
"size": 83619189
"checksum": "fb24324439bcca9575083f06af6a351a7f9f25066fcf370372b5e829287ef1ee",
"size": 84176167
},
"linux-x64": {
"binary": "claude.zst",
"checksum": "e88a8b40ed5a7e9213bf5047f5b12c360c33387b1bc36cf79ddbff0a3a40121c",
"size": 84348572
"checksum": "a14d80443473126e40cbc50eb78899f43e8f4d4336095863f8089a6b9ca02a97",
"size": 84909116
},
"linux-arm64-musl": {
"binary": "claude.zst",
"checksum": "1e86f455cbd30439ec4a4a38768e2d84e5be327827e2ec7f5c9c87b04b8f53ab",
"size": 82026156
"checksum": "e86dc4ad41e7e0af1b2cdadcd9b850acb4aed8f141bddce754f29091e59cf250",
"size": 82570865
},
"linux-x64-musl": {
"binary": "claude.zst",
"checksum": "c436b04d973f0db928dd2321f34206de90a48e6a23aa486a6b69e5cac574d5b1",
"size": 82790392
"checksum": "b79ed7738c8eb72812d89d2d4032fe4196cf19dac067ee8e724d4f892350c710",
"size": 83360753
},
"win32-x64": {
"binary": "claude.exe.zst",
"checksum": "5004d3bee5263ee011dcffcc28c837e40989808301f0b8bf64c3aa3d9b0ab8f1",
"size": 86659568
"checksum": "635c1867224abd72c010948307b6dd871c64837dada77e67d98ed850408198bf",
"size": 87205724
},
"win32-arm64": {
"binary": "claude.exe.zst",
"checksum": "7067da6d07b9d78d2a75ae40f53c5764066953a853b83b8c1053dc35a9a6b323",
"size": 82994951
"checksum": "f485b6b45317d01eb9c6cb3f62c66520aaa87f3e0f7c729ece129b832c211cbc",
"size": 83529567
}
},
"sdkCompat": {
"testedWrapperVersions": [
"0.3.245",
"0.3.246",
"0.3.247",
"0.3.248",
@@ -85,7 +84,8 @@
"0.3.278",
"0.3.280",
"0.3.281",
"0.3.282"
"0.3.282",
"0.3.285"
],
"harnessSchema": 1
}

View File

@@ -29,18 +29,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
version = "0.159.1";
version = "0.159.3";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
hash = "sha256-74sN8GM4W+u8bMxOenSp9tmIDqAtrABCmU5J8IsqZWA=";
hash = "sha256-djo9XISA01gXziGjCsSrNlQ67lRNb3FSwrfs03srYIE=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
cargoHash = "sha256-3X4gmzAZG10DDcI667k9Zf+r3IvzeAAWD1NbTdQZyGY=";
cargoHash = "sha256-U20V8MkGJZd+qTOQETzqB25QJPYxJGV89LiR1kToW7A=";
__structuredAttrs = true;

View File

@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-app-library";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-app-library";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-oAGo8ByFHiSR9J57Ytn9kjMRwu103Retr9VcZjjaTtY=";
hash = "sha256-7e9K1jWSPfUI6XeJU+/F/MZh0xb9ChJTIiYyR3Jtst0=";
};
cargoHash = "sha256-UNSoRkHFQ1VpIeF/xMyONpwZ8hG5yUkTWqq/9LQ1wqs=";
cargoHash = "sha256-nkqw7xfbMi5ErwwqCav5aODEVRywC/s6sJn1vNcjTVw=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -13,6 +13,7 @@
pulseaudio,
pipewire,
udev,
lsof,
xkeyboard_config,
nix-update-script,
nixosTests,
@@ -20,17 +21,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-applets";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applets";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-OMz/lh5bJ7YjS6GLP+yQsJ9HvYNDedj2MMMA5pgwPEE=";
hash = "sha256-Xq1/by/ytXqd+2ML4X/r01cs7hgTcC6Zt7T5XW539UI=";
};
cargoHash = "sha256-iGnqu6Di2kxEAujzJ+Yy+A4cUZrdDjQ7aF3yrVz+QYU=";
cargoHash = "sha256-9icbfWEWw56GA7/zSZN9/+Rp/dH0KPNLYrYh20jke0Q=";
separateDebugInfo = true;
__structuredAttrs = true;
@@ -50,6 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pulseaudio
pipewire
udev
lsof
];
dontUseJustBuild = true;

View File

@@ -14,14 +14,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-bg";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-bg";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-tvYVe3H99oB6NYzLjwzX+ccSFh54LAfvuLmFoCIaJp4=";
hash = "sha256-RE7jI4NVJvPv14fUe8Ldp5dXTH6ScUJZ8iNdpxKsVfg=";
};
postPatch = ''
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg"
'';
cargoHash = "sha256-j07BZ9JsY6UG9eXVxdn0CTWU8j/cGNA9lXrDsdF40lM=";
cargoHash = "sha256-4jXd7uJEREPqrJvpt5aAf+3V+8+XViDb8zqmgq+qvU4=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -20,17 +20,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-comp";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-comp";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-axWy7F05WOt03WX4nYdObclFf3E12C4zxQ2eNLOjPp0=";
hash = "sha256-/q2SDp9Sa2MG4bMtryOizxnhPovrAgYb9GXQ35NRs6c=";
};
cargoHash = "sha256-J9/7DVMyx4SV/BKhg4l9B4haRdGfspmoZjr8LPTzmgo=";
cargoHash = "sha256-WTpJuj3Xz9hHLj+kuhys0Fr8FmosAuXpbtNSK3Y5twU=";
# Only default feature is systemd
buildNoDefaultFeatures = !useSystemd;

View File

@@ -16,21 +16,21 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-edit";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-edit";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-mZnL9W67hnHVS4wJBAprdPzU8VEq6mguzuhXjtPPIhc=";
hash = "sha256-7ZtTvufmJalW8+9gFhh69M0OrPV91skToqEzMfmeqI8=";
};
postPatch = ''
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
'';
cargoHash = "sha256-NERnN9TqqpzI9kD2ujfs11W0RnVxU+Ra6GjGk3FGO3A=";
cargoHash = "sha256-IfG1OdeSdJD45qx32Ux/Zp1MZNNpXnMamf2bUaZaqwA=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-files";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-files";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-AHb+DIoQ4LKE//QSFKxTbmmse1D9C6VYQ0vhiqnbFaY=";
hash = "sha256-QtCiyTkPPnN2fWTlX0y4Pxn43sn3djYN9IIv+O9ihKs=";
};
cargoHash = "sha256-wO4tci+Ocd9sIwp2lQN7RNKc+XeqvlSJGdViQ+lVt4Q=";
cargoHash = "sha256-cqDRvByVLR3pcoTvQUeEjtAx+E2NSJQoZRlp6jOkfoI=";
separateDebugInfo = true;
__structuredAttrs = true;
@@ -59,6 +59,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoBuildFlags="$defaultCargoBuildFlags --package cosmic-files"
runHook cargoBuildHook
cargoBuildFlags="$defaultCargoBuildFlags --package cosmic-files-thumbnailer"
runHook cargoBuildHook
cargoBuildFlags="$defaultCargoBuildFlags --package cosmic-files-applet"
runHook cargoBuildHook
@@ -73,6 +76,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoTestFlags="$defaultCargoTestFlags --package cosmic-files"
runHook cargoCheckHook
cargoTestFlags="$defaultCargoTestFlags --package cosmic-files-thumbnailer"
runHook cargoCheckHook
cargoTestFlags="$defaultCargoTestFlags --package cosmic-files-applet"
runHook cargoCheckHook

View File

@@ -24,14 +24,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-greeter";
version = "1.8.0";
version = "1.9.1";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-greeter";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-mC8m6hbQ6VgJoFl7VFRkbKl4zev8pffKHRtzvXtwoRo=";
hash = "sha256-XKktgBfv6oWOiEPUOkNDTEZruROxGZelDZiCwmP9DAc=";
};
postPatch = ''
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
substituteInPlace src/greeter.rs --replace-fail '/usr/bin/orca' '${lib.getExe orca}'
'';
cargoHash = "sha256-vHR9go8/iVUT7oBV8h+mmBvhi2oSKNBKtV0uoDOr6go=";
cargoHash = "sha256-/yIwqJXQD8mZwWwSI2gcYklnVjy/47Dl5O8mPEKPqTA=";
buildNoDefaultFeatures = true;

View File

@@ -9,7 +9,7 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-icons";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {

View File

@@ -16,7 +16,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-idle";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {

View File

@@ -14,14 +14,14 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-initial-setup";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-initial-setup";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-Qv95Q528TN/UafVS3C6yZqvbu/EDT+/Gj0Od50ZvIVs=";
hash = "sha256-S26e8QDwFySJEhjiMtiSN+WSVK6z/5AXk/QqBg4uUCY=";
};
postPatch = ''

View File

@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-launcher";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-launcher";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-qfBP5EzI7+oVYt5MdY+WypG5SvsFvk46F78q/cwIpWo=";
hash = "sha256-V9KsYD8rMrrCvlBMiqveirP7Sl/CggYvMM/sw5vLLsY=";
};
cargoHash = "sha256-NwIcWFnN6ulNq0RVMYLlYfHGbMTgd71mbqzAAP5ZCKc=";
cargoHash = "sha256-YNd1y4NdcksZvX8G4EgR5iQWJOww6WyiwtBYH3jW20M=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-monitor";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-monitor";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-nItwje+QZkR0L+wOsmOVPJwo4THwiRLLvIFvH6XP31o=";
hash = "sha256-pYBS7pe9si+KzgIHjheYdPQ4mrZM47XV0cD/WM34Xvc=";
};
cargoHash = "sha256-HHKIXKyS1zDkNGbsEWiKghPqIsPKRUJtjxKuNfI6mak=";
cargoHash = "sha256-oUNAhoJcT1Dlu89d9OgoeKdH6ykLtYFWWI4KbM0ThNY=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-notifications";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-notifications";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-HhhmsAngWseqXOPy5ra2BIakiBD9YskE2IsjqXaMVGs=";
hash = "sha256-8YlImiN8INfkVZDmRjGWsjQ94i0ORHyOW0pxPO0MPPY=";
};
cargoHash = "sha256-32AoA17CO4noUzKhx+KDBpy5fWG4lvSBMK5aVJW8K9o=";
cargoHash = "sha256-kj84JxsqTD0WnNkUqWJj4SXS8xtI1xNXmn2VcTe6Qs8=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-osd";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-osd";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-bb1NKMRl8gyQ8PRniS4eIrmjkZ2ayyMi2AkzejXV+3Y=";
hash = "sha256-kGYoPIE/owCdoT3uNpDA1w1D1zbRMGrxOS6Yp3BfXzo=";
};
cargoHash = "sha256-C0GR/VWWu2zOAvAokQnM+g+OJqQM2s2WUf2ffwfZieI=";
cargoHash = "sha256-YLrUev919xxG74F5Vk85XbJjAvb5IfsDjM6flr7HJwE=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -0,0 +1,77 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
libcosmicAppHook,
just,
udev,
nix-update-script,
nixosTests,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-osk";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-osk";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-9lLzO+s1o3Vj68cEnqE6wnke89ZDargZxlz7vY5VsBk=";
};
cargoHash = "sha256-r5XlNx1GIy4gEiHX9QVYLEufRnuwxe9X4OBbz3tinIo=";
separateDebugInfo = true;
__structuredAttrs = true;
nativeBuildInputs = [
just
libcosmicAppHook
];
buildInputs = [
udev
];
dontUseJustBuild = true;
dontUseJustCheck = true;
justFlags = [
"--set"
"prefix"
(placeholder "out")
"--set"
"cargo-target-dir"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}"
];
passthru = {
tests = {
inherit (nixosTests)
cosmic
cosmic-autologin
cosmic-noxwayland
cosmic-autologin-noxwayland
;
};
updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"epoch-(.*)"
];
};
};
meta = {
homepage = "https://github.com/pop-os/cosmic-osk";
description = "COSMIC On-Screen Keyboard";
mainProgram = "cosmic-osk";
license = lib.licenses.gpl3Only;
teams = [ lib.teams.cosmic ];
platforms = lib.platforms.linux;
};
})

View File

@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-panel";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-panel";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-Cl4F9vf39qLT/ZVCP9dUJ6YTQq47Wl8tbjbu1b+6tgY=";
hash = "sha256-nnWr7kLqJiaPIOI6OyH20KGbnOEpYhzjjdi03Z2oBCM=";
};
cargoHash = "sha256-XIthlStPM97vjhJTdofUOkOudH1id6W2U4YdOxEh/eo=";
cargoHash = "sha256-02BfZfASrQYn/nwmxS7CRS7ONie8b22F0V3XwFVyfKE=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -22,14 +22,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-player";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-player";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-6AbCB1d4g9iy77HRXxEs0KT/7Ry6/quJs3Qumw5jTKI=";
hash = "sha256-h5sfUOCboMWoHMFwACWGFtXqiIJA5a1LBDU4oAF57t0=";
};
cargoHash = "sha256-9ReitIbvr6D+BGLa1xumi67DPG3YlgdA4pZ/rfvn4Cc=";

View File

@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-randr";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {

View File

@@ -11,7 +11,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-screenshot";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {

View File

@@ -12,14 +12,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-session";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-session";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-sYrWH8Ve/KBoSd7uoCbctdF33rRdrUnTT5MABXhZZEs=";
hash = "sha256-Evl2GxjZZqGCNSfmbmC22+QNRBBl7in0sjmeAqC5cjg=";
};
postPatch = ''
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '/usr/bin/start-cosmic' "$out/bin/start-cosmic"
'';
cargoHash = "sha256-5dLG40X+yxJo566guyHqOCLNp+uNSE+HONS8GIDm58A=";
cargoHash = "sha256-IoSLvxpc/1X1a6cDl4ZpoUpxHM7bsH3v2BU6wiQROhM=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -19,14 +19,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-settings-daemon";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings-daemon";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-D7f5IERgNP9JrmAIiHp6jlBZUOt+n8FpEiGx1jqqwgs=";
hash = "sha256-0xacJ7NivwME4w079Tu+Jdm2CTmnSp0cPpviAVs4yQU=";
};
postPatch = ''
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3'
'';
cargoHash = "sha256-4rGgRc7EDdxGvFmAUY4kJ9aO/Pas9S2Q+b5ArZNydvs=";
cargoHash = "sha256-ba3JKWTC5f0DSIILayUFmQQfA3oHaq477AzL3qo3CDE=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -16,6 +16,8 @@
pulseaudio,
udev,
dav1d,
pciutils,
desktop-file-utils,
cosmic-randr,
xkeyboard_config,
nix-update-script,
@@ -28,17 +30,17 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-settings";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-53DJw3oSVGsgpy/BNnxOT60J7kRB0kp18qrjP2IR4gI=";
hash = "sha256-fL6/e8nwqk7zJeeFX8GtG1RE5VY03RbP9e3JBbXZBgc=";
};
cargoHash = "sha256-NT4y838qjvdOuFLqAk6I2c5cHbmhMs3JrGoIIhw4+FE=";
cargoHash = "sha256-zk0XFCDyzliMyG40EEvgcEg0Qxkisw0dCWzlR1Tjh7I=";
separateDebugInfo = true;
__structuredAttrs = true;
@@ -60,6 +62,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
pulseaudio
udev
dav1d
pciutils
desktop-file-utils
];
dontUseJustBuild = true;

View File

@@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cosmic-sound-theme";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "pop-os";

View File

@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-store";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-store";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-z2w+FYNGsvRzCRp5EQ1QwrITHso2HhCAVz19M50Tk48=";
hash = "sha256-HKRjcyNRVS0hmN7mtTDHioJxyqJAhsmz4vSqzn5Dsg8=";
};
cargoHash = "sha256-MxLb1ur7IwVAfAxViXXaFoVN35vhuIF1S1HRvg3wPo4=";
cargoHash = "sha256-UKuAMppeSoHr2sCAZTdtTrD/C0gu/RlIW5og5X78q6k=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-term";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-term";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-eXy7gSjcBu3kALJEbHp7BgKg9H7FIgrKfGWgiad7Z1M=";
hash = "sha256-QIwOEDiU6oJjQ+Vr8Atk5moBkTD/hUKWFxNCfym8d3k=";
};
cargoHash = "sha256-NN3kX0/ea7Q+QcWO8eAchsSaIVuudbf5dbCRiRZdnBg=";
cargoHash = "sha256-wJH0Ar4FHzAiUPRXIqOwdgv68NJwwUVhixTNtkwJad4=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-viewer";
version = "0-unstable-2026-07-27";
version = "1.9.0";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-viewer";
rev = "6c999eb5100353260d481077f1820ef95ee68ea7";
hash = "sha256-KUfWA6ZZMSnzagFJNlHJoWJTcMP2jTd0j7BYTYKfBF4=";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-+BpwyavhFTCSS2AC/vgfkx9FqNBaVjS3+fqE28auUIw=";
};
cargoHash = "sha256-Ws8ozNY3hwxdkb5g6RuSDyzt3IRk1svm3byXkIpknQE=";
cargoHash = "sha256-vPUhFkDFIEJ+uHmCcc54jQVzks3orQdu2JUPEfIimOw=";
separateDebugInfo = true;
__structuredAttrs = true;

View File

@@ -7,7 +7,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-wallpapers";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {

View File

@@ -14,14 +14,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-workspaces-epoch";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-workspaces-epoch";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-ntn1mW6YKpSXNZQbkZRFhUHbZur3JtJD9A/MzI+AUMQ=";
hash = "sha256-lQxOmO0QklJBripTOeYnUtGqDHrZLha4weSqqhVXLWo=";
};
cargoHash = "sha256-0ZvnMT7wkMyZ9zHOBGZNh+DmLaoATHvpSplSnVgC/j4=";

View File

@@ -7,13 +7,13 @@
}:
buildGoModule (finalAttrs: {
pname = "devbox";
version = "0.17.5";
version = "0.18.4";
src = fetchFromGitHub {
owner = "jetify-com";
repo = "devbox";
tag = finalAttrs.version;
hash = "sha256-m7FMUjKZZsmnjtnjPyyq0YUIjDQiyb5zBbpGiH4cdyw=";
hash = "sha256-4qW4jVBYap1WH3I77fDH8HI0yRJc1EVHzheqQQwClI4=";
};
ldflags = [
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
# integration tests want file system access
doCheck = false;
vendorHash = "sha256-zZUE0J6w1QbdMAKOt1xH3ql4G5FbaUgtD4Xpsw/tmIk=";
vendorHash = "sha256-pA1wSCNEeGPUIXfqvrMoPtIT7NsB08PUSD4L3zq3amw=";
nativeBuildInputs = [ installShellFiles ];

View File

@@ -8,17 +8,17 @@
}:
buildNpmPackage rec {
pname = "immich-public-proxy";
version = "3.3.1";
version = "3.4.0";
src = fetchFromGitHub {
owner = "alangrainger";
repo = "immich-public-proxy";
tag = "v${version}";
hash = "sha256-9pYRGdrqPJAKG4eNZmaMn8tsYt3axSqsh/dgqDy1faw=";
hash = "sha256-8L0HXz0W9vRNOb2HyOupEqBs6pjICFU5KfP4zUh1KdA=";
};
sourceRoot = "${src.name}/app";
npmDepsHash = "sha256-Eue6kDAmMxlrwxiuqhrS1z8Iq1bFheA4lXr9yWVHLKA=";
npmDepsHash = "sha256-ca6TSION7l++NWbUheXQM/5kgVU3xA/gu4ZmXZCW8WA=";
# patch in absolute nix store paths so the process doesn't need to cwd in $out
postPatch = ''

View File

@@ -7,15 +7,15 @@
buildGoModule (finalAttrs: {
pname = "istioctl";
version = "1.30.3";
version = "1.31.1";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = finalAttrs.version;
hash = "sha256-9HIDkNpLwwGN80NIweQ6DowKR0x26E0LkMuzl3qsGNs=";
hash = "sha256-CsfV6HLzAMn+Pn7rn/xIbgq5XA7n4aHlaBH/CrwjcY0=";
};
vendorHash = "sha256-19ziol7/8UOw78kW5epqzrR6GO0k+CwQGkq1l7XKMaw=";
vendorHash = "sha256-NvUMAH8wMs34/oZcrKduj0J/CYPObJML+fxbJI8MYt8=";
nativeBuildInputs = [ installShellFiles ];

View File

@@ -31,13 +31,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mapnik";
version = "4.3.0";
version = "4.3.2";
src = fetchFromGitHub {
owner = "mapnik";
repo = "mapnik";
tag = "v${finalAttrs.version}";
hash = "sha256-CrE/Td/JllzhcrRvNHunw0HaWAiKEAyQpAdHpVM7lPM=";
hash = "sha256-8Apuwb1H8YKy7ld6zESiu4eVTu0Wn/2pGRBgE8CUovk=";
fetchSubmodules = true;
};

View File

@@ -13,16 +13,16 @@
}:
buildNpmPackage (finalAttrs: {
pname = "pi-coding-agent";
version = "0.99.1";
version = "0.99.2";
src = fetchFromGitHub {
owner = "earendil-works";
repo = "pi";
tag = "v${finalAttrs.version}";
hash = "sha256-bLDEt1sKiS6ReQ6Uch0tOSLU8aykKl3UwN7WVkRE9Og=";
hash = "sha256-ukN//DNSnCr9gZHKSzexAGEZu95eMzTGJLjLc5B+Hwo=";
};
npmDepsHash = "sha256-eKtv1fN7X4ukuYbsj7hduGZ3W2FdmO/fAnoaWJp7MQQ=";
npmDepsHash = "sha256-eKghIpCAKawZm0Uf2iG6y1fz21Z5jNnMiAFJ5Quj3GI=";
# The provider model catalog (packages/ai/src/providers/data/) is generated by
# a network fetch (models.dev plus provider APIs) and is gitignored upstream,
@@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: {
# under dist/providers/data/. Bump this hash alongside version.
modelData = fetchurl {
url = "https://registry.npmjs.org/@earendil-works/pi-ai/-/pi-ai-${finalAttrs.version}.tgz";
hash = "sha256-+fRGkhV9C/VnnEoXMEoxACgjHX2q6q6jtzJS9LeiZNM=";
hash = "sha256-Cz34eRtIghbzCdkIeJKUp0S7Ybuq0SPZQJjlbflTjSU=";
};
preConfigure = ''

View File

@@ -18,17 +18,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "xdg-desktop-portal-cosmic";
version = "1.8.0";
version = "1.9.0";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "xdg-desktop-portal-cosmic";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-UbWQSdC1GhizgFn9KMxJDT8rV8IaZ4hwDA0hQ14qc7o=";
hash = "sha256-NBLbaFS+jUjjz8LSDGNksD0Z3WshXlzT3KDRp18g+D4=";
};
cargoHash = "sha256-cENH+9M4irNfsSioeP3yX38Ux1ESO0KXtaiiK3XuEtA=";
cargoHash = "sha256-PlVydQUtr4zv1S9Co/Xw9RK5uF4Fq4wbB4b55YEiO84=";
separateDebugInfo = true;

View File

@@ -19,6 +19,7 @@
n64recomp,
directx-shader-compiler,
forceX11 ? false,
fetchpatch,
}:
let
@@ -55,6 +56,17 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
patches = [
# Fix building with gcc16
(fetchpatch {
name = "rmlui-cstdint.patch";
url = "https://github.com/mikke89/RmlUi/commit/8c27b0a5cb601a3c57ecddc6ce8769ca93a97cb8.patch";
stripLen = 1;
extraPrefix = "lib/RmlUi/";
hash = "sha256-oIyPlnBsLcrGIbylT16i5SLttyXmzF5ZP1js/JDRG3o=";
})
];
nativeBuildInputs = [
cmake
copyDesktopItems

View File

@@ -12,14 +12,14 @@
buildPythonPackage (finalAttrs: {
pname = "lxmf";
version = "1.1.1";
version = "1.2.0";
pyproject = true;
__structuredAttrs = true;
src = fetchPypi {
inherit (finalAttrs) version;
pname = "lxmf";
hash = "sha256-8vfqF9eT/MMsq4JugejpgkQE0CXR/HGxQ74yQtReal4=";
hash = "sha256-8UJDKDuQrQY1YHHZA5Q1dkCSQgH5yZLc3+y8I2FPswk=";
};
build-system = [ setuptools ];

View File

@@ -18,7 +18,7 @@ in
buildLinux (
args
// rec {
version = "7.2.7";
version = "7.2.8";
pname = "linux-zen";
modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
isZen = true;
@@ -27,7 +27,7 @@ buildLinux (
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "1gh6ny9ncv4n9injfc30n11p3glv6v9y6jmkzb3bw0hklrf949pp";
sha256 = "0v4av56ybv7pv9dfwxn63xd3iiciqxx2h5x4vh88zcrqw3r095p6";
};
# This is based on the following source: