Merge staging-next-24.05 into staging-24.05

This commit is contained in:
github-actions[bot] 2024-06-03 00:15:37 +00:00 committed by GitHub
commit c9a5af47de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
32 changed files with 222 additions and 115 deletions

View File

@ -690,6 +690,7 @@ with lib.maintainers; {
dandellion
sumnerevans
nickcao
teutat3s
];
scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
shortName = "Matrix";

View File

@ -55,7 +55,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- Similarly, please use the `services.xserver.desktopManager.mate.extraCajaExtensions` option for installing Caja extensions.
- To use the Wayland session, enable `services.xserver.desktopManager.mate.enableWaylandSession`. This is opt-in for now as it is in early an stage and introduces a new set of Wayfire closures. Due to [known issues with LightDM](https://github.com/canonical/lightdm/issues/63), we suggest using SDDM as the display manager.
- Plasma 6 is now available and can be installed with `services.xserver.desktopManager.plasma6.enable = true;`. Plasma 5 will likely be deprecated in the next release (24.11). Note that Plasma 6 runs as Wayland by default, and the X11 session needs to be explicitly selected if necessary.
- Plasma 6 is now available and can be installed with `services.desktopManager.plasma6.enable = true;`. Plasma 5 will likely be deprecated in the next release (24.11). Note that Plasma 6 runs as Wayland by default, and the X11 session needs to be explicitly selected if necessary.
## New Services {#sec-release-24.05-new-services}

View File

@ -1,5 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i nu -p nushell common-updater-scripts
let latest_tag = list-git-tags --url=https://codeberg.org/ifreund/waylock | lines | sort --natural | str replace v '' | last
update-source-version waylock $latest_tag

View File

@ -181,7 +181,7 @@ stdenv.mkDerivation rec {
homepage = "https://signal.org/";
changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ eclairevoyant mic92 equirosa urandom bkchr ];
maintainers = with lib.maintainers; [ eclairevoyant mic92 equirosa urandom bkchr teutat3s ];
mainProgram = pname;
platforms = [ "x86_64-linux" "aarch64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

View File

@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop";
dir = "Signal";
version = "7.9.0";
version = "7.10.0";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-Iv2WG1kvB3tEiFu4Oy0po0KlpWCwfalDNOXstO/C+e0=";
hash = "sha256-CAofRnG9BWaNtP8zL5YfE9+ofc5+sgniTbPGsnEtlVY=";
}

View File

@ -84,7 +84,7 @@ let
changelog = "https://slack.com/release-notes";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ mmahut ];
maintainers = with maintainers; [ mmahut teutat3s ];
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ];
mainProgram = "slack";
};

View File

@ -272,7 +272,7 @@ rec {
To enable the docker daemon on NixOS, set the `virtualisation.docker.enable` option to `true`.
'';
license = licenses.asl20;
maintainers = with maintainers; [ offline vdemeester periklis ];
maintainers = with maintainers; [ offline vdemeester periklis teutat3s ];
mainProgram = "docker";
};
});

View File

