Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-03-18 00:03:01 +00:00 committed by GitHub
commit d681bc8661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
58 changed files with 942 additions and 229 deletions

View File

@ -16720,6 +16720,12 @@
githubId = 908716;
name = "Zach Coyle";
};
Zaechus = {
email = "zaechus@proton.me";
github = "Zaechus";
githubId = 19353212;
name = "Maxwell Anderson";
};
zagy = {
email = "cz@flyingcircus.io";
github = "zagy";

View File

@ -95,18 +95,6 @@ in
description = lib.mdDoc "Phonon audio backend to install.";
};
supportDDC = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Support setting monitor brightness via DDC.
This is not needed for controlling brightness of the internal monitor
of a laptop and as it is considered experimental by upstream, it is
disabled by default.
'';
};
useQtScaling = mkOption {
type = types.bool;
default = false;
@ -173,6 +161,7 @@ in
imports = [
(mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "enableQt4Support" ] "Phonon no longer supports Qt 4.")
(mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "supportDDC" ] "DDC/CI is no longer supported upstream.")
(mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
];
@ -201,12 +190,6 @@ in
};
};
# DDC support
boot.kernelModules = lib.optional cfg.supportDDC "i2c_dev";
services.udev.extraRules = lib.optionalString cfg.supportDDC ''
KERNEL=="i2c-[0-9]*", TAG+="uaccess"
'';
environment.systemPackages =
with libsForQt5;
with plasma5; with kdeGear; with kdeFrameworks;

View File

@ -29,13 +29,13 @@
buildDotnetModule rec {
pname = "ryujinx";
version = "1.1.651"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
version = "1.1.665"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "f0562b9c75308c8cfcaa2458dfd37ac42751a374";
sha256 = "1bkfncms8lagxhpnafyahrghzvpklsgxddqq7w1wzjzyxp6pxc51";
rev = "da073fce6127243fcd93b736cde951c4e835e508";
sha256 = "0zbww3mhmmakfaqh8q1bzn7liz4i85kmkz967jqbnlq90w0a7i3f";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;

View File

@ -18,7 +18,6 @@
(fetchNuGet { pname = "Avalonia.X11"; version = "0.10.18"; sha256 = "0bzhbnz0dimxbpjxcrphnjn8nk37hqw0b83s2nsha4gzqvpc75b2"; })
(fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
(fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
(fetchNuGet { pname = "Crc32.NET"; version = "1.2.0"; sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; })
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; })
(fetchNuGet { pname = "DynamicData"; version = "7.12.11"; sha256 = "159037gd4rn8z5wdkbnb296rw5csay8rjigi1h4n35mjfg4nhm8f"; })
(fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; })
@ -64,7 +63,6 @@
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; })
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; })
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; })
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; })
(fetchNuGet { pname = "MsgPack.Cli"; version = "1.0.1"; sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; })
@ -171,7 +169,6 @@
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; })
(fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; })
(fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
(fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; })
(fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; })
(fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; })
@ -185,7 +182,7 @@
(fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; })
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
(fetchNuGet { pname = "System.IO.Hashing"; version = "7.0.0"; sha256 = "0vilmb817wnw8w13kkps831p05zzc41dldigpbr3wqi0hsrf8ad9"; })
(fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; })
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
@ -197,7 +194,6 @@
(fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; })
(fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; })
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
(fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.3.0"; sha256 = "05kji1mv4sl75iwmc613p873145nynm02xiajx8pn0h2kx53d23s"; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; })

View File

@ -0,0 +1,94 @@
{ lib
, fetchFromGitLab
, desktop-file-utils
, gettext
, glib
, gobject-introspection
, gtk4
, libadwaita
, libnotify
, webkitgtk_5_0
, meson
, ninja
, pkg-config
, python3
, wrapGAppsHook4
, nix-update-script
}:
python3.pkgs.buildPythonApplication rec {
pname = "komikku";
version = "1.15.0";
format = "other";
src = fetchFromGitLab {
owner = "valos";
repo = "Komikku";
rev = "v${version}";
hash = "sha256-dmi8a9Gf4ixq5oW6ewDGZYRmxY2qmUrD42DfjskRpHk=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
wrapGAppsHook4
gettext
glib # for glib-compile-resources
desktop-file-utils
gobject-introspection
];
buildInputs = [
glib
gtk4
libadwaita
libnotify
webkitgtk_5_0
gobject-introspection
];
propagatedBuildInputs = with python3.pkgs; [
pygobject3
beautifulsoup4
brotli
cloudscraper
dateparser
emoji
keyring
lxml
python-magic
natsort
piexif
pillow
pure-protobuf
rarfile
unidecode
];
# Tests require network
doCheck = false;
# Prevent double wrapping.
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}"
)
'';
passthru = {
updateScript = nix-update-script {
attrPath = "komikku";
};
};
meta = with lib; {
description = "Manga reader for GNOME";
homepage = "https://valos.gitlab.io/Komikku/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ chuangzhu ];
};
}

View File

@ -15,8 +15,10 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw=";
};
# Disable version check
postPatch = ''
# Drop broken version specifier
sed -i '/python_requires/d' setup.py
# Disable version check
substituteInPlace raphodo/constants.py \
--replace "disable_version_check = False" "disable_version_check = True"
'';

View File

@ -8,13 +8,13 @@
mkDerivation rec {
pname = "heimer";
version = "3.7.0";
version = "4.0.0";
src = fetchFromGitHub {
owner = "juzzlin";
repo = pname;
rev = version;
hash = "sha256-tcA7+3gp/CFpapCL4yt3xG12sm+LcnRIoB/caJlKF8A=";
hash = "sha256-sp3iy28Bc+gOvivHA8OPG8vf7otjeaPk6Iy4BhT/SaU=";
};
nativeBuildInputs = [

View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "otpclient";
version = "3.1.4";
version = "3.1.5";
src = fetchFromGitHub {
owner = "paolostivanin";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Cz3fxmtpSe7GMGmmSLDG9kDifmIMgCBlBRjX/qardXA=";
sha256 = "sha256-/1nycFh/slcfztfaZA6p9rZTWS4/vkb/Sovc94zlfCI=";
};
buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar protobuf protobufc libsecret qrencode libuuid ];
@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/paolostivanin/OTPClient";
license = licenses.gpl3Only;
maintainers = with maintainers; [ alexbakker ];
platforms = platforms.linux;
};
}

