Merge master into staging-next

Changed files
+399 -608
maintainers
nixos
doc
manual
release-notes
modules
services
databases
web-apps
system
boot
loader
systemd-boot
pkgs
applications
emulators
misc
gpsprune
gremlin-console
tui-journal
networking
cluster
talosctl
instant-messengers
discord
rambox
science
logic
version-management
video
manim
obs-studio
virtualization
kraft
by-name
at
ay
ayatana-indicator-datetime
ca
cargo-bloat
co
cockpit
mi
mihomo
mo
movim
pw
pwndbg
te
tetrio-desktop
wo
workout-tracker
ze
zed-editor
desktops
lomiri
applications
lomiri-system-settings
qml
development
libraries
SDL2_mixer
SDL2_net
the-foundation
ocaml-modules
iri
tsdl-ttf
python-modules
manim-slides
pystemd
tokenizers
tools
rust
cargo-deny
rye
games
doom-ports
chocolate-doom
dhewm3
doomseeker
eternity-engine
odamex
zandronum
os-specific
linux
below
mwprocapture
servers
guacamole-client
guacamole-server
tools
admin
networking
-12
maintainers/maintainer-list.nix
···
githubId = 20026143;
name = "Katona László";
-
MP2E = {
-
email = "MP2E@archlinux.us";
-
github = "MP2E";
-
githubId = 167708;
-
name = "Cray Elliott";
-
};
mpcsh = {
email = "m@mpc.sh";
github = "mpcsh";
···
github = "zokrezyl";
githubId = 51886259;
name = "Zokre Zyl";
-
};
-
zombiezen = {
-
name = "Ross Light";
-
email = "ross@zombiezen.com";
-
github = "zombiezen";
-
githubId = 181535;
zookatron = {
email = "tim@zookatron.com";
-1
maintainers/team-list.nix
···
members = [
aanderse
edwtjo
-
MP2E
thiagokokada
];
scope = "Maintain Libretro, RetroArch and related packages.";
+2
nixos/doc/manual/release-notes/rl-2405.section.md
···
- `network-interfaces.target` system target was removed as it has been deprecated for a long time. Use `network.target` instead.
+
- `services.redis.vmOverCommit` now defaults to `true` and no longer enforces Transparent Hugepages (THP) to be disabled. Redis only works with THP configured to `madvise` which is the kernel's default.
+
- `azure-cli` now has extension support. For example, to install the `aks-preview` extension, use
```nix
+5 -6
nixos/modules/services/databases/redis.nix
···
package = mkPackageOption pkgs "redis" { };
vmOverCommit = mkEnableOption ''
-
setting of vm.overcommit_memory to 1
+
set `vm.overcommit_memory` sysctl to 1
(Suggested for Background Saving: <https://redis.io/docs/get-started/faq/>)
-
'';
+
'' // { default = true; };
servers = mkOption {
type = with types; attrsOf (submodule ({ config, name, ... }: {
···
'';
}) enabledServers);
-
boot.kernel.sysctl = mkMerge [
-
{ "vm.nr_hugepages" = "0"; }
-
( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } )
-
];
+
boot.kernel.sysctl = mkIf cfg.vmOverCommit {
+
"vm.overcommit_memory" = "1";
+
};
networking.firewall.allowedTCPPorts = concatMap (conf:
optional conf.openFirewall conf.port
+10 -12
nixos/modules/services/web-apps/movim.nix
···
lib.concatStringsSep "\n" [
(lib.optionalString brotli.enable ''
echo -n "Precompressing static files with Brotli …"
-
find ${appDir}/public -type f ${findTextFileNames} \
-
| ${lib.getExe pkgs.parallel} ${lib.escapeShellArgs [
-
"--will-cite"
-
"-j $NIX_BUILD_CORES"
-
"${lib.getExe brotli.package} --keep --quality=${builtins.toString brotli.compressionLevel} --output={}.br {}"
-
]}
+
find ${appDir}/public -type f ${findTextFileNames} -print0 \
+
| xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_broti" ''
+
file="$1"
+
${lib.getExe brotli.package} --keep --quality=${builtins.toString brotli.compressionLevel} --output=$file.br $file
+
''}
echo " done."
'')
(lib.optionalString gzip.enable ''
echo -n "Precompressing static files with Gzip …"
-
find ${appDir}/public -type f ${findTextFileNames} \
-
| ${lib.getExe pkgs.parallel} ${lib.escapeShellArgs [
-
"--will-cite"
-
"-j $NIX_BUILD_CORES"
-
"${lib.getExe gzip.package} -c -${builtins.toString gzip.compressionLevel} {} > {}.gz"
-
]}
+
find ${appDir}/public -type f ${findTextFileNames} -print0 \
+
| xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_broti" ''
+
file="$1"
+
${lib.getExe gzip.package} -c -${builtins.toString gzip.compressionLevel} $file > $file.gz
+
''}
echo " done."
'')
];
+14 -12
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
···
efi = config.boot.loader.efi;
+
# We check the source code in a derivation that does not depend on the
+
# system configuration so that most users don't have to redo the check and require
+
# the necessary dependencies.
+
checkedSource = pkgs.runCommand "systemd-boot" { } ''
+
install -m755 -D ${./systemd-boot-builder.py} $out
+
${lib.getExe pkgs.buildPackages.mypy} \
+
--no-implicit-optional \
+
--disallow-untyped-calls \
+
--disallow-untyped-defs \
+
$out
+
'';
+
systemdBootBuilder = pkgs.substituteAll rec {
-
src = ./systemd-boot-builder.py;
+
src = checkedSource;
isExecutable = true;
···
'';
};
-
checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { } ''
-
mkdir -p $out/bin
-
install -m755 ${systemdBootBuilder} $out/bin/systemd-boot-builder
-
${lib.getExe pkgs.buildPackages.mypy} \
-
--no-implicit-optional \
-
--disallow-untyped-calls \
-
--disallow-untyped-defs \
-
$out/bin/systemd-boot-builder
-
'';
-
finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" ''
#!${pkgs.runtimeShell}
-
${checkedSystemdBootBuilder}/bin/systemd-boot-builder "$@"
+
${systemdBootBuilder} "$@"
${cfg.extraInstallCommands}
'';
in {
-1
pkgs/applications/emulators/dolphin-emu/default.nix
···
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [
-
MP2E
ashkitten
ivar
];
+1 -1
pkgs/applications/emulators/dolphin-emu/primehack.nix
···
homepage = "https://github.com/shiiion/dolphin";
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
license = licenses.gpl2Plus;
-
maintainers = with maintainers; [ MP2E ashkitten Madouura ];
+
maintainers = with maintainers; [ ashkitten Madouura ];
broken = stdenv.isDarwin;
platforms = platforms.unix;
};
+2 -2
pkgs/applications/misc/gpsprune/default.nix
···
stdenv.mkDerivation rec {
pname = "gpsprune";
-
version = "23.2";
+
version = "24";
src = fetchurl {
url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
-
sha256 = "sha256-r2iw1vINWgqxoW0Zc8Sloa+wN/GUbUQfJ0e2BSP9vxM=";
+
sha256 = "sha256-gMwTdwYjYJt1j5MpHw6UD1wqmF7q3ikzjVSOGakIP30=";
};
dontUnpack = true;
+2 -2
pkgs/applications/misc/gremlin-console/default.nix
···
stdenv.mkDerivation rec {
pname = "gremlin-console";
-
version = "3.7.1";
+
version = "3.7.2";
src = fetchzip {
url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
-
sha256 = "sha256-uiJy4kfcTFUymyE0DxP6GlMX7ONogLFrx6K9IcgwTSE=";
+
sha256 = "sha256-lIrqMvI/sYGu36X3jNptoIz7mPVomk8YCIR/6y8mpEc=";
};
nativeBuildInputs = [ makeWrapper ];
+3 -3
pkgs/applications/misc/tui-journal/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "tui-journal";
-
version = "0.8.2";
+
version = "0.8.3";
src = fetchFromGitHub {
owner = "AmmarAbouZor";
repo = "tui-journal";
rev = "v${version}";
-
hash = "sha256-qHNB+jRLQoiHPuTblpCHg2+6e5j8W6YPsuygRlTidtE=";
+
hash = "sha256-G8p1eaHebUH2lFNyC2njUzZacE6rayApCb7PBFcpKLk=";
};
-
cargoHash = "sha256-T+fXSca1u9+c305yuKOF+soxnSZ1YbBs57wco5TLpQw=";
+
cargoHash = "sha256-iM5PsgCUxBbjeWGEIohZwMiCIdXqj/bhFoL0GtVKKq4=";
nativeBuildInputs = [
pkg-config
+3 -3
pkgs/applications/networking/cluster/talosctl/default.nix
···
buildGoModule rec {
pname = "talosctl";
-
version = "1.6.5";
+
version = "1.7.0";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
rev = "v${version}";
-
hash = "sha256-TEQnbQux+rN2WdlIbxh836Lx/ipqTDkoUsjQP8Ubl6s=";
+
hash = "sha256-E5pu37R2y0hQezM/p6LJXZv2L6QnV89Ir2HoKaqcOqI=";
};
-
vendorHash = "sha256-xdcHd/LvIm4rawwXtsGMF8Es9pMGMaJJaZ6UQwc24ZU=";
+
vendorHash = "sha256-5vWAZsLQxPZGpTiT/OowCLNPdE5e+HrAGXpFRw6jgbU=";
ldflags = [ "-s" "-w" ];
+13 -13
pkgs/applications/networking/instant-messengers/discord/default.nix
···
let
versions =
if stdenv.isLinux then {
-
stable = "0.0.50";
-
ptb = "0.0.80";
-
canary = "0.0.357";
+
stable = "0.0.51";
+
ptb = "0.0.81";
+
canary = "0.0.369";
development = "0.0.17";
} else {
-
stable = "0.0.301";
-
ptb = "0.0.109";
-
canary = "0.0.477";
+
stable = "0.0.302";
+
ptb = "0.0.110";
+
canary = "0.0.486";
development = "0.0.39";
};
version = versions.${branch};
···
x86_64-linux = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-
hash = "sha256-6VXdVLk7Z8NGQMiSdgBRd8NIueUktkId6BXYKNABb+4=";
+
hash = "sha256-w8zLeaqJXdbI67X/UDxSLQxZei5eraa/BkMZa+GDpYk=";
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-
hash = "sha256-y/ntnHIYcY35Jszh0PrFy395eJ5dBWwLNpzHMoSZuNA=";
+
hash = "sha256-/kM23y4Hx/0HwIOQvd+4Y429s/6Q+coa27hgI2U3EcU=";
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-
hash = "sha256-sDwC5kPzAfvQmsrq6M/GPFtUaT9pNAEB4uGI5Mn3oXs=";
+
hash = "sha256-Ohfp5ypvdmjr5rYR1usdVoEuVwOALRozysIjT/v75Qs=";
};
development = fetchurl {
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
···
x86_64-darwin = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
-
hash = "sha256-h7C1wCKtUGcMFUhoKVdD7Vq9TGUaXfmjlVhwmRdhqYw=";
+
hash = "sha256-Xt0ef+ogGlPA4ebxuAsGQKeMVDoTB58jCRcyM1fHjYE=";
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-
hash = "sha256-xxLnzELuI0X2r/weP1K2Bb51uRh1JjR72p7cXzy12Kc=";
+
hash = "sha256-hkRO/4YD1j4gsp+r3+md3ND/xtNmdutJiXlY3UIecIY=";
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-
hash = "sha256-xEDtEtZNhOTtz+zRLLQBSeLbntlVAVQsocAGyAaVePM=";
+
hash = "sha256-c7KNWsV+pultD+HqRNonSOW9PCGx1AajCfnc94Dokwc=";
};
development = fetchurl {
url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
···
downloadPage = "https://discordapp.com/download";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
-
maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ];
+
maintainers = with maintainers; [ Scrumplex artturin infinidoge jopejoe1 ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
mainProgram = "discord";
};
+1 -2
pkgs/applications/networking/instant-messengers/rambox/default.nix
···
categories = [ "Network" ];
});
-
appimageContents = appimageTools.extractType2 {
+
appimageContents = appimageTools.extract {
inherit pname version src;
};
in
···
extraInstallCommands = ''
mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps
-
ln -sf rambox-${version} $out/bin/${pname}
install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/rambox*.png $out/share/icons/hicolor/256x256/apps/${pname}.png
install -Dm644 ${desktopItem}/share/applications/* $out/share/applications
'';
+2 -2
pkgs/applications/science/logic/why3/default.nix
···
{ callPackage, fetchurl, lib, stdenv
, ocamlPackages, coqPackages, rubber, hevea, emacs
-
, version ? "1.7.1"
+
, version ? "1.7.2"
, ideSupport ? true
, wrapGAppsHook3
}:
···
src = fetchurl {
url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz";
hash = {
-
"1.7.1" = "sha256-rG1hcxFhQ2PlE9RTz9ELliDjCuSzLnJ1togRY637cU4=";
+
"1.7.2" = "sha256-VaSG/FiO2MDdSSFXGJJrIylQx0LPwtT8AF7TpPVZhCQ=";
"1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw=";
}."${version}";
};
-1
pkgs/applications/version-management/gg/default.nix
···
homepage = "https://gg-scm.io/";
changelog = "https://github.com/gg-scm/gg/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
-
maintainers = with maintainers; [ zombiezen ];
};
}
+3 -3
pkgs/applications/video/manim/default.nix
···
in python.pkgs.buildPythonApplication rec {
pname = "manim";
pyproject = true;
-
version = "0.18.0.post0";
-
disabled = python3.pythonOlder "3.8";
+
version = "0.18.1";
+
disabled = python3.pythonOlder "3.9";
src = fetchFromGitHub {
owner = "ManimCommunity";
repo = "manim";
rev = "refs/tags/v${version}";
-
hash = "sha256-4HwQ74oHloK+1KOD6SzXCzGIDD+Dc0jDabw6/+cqmos=";
+
hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ=";
};
nativeBuildInputs = with python.pkgs; [
+1 -1
pkgs/applications/video/obs-studio/default.nix
···
video content, efficiently
'';
homepage = "https://obsproject.com";
-
maintainers = with maintainers; [ eclairevoyant jb55 MP2E materus fpletz ];
+
maintainers = with maintainers; [ eclairevoyant jb55 materus fpletz ];
license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk;
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
mainProgram = "obs";
+3 -3
pkgs/applications/virtualization/kraft/default.nix
···
buildGoModule rec {
pname = "kraftkit";
-
version = "0.8.4";
+
version = "0.8.5";
src = fetchFromGitHub {
owner = "unikraft";
repo = "kraftkit";
rev = "v${version}";
-
hash = "sha256-Ob02OjqQGV60TE1CBe/Hr/WWiPNQ/33T1vPYPmJBr/4=";
+
hash = "sha256-31cgihmtBIB8U60ic5wKNyqB4a5sXZmIXxAjQI/43ro=";
};
-
vendorHash = "sha256-XYYGr/mJYQuiDJFRrr8GlQbotM+Sb8xaBiARjZ/UyIs=";
+
vendorHash = "sha256-X2E0Sy4rJhrDgPSSOTqUeMEdgq5H3DF5xjh84qlH1Ug=";
ldflags = [
"-s"
+3 -3
pkgs/by-name/at/atac/package.nix
···
}:
rustPlatform.buildRustPackage rec {
pname = "atac";
-
version = "0.13.0";
+
version = "0.14.0";
src = fetchFromGitHub {
owner = "Julien-cpsn";
repo = "ATAC";
rev = "v${version}";
-
hash = "sha256-ChX2LMRbqoKzl+QKkeervrCHr3plAQ21RzC4RqEucCA=";
+
hash = "sha256-d5qUleQrwWWTIEDj3VvJKpINHpc0rko18if4pv5GonU=";
};
-
cargoHash = "sha256-nYkXL3SIjG3REE+w2vIlB04FWs7e0d4iu0hRjAPz7aU=";
+
cargoHash = "sha256-vlrllbcf5Y9DFwdekAHE5xtGlloKxTExXkp1LySEUK0=";
nativeBuildInputs = [
pkg-config
+6 -25
pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
···
{ stdenv
, lib
, fetchFromGitHub
-
, fetchpatch
, gitUpdater
, nixosTests
, ayatana-indicator-messages
···
in
stdenv.mkDerivation (finalAttrs: {
pname = "ayatana-indicator-datetime";
-
version = "23.10.1";
+
version = "24.2.0";
src = fetchFromGitHub {
owner = "AyatanaIndicators";
repo = "ayatana-indicator-datetime";
rev = finalAttrs.version;
-
hash = "sha256-cm1zhG9TODGe79n/fGuyVnWL/sjxUc3ZCu9FhqA1NLE=";
+
hash = "sha256-J3Yp7Dx4UvvdlM8Cp1sPe4Ftm/aAmNzpo4re/jF7pRo=";
};
-
patches = [
-
# Fix test-menus building & running
-
# Remove when version > 23.10.1
-
(fetchpatch {
-
name = "0001-ayatana-indicator-datetime-Fix-test-menus-tests.patch";
-
url = "https://github.com/AyatanaIndicators/ayatana-indicator-datetime/commit/ddabb4a61a496da14603573b700c5961a3e5b834.patch";
-
hash = "sha256-vf8aVXonCoTWMuAQZG6FuklWR2IaGY4hecFtoyNCGg8=";
-
})
-
-
# Fix EDS-related tests
-
# Remove when version > 23.10.1
-
(fetchpatch {
-
name = "0002-ayatana-indicator-datetime-Fix-EDS-colour-tests.patch";
-
url = "https://github.com/AyatanaIndicators/ayatana-indicator-datetime/commit/6d67f7b458911833e72e0b4a162b1d823609d6f8.patch";
-
hash = "sha256-VUdMJuma6rmsjUOeyO0W8UNKADODiM+wDVfj6aDhqgw=";
-
})
-
];
-
postPatch = ''
-
# Queries systemd user unit dir via pkg_get_variable, can't override prefix
+
# Override systemd prefix
substituteInPlace data/CMakeLists.txt \
-
--replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/user)' \
-
--replace-fail '/etc' "\''${CMAKE_INSTALL_FULL_SYSCONFDIR}"
+
--replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \
+
--replace-fail 'XDG_AUTOSTART_DIR "/etc' 'XDG_AUTOSTART_DIR "''${CMAKE_INSTALL_FULL_SYSCONFDIR}'
# Looking for Lomiri schemas for code generation
substituteInPlace src/CMakeLists.txt \
···
]}
'';
+
# schema is already added automatically by wrapper, EDS needs to be added explicitly
preFixup = ''
-
# schema is already added automatically by wrapper, EDS needs to be added explicitly
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${edsDataDir}"
)
+3 -3
pkgs/by-name/ca/cargo-bloat/package.nix
···
rustPlatform.buildRustPackage rec {
pname = "cargo-bloat";
-
version = "0.11.1";
+
version = "0.12.0";
src = fetchFromGitHub {
owner = "RazrFalcon";
repo = pname;
rev = "v${version}";
-
hash = "sha256-lCA7C1G2xu65jn3/wzj6prWSrjQz3EqqJyMlPR/HRFs=";
+
hash = "sha256-vPk6ERl0VM1TjK/JRMcXqCvKqSTuw78MsmQ0xImQyd4=";
};
-
cargoHash = "sha256-fOenXn5gagFss9DRDXXsGxQlDqVXZ5LZcdM4WsXAyUU=";
+
cargoHash = "sha256-6fMFGLH16Z1O+ETlr0685TXHup1vJetfzPdNC2Lw9uM=";
meta = with lib; {
description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable";
+2 -2
pkgs/by-name/co/cockpit/package.nix
···
stdenv.mkDerivation rec {
pname = "cockpit";
-
version = "315";
+
version = "316";
src = fetchFromGitHub {
owner = "cockpit-project";
repo = "cockpit";
rev = "refs/tags/${version}";
-
hash = "sha256-N6MDqhYQky80r9wSiDIPusg6iOpDh4S52pf337nojyY=";
+
hash = "sha256-AoRdeAA+K6VhRxgAF7t2COJtovk8U9B9j8MaBwMjJgw=";
fetchSubmodules = true;
};
+3 -3
pkgs/by-name/mi/mihomo/package.nix
···
buildGoModule rec {
pname = "mihomo";
-
version = "1.18.3";
+
version = "1.18.4";
src = fetchFromGitHub {
owner = "MetaCubeX";
repo = "mihomo";
rev = "v${version}";
-
hash = "sha256-/fFVUI++OhOer5DrvcXO+R+4whtb5+3Qg3e4+ikJr1Y=";
+
hash = "sha256-mqNcMB2nb8+e9XEGKqwaBE/nC4+jRaEFxE17e0JTo8Y=";
};
-
vendorHash = "sha256-k4xB/jO78VGD+n9HtuoWXoXB+kZCEyPKJTTwj32nGIw=";
+
vendorHash = "sha256-9Ey4roUm/Y6GfFmLD6ij/A+YIgetStawWmhD+Iq3qc8=";
excludedPackages = [ "./test" ];
+31 -34
pkgs/by-name/mo/movim/package.nix
···
{ lib
, fetchpatch
, fetchFromGitHub
+
, writeShellScript
, dash
, php
, phpCfg ? null
, withPgsql ? true # “strongly recommended” according to docs
, withMysql ? false
, minifyStaticFiles ? false # default files are often not minified
-
, parallel
, esbuild
, lightningcss
, scour
···
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-t63POjywZLk5ulppuCedFhhEhOsnB90vy3k/HhM3MGc=";
};
+
+
patches = [
+
(fetchpatch {
+
url = "https://github.com/movim/movim/commit/4dd2842f4617f3baaa166157892a532ad07df80d.patch";
+
hash = "sha256-32MLS5g60Rhm8HQDBPnUo9k+aB7L8dNMcnSjPIlooks=";
+
})
+
];
php = php.buildEnv ({
extensions = ({ all, enabled }:
···
});
nativeBuildInputs =
-
lib.optional (lib.any (x: x.enable) (lib.attrValues minify)) parallel
-
++ lib.optional minify.script.enable esbuild
+
lib.optional minify.script.enable esbuild
++ lib.optional minify.style.enable lightningcss
++ lib.optional minify.svg.enable scour;
···
'';
preBuild = lib.optionalString minify.script.enable ''
-
find ./public -type f -iname "*.js" \
-
| parallel ${lib.escapeShellArgs [
-
"--will-cite"
-
"-j $NIX_BUILD_CORES"
-
''
-
tmp="$(mktemp)"
-
esbuild {} --minify --target=${lib.escapeShellArg minify.script.target} --outfile=$tmp
-
[[ "$(stat -c %s $tmp)" -lt "$(stat -c %s {})" ]] && mv $tmp {}
-
''
-
]}
+
find ./public -type f -iname "*.js" -print0 \
+
| xargs -0 -n 1 -P $NIX_BUILD_CORES ${writeShellScript "movim_script_minify" ''
+
file="$1"
+
tmp="$(mktemp)"
+
esbuild $file --minify --target=${lib.escapeShellArg minify.script.target} --outfile=$tmp
+
[[ "$(stat -c %s $tmp)" -lt "$(stat -c %s $file)" ]] && mv $tmp $file
+
''}
'' + lib.optionalString minify.style.enable ''
-
export BROWSERLIST=${lib.escapeShellArg minify.style.browserslist}
-
find ./public -type f -iname "*.css" \
-
| parallel ${lib.escapeShellArgs [
-
"--will-cite"
-
"-j $NIX_BUILD_CORES"
-
''
-
tmp="$(mktemp)"
-
lightningcss {} --minify --browserslist --output-file=$tmp
-
[[ "$(stat -c %s $tmp)" -lt "$(stat -c %s {})" ]] && mv $tmp {}
-
''
-
]}
+
find ./public -type f -iname "*.css" -print0 \
+
| xargs -0 -n 1 -P $NIX_BUILD_CORES ${writeShellScript "movim_style_minify" ''
+
export BROWSERLIST="${lib.escapeShellArg minify.style.browserslist}"
+
file="$1"
+
tmp="$(mktemp)"
+
lightningcss $file --minify --browserslist --output-file=$tmp
+
[[ "$(stat -c %s $tmp)" -lt "$(stat -c %s $file)" ]] && mv $tmp $file
+
''}
'' + lib.optionalString minify.svg.enable ''
-
find ./public -type f -iname "*.svg" -a -not -path "*/emojis/*" \
-
| parallel ${lib.escapeShellArgs [
-
"--will-cite"
-
"-j $NIX_BUILD_CORES"
-
''
-
tmp="$(mktemp)"
-
scour -i {} -o $tmp --disable-style-to-xml --enable-comment-stripping --enable-viewboxing --indent=tab
-
[[ "$(stat -c %s $tmp)" -lt "$(stat -c %s {})" ]] && mv $tmp {}
-
''
-
]}
+
find ./public -type f -iname "*.svg" -a -not -path "*/emojis/*" -print0 \
+
| xargs -0 -n 1 -P $NIX_BUILD_CORES ${writeShellScript "movim_svg_minify" ''
+
file="$1"
+
tmp="$(mktemp)"
+
scour -i $file -o $tmp --disable-style-to-xml --enable-comment-stripping --enable-viewboxing --indent=tab
+
[[ "$(stat -c %s $tmp)" -lt "$(stat -c %s $file)" ]] && mv $tmp $file
+
''}
'';
postInstall = ''
+17 -5
pkgs/by-name/pw/pwndbg/package.nix
···
python3.pkgs.ropgadget # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32
]);
in
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation {
pname = "pwndbg";
version = lib.getVersion pwndbg-py;
format = "other";
···
runHook preInstall
mkdir -p $out/share/pwndbg
-
cp gdbinit.py $out/share/pwndbg
+
cp gdbinit.py $out/share/pwndbg/gdbinit.py
chmod +x $out/share/pwndbg/gdbinit.py
+
# First line is a import from future, so we need to append our imports after that
+
sed '2 i import sys, os
+
3 i [sys.path.append(p) for p in "${pythonPath}".split(":")]
+
4 i os.environ["PATH"] += ":${binPath}"' -i $out/share/pwndbg/gdbinit.py
# Don't require an in-package venv
touch $out/share/pwndbg/.skip-venv
makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \
-
--add-flags "-q -x $out/share/pwndbg/gdbinit.py" \
-
--prefix PATH : ${binPath} \
-
--set PYTHONPATH ${pythonPath} \
+
--add-flags "-q -x $out/share/pwndbg/gdbinit.py"
runHook postInstall
+
'';
+
+
doInstallCheck = true;
+
installCheckPhase = ''
+
runHook preInstallCheck
+
+
# Check if pwndbg is installed correctly
+
HOME=$TMPDIR LC_CTYPE=C.UTF-8 $out/bin/pwndbg -ex exit
+
+
runHook postInstallCheck
'';
meta = with lib; {
+6 -1
pkgs/by-name/te/tetrio-desktop/package.nix
···
let
tetrio-plus' =
if tetrio-plus == null
-
then callPackage ./tetrio-plus.nix { tetrio-src = finalAttrs.src; }
+
then
+
callPackage ./tetrio-plus.nix
+
{
+
tetrio-src = finalAttrs.src;
+
tetrio-version = finalAttrs.version;
+
}
else tetrio-plus;
asarPath =
+10 -4
pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix
···
, asar
, tetrio-src
+
, tetrio-version
}:
let
-
version = "unstable-2024-04-20";
+
version = "0.27.2";
src = fetchFromGitLab {
owner = "UniQMG";
repo = "tetrio-plus";
-
rev = "8091b969cddbff32254eaebf8088efb63f4c519a";
-
hash = "sha256-ow9DrS3jWNtTbz8Obj4l8Zdr3u9m7f9V3dYUE2H3thk=";
+
rev = "electron-v${version}-tetrio-v${lib.versions.major tetrio-version}";
+
hash = "sha256-PvTivTt1Zuvk5gaCcQDcIBFsUf/ZG7TJYXqm0NP++Bw=";
fetchSubmodules = true;
# tetrio-plus uses this info for displaying its version,
···
sourceRoot = "${src.name}/tpsecore";
-
cargoHash = "sha256-r5Qcu2u/ju0b/1PWz9tE5jNlNS3PfzS79Gm1XSKA3W4=";
+
cargoHash = "sha256-K9l8wQOtjf3l8gZMMdVnaNrgzVWGl62iBBcpA+ulJbw=";
nativeBuildInputs = [
wasm-pack
···
# Finally, we install the tetrio-plus code where the above patch script expects
cp -r $src out/tetrioplus
chmod -R u+w out/tetrioplus
+
+
# Disable the uninstall button in the tetrio-plus popup,
+
# as it doesn't make sense to mutably uninstall it in a nix package
+
substituteInPlace out/tetrioplus/desktop-manifest.js \
+
--replace-fail '"show_uninstaller_button": true' '"show_uninstaller_button": false'
# We don't need the tpsecore source code bundled
rm -rf out/tetrioplus/tpsecore/
+2 -2
pkgs/by-name/wo/workout-tracker/package.nix
···
buildGoModule rec {
pname = "workout-tracker";
-
version = "0.14.1";
+
version = "0.14.2";
src = fetchFromGitHub {
owner = "jovandeginste";
repo = "workout-tracker";
rev = "refs/tags/v${version}";
-
hash = "sha256-zmDY5KpKkq/9SYAm+v0QSnLLjxYQCzzXWLlCFkE8bA0=";
+
hash = "sha256-hQPBptpsxksfILZXXAVIcFf+W7Eea3pcgnndHY4mO9c=";
};
vendorHash = null;
+48 -48
pkgs/by-name/ze/zed-editor/Cargo.lock
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
]
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
]
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
]
[[package]]
···
"regex",
"rustc-hash",
"shlex",
-
"syn 2.0.48",
+
"syn 2.0.59",
"which 4.4.2",
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
"heck 0.4.1",
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
dependencies = [
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
[[package]]
name = "memchr"
-
version = "2.6.3"
+
version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+
checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
[[package]]
name = "memfd"
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
"proc-macro-error",
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
"phf_shared",
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
dependencies = [
"proc-macro2",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
[[package]]
name = "proc-macro2"
-
version = "1.0.78"
+
version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+
checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
dependencies = [
"unicode-ident",
···
checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
dependencies = [
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
"proc-macro2",
"quote",
"rust-embed-utils",
-
"syn 2.0.48",
+
"syn 2.0.59",
"walkdir",
···
"proc-macro-error",
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
"proc-macro2",
"quote",
"sea-bae",
-
"syn 2.0.48",
+
"syn 2.0.59",
"unicode-ident",
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
"proc-macro2",
"quote",
"rustversion",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
[[package]]
name = "syn"
-
version = "2.0.48"
+
version = "2.0.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+
checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a"
dependencies = [
"proc-macro2",
"quote",
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
[[package]]
name = "tree-sitter"
version = "0.20.100"
-
source = "git+https://github.com/tree-sitter/tree-sitter?rev=7f21c3b98c0749ac192da67a0d65dfe3eabc4a63#7f21c3b98c0749ac192da67a0d65dfe3eabc4a63"
+
source = "git+https://github.com/tree-sitter/tree-sitter?rev=7b4894ba2ae81b988846676f54c0988d4027ef4f#7b4894ba2ae81b988846676f54c0988d4027ef4f"
dependencies = [
"cc",
"regex",
···
"once_cell",
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
"wasm-bindgen-shared",
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
···
"anyhow",
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
"wasmtime-component-util",
"wasmtime-wit-bindgen",
"wit-parser",
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
"proc-macro2",
"quote",
"shellexpand",
-
"syn 2.0.48",
+
"syn 2.0.59",
"witx",
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
"wiggle-generate",
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
"anyhow",
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
"wit-bindgen-core",
"wit-bindgen-rust",
···
[[package]]
name = "zed"
-
version = "0.132.2"
+
version = "0.132.3"
dependencies = [
"activity_indicator",
"anyhow",
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
···
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.48",
+
"syn 2.0.59",
[[package]]
+3 -3
pkgs/by-name/ze/zed-editor/package.nix
···
rustPlatform.buildRustPackage rec {
pname = "zed";
-
version = "0.132.2";
+
version = "0.132.3";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "zed";
rev = "refs/tags/v${version}";
-
hash = "sha256-KojFa22CLne36kGfMvZGWjo2Ae3tjYAfL371c0qe/Bk=";
+
hash = "sha256-EuoUDke8vBPQkiMa9WlP2K3FroIBBAVNJRjsRx4rkO0=";
fetchSubmodules = true;
};
···
"nvim-rs-0.6.0-pre" = "sha256-bdWWuCsBv01mnPA5e5zRpq48BgOqaqIcAu+b7y1NnM8=";
"pathfinder_simd-0.5.3" = "sha256-bakBcAQZJdHQPXybe0zoMzE49aOHENQY7/ZWZUMt+pM=";
"taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw=";
-
"tree-sitter-0.20.100" = "sha256-k8au4++UJyaOCNo0cqokaQ5Is3BmIiCBSxiUkbrzhFQ=";
+
"tree-sitter-0.20.100" = "sha256-xZDWAjNIhWC2n39H7jJdKDgyE/J6+MAVSa8dHtZ6CLE=";
"tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=";
"tree-sitter-cpp-0.20.0" = "sha256-2QYEFkpwcRmh2kf4qEAL2a5lGSa316CetOhF73e7rEM=";
"tree-sitter-css-0.19.0" = "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU=";
+7 -29
pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-system-settings-unwrapped";
-
version = "1.0.2";
+
version = "1.1.0";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-system-settings";
rev = finalAttrs.version;
-
hash = "sha256-gi6ZujIs0AEDLsqcTNlRNSS8SyqEU6q0+xaDf55XwuM=";
+
hash = "sha256-Po5eArO7zyaGatTf6kqci3DdzFDJSZakeglbiMx9kR8=";
};
outputs = [
···
hash = "sha256-lSKAhtE3oSSv7USvDbbcfBZWAtWMmuKneWawKQABIiM=";
})
-
# Remove when version > 1.0.2
-
(fetchpatch {
-
name = "0003-lomiri-system-settings-Use-GSettings-for-DT2W-value.patch";
-
url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/29e2533efcac23e41b083b11c540c9221b71de7e.patch";
-
hash = "sha256-d52d/b1ZdafaqhOljCg5E3I12XWtFAfG4rmn8CYngB4=";
-
})
-
] ++ lib.optionals (lib.strings.versionOlder python3.pkgs.python-dbusmock.version "0.30.1") [
-
# Makes tests work with newer dbusmock, but breaks with much-newer dbusmock
-
# See for details:
-
# - https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/354
-
# - https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/426
-
# Remove/adjust based on merges & next LSS release, and packaged version of dbusmock
-
(fetchpatch {
-
name = "0101-lomiri-system-settings-Pass-missing-parameters-to-dbusmock.patch";
-
url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/b9aacd88e3789dbb7578f32b31ad5b239db227a2.patch";
-
hash = "sha256-jf+jMc+6QxONavlX5C9UZyX23jb6fZnYV8mWFyQGGbU=";
-
})
-
(fetchpatch {
-
name = "0102-lomiri-system-settings-Fix-BT-plugin-testIsPaired.patch";
-
url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/e39b9728e18635413f07f9c9f6ddc73208260b2a.patch";
-
hash = "sha256-YUtdlQ2XcanXzsxD40SbML7fSxG75yMKz/XnaQN9YP8=";
-
})
+
# Fixes tests with very-recent python-dbusmock
+
# Remove when version > 1.1.0
(fetchpatch {
-
name = "0103-lomiri-system-settings-Fix-BT-plugin-testGet-IconName-Type.patch";
-
url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/9ad5d9324945f06f764d3a963dbfc7bccefe574b.patch";
-
# Merge conflict, relevant change handled further down
-
excludes = [ "CMakeLists.txt" ];
-
hash = "sha256-QCgkVos9Q9/8jd25rqzdEKdnBw0Re47X7B9nLH8QOQU=";
+
name = "0003-lomiri-system-settings-Revert-Pass-missing-parameter-to-dbusmock-bluez-PairDevice-function.patch";
+
url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/67d9e28ebab8bdb9473d5bf8da2b7573e6848fa2.patch";
+
hash = "sha256-pFWNne2UH3R5Fz9ayHvIpDXDQbXPs0k4b/oRg0fzi+s=";
})
] ++ [
+11 -14
pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch
···
-
From 243477a2bd6e315c77ebaf5b2ed4a9c9c4e1e22a Mon Sep 17 00:00:00 2001
-
From: OPNA2608 <christoph.neidahl@gmail.com>
-
Date: Sat, 25 Nov 2023 10:49:32 +0100
+
From c71d5fed4ef1f0b6d56400cddf02d8ac438168c8 Mon Sep 17 00:00:00 2001
+
From: OPNA2608 <opna2608@protonmail.com>
+
Date: Wed, 17 Apr 2024 16:18:23 +0200
Subject: [PATCH] Mark problematic tests
- ShapeMaterial requires a Qt OpenGL context, doesn't work in our sandbox
- SignalSpy on QML shaders compilers don't see changes
-
- Scaling value from environment not picked up properly since Qt 5.15.11
-
https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/34
- TypeError on some properties with Qt 5.15
https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/9
---
-
tests/checkresults.sh | 89 ++++++++++++++++++++++++++++++++++++++++---
-
1 file changed, 83 insertions(+), 6 deletions(-)
+
tests/checkresults.sh | 88 ++++++++++++++++++++++++++++++++++++++++---
+
1 file changed, 82 insertions(+), 6 deletions(-)
diff --git a/tests/checkresults.sh b/tests/checkresults.sh
-
index fc498985e..730b9d406 100755
+
index fc498985e..b5d204d0d 100755
--- a/tests/checkresults.sh
+++ b/tests/checkresults.sh
@@ -22,6 +22,7 @@ ERRORS_PATTERN='<failure'
···
EXCEPTED=0
for _XML in $*; do
_TESTNAME=$(basename $_XML | sed -r 's@(.+)\.xml@\1@' -)
-
@@ -31,7 +32,72 @@ for _XML in $*; do
+
@@ -31,7 +32,71 @@ for _XML in $*; do
exit 1
fi
···
+ swipearea \
+ tst_icon.11.qml \
+ tst_icon.13.qml \
-
+ dpr1 \
+ '
+
+ EXCEPTIONS='\
···
tst_tabbar.11.qml \
tst_datepicker.bug1567840.SEGFAULT.12.qml \
tst_datepicker.bug1567840.SEGFAULT.13.qml \
-
@@ -49,22 +115,28 @@ for _XML in $*; do
+
@@ -49,22 +114,28 @@ for _XML in $*; do
inversemousearea \
tst_listitem_focus_bug.13.qml \
tst_shortcuts.13.qml \
···
WOOT_FILES="${WOOT_FILES} ${_TESTNAME}\n"
fi
done
-
@@ -82,6 +154,11 @@ if [ -n "$FATAL_WARNINGS_FILES" ]; then
+
@@ -82,6 +153,11 @@ if [ -n "$FATAL_WARNINGS_FILES" ]; then
echo -e "$FATAL_WARNINGS_FILES"
fi
···
if [ -n "$EXCEPTED_FILES" ]; then
echo The following tests issued $EXCEPTED expected warnings:
echo -e "$EXCEPTED_FILES"
-
@@ -89,7 +166,7 @@ fi
+
@@ -89,7 +165,7 @@ fi
if [ -n "$WOOT_FILES" ]; then
echo Woot! Known problematic tests passed!
···
fi
--
-
2.40.1
+
2.42.0
+11 -27
pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
···
{ stdenv
, lib
, fetchFromGitLab
-
, fetchpatch
, gitUpdater
, substituteAll
, testers
···
in
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-ui-toolkit";
-
version = "1.3.5012";
+
version = "1.3.5100";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-ui-toolkit";
rev = finalAttrs.version;
-
hash = "sha256-Azz2IOm/7XRvDbyIKaYxrkR47evSB17ejtssuEJayPc=";
+
hash = "sha256-r+wUCl+ywFcgFYo7BjBoXiulQptd1Zd3LJchXiMtx4I=";
};
outputs = [ "out" "dev" ];
patches = [
-
# Upstreaming effort for these two patches: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/merge_requests/44
-
(fetchpatch {
-
name = "0001-lomiri-ui-toolkit-fix-tests-on-qt-5.15.4.patch";
-
url = "https://salsa.debian.org/ubports-team/lomiri-ui-toolkit/-/raw/1ad650c326ba9706d549d1dbe8335c70f6b382c8/debian/patches/0001-fix-tests-on-qt-5.15.4.patch";
-
hash = "sha256-Y5HVvulR2760DBzlmYkImbJ/qIeqMISqPpUppbv8xJA=";
-
})
-
(fetchpatch {
-
name = "0002-lomiri-ui-toolkit-fix-tests-on-qt-5.15.5.patch";
-
url = "https://salsa.debian.org/ubports-team/lomiri-ui-toolkit/-/raw/03bcafadd3e4fda34bcb5af23454f4b202cf5517/debian/patches/0002-fix-tests-on-qt-5.15.5.patch";
-
hash = "sha256-x8Zk7+VBSlM16a3V1yxJqIB63796H0lsS+F4dvR/z80=";
-
})
-
./2001-Mark-problematic-tests.patch
(substituteAll {
src = ./2002-Nixpkgs-versioned-QML-path.patch.in;
···
postPatch = ''
patchShebangs documentation/docs.sh tests/
-
substituteInPlace tests/tests.pro \
-
--replace "\''$\''$PYTHONDIR" "$dev/${python3.sitePackages}"
-
for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do
substituteInPlace $subproject/$subproject.pro \
-
--replace "\''$\''$[QT_INSTALL_PREFIX]" "$out" \
-
--replace "\''$\''$[QT_INSTALL_LIBS]" "$out/lib"
+
--replace-fail "\''$\''$[QT_INSTALL_PREFIX]" "$out" \
+
--replace-warn "\''$\''$[QT_INSTALL_LIBS]" "$out/lib"
done
# Install apicheck tool into bin
substituteInPlace apicheck/apicheck.pro \
-
--replace "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin"
+
--replace-fail "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin"
# Causes redefinition error with our own fortify hardening
sed -i '/DEFINES += _FORTIFY_SOURCE/d' features/lomiri_common.prf
···
# Using /run/current-system/sw/share/locale instead of /usr/share/locale isn't a great
# solution, but at least it should get us working localisations
substituteInPlace src/LomiriToolkit/i18n.cpp \
-
--replace "/usr" "/run/current-system/sw"
+
--replace-fail "/usr" "/run/current-system/sw"
# The code here overrides the regular QML import variables so the just-built modules are found & used in the tests
# But we need their QML dependencies too, so put them back in there
substituteInPlace export_qml_dir.sh \
-
--replace '_IMPORT_PATH=$BUILD_DIR/qml' '_IMPORT_PATH=$BUILD_DIR/qml:${qtQmlPaths}'
+
--replace-fail '_IMPORT_PATH=$BUILD_DIR/qml' '_IMPORT_PATH=$BUILD_DIR/qml:${qtQmlPaths}'
# These tests try to load Suru theme icons, but override XDG_DATA_DIRS / use full paths to load them
substituteInPlace \
tests/unit/visual/tst_visual.cpp \
tests/unit/visual/tst_icon.{11,13}.qml \
tests/unit/visual/tst_imageprovider.11.qml \
-
--replace '/usr/share' '${suru-icon-theme}/share'
+
--replace-fail '/usr/share' '${suru-icon-theme}/share'
'';
# With strictDeps, QMake only picks up Qt dependencies from nativeBuildInputs
···
# Qt-generated wrapper script lacks QML paths to dependencies
for qmlModule in Components PerformanceMetrics Test; do
substituteInPlace src/imports/$qmlModule/wrapper.sh \
-
--replace 'QML2_IMPORT_PATH=' 'QML2_IMPORT_PATH=${qtQmlPaths}:'
+
--replace-fail 'QML2_IMPORT_PATH=' 'QML2_IMPORT_PATH=${qtQmlPaths}:'
done
'';
···
# Code loads Qt's qt_module.prf, which force-overrides all QMAKE_PKGCONFIG_* variables except PREFIX for QMake-generated pkg-config files
for pcFile in Lomiri{Gestures,Metrics,Toolkit}.pc; do
substituteInPlace $out/lib/pkgconfig/$pcFile \
-
--replace "${lib.getLib qtbase}/lib" "\''${prefix}/lib" \
-
--replace "${lib.getDev qtbase}/include" "\''${prefix}/include"
+
--replace-fail "${lib.getLib qtbase}/lib" "\''${prefix}/lib" \
+
--replace-fail "${lib.getDev qtbase}/include" "\''${prefix}/include"
done
# These are all dev-related tools, but declaring a bin output also moves around the QML modules
+1 -1
pkgs/development/libraries/SDL2_mixer/default.nix
···
description = "SDL multi-channel audio mixer library";
platforms = platforms.unix;
homepage = "https://github.com/libsdl-org/SDL_mixer";
-
maintainers = with maintainers; [ MP2E ];
+
maintainers = with maintainers; [ ];
license = licenses.zlib;
};
}
+1 -1
pkgs/development/libraries/SDL2_net/default.nix
···
description = "SDL multiplatform networking library";
homepage = "https://www.libsdl.org/projects/SDL_net";
license = licenses.zlib;
-
maintainers = with maintainers; [ MP2E ];
+
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
+2 -2
pkgs/development/libraries/the-foundation/default.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "the-foundation";
-
version = "1.7.0";
+
version = "1.8.1";
src = fetchFromGitea {
domain = "git.skyjake.fi";
owner = "skyjake";
repo = "the_Foundation";
rev = "v${finalAttrs.version}";
-
hash = "sha256-6bEd8KzOfBse5sQ2zp+cZtEAu8xIl3GqrpxSZ7h/edI=";
+
hash = "sha256-gyDBK/bF+QxXMnthUfMjeUuRBZk0Xcahm7wOtLGs5kY=";
};
nativeBuildInputs = [ cmake pkg-config ];
+2 -2
pkgs/development/ocaml-modules/iri/default.nix
···
buildDunePackage rec {
pname = "iri";
-
version = "0.7.0";
+
version = "1.0.0";
minimalOCamlVersion = "4.12";
···
owner = "zoggy";
repo = "ocaml-iri";
rev = version;
-
hash = "sha256-Mkg7kIIVpKbeWUras1RqtJsRx2Q3dBnm4QqSMJFweF8=";
+
hash = "sha256-6Q7qPezmdcO6JSevWl55XAxFuIROZNDrMkYw8VRR7qg=";
};
propagatedBuildInputs = [ sedlex uunf uutf ];
+2 -2
pkgs/development/ocaml-modules/tsdl-ttf/default.nix
···
buildDunePackage rec {
pname = "tsdl-ttf";
-
version = "0.5";
+
version = "0.6";
duneVersion = "3";
···
owner = "sanette";
repo = pname;
rev = version;
-
hash = "sha256-ai9ChsA3HZzTxT9AuHsY1UIA2Q3U3CcOA7jRSG4MDsQ=";
+
hash = "sha256-1MGbsekaBoCz4vAwg+Dfzsl0xUKgs8dUEr+OpLopnig=";
};
buildInputs = [
+10 -9
pkgs/development/python-modules/manim-slides/default.nix
···
, fetchFromGitHub
, pythonOlder
+
, hatchling
+
, pythonRelaxDepsHook
, manim
, ffmpeg
···
# Optional dependencies
, ipython
-
# Hooks
-
, pdm-backend
-
, pythonRelaxDepsHook
-
# As Module or application?
, withGui ? false
}:
buildPythonPackage rec {
pname = "manim-slides";
-
format = "pyproject";
-
version = "5.1.3";
+
version = "5.1.5";
+
pyproject = true;
disabled = pythonOlder "3.9";
···
owner = "jeertmans";
repo = "manim-slides";
rev = "refs/tags/v${version}";
-
hash = "sha256-WZR95swapT2Fbu6mbuHLjMu3Okq/wKFabzN7xpZw0/g=";
+
hash = "sha256-YOveWGukizXvEUOhId7UDJema64ypbg7w06JzrTsKjw=";
};
-
nativeBuildInputs = [ pdm-backend pythonRelaxDepsHook ];
+
build-system = [
+
hatchling
+
pythonRelaxDepsHook
+
];
pythonRemoveDeps = [ "opencv-python" ];
pythonRelaxDeps = [ "rtoml" "qtpy" ];
-
propagatedBuildInputs = [
+
dependencies = [
av
click
click-default-group
+3 -1
pkgs/development/python-modules/pystemd/default.nix
···
nativeBuildInputs = [ pkg-config ];
-
nativeCheckInputs = [ lxml mock psutil pytest ];
+
propagatedBuildInputs = [ lxml psutil ];
+
+
nativeCheckInputs = [ mock pytest ];
checkPhase = "pytest tests";
+4
pkgs/development/python-modules/tokenizers/default.nix
···
, buildPythonPackage
, cargo
, datasets
+
, huggingface-hub
, fetchFromGitHub
, fetchurl
, libiconv
···
, openssl
, pkg-config
, pytestCheckHook
+
, python
, pythonOlder
, requests
, rustPlatform
···
};
sourceRoot = "${src.name}/bindings/python";
+
maturinBuildFlags = [ "--interpreter ${python.executable}" ];
nativeBuildInputs = [
pkg-config
···
dependencies = [
numpy
+
huggingface-hub
];
nativeCheckInputs = [
+3 -3
pkgs/development/tools/rust/cargo-deny/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
-
version = "0.14.21";
+
version = "0.14.22";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-deny";
rev = version;
-
hash = "sha256-d5qgljNuEfh9kYQU+jP4tgyly6i7hETFC5tEY67Yq8g=";
+
hash = "sha256-04CRMlH31MzYpE2pRUrbAvSojbxan4ktqX9J/zjeTkk=";
};
-
cargoHash = "sha256-u1cayvVatGg03Q3xShC/0ymE8EGHyYFrZD3Q8UD8Mm8=";
+
cargoHash = "sha256-Nutx3Dvvh7qvgAtengWw0kJve4Ent9y7OXgovUZWTLE=";
nativeBuildInputs = [
pkg-config
+102 -282
pkgs/development/tools/rye/Cargo.lock
···
[[package]]
name = "age"
-
version = "0.9.2"
+
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "6d55a4d912c80a92762ffd1c884065f3f9646467d22c95390e824a0ff7def472"
+
checksum = "edeef7d7b199195a2d7d7a8155d2d04aee736e60c5c7bdd7097d115369a8817d"
dependencies = [
"age-core",
-
"base64 0.13.1",
+
"base64 0.21.7",
"bech32",
"chacha20poly1305",
"cookie-factory",
-
"hkdf",
"hmac",
"i18n-embed",
"i18n-embed-fl",
"lazy_static",
"nom",
"pin-project",
-
"rand 0.7.3",
-
"rand 0.8.5",
+
"rand",
"rust-embed",
"scrypt",
"sha2",
···
[[package]]
name = "age-core"
-
version = "0.9.0"
+
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "e3d2e815ac879dc23c1139e720d21c6cd4d1276345c772587285d965a69b8f32"
+
checksum = "a5f11899bc2bbddd135edbc30c36b1924fa59d0746bb45beb5933fafe3fe509b"
dependencies = [
-
"base64 0.13.1",
+
"base64 0.21.7",
"chacha20poly1305",
"cookie-factory",
"hkdf",
"io_tee",
"nom",
-
"rand 0.8.5",
+
"rand",
"secrecy",
"sha2",
]
···
]
[[package]]
-
name = "cfb"
-
version = "0.7.3"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
-
dependencies = [
-
"byteorder",
-
"fnv",
-
"uuid",
-
]
-
-
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b"
[[package]]
-
name = "core-foundation-sys"
-
version = "0.8.6"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-
[[package]]
name = "cpufeatures"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "curve25519-dalek"
-
version = "3.2.0"
+
version = "4.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+
checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
dependencies = [
-
"byteorder",
-
"digest 0.9.0",
-
"rand_core 0.5.1",
+
"cfg-if",
+
"cpufeatures",
+
"curve25519-dalek-derive",
+
"fiat-crypto",
+
"platforms",
+
"rustc_version",
"subtle",
"zeroize",
]
[[package]]
-
name = "darling"
-
version = "0.14.4"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-
dependencies = [
-
"darling_core",
-
"darling_macro",
-
]
-
-
[[package]]
-
name = "darling_core"
-
version = "0.14.4"
+
name = "curve25519-dalek-derive"
+
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
+
checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
-
"fnv",
-
"ident_case",
"proc-macro2",
"quote",
-
"strsim",
-
"syn 1.0.109",
-
]
-
-
[[package]]
-
name = "darling_macro"
-
version = "0.14.4"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
-
dependencies = [
-
"darling_core",
-
"quote",
-
"syn 1.0.109",
+
"syn 2.0.48",
]
[[package]]
···
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
-
-
[[package]]
-
name = "decompress"
-
version = "0.6.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "67605f4868a37e8a9c50003a866a6896104602d5d7ddf7e8a7f398ec97e44ab3"
-
dependencies = [
-
"derive_builder",
-
"flate2",
-
"infer",
-
"lazy_static",
-
"regex",
-
"tar",
-
"thiserror",
-
"zstd 0.12.4",
-
]
[[package]]
name = "deranged"
···
]
[[package]]
-
name = "derive_builder"
-
version = "0.12.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
-
dependencies = [
-
"derive_builder_macro",
-
]
-
-
[[package]]
-
name = "derive_builder_core"
-
version = "0.12.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
-
dependencies = [
-
"darling",
-
"proc-macro2",
-
"quote",
-
"syn 1.0.109",
-
]
-
-
[[package]]
-
name = "derive_builder_macro"
-
version = "0.12.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
-
dependencies = [
-
"derive_builder_core",
-
"syn 1.0.109",
-
]
-
-
[[package]]
name = "deunicode"
version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "digest"
-
version = "0.9.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-
dependencies = [
-
"generic-array",
-
]
-
-
[[package]]
-
name = "digest"
version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
···
checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
[[package]]
+
name = "fiat-crypto"
+
version = "0.2.7"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f"
+
+
[[package]]
name = "filetime"
version = "0.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
]
[[package]]
-
name = "fnv"
-
version = "1.0.7"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-
[[package]]
name = "form_urlencoded"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "getrandom"
-
version = "0.1.16"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-
dependencies = [
-
"cfg-if",
-
"libc",
-
"wasi 0.9.0+wasi-snapshot-preview1",
-
]
-
-
[[package]]
-
name = "getrandom"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
dependencies = [
"cfg-if",
"libc",
-
"wasi 0.11.0+wasi-snapshot-preview1",
+
"wasi",
]
[[package]]
···
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
dependencies = [
-
"digest 0.10.7",
+
"digest",
]
[[package]]
···
[[package]]
name = "i18n-embed"
-
version = "0.13.9"
+
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa"
+
checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c"
dependencies = [
"arc-swap",
"fluent",
···
[[package]]
name = "i18n-embed-fl"
-
version = "0.6.7"
+
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395"
+
checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2"
dependencies = [
"dashmap",
"find-crate",
···
"quote",
"syn 2.0.48",
]
-
-
[[package]]
-
name = "ident_case"
-
version = "1.0.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "idna"
···
"number_prefix",
"portable-atomic",
"unicode-width",
-
]
-
-
[[package]]
-
name = "infer"
-
version = "0.12.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3"
-
dependencies = [
-
"cfb",
]
[[package]]
···
"tracing",
"unscanny",
"ureq",
-
"zstd 0.13.0",
+
"zstd",
[[package]]
···
[[package]]
-
name = "ntapi"
-
version = "0.4.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
-
dependencies = [
-
"winapi",
-
]
-
-
[[package]]
name = "num-conv"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "pbkdf2"
-
version = "0.11.0"
+
version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+
checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
dependencies = [
-
"digest 0.10.7",
+
"digest",
+
"hmac",
[[package]]
···
checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
[[package]]
+
name = "platforms"
+
version = "3.3.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
+
+
[[package]]
name = "poly1305"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "rand"
-
version = "0.7.3"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-
dependencies = [
-
"getrandom 0.1.16",
-
"libc",
-
"rand_chacha 0.2.2",
-
"rand_core 0.5.1",
-
"rand_hc",
-
]
-
-
[[package]]
-
name = "rand"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
-
"rand_chacha 0.3.1",
-
"rand_core 0.6.4",
-
]
-
-
[[package]]
-
name = "rand_chacha"
-
version = "0.2.2"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-
dependencies = [
-
"ppv-lite86",
-
"rand_core 0.5.1",
+
"rand_chacha",
+
"rand_core",
[[package]]
···
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
-
"rand_core 0.6.4",
-
]
-
-
[[package]]
-
name = "rand_core"
-
version = "0.5.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-
dependencies = [
-
"getrandom 0.1.16",
+
"rand_core",
[[package]]
···
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
-
"getrandom 0.2.12",
-
]
-
-
[[package]]
-
name = "rand_hc"
-
version = "0.2.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-
dependencies = [
-
"rand_core 0.5.1",
+
"getrandom",
[[package]]
···
checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
dependencies = [
"cc",
-
"getrandom 0.2.12",
+
"getrandom",
"libc",
"spin",
"untrusted",
···
[[package]]
name = "rust-embed"
-
version = "6.8.1"
+
version = "8.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661"
+
checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745"
dependencies = [
"rust-embed-impl",
"rust-embed-utils",
···
[[package]]
name = "rust-embed-impl"
-
version = "6.8.1"
+
version = "8.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac"
+
checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8"
dependencies = [
"proc-macro2",
"quote",
···
[[package]]
name = "rust-embed-utils"
-
version = "7.8.1"
+
version = "8.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74"
+
checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581"
dependencies = [
"sha2",
"walkdir",
···
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
+
name = "rustc_version"
+
version = "0.4.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+
dependencies = [
+
"semver",
+
]
+
+
[[package]]
name = "rustix"
version = "0.38.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "rye"
-
version = "0.31.0"
+
version = "0.33.0"
dependencies = [
"age",
"anyhow",
···
"console",
"ctrlc",
"curl",
-
"decompress",
"dialoguer",
"dotenvy",
"flate2",
···
"insta-cmd",
"junction",
"license",
-
"memchr",
"minijinja",
"monotrail-utils",
-
"nix",
"once_cell",
"pathdiff",
"pep440_rs",
···
"shlex",
"slug",
"static_vcruntime",
-
"sysinfo",
"tar",
"tempfile",
-
"toml_edit",
+
"toml_edit 0.22.9",
"url",
"walkdir",
"which",
···
"winreg",
"xattr",
"zip",
-
"zstd 0.13.0",
+
"zstd",
[[package]]
···
[[package]]
name = "scrypt"
-
version = "0.10.0"
+
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d"
+
checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
dependencies = [
-
"hmac",
"pbkdf2",
"salsa20",
"sha2",
···
checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba"
[[package]]
+
name = "semver"
+
version = "1.0.22"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+
+
[[package]]
name = "serde"
version = "1.0.196"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
dependencies = [
"cfg-if",
"cpufeatures",
-
"digest 0.10.7",
+
"digest",
[[package]]
···
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
-
"quote",
"unicode-ident",
···
[[package]]
-
name = "sysinfo"
-
version = "0.29.11"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
-
dependencies = [
-
"cfg-if",
-
"core-foundation-sys",
-
"libc",
-
"ntapi",
-
"once_cell",
-
"winapi",
-
]
-
-
[[package]]
name = "tar"
version = "0.4.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
"serde",
"serde_spanned",
"toml_datetime",
-
"toml_edit",
+
"toml_edit 0.21.1",
[[package]]
···
"serde",
"serde_spanned",
"toml_datetime",
-
"winnow",
+
"winnow 0.5.37",
+
]
+
+
[[package]]
+
name = "toml_edit"
+
version = "0.22.9"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
+
dependencies = [
+
"indexmap",
+
"toml_datetime",
+
"winnow 0.6.5",
[[package]]
···
[[package]]
-
name = "uuid"
-
version = "1.7.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
-
-
[[package]]
name = "vcpkg"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
"same-file",
"winapi-util",
-
-
[[package]]
-
name = "wasi"
-
version = "0.9.0+wasi-snapshot-preview1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]]
name = "wasi"
···
[[package]]
+
name = "winnow"
+
version = "0.6.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+
dependencies = [
+
"memchr",
+
]
+
+
[[package]]
name = "winreg"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "x25519-dalek"
-
version = "1.1.1"
+
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f"
+
checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
dependencies = [
"curve25519-dalek",
-
"rand_core 0.5.1",
+
"rand_core",
+
"serde",
"zeroize",
···
[[package]]
name = "zstd"
-
version = "0.12.4"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
-
dependencies = [
-
"zstd-safe 6.0.6",
-
]
-
-
[[package]]
-
name = "zstd"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
dependencies = [
-
"zstd-safe 7.0.0",
-
]
-
-
[[package]]
-
name = "zstd-safe"
-
version = "6.0.6"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
-
dependencies = [
-
"libc",
-
"zstd-sys",
+
"zstd-safe",
[[package]]
+4 -2
pkgs/development/tools/rye/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "rye";
-
version = "0.31.0";
+
version = "0.33.0";
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "rye";
rev = "refs/tags/${version}";
-
hash = "sha256-hPfMKp5FUbIKKKFfoS/pxseWmhqW8UOts7DOcRzgHWU=";
+
hash = "sha256-sgA+Tp4Qysd07+1iNDgn9Hw0nDN8l6/fD41rE5QqWzY=";
};
cargoLock = {
···
"--skip=test_add_flask"
"--skip=test_add_from_find_links"
"--skip=test_autosync_remember"
+
"--skip=test_basic_list"
"--skip=test_basic_tool_behavior"
"--skip=test_config_empty"
"--skip=test_config_get_set_multiple"
···
"--skip=test_init_lib"
"--skip=test_init_script"
"--skip=test_lint_and_format"
+
"--skip=test_list_not_rye_managed"
"--skip=test_publish_outside_project"
"--skip=test_version"
];
+1 -1
pkgs/games/doom-ports/chocolate-doom/default.nix
···
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
hydraPlatforms = lib.platforms.linux; # darwin times out
-
maintainers = with lib.maintainers; [ MP2E ];
+
maintainers = with lib.maintainers; [ ];
};
}
+1 -1
pkgs/games/doom-ports/dhewm3/default.nix
···
description = "Doom 3 port to SDL";
mainProgram = "dhewm3";
license = lib.licenses.gpl3;
-
maintainers = with maintainers; [ MP2E ];
+
maintainers = with maintainers; [ ];
platforms = with platforms; linux;
};
}
+1 -1
pkgs/games/doom-ports/doomseeker/default.nix
···
mainProgram = "doomseeker";
license = licenses.gpl2;
platforms = platforms.unix;
-
maintainers = [ maintainers.MP2E ];
+
maintainers = [ ];
};
}
+1 -1
pkgs/games/doom-ports/eternity-engine/default.nix
···
mainProgram = "eternity";
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
-
maintainers = with lib.maintainers; [ MP2E ];
+
maintainers = with lib.maintainers; [ ];
};
}
+1 -1
pkgs/games/doom-ports/odamex/default.nix
···
description = "A client/server port for playing old-school Doom online";
license = lib.licenses.gpl2Only;
platforms = lib.platforms.unix;
-
maintainers = with lib.maintainers; [ MP2E ];
+
maintainers = with lib.maintainers; [ ];
};
}
+1 -1
pkgs/games/doom-ports/zandronum/alpha/default.nix
···
meta = with lib; {
homepage = "https://zandronum.com/";
description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
-
maintainers = with maintainers; [ lassulus MP2E ];
+
maintainers = with maintainers; [ lassulus ];
license = licenses.sleepycat;
platforms = platforms.linux;
};
+1 -1
pkgs/games/doom-ports/zandronum/default.nix
···
homepage = "https://zandronum.com/";
description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
mainProgram = "zandronum-server";
-
maintainers = with maintainers; [ lassulus MP2E ];
+
maintainers = with maintainers; [ lassulus ];
license = licenses.sleepycat;
platforms = platforms.linux;
};
+3 -3
pkgs/os-specific/linux/below/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "below";
-
version = "0.7.1";
+
version = "0.8.1";
src = fetchFromGitHub {
owner = "facebookincubator";
repo = "below";
rev = "v${version}";
-
sha256 = "sha256-2mZBpvLPY6yrEAvB1YlFuaXJlmmNuZqhu3xWADNHbx0=";
+
sha256 = "sha256-87Fdx3Jqi3dNWM5DZl+UYs031qn2DoiiWd3IysT/glQ=";
};
-
cargoHash = "sha256-cTNxWCd4YH5VuZh0GRfBNtHmLqCQ75uyHqROkv1jbRA=";
+
cargoHash = "sha256-y2fNypA0MrCdUI/K6QrZWw/5mkYafj2s6jrGHU2zGXw=";
prePatch = ''sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service'';
postInstall = ''
+1 -1
pkgs/os-specific/linux/mwprocapture/default.nix
···
homepage = "https://www.magewell.com/";
description = "Linux driver for the Magewell Pro Capture family";
license = licenses.unfreeRedistributable;
-
maintainers = with maintainers; [ flexiondotorg MP2E ];
+
maintainers = with maintainers; [ flexiondotorg ];
platforms = platforms.linux;
};
}
+2 -2
pkgs/servers/guacamole-client/default.nix
···
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "guacamole-client";
-
version = "1.5.4";
+
version = "1.5.5";
src = fetchurl {
url = "https://archive.apache.org/dist/guacamole/${finalAttrs.version}/binary/guacamole-${finalAttrs.version}.war";
-
hash = "sha256-Vyi1Y5Eb1kvOCguBx06ozLIZDReFv/NAMPxohagnPT4=";
+
hash = "sha256-QmcwfzYAZjcj8kr5LVlumcg1lCUxUTUFKkLUUflSkgA=";
};
dontUnpack = true;
+2 -2
pkgs/servers/guacamole-server/default.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "guacamole-server";
-
version = "1.5.4";
+
version = "1.5.5";
src = fetchFromGitHub {
owner = "apache";
repo = "guacamole-server";
rev = finalAttrs.version;
-
hash = "sha256-Jke9Sp/T/GyamTq7lyu8JakJHqEwSrer0v1DugSg7JY=";
+
hash = "sha256-ZrUaoWkZ3I/LxE7csDXXeUZ92jZDhkZ1c8EQU0gI1yY=";
};
NIX_CFLAGS_COMPILE = [
+6 -4
pkgs/tools/admin/azure-cli/default.nix
···
, url
, sha256
, description
-
}: python3.pkgs.buildPythonPackage {
-
inherit pname version;
+
, ...
+
}@args: python3.pkgs.buildPythonPackage ({
format = "wheel";
src = fetchurl { inherit url sha256; };
meta = with lib; {
···
license = lib.licenses.mit;
sourceProvenance = [ sourceTypes.fromSource ];
};
-
};
+
} // (removeAttrs args [ "url" "sha256" "description" ]));
-
extensions = callPackages ./extensions-generated.nix { inherit mkAzExtension; };
+
extensions =
+
callPackages ./extensions-generated.nix { inherit mkAzExtension; }
+
// callPackages ./extensions-manual.nix { inherit mkAzExtension; };
extensionDir = stdenvNoCC.mkDerivation {
name = "azure-cli-extensions";
+16
pkgs/tools/admin/azure-cli/extensions-manual.nix
···
+
{ mkAzExtension
+
, python3Packages
+
}:
+
+
{
+
azure-devops = mkAzExtension rec {
+
pname = "azure-devops";
+
version = "1.0.0";
+
url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl";
+
sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a";
+
description = "Tools for managing Azure DevOps";
+
propagatedBuildInputs = with python3Packages; [
+
distro
+
];
+
};
+
}
-1
pkgs/tools/networking/ghz/default.nix
···
description = "Simple gRPC benchmarking and load testing tool";
homepage = "https://ghz.sh";
license = licenses.asl20;
-
maintainers = [ maintainers.zombiezen ];
};
}