@ -24,13 +24,13 @@ let
hy3 = { fetchFromGitHub, cmake, hyprland }:
mkHyprlandPlugin hyprland {
pluginName = "hy3";
version = "0.39.1";
version = "0.40.0";
src = fetchFromGitHub {
owner = "outfoxxed";
repo = "hy3";
rev = "hl0.39.1";
hash = "sha256-PqVld+oFziSt7VZTNBomPyboaMEAIkerPQFwNJL/Wjw=";
rev = "hl0.40.0";
hash = "sha256-Y9bIML3C5xyKKv+Yel4LUfSkScwGunOVZkg+Z1dPwHI=";
};
nativeBuildInputs = [ cmake ];

View File

@ -0,0 +1,56 @@
{
stdenvNoCC,
lib,
fetchFromGitHub,
unstableGitUpdater,
variant ? "macchiato",
}:
let
pname = "catppuccin-plymouth";
validVariants = [
"latte"
"frappe"
"macchiato"
"mocha"
];
in
lib.checkListOfEnum "${pname}: color variant" validVariants [ variant ]
stdenvNoCC.mkDerivation
(finalAttrs: {
inherit pname;
version = "0-unstable-2024-05-28";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "plymouth";
rev = "e13c348a0f47772303b2da1e9396027d8cda160d";
hash = "sha256-6DliqhRncvdPuKzL9LJec3PJWmK/jo9BrrML7g6YcH0=";
};
sourceRoot = "${finalAttrs.src.name}/themes/catppuccin-${variant}";
installPhase = ''
runHook preInstall
sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' catppuccin-${variant}.plymouth
mkdir -p $out/share/plymouth/themes/catppuccin-${variant}
cp * $out/share/plymouth/themes/catppuccin-${variant}
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
meta = {
description = "Soothing pastel theme for Plymouth";
homepage = "https://github.com/catppuccin/plymouth";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
johnrtitor
spectre256
];
};
})

View File

@ -64,11 +64,11 @@ let
in stdenv.mkDerivation (finalAttrs: {
pname = "google-chrome";
version = "125.0.6422.112";
version = "125.0.6422.141";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-Tx9SGob0b4mndk+zIhSL8MAuCUdwz2HrbnhfXYYfEUo=";
hash = "sha256-nIdzl3DkvGy9EsNS8nvPi8yK0gvx9mFaxYSxuYZZzxI=";
};
nativeBuildInputs = [ patchelf makeWrapper ];

View File

@ -1,6 +1,6 @@
import ./generic.nix {
hash = "sha256-BFB4bdfh3hI7D1m7a20ckPPyP9CYXW7mjqeTZ/21Gqs=";
version = "6.1.0";
vendorHash = "sha256-a8ZPhzs7sNIJLjQ9Y87Zf9SXAsmbdVn250Q0OQwy69A=";
hash = "sha256-33qUmET1BYAv6e8ZaFNSa7jrn8WGf3BqY8Nud/ZywSY=";
version = "6.2.0";
vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA=";
patches = [ ];
}

View File

@ -5,11 +5,11 @@
renode.overrideAttrs (finalAttrs: _: {
pname = "renode-unstable";
version = "1.15.0+20240515gita6b1d773d";
version = "1.15.0+20240517gitf683c4f59";
src = fetchurl {
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
hash = "sha256-N0pdjbEsXZiPh/xr76akmwSmkEt/fsBXZl4Cjncz3hU=";
hash = "sha256-fbGzh2vBKmtLbji8FunbNmbONZdFpJ/r6VUEO8odUec=";
};
passthru.updateScript =

View File

@ -0,0 +1,20 @@
# generated by zon2nix (https://github.com/nix-community/zon2nix)
{ linkFarm, fetchzip }:
linkFarm "zig-packages" [
{
name = "1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017";
path = fetchzip {
url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.1.0.tar.gz";
hash = "sha256-xilmsDGWlkfpTiGff+/nb76jx87ANdr4zqYy6rKOBMg=";
};
}
{
name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d";
path = fetchzip {
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz";
hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA=";
};
}
]

View File

@ -1,18 +1,20 @@
{ lib
, stdenv
, fetchFromGitea
, libxkbcommon
, pam
, pkg-config
, scdoc
, wayland
, wayland-protocols
, zig_0_11
{
lib,
stdenv,
callPackage,
fetchFromGitea,
libxkbcommon,
pam,
pkg-config,
scdoc,
wayland,
wayland-protocols,
zig_0_12,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "waylock";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitea {
domain = "codeberg.org";
@ -20,14 +22,16 @@ stdenv.mkDerivation (finalAttrs: {
repo = "waylock";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-Z5YNaR+jocJ4hS7NT8oAlrMnqNfD8KRzOyyqdVGDSl0=";
hash = "sha256-U8xJucLpmeLdmSUc+AVSH/mlv6UOXsxotJPTMK7lnkA=";
};
deps = callPackage ./build.zig.zon.nix { };
nativeBuildInputs = [
pkg-config
scdoc
wayland
zig_0_11.hook
zig_0_12.hook
];
buildInputs = [
@ -36,7 +40,11 @@ stdenv.mkDerivation (finalAttrs: {
pam
];
zigBuildFlags = [ "-Dman-pages" ];
zigBuildFlags = [
"-Dman-pages"
"--system"
"${finalAttrs.deps}"
];
passthru.updateScript = ./update.nu;
@ -45,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://codeberg.org/ifreund/waylock/releases/tag/v${finalAttrs.version}";
description = "A small screenlocker for Wayland compositors";
license = lib.licenses.isc;
maintainers = with lib.maintainers; [ adamcstephens jordanisaacs ];
maintainers = with lib.maintainers; [
adamcstephens
jordanisaacs
];
mainProgram = "waylock";
platforms = lib.platforms.linux;
};

View File

@ -0,0 +1,8 @@
#!/usr/bin/env nix-shell
#!nix-shell -i nu -p nushell common-updater-scripts zon2nix
let latest_tag = list-git-tags --url=https://codeberg.org/ifreund/waylock | lines | sort --natural | str replace v '' | last
update-source-version waylock $latest_tag
http get $"https://codeberg.org/ifreund/waylock/raw/tag/v($latest_tag)/build.zig.zon" | save build.zig.zon
zon2nix > pkgs/by-name/wa/waylock/build.zig.zon.nix

View File

@ -0,0 +1,36 @@
{
lib,
stdenvNoCC,
fetchzip,
nix-update-script,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "win-disk-writer";
version = "1.3";
src = fetchzip {
url = "https://github.com/TechUnRestricted/WinDiskWriter/releases/download/v${finalAttrs.version}/WinDiskWriter.${finalAttrs.version}.zip";
hash = "sha256-3+Pjp1T0u6G64W8dm4pWRiznDWNW4cMxTkoAIQgvtQY=";
};
installPhase = ''
runHook preInstall
mkdir -p "$out/Applications/WinDiskWriter.app"
cp -R . "$out/Applications/WinDiskWriter.app/"
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Windows Bootable USB creator for macOS";
homepage = "https://github.com/TechUnRestricted/WinDiskWriter";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ donteatoreo ];
platforms = lib.platforms.darwin;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
})

View File

@ -1,43 +0,0 @@
{ stdenvNoCC
, lib
, fetchFromGitHub
, variant ? "macchiato"
}:
let
pname = "catppuccin-plymouth";
validVariants = [ "latte" "frappe" "macchiato" "mocha" ];
in
lib.checkListOfEnum "${pname}: color variant" validVariants [ variant ]
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "unstable-2022-12-10";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "plymouth";
rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c";
hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE=";
};
sourceRoot = "${src.name}/themes/catppuccin-${variant}";
installPhase = ''
runHook preInstall
sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' catppuccin-${variant}.plymouth
mkdir -p $out/share/plymouth/themes/catppuccin-${variant}
cp * $out/share/plymouth/themes/catppuccin-${variant}
runHook postInstall
'';
meta = with lib; {
description = "Soothing pastel theme for Plymouth";
homepage = "https://github.com/catppuccin/plymouth";
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.spectre256 ];
};
}

View File

@ -6,6 +6,7 @@
, qtbase
, qtermwidget
, qttools
, qtwayland
, wrapQtAppsHook
, gitUpdater
, nixosTests
@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
buildInputs = [
qtbase
qtermwidget
qtwayland
];
passthru.updateScript = gitUpdater { };

View File

@ -1,15 +1,14 @@
{ lib, fetchurl, buildDunePackage, cppo, seq }:
{ lib, fetchurl, buildDunePackage, seq }:
buildDunePackage rec {
pname = "yojson";
version = "2.1.2";
version = "2.2.0";
src = fetchurl {
url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
hash = "sha256-WfLxq7/Ip8y9v2CIlOXHXop2AG40iZJURG+D4gDftPk=";
hash = "sha256-v9wzvvMUG7qaj6ZqiFtUsp9r+rRQBAiE3Yz3zex4RRk=";
};
nativeBuildInputs = [ cppo ];
propagatedBuildInputs = [ seq ];
meta = with lib; {

View File

@ -236,7 +236,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
homepage = "https://github.com/electron/electron";
platforms = lib.platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ yayayayaka ];
maintainers = with maintainers; [ yayayayaka teutat3s ];
mainProgram = "electron";
hydraPlatforms = lib.optionals (!(hasInfix "alpha" info.version) && !(hasInfix "beta" info.version)) ["aarch64-linux" "x86_64-linux"];
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)

View File

@ -47,7 +47,7 @@ buildGoModule rec {
homepage = "https://github.com/equinix/metal-cli/";
changelog = "https://github.com/equinix/metal-cli/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne nshalman ];
maintainers = with maintainers; [ Br1ght0ne nshalman teutat3s ];
mainProgram = "metal";
};
}

View File

@ -77,7 +77,7 @@ buildGoModule rec {
downloadPage = "https://github.com/superfly/flyctl";
homepage = "https://fly.io/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ adtya jsierles techknowlogick RaghavSood ];
maintainers = with lib.maintainers; [ adtya jsierles techknowlogick RaghavSood teutat3s ];
mainProgram = "flyctl";
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "microcode-intel";
version = "20240514";
version = "20240531";
src = fetchFromGitHub {
owner = "intel";
repo = "Intel-Linux-Processor-Microcode-Data-Files";
rev = "microcode-${version}";
hash = "sha256-6XHlAtQzHtlRs3Zy4+CC/XGJS/PkDPtTg/Y2bX7PJek=";
hash = "sha256-64vcEc3UiiV5Rg4Eh3Wsi/WSCj5DbjvZBzKLr7EgNOU=";
};
nativeBuildInputs = [ iucode-tool libarchive ];

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rdma-core";
version = "51.0";
version = "52.0";
src = fetchFromGitHub {
owner = "linux-rdma";
repo = "rdma-core";
rev = "v${finalAttrs.version}";
hash = "sha256-G5Z2BbmF5fzOg/32BBgGpC6yroDFOnZWtA/+5QatQ1M=";
hash = "sha256-M4nmnfeEIxsaFO1DJV9jKD/NnkaLHVNXtfTPf2pTDs4=";
};
strictDeps = true;

View File

@ -1,19 +1,37 @@
{ lib, stdenv, nixosTests, fetchFromGitHub, rustPlatform, libiconv, Security }:
{
lib,
stdenv,
nixosTests,
fetchFromGitHub,
rustPlatform,
libiconv,
Security,
openssl,
pkg-config,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "agate";
version = "3.3.4";
version = "3.3.7";
src = fetchFromGitHub {
owner = "mbrubeck";
repo = "agate";
rev = "v${version}";
hash = "sha256-7z3iAA+Q3k5jEO9ZhA06h7/17gE0FWPqDOGK/XENRWg=";
hash = "sha256-pNfTgkl59NTRDH+w23P49MUWzIXh5ElnJitMEYfsBnc=";
};
cargoHash = "sha256-iTopJnuH2extGnaJXL+RPUwcvj2e+k5A4BT33v+sFiA=";
cargoHash = "sha256-RuSvweZhPWS2C2lwncxWAW2XLQN6+bAslv3p4IwQ2BA=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
nativeBuildInputs = [ pkg-config ];
buildInputs =
[ openssl ]
++ lib.optionals stdenv.isDarwin [
libiconv
Security
];
doInstallCheck = true;
installCheckPhase = ''
@ -25,11 +43,16 @@ rustPlatform.buildRustPackage rec {
__darwinAllowLocalNetworking = true;
passthru.tests = { inherit (nixosTests) agate; };
passthru = {
tests = {
inherit (nixosTests) agate;
};
updateScript = nix-update-script { };
};
meta = with lib; {
meta = {
homepage = "https://github.com/mbrubeck/agate";
changelog = "https://github.com/mbrubeck/agate/blob/master/CHANGELOG.md";
changelog = "https://github.com/mbrubeck/agate/releases/tag/v${version}";
description = "Very simple server for the Gemini hypertext protocol";
mainProgram = "agate";
longDescription = ''
@ -38,7 +61,10 @@ rustPlatform.buildRustPackage rec {
static files. It uses async I/O, and should be quite efficient even when
running on low-end hardware and serving many concurrent requests.
'';
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ jk ];
license = with lib.licenses; [
asl20
mit
];
maintainers = with lib.maintainers; [ jk ];
};
}

View File

@ -1,4 +1,4 @@
import ./common.nix {
version = "12.0.8";
hash = "sha256-lmlt2bjomXl7UWu3FDUBSLGv0oyXV/8kPhRCtfSUW7w=";
version = "12.0.9";
hash = "sha256-+/pn6Q24QDTaK+Slr+B17fshEXXh6sO1DWRuFGfi2h0=";
}

View File

@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
version = "1.25.4";
hash = "sha256-dgcpkBrLqlF5luaB7m6iWQMpheN8J2i+74DfOod97tk=";
version = "1.27.0";
hash = "sha256-tyMOPPh+qi1LC8VqrckgqWDHhzuZkaG2b/zAj8ZQEpw=";
}

View File

@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix args {
version = "1.26.0";
hash = "sha256-0ubIQ51sbbUBXY6qskcKtSrvhae/NjGCh5l34IQ3BJc=";
version = "1.26.1";
hash = "sha256-+Rh0aP8usVkmC/1Thnwl/44zRyYjes8ie56HDlPT42s=";
}

View File

@ -39,7 +39,7 @@ let
homepage = "https://sensu.io";
description = "Open source monitoring tool for ephemeral infrastructure & distributed applications";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ thefloweringash ];
maintainers = with lib.maintainers; [ thefloweringash teutat3s ];
};
};
in

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "goaccess";
version = "1.9.2";
version = "1.9.3";
src = fetchFromGitHub {
owner = "allinurl";
repo = "goaccess";
rev = "refs/tags/v${version}";
hash = "sha256-FAooBAP2RbqAp7NTJNBdbRVldGCbx3SvOoTaiQ9Fl/I=";
hash = "sha256-ZOngDAHA88YQvkx2pk5ZSpBzxqelvCIR4z5hiFmfGyc=";
};
nativeBuildInputs = [ autoreconfHook ];

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "panoply";
version = "5.4.0";
version = "5.4.1";
src = fetchurl {
url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
sha256 = "sha256-mWk0wuTxkITVU3SwWYPHrX8Y9NceXeRMwyvpwEDWIiA=";
sha256 = "sha256-C/9kFWDpv4bzqpsUcGpZn7P+fqU6teU39HibYhhva3o=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -429,8 +429,6 @@ with pkgs;
catppuccin-papirus-folders = callPackage ../data/icons/catppuccin-papirus-folders { };
catppuccin-plymouth = callPackage ../data/themes/catppuccin-plymouth { };
btdu = callPackage ../tools/misc/btdu { };
ccal = callPackage ../tools/misc/ccal { };
@ -31765,8 +31763,6 @@ with pkgs;
waycorner = callPackage ../applications/misc/waycorner { };
waylock = callPackage ../applications/misc/waylock { };
wayshot = callPackage ../tools/misc/wayshot { };
waylevel = callPackage ../tools/misc/waylevel { };