View File

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lagrange";
version = "1.15.4";
version = "1.15.5";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${finalAttrs.version}";
hash = "sha256-l69h0+yMX4vzQ1GYB1AqhZc1ztMKF/7PthxEDarizek=";
hash = "sha256-TP9Q80QKSkpOOQ7mllnaE1dOnNPU7k3Ij6M3+n8Jv2E=";
};
nativeBuildInputs = [ cmake pkg-config zip ];

View File

@ -3,10 +3,10 @@
mkFranzDerivation rec {
pname = "ferdium";
name = "Ferdium";
version = "6.2.0";
version = "6.2.4";
src = fetchurl {
url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb";
sha256 = "sha256-lb3dvEaKgOnT5+YAJcYmro71soqkT/jpTjE0YMVMRUA=";
sha256 = "sha256-iat0d06IhupMVYfK8Ot14gBY+5rHO4e/lVYqbX9ucIo=";
};
extraBuildInputs = [ xorg.libxshmfence ];

View File

@ -4,29 +4,30 @@
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, fixup_yarn_lock
, yarn
, nodejs
, fetchYarnDeps
, fixup_yarn_lock
, electron
, libpulseaudio
, pipewire
, alsa-utils
}:
stdenv.mkDerivation rec {
pname = "teams-for-linux";
version = "1.0.45";
version = "1.0.53";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Q6DFegFrLUW/YiRyYJI4ITVVyMC5IkazlzhdR8203cY=";
sha256 = "sha256-zigcOshtRQuQxJBXPWVmTjj5+4AorR5WW8lHVInUKFg=";
};
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
sha256 = "sha256-jaAieO5q+tNfWN7Rp6ueasl45cfp9W1QxPdqIeCnVkE=";
yarnLock = "${src}/yarn.lock";
sha256 = "sha256-3zjmVIPQ+F2jPQ2xkAv5hQUjr8k5jIHTsa73J+IMayw=";
};
nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ];
@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
runHook preBuild
yarn --offline electron-builder \
--dir --linux ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \
--dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \
-c.electronDist=${electron}/lib/electron \
-c.electronVersion=${electron.version}
@ -58,7 +59,7 @@ stdenv.mkDerivation rec {
runHook preInstall
mkdir -p $out/share/{applications,teams-for-linux}
cp dist/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/
cp dist/${if stdenv.isDarwin then "darwin-" else "linux-"}${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/
pushd build/icons
for image in *png; do
@ -67,8 +68,12 @@ stdenv.mkDerivation rec {
done
popd
# Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing
makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \
${lib.optionalString stdenv.isLinux ''
--prefix PATH : ${lib.makeBinPath [ alsa-utils ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \
''} \
--add-flags "$out/share/teams-for-linux/app.asar" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
@ -88,7 +93,8 @@ stdenv.mkDerivation rec {
description = "Unofficial Microsoft Teams client for Linux";
homepage = "https://github.com/IsmaelMartinez/teams-for-linux";
license = licenses.gpl3Only;
maintainers = with maintainers; [ muscaln ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ muscaln lilyinstarlight ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}

View File

@ -2,7 +2,7 @@
, python3, pipewire, libpulseaudio, xdg-utils, electron_22, makeDesktopItem }:
buildNpmPackage rec {
name = "webcord";
pname = "webcord";
version = "4.1.1";
src = fetchFromGitHub {
@ -24,10 +24,6 @@ buildNpmPackage rec {
libpulseaudio
];
binPath = lib.makeBinPath [
xdg-utils
];
# npm install will error when electron tries to download its binary
# we don't need it anyways since we wrap the program with our nixpkgs electron
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@ -49,9 +45,10 @@ buildNpmPackage rec {
install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
# Add xdg-utils to path via suffix, per PR #181171
makeWrapper '${electron_22}/bin/electron' $out/bin/webcord \
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
--prefix PATH : "${binPath}" \
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
--add-flags $out/lib/node_modules/webcord/

View File

@ -2,12 +2,12 @@
let
pname = "electron-mail";
version = "5.1.2";
version = "5.1.6";
name = "ElectronMail-${version}";
src = fetchurl {
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
sha256 = "sha256-PLDzAtH7T7QMrLavvcF3zOVTayCqEA1IghIUAAxkbEE=";
sha256 = "sha256-lsXVsx7U43czWFWxAgwTUYTnUXSL4KPFnXLzUklieAo=";
};
appimageContents = appimageTools.extract { inherit name src; };

View File

@ -27,11 +27,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
version = "0.61.3";
version = "0.61.4";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
hash = "sha256-OtFHTZQ+K3CQPEcuirvp8MmW9IC5lEpg42A6FSZVTTA=";
hash = "sha256-VXna2ofhh8Hcyfp9+ekXHs68xcXF7HdcJNagJlzPV6c=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,30 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
}:
stdenv.mkDerivation rec {
pname = "hyprland-protocols";
version = "unstable-2023-01-13";
src = fetchFromGitHub {
owner = "hyprwm";
repo = pname;
rev = "eb7dcc0132ad25addc3e8d434c4bfae6bd3a8c90";
hash = "sha256-gkLgUg9/fP04bKCJMj/rN0r6PV/cbLShDvKQyFvVap0=";
};
nativeBuildInputs = [
meson
ninja
];
meta = {
homepage = "https://github.com/hyprwm/hyprland-protocols";
description = "Wayland protocol extensions for Hyprland";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fufexan ];
platforms = lib.platforms.linux;
};
}

View File

@ -1,94 +1,115 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchFromGitLab
, cmake
, pkg-config
, meson
, ninja
, cairo
, git
, hyprland-protocols
, jq
, libdrm
, libinput
, libxcb
, libxkbcommon
, mesa
, pango
, pkg-config
, pciutils
, systemd
, udis86
, wayland
, wayland-protocols
, wayland-scanner
, wlroots
, xcbutilwm
, xwayland
, debug ? false
, enableXWayland ? true
, hidpiXWayland ? false
, legacyRenderer ? false
, nvidiaPatches ? false
, withSystemd ? true
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hyprland";
version = "0.6.1beta";
let
assertXWayland = lib.assertMsg (hidpiXWayland -> enableXWayland) ''
Hyprland: cannot have hidpiXWayland when enableXWayland is false.
'';
in
assert assertXWayland;
stdenv.mkDerivation rec {
pname = "hyprland" + lib.optionalString debug "-debug";
version = "0.23.0beta";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "Hyprland";
rev = "v${finalAttrs.version}";
hash = "sha256-0Msqe2ErAJvnO1zHoB2k6TkDhTYnHRGkvJrfSG12dTU=";
repo = "hyprland";
rev = "v${version}";
hash = "sha256-aPSmhgof4nIJquHmtxxirIMVv439wTYYCwf1ekS96gA=";
};
patches = [
# make meson use the provided dependencies instead of the git submodules
"${src}/nix/meson-build.patch"
];
postPatch = ''
# Fix hardcoded paths to /usr installation
sed -i "s#/usr#$out#" src/render/OpenGL.cpp
substituteInPlace meson.build \
--replace "@GIT_COMMIT_HASH@" '${version}' \
--replace "@GIT_DIRTY@" ""
'';
nativeBuildInputs = [
cmake
jq
meson
ninja
pkg-config
wayland-scanner
];
buildInputs = [
libdrm
libinput
libxcb
libxkbcommon
mesa
pango
wayland
wayland-protocols
xcbutilwm
]
++ [
# INFO: When updating src, remember to synchronize this wlroots with the
# exact commit used by upstream
(wlroots.overrideAttrs (_: {
version = "unstable-2022-06-07";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = "b89ed9015c3fbe8d339e9d65cf70fdca6e5645bc";
hash = "sha256-8y3u8CoigjoZOVbA2wCWBHlDNEakv0AVxU46/cOC00s=";
};
}))
outputs = [
"out"
"man"
];
# build with system wlroots
postPatch = ''
sed -Ei 's|"\.\./wlroots/include/([a-zA-Z0-9./_-]+)"|<\1>|g' src/includes.hpp
'';
buildInputs =
[
cairo
git
hyprland-protocols
libdrm
libinput
libxkbcommon
mesa
udis86
wayland
wayland-protocols
wayland-scanner
pciutils
(wlroots.override { inherit enableXWayland hidpiXWayland nvidiaPatches; })
]
++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ]
++ lib.optionals withSystemd [ systemd ];
preConfigure = ''
make protocols
'';
mesonBuildType =
if debug
then "debug"
else "release";
postBuild = ''
pushd ../hyprctl
${stdenv.cc.targetPrefix}c++ -std=c++20 -w ./main.cpp -o ./hyprctl
popd
'';
mesonFlags = builtins.concatLists [
(lib.optional (!enableXWayland) "-Dxwayland=disabled")
(lib.optional legacyRenderer "-DLEGACY_RENDERER:STRING=true")
(lib.optional withSystemd "-Dsystemd=enabled")
];
installPhase = ''
runHook preInstall
install -Dm755 ../hyprctl/hyprctl ./Hyprland -t $out/bin
runHook postInstall
'';
passthru.providedSessions = [ "hyprland" ];
meta = with lib; {
inherit (finalAttrs.src.meta) homepage;
homepage = "https://github.com/vaxerski/Hyprland";
description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
license = licenses.bsd3;
maintainers = with maintainers; [ wozeparrot ];
inherit (wayland.meta) platforms;
maintainers = with maintainers; [ wozeparrot fufexan ];
mainProgram = "Hyprland";
platforms = wlroots.meta.platforms;
};
})
}

View File

@ -0,0 +1,15 @@
{ udis86
, fetchFromGitHub
}:
udis86.overrideAttrs (old: {
version = "unstable-2022-10-13";
src = fetchFromGitHub {
owner = "canihavesomecoffee";
repo = "udis86";
rev = "5336633af70f3917760a6d441ff02d93477b0c86";
hash = "sha256-HifdUQPGsKQKQprByeIznvRLONdOXeolOsU5nkwIv3g=";
};
patches = [ ];
})

View File

@ -0,0 +1,113 @@
{ fetchFromGitLab
, hyprland
, wlroots
, xwayland
, fetchpatch
, lib
, libdisplay-info
, libliftoff
, hwdata
, hidpiXWayland ? true
, enableXWayland ? true
, nvidiaPatches ? false
}:
let
libdisplay-info-new = libdisplay-info.overrideAttrs (old: {
version = "0.1.1+date=2023-03-02";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "emersion";
repo = old.pname;
rev = "147d6611a64a6ab04611b923e30efacaca6fc678";
sha256 = "sha256-/q79o13Zvu7x02SBGu0W5yQznQ+p7ltZ9L6cMW5t/o4=";
};
});
libliftoff-new = libliftoff.overrideAttrs (old: {
version = "0.5.0-dev";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "emersion";
repo = old.pname;
rev = "d98ae243280074b0ba44bff92215ae8d785658c0";
sha256 = "sha256-DjwlS8rXE7srs7A8+tHqXyUsFGtucYSeq6X0T/pVOc8=";
};
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=sign-conversion"
];
});
in
assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
wlroots-hyprland: cannot have hidpiXWayland when enableXWayland is false.
'');
(wlroots.overrideAttrs
(old: {
version = "0.17.0-dev";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = "5ae17de23f5fd9bb252a698f3771c840280e2c05";
hash = "sha256-dWrk+Q3bLdtFe5rkyaAKWCQJCeE/KFNllcu1DvBC38c=";
};
pname =
old.pname
+ "-hyprland"
+ (
if hidpiXWayland
then "-hidpi"
else ""
)
+ (
if nvidiaPatches
then "-nvidia"
else ""
);
patches =
(old.patches or [ ])
++ (lib.optionals (enableXWayland && hidpiXWayland) [
"${hyprland.src}/nix/wlroots-hidpi.patch"
(fetchpatch {
url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/18595000f3a21502fd60bf213122859cc348f9af.diff";
sha256 = "sha256-jvfkAMh3gzkfuoRhB4E9T5X1Hu62wgUjj4tZkJm0mrI=";
revert = true;
})
])
++ (lib.optionals nvidiaPatches [
(fetchpatch {
url = "https://aur.archlinux.org/cgit/aur.git/plain/nvidia.patch?h=hyprland-nvidia-git&id=757614af7729352fda534abe9eb1a88fe77dfe04";
sha256 = "A9f1p5EW++mGCaNq8w7ZJfeWmvTfUm4iO+1KDcnqYX8=";
})
]);
postPatch =
(old.postPatch or "")
+ (
if nvidiaPatches
then ''
substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"
''
else ""
);
buildInputs =
old.buildInputs
++ [
hwdata
libdisplay-info-new
libliftoff-new
];
})).override {
xwayland = xwayland.overrideAttrs (old: {
patches =
(old.patches or [ ])
++ (lib.optionals hidpiXWayland [
"${hyprland.src}/nix/xwayland-vsync.patch"
"${hyprland.src}/nix/xwayland-hidpi.patch"
]);
});
}

View File

@ -0,0 +1,95 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, cmake
, ninja
, cairo
, fribidi
, libdatrie
, libjpeg
, libselinux
, libsepol
, libthai
, pango
, pcre
, utillinux
, wayland
, wayland-protocols
, wayland-scanner
, wlroots
, libXdmcp
, debug ? false
}:
stdenv.mkDerivation {
pname = "hyprpicker" + lib.optionalString debug "-debug";
version = "unstable-2023-03-09";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprpicker";
rev = "234c2da51a71941c0cd2ee380f42de365f90dd6f";
hash = "sha256-wb1oXsaM0AkThPJGjn0Ytxt8vbBQG+mg2AGY0uxhUJ0=";
};
cmakeFlags = lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
nativeBuildInputs = [
cmake
ninja
pkg-config
];
buildInputs = [
cairo
fribidi
libdatrie
libjpeg
libselinux
libsepol
libthai
pango
pcre
wayland
wayland-protocols
wayland-scanner
wlroots
libXdmcp
utillinux
];
configurePhase = ''
runHook preConfigure
make protocols
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
make release
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share/licenses}
install -Dm755 build/hyprpicker -t $out/bin
install -Dm644 LICENSE -t $out/share/licenses/hyprpicker
runHook postInstall
'';
meta = with lib; {
description = "A wlroots-compatible Wayland color picker that does not suck";
homepage = "https://github.com/hyprwm/hyprpicker";
license = licenses.bsd3;
maintainers = with maintainers; [ fufexan ];
platforms = wayland.meta.platforms;
};
}

View File

@ -0,0 +1,53 @@
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, meson
, ninja
, pkg-config
, hyprland-protocols
, hyprland-share-picker
, inih
, libdrm
, mesa
, pipewire
, systemd
, wayland
, wayland-protocols
, wayland-scanner
}:
let
source = import ./source.nix { inherit lib fetchFromGitHub wayland; };
in
stdenv.mkDerivation {
pname = "xdg-desktop-portal-hyprland";
inherit (source) src version meta;
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
makeWrapper
meson
ninja
pkg-config
wayland-scanner
];
buildInputs = [
hyprland-protocols
inih
libdrm
mesa
pipewire
systemd
wayland
wayland-protocols
];
mesonFlags = [
"-Dsd-bus-provider=libsystemd"
];
postInstall = ''
wrapProgram $out/libexec/xdg-desktop-portal-hyprland --prefix PATH ":" ${lib.makeBinPath [hyprland-share-picker]}
'';
}

View File

@ -0,0 +1,36 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, qtbase
, makeShellWrapper
, wrapQtAppsHook
, hyprland
, grim
, slurp
, wayland
}:
let
source = import ./source.nix { inherit lib fetchFromGitHub wayland; };
in
stdenv.mkDerivation {
pname = "hyprland-share-picker";
inherit (source) version;
src = "${source.src}/hyprland-share-picker";
nativeBuildInputs = [ cmake wrapQtAppsHook makeShellWrapper ];
buildInputs = [ qtbase ];
dontWrapQtApps = true;
postInstall = ''
wrapProgramShell $out/bin/hyprland-share-picker \
"''${qtWrapperArgs[@]}" \
--prefix PATH ":" ${lib.makeBinPath [grim slurp hyprland]}
'';
meta = source.meta // {
description = "Helper program for xdg-desktp-portal-hyprland";
};
}

View File

@ -0,0 +1,22 @@
{ lib
, fetchFromGitHub
, wayland
}:
{
version = "unstable-2023-03-16";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "xdg-desktop-portal-hyprland";
rev = "85f49f4d6c9c398428117e9bdb588f53f09e52e0";
hash = "sha256-qed+BV0NBt1egGCBEM7d5MiZJevQb8jd1WybfFM53Ak=";
};
meta = with lib; {
description = "xdg-desktop-portal backend for Hyprland";
homepage = "https://github.com/hyprwm/xdg-desktop-portal-hyprland";
license = licenses.mit;
maintainers = with maintainers; [ fufexan ];
platforms = wayland.meta.platforms;
};
}

View File

@ -34,6 +34,9 @@ let
"dontUnpack"
"LC_ALL"
"meta"
"buildPhase"
"nativeBuildInputs"
"installPhase"
];
in
stdenv.mkDerivation ({

View File

@ -9,28 +9,26 @@
, mtdev
, cairo
, xorg
, waylandSupport ? false
, waylandSupport ? true
, wayland
}:
stdenv.mkDerivation rec {
pname = "qt5platform-plugins";
version = "5.6.3";
version = "5.6.5";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-AySltMI9x5mfquy532h1QfGpfwSfI9+h6BtIHPyNWGk=";
sha256 = "sha256-DHgnfJTUw1hY53DmDfzVFM6Ff8q6pbNDPmPeSsV7MwY=";
};
## https://github.com/linuxdeepin/qt5platform-plugins/pull/119
postPatch = ''
rm -r xcb/libqt5xcbqpa-dev/
mkdir -p xcb/libqt5xcbqpa-dev/${qtbase.version}
cp -r ${qtbase.src}/src/plugins/platforms/xcb/*.h xcb/libqt5xcbqpa-dev/${qtbase.version}/
'';
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
nativeBuildInputs = [
qmake
pkg-config
wrapQtAppsHook
];
buildInputs = [
mtdev
@ -38,13 +36,20 @@ stdenv.mkDerivation rec {
qtbase
qtx11extras
xorg.libSM
]
++ lib.optionals waylandSupport [
wayland
];
qmakeFlags = [
"INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms"
"QT_XCB_PRIVATE_INCLUDE=${qtbase.src}/src/plugins/platforms/xcb"
]
++ lib.optionals (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ];
env.NIX_CFLAGS_COMPILE = lib.optionalString waylandSupport "-I${wayland.dev}/include";
meta = with lib; {
description = "Qt platform plugins for DDE";
homepage = "https://github.com/linuxdeepin/qt5platform-plugins";

View File

@ -4,13 +4,13 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "deepin-desktop-base";
version = "2022.03.07";
version = "2022.11.15-deepin";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-joAduRI9jUtPA4lNsEhgOZlci8j/cvD8rJThqvj6a8A=";
sha256 = "sha256-GTgIHWz+x1Pl3F4zKA9V8o2oq6c53OK94q95WoMG+Qo=";
};
makeFlags = [ "DESTDIR=${placeholder "out"}" ];
@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec {
meta = with lib; {
description = "Base assets and definitions for Deepin Desktop Environment";
homepage = "https://github.com/linuxdeepin/deepin-desktop-base";
license = licenses.gpl3Plus;
license = with licenses; [ gpl3Plus cc-by-40 ];
platforms = platforms.linux;
maintainers = teams.deepin.members;
};

View File

@ -9,14 +9,14 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-dash-to-dock";
version = "75";
version = "79";
# Temporarily switched to commit hash because stable version is buggy.
src = fetchFromGitHub {
owner = "micheleg";
repo = "dash-to-dock";
rev = "extensions.gnome.org-v${version}";
sha256 = "sha256-vHXNhJgty7x4Ef6jxUI29KYpadC3jtUqE1Nt1dWYr24=";
sha256 = "sha256-vqQ9nAa/avae2+0xJ5gApbAU07pawi+R6IEQ9O6DTjs=";
};
nativeBuildInputs = [

View File

@ -1,20 +1,30 @@
{ lib, buildGraalvmNativeImage, fetchurl, writeScript }:
{ lib
, buildGraalvmNativeImage
, graalvmCEPackages
, removeReferencesTo
, fetchurl
, writeScript }:
buildGraalvmNativeImage rec {
pname = "babashka";
version = "1.1.173";
version = "1.2.174";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-p/KGDCocTksvUwj6x5l1xUEM1OZ4pNHtXL4mTgg7JUI=";
sha256 = "sha256-5ZvqbOU69ZZNIT5Mh7+Cg5s+gLhOnFMSIO4ZI9t6D/8=";
};
graalvmDrv = graalvmCEPackages.graalvm19-ce;
executable = "bb";
nativeBuildInputs = [ removeReferencesTo ];
extraNativeImageBuildArgs = [
"-H:+ReportExceptionStackTraces"
"--no-fallback"
"--native-image-info"
"--enable-preview"
];
installCheckPhase = ''
@ -23,6 +33,13 @@ buildGraalvmNativeImage rec {
$out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | grep '[1 2]'
'';
# As of v1.2.174, this will remove references to ${graalvmDrv}/conf/chronology,
# not sure the implications of this but this file is not available in
# graalvm19-ce anyway.
postInstall = ''
remove-references-to -t ${graalvmDrv} $out/bin/${executable}
'';
passthru.updateScript = writeScript "update-babashka" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl common-updater-scripts jq

View File

@ -25,13 +25,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
version = "2023.Q1.2";
version = "2023.Q1.3";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
sha256 = "sha256-QNjBLOnSfCTA+5qLqejAqJv9eIWAEVNc/VrhidGjmTc=";
sha256 = "JYGegQQCoKIpvBQYhNbG8j6CgtKb+c8MsK+cFtYUgtY=";
};
buildInputs = [

View File

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "tdb";
version = "1.4.7";
version = "1.4.8";
src = fetchurl {
url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
sha256 = "sha256-pPsWje9TPzH/LAf32YRLsxMeZ5nwlOvnfQOArcmHwg4=";
sha256 = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg=";
};
nativeBuildInputs = [

View File

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "tevent";
version = "0.13.0";
version = "0.14.1";
src = fetchurl {
url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
sha256 = "sha256-uUN6kX+lU0Q2G+tk7J4AQumcroh5iCpi3Tj2q+I3HQw=";
sha256 = "sha256-74X8qoD/0jUQNrpLNHYw/vKhrD2pZKfxggRmutA80A0=";
};
nativeBuildInputs = [

View File

@ -12,14 +12,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "the-foundation";
version = "1.6.0";
version = "1.6.1";
src = fetchFromGitea {
domain = "git.skyjake.fi";
owner = "skyjake";
repo = "the_Foundation";
rev = "v${finalAttrs.version}";
hash = "sha256-+V2WJYEmIZWpioNvvZMiw7Vt9ogEnEcjq+vR7UiBTO0=";
hash = "sha256-GOvdnmutSQcsNT57tADLSkJAUX0JDVsualII+y21a+I=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -4,7 +4,6 @@
, pytest-runner
, pytestCheckHook
, pytest-asyncio
, sqlalchemy
, isPy27
}:
@ -25,10 +24,6 @@ buildPythonPackage rec {
pytest-runner
];
propagatedBuildInputs = [
sqlalchemy
];
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "nibe";
version = "2.0.0";
version = "2.1.4";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "yozik04";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-e5rKtVFSlB4sFBrBHKrZmHq/sJEL9VZejSpUgeCwCzw=";
hash = "sha256-gz5+vGjZAU+sBqtQJWi8MR5PL7ZpKQcdR6CmImxEi28=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,50 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, setuptools-scm
, toml
, pytestCheckHook
, pytest-benchmark
, hatch-vcs
, hatchling
}:
buildPythonPackage rec {
pname = "pure-protobuf";
version = "2.2.3";
format = "pyproject";
disabled = pythonOlder "3.7";
# PyPi lacks tests.
src = fetchFromGitHub {
owner = "eigenein";
repo = "protobuf";
rev = version;
hash = "sha256-FsVWlYPav4uusdEPXc5hScLeNJWfbSjGOLuZ7yZXyCw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
hatch-vcs
hatchling
];
checkInputs = [
pytestCheckHook
pytest-benchmark
];
pythonImportsCheck = [
"pure_protobuf"
];
meta = with lib; {
description = "Python implementation of Protocol Buffers with dataclass-based schemas";
homepage = "https://github.com/eigenein/protobuf";
license = licenses.mit;
maintainers = with maintainers; [ chuangzhu ];
};
}

View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "social-auth-app-django";
version = "5.0.0";
version = "5.1.0";
src = fetchFromGitHub {
owner = "python-social-auth";
repo = "social-app-django";
rev = version;
hash = "sha256-ONhdXxclHRpVtijpKEZlmGDhjid/jnTaPq6LQtjxCC4=";
rev = "refs/tags/${version}";
hash = "sha256-QZZSwPyQKtcKe1Dij4MjRnKGudg6A6cmS4FGb2F1goY=";
};
propagatedBuildInputs = [

View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-protobuf";
version = "4.21.0.7";
version = "4.22.0.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-bsrdzHrtLGNnRaF8FBGTLN73oDUwTVD/1BQCl7a4gug=";
hash = "sha256-vytBTYFdw4fAoEHZIH2wVMfNuUWRuyM9m3GoUkPgXvw=";
};
propagatedBuildInputs = [

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dagger";
version = "0.3.13";
version = "0.4.0";
src = fetchFromGitHub {
owner = "dagger";
repo = "dagger";
rev = "v${version}";
hash = "sha256-J+3wihsZx8ZnanWfahtd9J659dUaQXbD0lz2uMHLb3E=";
hash = "sha256-xSEO1UD5piTFBBdse45yPAXKEwUm2tCxvwNTrlfgRNk=";
};
vendorHash = "sha256-r8XJrHU8ToqW7CqvpYoHcM0skqWOXZxFAyQQZ2yIBQ4=";
vendorHash = "sha256-nBlebDN1TsB+RFArl5fR3xyz5FWr4wOxL+9oWVvOpwI=";
proxyVendor = true;
subPackages = [

View File

@ -1,6 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchPypi
, python3
, git
}:
@ -10,11 +10,9 @@ python3.pkgs.buildPythonApplication rec {
version = "1.6.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "pypa";
repo = "hatch";
rev = "hatch-v${version}";
hash = "sha256-3nPh6F+TmLoogz9FgaZMub7hPJIzANCY4oWk9Mq22Pc=";
src = fetchPypi {
inherit pname version;
hash = "sha256-ZQ5nG6MAMY5Jjvk7vjuZsyzhSSB2T7h1P4mZP2Pu15o=";
};
propagatedBuildInputs = with python3.pkgs; [
@ -73,7 +71,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Modern, extensible Python project manager";
homepage = "https://hatch.pypa.io/latest/";
changelog = "https://github.com/pypa/hatch/blob/${src.rev}/docs/history.md#hatch";
changelog = "https://github.com/pypa/hatch/blob/hatch-v${version}/docs/history.md#hatch";
license = licenses.mit;
maintainers = with maintainers; [ onny ];
};

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-diet";
version = "1.2.4";
version = "1.2.5";
src = fetchFromGitHub {
owner = "the-lean-crate";
repo = pname;
rev = "v${version}";
sha256 = "sha256-olF+F2y7F3ZpyluyslRDlfRKkWmE+zJ01bXyzy9x5EQ=";
sha256 = "sha256-JzhSTbEf2Yl5cEIb+88y+s8lUN6c1Mir4NYvzAWMZwY=";
};
cargoSha256 = "sha256-ayi7Px1A8XzswlGnm31YWF7+8+lBChBaVJFwozSAimw=";
cargoSha256 = "sha256-zW6ec8DHzP6AuNI6fcOQLH03ca+/yjdh56nltSM9pAA=";
meta = with lib; {
description = "Help computing optimal include directives for your Cargo.toml manifest";

View File

@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2023-03-06";
cargoSha256 = "sha256-K4zaspweDhzkl0iFvW/6s2Qonj0Waepy0viX6U7x844=";
version = "2023-03-13";
cargoSha256 = "sha256-dyQpgh+htNQDa8voj6NormTw2TmnlId6iS6cQ2LEB/U=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY=";
sha256 = "sha256-3DHDfYCLn0clUXoUPqU5FjJFDkiqff7zMhIRHh3QU2M=";
};
auditable = true; # TODO: remove when this is the default

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "typeshare";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "1password";
repo = "typeshare";
rev = "v${version}";
hash = "sha256-FQ9KL8X7zz3ew+H1lhh4bkZ01Te1TD+QXAMxS8dXAaI=";
hash = "sha256-zY1Z2TT1D3mgnnepRih88U+tpPQWWnAtxt5yAVuoBbk=";
};
cargoHash = "sha256-t6tGNHmPasmTRto2hobvJywrF/8tO79zkfWwa6lCPK8=";
cargoHash = "sha256-kMmjuPR5h2sVcnilUVt0SEZYcOEgXzM8fPC6Ljg6+d0=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -71,6 +71,7 @@ buildFHSUserEnv {
libGLU
libglvnd
libgpg-error
libgudev
libjpeg
libkrb5
libmpeg2
@ -81,22 +82,31 @@ buildFHSUserEnv {
libselinux
libsndfile
libsndfile
libsoup
libtheora
libtiff
libusb1
libv4l
libva
libvdpau
libvorbis
libvpx
libwebp
libxkbcommon
libxml2
mpg123
ncurses
ocl-icd
openal
openldap
openssl
openssl_1_1
pango
pipewire
samba4
sane-backends
SDL2
speex
sqlite
udev
udev

View File

@ -0,0 +1,82 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, directx-shader-compiler
, libGLU
, libpng
, libjpeg_turbo
, openal
, rapidjson
, SDL2
, vulkan-headers
, vulkan-loader
, zlib
}:
stdenv.mkDerivation rec {
pname = "rbdoom-3-bfg";
version = "1.4.0";
src = fetchFromGitHub {
owner = "RobertBeckebans";
repo = pname;
rev = "v${version}";
hash = "sha256-r/dvTirgFXdBJ+Gjl6zpHoGCTPoo0tRmOCV9oCdnltI=";
fetchSubmodules = true;
};
patches = [
(fetchpatch {
name = "remove-jpeg_internals-define.patch";
url = "https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/de6ab9d31ffcd6eba26df69f8c77da38a0ab4722.diff";
hash = "sha256-3XbWmQtY/8a90IqDtN5TNT5EOa+i5mFOH+H9tuZqTmU=";
})
];
nativeBuildInputs = [
cmake
directx-shader-compiler
];
buildInputs = [
libGLU
libpng
libjpeg_turbo
openal
rapidjson
SDL2
vulkan-headers
vulkan-loader
zlib
];
cmakeDir = "../neo";
cmakeFlags = [
"-DFFMPEG=OFF"
"-DBINKDEC=ON"
"-DUSE_SYSTEM_LIBGLEW=ON"
"-DUSE_SYSTEM_LIBPNG=ON"
"-DUSE_SYSTEM_LIBJPEG=ON"
"-DUSE_SYSTEM_RAPIDJSON=ON"
"-DUSE_SYSTEM_ZLIB=ON"
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install RBDoom3BFG $out/bin/RBDoom3BFG
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/RobertBeckebans/RBDOOM-3-BFG";
description = "Doom 3 BFG Edition with modern engine features";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ Zaechus ];
platforms = platforms.unix;
};
}

View File

@ -2,61 +2,61 @@
"4.14": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.307-hardened1.patch",
"sha256": "0fqif3brjhjfwdxjwm12allj5pdgdlfm83h6izlgxkn5iy05cviq",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.307-hardened1/linux-hardened-4.14.307-hardened1.patch"
"name": "linux-hardened-4.14.309-hardened1.patch",
"sha256": "0j9dnrxn75qigfv2jq8aa76jli80bi56hriy205qar99vgp59a8a",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.309-hardened1/linux-hardened-4.14.309-hardened1.patch"
},
"sha256": "00dp0vj9572ig4zsnmhl2a2v5vx40hnjibyifw24x1q6qdaia72f",
"version": "4.14.307"
"sha256": "1rwhz9w5x2x3idy2f0bpk945qam6xxswbn69wmz8y1ik9b1nns09",
"version": "4.14.309"
},
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.275-hardened1.patch",
"sha256": "0ni0ig82zbmfngcm1la2frcihxjaaf0y1ki0vv6gqzxpsp5xz0nq",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.275-hardened1/linux-hardened-4.19.275-hardened1.patch"
"name": "linux-hardened-4.19.277-hardened1.patch",
"sha256": "16q0lc5nzzf372mlkjvg8vr67afnz0jxwv3zvvg6ip3k7gljphfz",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.277-hardened1/linux-hardened-4.19.277-hardened1.patch"
},
"sha256": "02l6f5y1cbjc9997lmcak5j8dllkzr8q47nqscqsyvz2c2hnzsdg",
"version": "4.19.275"
"sha256": "137mjk6hzpr120bb6ky3b8q4jnkbgqla0cpgnhzpcng00aidk0pn",
"version": "4.19.277"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.172-hardened1.patch",
"sha256": "1ik2l453bgqcpqrhdf4gy6qdlvqknz9i7s9s9pynvk4lpvva34zc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.172-hardened1/linux-hardened-5.10.172-hardened1.patch"
"name": "linux-hardened-5.10.174-hardened1.patch",
"sha256": "0zgp7jl16227fjj9j5zwahxa5xbkp2gkznpvzh68sanwd04qzby3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.174-hardened1/linux-hardened-5.10.174-hardened1.patch"
},
"sha256": "1c9757gma0dksd1ch8pljbsmf586bq66gxqpsv53676z8kivl3gj",
"version": "5.10.172"
"sha256": "092ai8ggplsa933s3qlayyjkw9d3z6sg782byh7rz0ym0380r2ig",
"version": "5.10.174"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.98-hardened1.patch",
"sha256": "1d1jfx0m59j4b7kk476x11af5h5hy8f5n4d6h419qylnibm22573",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.98-hardened1/linux-hardened-5.15.98-hardened1.patch"
"name": "linux-hardened-5.15.102-hardened1.patch",
"sha256": "05cxqcwr6fh2v69n4s30gs0pdw5i8h8kvrp3kzz0n2zb2afg6c8z",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.102-hardened1/linux-hardened-5.15.102-hardened1.patch"
},
"sha256": "11vpngxqih2f3sn9v1h8ccjywsj0m5p8i98n0fvck5azlk9jrikx",
"version": "5.15.98"
"sha256": "1rh1kcvaz42brn5sxqq00mvy0b36fck196yvxfg7b5qbjzxxs724",
"version": "5.15.102"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.234-hardened1.patch",
"sha256": "06jc2060v259wblbl38dcsk5vi61lbf4y8aipppy5lqd25rpm12y",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.234-hardened1/linux-hardened-5.4.234-hardened1.patch"
"name": "linux-hardened-5.4.236-hardened1.patch",
"sha256": "07540gv79ah7n2vvmqa5nq0rjh6y0al78wmqwlzc2xdfmahk63mj",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.236-hardened1/linux-hardened-5.4.236-hardened1.patch"
},
"sha256": "1489jnp4vb8p879hq1nx3xgyzjdwj1zalk3x4vcbnc9f7yrrrixc",
"version": "5.4.234"
"sha256": "0la92nvqihg4284risb2ljsrdh8x4wy0dwc3wsyq09bgm7x95j6c",
"version": "5.4.236"
},
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.1.15-hardened1.patch",
"sha256": "14svc378i43jv9cbv97gibmmr8pwf39dcjvjaqlbwfmhiwikj975",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.15-hardened1/linux-hardened-6.1.15-hardened1.patch"
"name": "linux-hardened-6.1.19-hardened1.patch",
"sha256": "0ax948idfyzpd7x8cp89m9lrwy30d4clj8z7ih919iji5nggjmvh",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.19-hardened1/linux-hardened-6.1.19-hardened1.patch"
},
"sha256": "1zf48h34cz4chv0n12xlif0n7fdzbri2v8am1nn68bla2vidy5ic",
"version": "6.1.15"
"sha256": "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy",
"version": "6.1.19"
}
}

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.309";
version = "4.14.310";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1rwhz9w5x2x3idy2f0bpk945qam6xxswbn69wmz8y1ik9b1nns09";
sha256 = "0r91f3jj3y0cca4sfs0xa12lbrc62q2yzgval5ainwr74bk7dwlb";
};
} // (args.argsOverride or {}))

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.277";
version = "4.19.278";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "137mjk6hzpr120bb6ky3b8q4jnkbgqla0cpgnhzpcng00aidk0pn";
sha256 = "0miyadgnd52cgw3bgpmx66kr1pgxh14b2f52fasy57b6wysv0lnv";
};
} // (args.argsOverride or {}))

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.174";
version = "5.10.175";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "092ai8ggplsa933s3qlayyjkw9d3z6sg782byh7rz0ym0380r2ig";
sha256 = "1kkv63v5lc0ahkl8sjmwhqxahmwmbxcbf4mfcmkf6d7j50p5cxz2";
};
} // (args.argsOverride or {}))

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.102";
version = "5.15.103";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1rh1kcvaz42brn5sxqq00mvy0b36fck196yvxfg7b5qbjzxxs724";
sha256 = "01fpipy8skmp4dyxgk8fk9k6hc0w0gvk7mm8f8pm7jhwcf0vlxh8";
};
} // (args.argsOverride or { }))

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.236";
version = "5.4.237";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0la92nvqihg4284risb2ljsrdh8x4wy0dwc3wsyq09bgm7x95j6c";
sha256 = "09smq8jsbpqfh135snljack2wj41anx8f8i0lmjcqcq5zzhgw25p";
};
} // (args.argsOverride or {}))

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.1.19";
version = "6.1.20";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy";
sha256 = "1w1iy1i3bpzrs5rhvqbn2awxv5qqgng9n7jd5js66g0sq3l2sckn";
};
} // (args.argsOverride or { }))

View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.2.6";
version = "6.2.7";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "179x1fqgi3drg1q1xy0648hvy7cpc79yzn2r248rq4mprvbz3qhz";
sha256 = "138dpmj8qr5fcji99kmi3sj34ah21bgqgzsz2lbhn37v059100s3";
};
} // (args.argsOverride or { }))

View File

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19102";
sha256 = "1w9zl7grws1nzq4zp4mj1v5a6akqwkzy9lf0wwdar68jbxav3fvf";
rev = "19109";
sha256 = "1z8qbfrn489bsi4grpw5dzw8f5jzml0swngfflh8flb80zcq0s2p";
}
, ...
}:

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.3.4";
version = "2023.3.5";
components = {
"3_day_blinds" = ps: with ps; [
];

View File

@ -69,6 +69,15 @@ let
];
});
bimmer-connected = super.bimmer-connected.overridePythonAttrs (oldAttrs: rec {
version = "0.12.1";
src = fetchFromGitHub {
inherit (oldAttrs.src) owner repo;
rev = "refs/tags/${version}";
hash = "sha256-wLQ2UkedLSwfbUqmb85QgsDYh0zcbgQOMnhbRHW5Bnw=";
};
});
dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec {
version = "0.33";
src = fetchFromGitHub {
@ -79,6 +88,34 @@ let
};
});
geojson = super.geojson.overridePythonAttrs (oldAttrs: rec {
version = "2.5.0";
src = fetchFromGitHub {
inherit (oldAttrs.src) owner repo;
rev = "refs/tags/${version}";
hash = "sha256-AcImffYki1gnIaZp/1eacNjdDgjn6qinPJXq9jYtoRg=";
};
doCheck = false;
});
gios = super.gios.overridePythonAttrs (oldAttrs: rec {
version = "2.3.0";
src = fetchFromGitHub {
inherit (oldAttrs.src) owner repo;
rev = "refs/tags/${version}";
hash = "sha256-/lAENP9wKZ+h2Iq2e9S7s7Naa0CTl/I2cwCxBEAwsrA=";
};
});
jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec {
version = "3.3.0";
src = fetchFromGitHub {
inherit (oldAttrs.src) owner repo;
rev = "refs/tags/v${version}";
hash = "sha256-LnbWzIST+GMtdsHDKg67WWt9GmHUcSuGZ5Spei3nEio=";
};
});
# Pinned due to API changes in 10.0
mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec {
version = "9.3.0";
@ -111,6 +148,15 @@ let
};
});
p1monitor = super.p1monitor.overridePythonAttrs (oldAttrs: rec {
version = "2.1.1";
src = fetchFromGitHub {
inherit (oldAttrs.src) owner repo;
rev = "refs/tags/v${version}";
hash = "sha256-VHY5AWxt5BZd1NQKzsgubEZBLKAlDNm8toyEazPUnDU=";
};
});
# Pinned due to API changes >0.3.5.3
pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec {
version = "0.3.5.3";
@ -132,6 +178,15 @@ let
};
});
pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec {
version = "1.0.1";
src = fetchFromGitHub {
inherit (oldAttrs.src) owner repo;
rev = "refs/tags/v${version}";
hash = "sha256-KM/gtpsQ27QZz2uI1t/yVN5no0zp9LZag1duAJzK55g=";
};
});
python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
pname = "python-slugify";
version = "4.0.1";
@ -196,6 +251,15 @@ let
];
});
subarulink = super.subarulink.overridePythonAttrs (oldAttrs: rec {
version = "0.7.0";
src = fetchFromGitHub {
inherit (oldAttrs.src) owner repo;
rev = "refs/tags/v${version}";
hash = "sha256-BxnpdZwbnZF1oWcu3jRDeXvcaweOuVk1R79KpMLB02c=";
};
});
# Pinned due to API changes in 0.3.0
tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec {
version = "0.2.0";
@ -263,7 +327,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.3.4";
hassVersion = "2023.3.5";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -279,7 +343,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations
src = fetchPypi {
inherit pname version;
hash = "sha256-BJCik8TxNzOsehD1fBNQO8Kvmb6ZaqEy4oEVmtIhwp0=";
hash = "sha256-+n42LnfZ0R0ugUkse2EJ0wPUHn4YctrAb7hkBd8+ZjA=";
};
# Secondary source is git for tests
@ -287,7 +351,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-iwRjyOgQNTs54mnL3mlL9O3wVD5SWZIl+Hhxir6F+3o=";
hash = "sha256-v+c0hnY1Owr2YCQX8TVzKzYCLBsyUKPOvnVOjOeI6Dk=";
};
nativeBuildInputs = with python3.pkgs; [

View File

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20230309.0";
version = "20230309.1";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
hash = "sha256-gHc93xKIm0LDQrkTtlMdLv/N2smfYz5lQ6uLV+Cqj+s=";
hash = "sha256-o9NIJHmjr3hQxCNl+DGyIfAfXugn8o9O30B46xqsSXo=";
};
# there is nothing to strip in this package

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2023.3.4";
version = "2023.3.5";
format = "pyproject";
disabled = python.version != home-assistant.python.version;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
hash = "sha256-uNwh1IYn3rDwj+FB8h9SwbFaju7cnCWl7HjX0mdw/UA=";
hash = "sha256-nNTuBQs5yD1XA46oIFQIlYRxClgRw2CgPjyiD+6SmUw=";
};
nativeBuildInputs = [

View File

@ -5000,12 +5000,23 @@ with pkgs;
hunt = callPackage ../tools/misc/hunt { };
hypr = callPackage ../applications/window-managers/hyprwm/hypr {
cairo = cairo.override { xcbSupport = true; };
cairo = cairo.override { xcbSupport = true; }; };
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
stdenv = gcc12Stdenv;
wlroots = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { };
udis86 = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { };
};
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { };
hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
hyprland-share-picker = libsForQt5.callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix { };
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper {
stdenv = gcc12Stdenv;
};
hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { };
hysteria = callPackage ../tools/networking/hysteria { };
@ -29641,6 +29652,8 @@ with pkgs;
kerbrute = callPackage ../tools/security/kerbrute { };
komikku = callPackage ../applications/graphics/komikku { };
kvmtool = callPackage ../applications/virtualization/kvmtool { };
exrtools = callPackage ../applications/graphics/exrtools { };
@ -34546,6 +34559,8 @@ with pkgs;
xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { };
xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland { };
xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { };
xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };
@ -35227,6 +35242,8 @@ with pkgs;
keeperrl = callPackage ../games/keeperrl { };
rbdoom-3-bfg = callPackage ../games/rbdoom-3-bfg { };
### GAMES/LGAMES
barrage = callPackage ../games/lgames/barrage { };

View File

@ -7779,6 +7779,8 @@ self: super: with self; {
purepng = callPackage ../development/python-modules/purepng { };
pure-protobuf = callPackage ../development/python-modules/pure-protobuf { };
pure-python-adb = callPackage ../development/python-modules/pure-python-adb { };
pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { };