nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-10-07 12:06:11 +00:00 committed by GitHub
commit a0b1d0baed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
48 changed files with 1664 additions and 1202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/desktop-managers/lomiri.nix
View File

@ -44,10 +44,9 @@ in {
telephony-service
teleports
]);
variables = {
# To override the keyboard layouts in Lomiri
NIXOS_XKB_LAYOUTS = config.services.xserver.xkb.layout;
};
# To override the default keyboard layout in Lomiri
etc.${pkgs.lomiri.lomiri.passthru.etcLayoutsFile}.text = lib.strings.replaceStrings [","] ["\n"] config.services.xserver.xkb.layout;
};
hardware = {

5
nixos/modules/system/activation/activation-script.nix
View File

@ -234,11 +234,12 @@ in
system.activationScripts.var = ""; # obsolete
systemd.tmpfiles.rules = [
"D /var/empty 0555 root root -"
"h /var/empty - - - - +i"
] ++ lib.optionals config.nix.enable [
# Prevent the current configuration from being garbage-collected.
"d /nix/var/nix/gcroots -"
"L+ /nix/var/nix/gcroots/current-system - - - - /run/current-system"
"D /var/empty 0555 root root -"
"h /var/empty - - - - +i"
];
system.activationScripts.usrbinenv = if config.environment.usrbinenv != null

10
nixos/modules/system/boot/systemd/tmpfiles.nix
View File

@ -281,15 +281,19 @@ in
) cfg.settings);
systemd.tmpfiles.rules = [
"d /nix/var 0755 root root - -"
"L+ /nix/var/nix/gcroots/booted-system 0755 root root - /run/booted-system"
"d /run/lock 0755 root root - -"
"d /var/db 0755 root root - -"
"L /var/lock - - - - ../run/lock"
# Boot-time cleanup
] ++ lib.optionals config.nix.enable [
"d /nix/var 0755 root root - -"
"L+ /nix/var/nix/gcroots/booted-system 0755 root root - /run/booted-system"
]
# Boot-time cleanup
++ [
"R! /etc/group.lock - - - - -"
"R! /etc/passwd.lock - - - - -"
"R! /etc/shadow.lock - - - - -"
] ++ lib.optionals config.nix.enable [
"R! /nix/var/nix/gcroots/tmp - - - - -"
"R! /nix/var/nix/temproots - - - - -"
];

3
nixos/tests/common/resolver.nix
View File

@ -31,10 +31,11 @@
services.bind.forwarders = lib.mkForce [];
services.bind.zones = lib.singleton {
name = ".";
master = true;
file = let
addDot = zone: zone + lib.optionalString (!lib.hasSuffix "." zone) ".";
mkNsdZoneNames = zones: map addDot (lib.attrNames zones);
mkBindZoneNames = zones: map (zone: addDot zone.name) zones;
mkBindZoneNames = zones: map addDot (lib.attrNames zones);
getZones = cfg: mkNsdZoneNames cfg.services.nsd.zones
++ mkBindZoneNames cfg.services.bind.zones;

88
nixos/tests/lomiri.nix
View File

@ -700,4 +700,92 @@ in
}
);
keymap =
let
pwInput = "qwerty";
pwOutput = "qwertz";
in
makeTest (
{ pkgs, lib, ... }:
{
name = "lomiri-keymap";
meta = {
maintainers = lib.teams.lomiri.members;
};
nodes.machine =
{ config, ... }:
{
imports = [ ./common/user-account.nix ];
virtualisation.memorySize = 2047;
users.users.${user} = {
inherit description;
password = lib.mkForce pwOutput;
};
services.desktopManager.lomiri.enable = lib.mkForce true;
services.displayManager.defaultSession = lib.mkForce "lomiri";
# Help with OCR
fonts.packages = [ pkgs.inconsolata ];
# Non-QWERTY keymap to test keymap patch
services.xserver.xkb.layout = "de";
};
enableOCR = true;
testScript =
{ nodes, ... }:
''
def wait_for_text(text):
"""
Wait for on-screen text, and try to optimise retry count for slow hardware.
"""
machine.sleep(10)
machine.wait_for_text(text)
start_all()
machine.wait_for_unit("multi-user.target")
# Lomiri in greeter mode should use the correct keymap
with subtest("lomiri greeter keymap works"):
machine.wait_for_unit("display-manager.service")
machine.wait_until_succeeds("pgrep -u lightdm -f 'lomiri --mode=greeter'")
# Start page shows current time
wait_for_text(r"(AM|PM)")
machine.screenshot("lomiri_greeter_launched")
# Advance to login part
machine.send_key("ret")
wait_for_text("${description}")
machine.screenshot("lomiri_greeter_login")
# Login
machine.send_chars("${pwInput}\n")
machine.wait_until_succeeds("pgrep -u ${user} -f 'lomiri --mode=full-shell'")
# Output rendering from Lomiri has started when it starts printing performance diagnostics
machine.wait_for_console_text("Last frame took")
# Look for datetime's clock, one of the last elements to load
wait_for_text(r"(AM|PM)")
machine.screenshot("lomiri_launched")
# Lomiri in desktop mode should use the correct keymap
with subtest("lomiri session keymap works"):
machine.send_key("ctrl-alt-t")
wait_for_text(r"(${user}|machine)")
machine.screenshot("terminal_opens")
machine.send_chars("touch ${pwInput}\n")
machine.wait_for_file("/home/alice/${pwOutput}", 10)
machine.send_key("alt-f4")
'';
}
);
}

12
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -18528,6 +18528,18 @@ final: prev:
meta.homepage = "https://github.com/samodostal/image.nvim/";
};
resession-nvim = buildVimPlugin {
pname = "resession.nvim";
version = "2024-08-16";
src = fetchFromGitHub {
owner = "stevearc";
repo = "resession.nvim";
rev = "c4d92a57b3936a2d6e1c087dbd6b670da2b1b082";
sha256 = "sha256-S5mN/1yzUjV76YTYB41aaTL1xuGEfTN2LpEsc28RhDM=";
};
meta.homepage = "https://github.com/stevearc/resession.nvim";
};
tinykeymap = buildVimPlugin {
pname = "tinykeymap";
version = "2024-02-17";

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -878,6 +878,7 @@ https://github.com/vladdoster/remember.nvim/,,
https://github.com/filipdutescu/renamer.nvim/,,
https://github.com/MeanderingProgrammer/render-markdown.nvim/,,
https://github.com/gabrielpoca/replacer.nvim/,HEAD,
https://github.com/stevearc/resession.nvim/,HEAD,
https://github.com/NTBBloodbath/rest.nvim/,,
https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim
https://github.com/gu-fan/riv.vim/,,

6
pkgs/applications/editors/vscode/extensions/default.nix
View File

@ -1642,8 +1642,8 @@ let
mktplcRef = {
name = "elixir-ls";
publisher = "JakeBecker";
version = "0.23.1";
hash = "sha256-rwpaixQbuxVkH4wlKPG4Qk69IylwjfCtyfUcqCuN/e8=";
version = "0.24.0";
hash = "sha256-zNiKtOeZEO9zVpyF4AE/3FjiEy4jtCSCjB9T8e8PjRE=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";
@ -5393,6 +5393,8 @@ let
};
};
yzane.markdown-pdf = callPackage ./yzane.markdown-pdf { };
yzhang.dictionary-completion = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "yzhang";

31
pkgs/applications/editors/vscode/extensions/yzane.markdown-pdf/default.nix Normal file
View File

@ -0,0 +1,31 @@
{
lib,
vscode-utils,
jq,
moreutils,
ungoogled-chromium,
}:
vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "markdown-pdf";
publisher = "yzane";
version = "1.5.0";
hash = "sha256-aiifZgHXC4GUEbkKAbLc0p/jUZxp1jF/J1Y/KIyvLIE=";
};
nativeBuildInputs = [
jq
moreutils
];
postInstall = ''
jq '.contributes.configuration.properties."markdown-pdf.executablePath".default = "${lib.getExe ungoogled-chromium}"' $out/$installPrefix/package.json | sponge $out/$installPrefix/package.json
'';
meta = {
description = "Converts Markdown files to pdf, html, png or jpeg files";
homepage = "https://github.com/yzane/vscode-markdown-pdf#readme";
changelog = "https://github.com/yzane/vscode-markdown-pdf/blob/master/CHANGELOG.md";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=yzane.markdown-pdf";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pandapip1 ];
};
}

27
pkgs/applications/networking/cluster/kconf/default.nix
View File

@ -1,27 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kconf";
version = "2.0.0";
src = fetchFromGitHub {
owner = "particledecay";
repo = "kconf";
rev = "v${version}";
sha256 = "sha256-bLyLXkXOZRFaplv5sY0TgFffvbA3RUwz6b+7h3MN7kA=";
};
vendorHash = "sha256-REguLiYlcC2Q6ao2oMl92/cznW+E8MO2UGhQKRXZ1vQ=";
ldflags = [
"-s" "-w" "-X github.com/particledecay/kconf/build.Version=${version}"
];
meta = with lib; {
description = "Opinionated command line tool for managing multiple kubeconfigs";
mainProgram = "kconf";
homepage = "https://github.com/particledecay/kconf";
license = licenses.mit;
maintainers = with maintainers; [ thmzlt ];
};
}

0
pkgs/development/tools/amqpcat/default.nix → pkgs/by-name/am/amqpcat/package.nix
View File

0
pkgs/development/tools/amqpcat/shards.nix → pkgs/by-name/am/amqpcat/shards.nix
View File

0
pkgs/development/tools/bingo/default.nix → pkgs/by-name/bi/bingo/package.nix
View File

6
pkgs/by-name/da/databricks-cli/package.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "databricks-cli";
version = "0.228.1";
version = "0.229.0";
src = fetchFromGitHub {
owner = "databricks";
repo = "cli";
rev = "v${version}";
hash = "sha256-zQ39PwVjyxOTo6P+RA4F20/28loMbu3Bprd4C3jgu5A=";
hash = "sha256-ap2IypBPFV4yJVXRS8zSXC0kW/QKpOvFS9Cod0pSlG0=";
};
vendorHash = "sha256-SOeVIwMbx1eRzBvyfT3aaJOL7BCb745yezn1QYrf5vU=";
vendorHash = "sha256-yCwevuivIHZ0dns9QljiKvwws4cFknIydvfjs4Jib3s=";
excludedPackages = [ "bundle/internal" ];

0
pkgs/tools/audio/dsp/default.nix → pkgs/by-name/ds/dsp/package.nix
View File

6
pkgs/by-name/ed/edk2/package.nix
View File

@ -63,16 +63,18 @@ edk2 = stdenv.mkDerivation {
})
];
# EDK2 is currently working on OpenSSL 3.3.x support. Use buildpackages.openssl again,
# when "https://github.com/tianocore/edk2/pull/6167" is merged.
postPatch = ''
# We don't want EDK2 to keep track of OpenSSL, they're frankly bad at it.
rm -r CryptoPkg/Library/OpensslLib/openssl
mkdir -p CryptoPkg/Library/OpensslLib/openssl
(
cd CryptoPkg/Library/OpensslLib/openssl
tar --strip-components=1 -xf ${buildPackages.openssl.src}
tar --strip-components=1 -xf ${buildPackages.openssl_3.src}
# Apply OpenSSL patches.
${lib.pipe buildPackages.openssl.patches [
${lib.pipe buildPackages.openssl_3.patches [
(builtins.filter (
patch:
!builtins.elem (baseNameOf patch) [

6
pkgs/by-name/go/go-ethereum/package.nix
View File

@ -9,17 +9,17 @@ let
in buildGoModule rec {
pname = "go-ethereum";
version = "1.14.9";
version = "1.14.11";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
hash = "sha256-W0wHQMvbQJC3PdCZLVpE3cTasii/CkF+gdVOV2MX2Mo=";
hash = "sha256-y4tUV5TGhvvaLTukT0jVhoBWxXQlDFVKHScQC8Ytl/A=";
};
proxyVendor = true;
vendorHash = "sha256-Fxl8fisdCH0nlUFOS5NLMnvfpqIhlTd6/BbR+qIzlKQ=";
vendorHash = "sha256-xPFTvzsHMWVyeAt7m++6v2l8m5ZvnLaIDGki/TWe5kU=";
doCheck = false;

0
pkgs/development/compilers/go-jsonnet/default.nix → pkgs/by-name/go/go-jsonnet/package.nix
View File

0
pkgs/development/tools/gojq/default.nix → pkgs/by-name/go/gojq/package.nix
View File

6
pkgs/by-name/hy/hydra/package.nix
View File

@ -124,13 +124,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "hydra";
version = "0-unstable-2024-09-20";
version = "0-unstable-2024-09-24";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "44248d3cf4162944ec2e6a45f8cc058758bf5a86";
hash = "sha256-WJ7M/1a8j5gRJJVzCJL6JrkGPckD5ZhKzTlmiKNdtm0=";
rev = "95003f2eb503f71979856470c7caea946f1ae7f0";
hash = "sha256-6FI0QIkMAL35J8mzAiAntCsFbMMZBuOBpKuDIctflaA=";
};
buildInputs = [

47
pkgs/by-name/kc/kconf/package.nix Normal file
View File

@ -0,0 +1,47 @@
{
lib,
buildGoModule,
fetchFromGitHub,
installShellFiles,
stdenv,
}:
buildGoModule rec {
pname = "kconf";
version = "2.0.0";
src = fetchFromGitHub {
owner = "particledecay";
repo = "kconf";
rev = "v${version}";
sha256 = "sha256-bLyLXkXOZRFaplv5sY0TgFffvbA3RUwz6b+7h3MN7kA=";
};
vendorHash = "sha256-REguLiYlcC2Q6ao2oMl92/cznW+E8MO2UGhQKRXZ1vQ=";
ldflags = [
"-s"
"-w"
"-X github.com/particledecay/kconf/build.Version=${version}"
];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd kconf \
--bash <($out/bin/kconf completion bash) \
--fish <($out/bin/kconf completion fish) \
--zsh <($out/bin/kconf completion zsh)
'';
meta = with lib; {
description = "Opinionated command line tool for managing multiple kubeconfigs";
mainProgram = "kconf";
homepage = "https://github.com/particledecay/kconf";
license = licenses.mit;
maintainers = with maintainers; [
thmzlt
sailord
vinetos
];
};
}

19
pkgs/by-name/ke/keep-sorted/package.nix
View File

@ -1,25 +1,26 @@
{ lib
, buildGoModule
, fetchFromGitHub
, nix-update-script
{
lib,
buildGo123Module,
fetchFromGitHub,
nix-update-script,
}:
buildGoModule rec {
buildGo123Module rec {
pname = "keep-sorted";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "google";
repo = "keep-sorted";
rev = "v${version}";
hash = "sha256-yeps+StUA7h12Jlra24Po2zNzjIPNIQCOyWLazC8F8M=";
hash = "sha256-jqSb/lcdeQMa1XpzaopDBbkKymp+HubLeAx3d6x5pns=";
};
vendorHash = "sha256-tPTWWvr+/8wWUnQcI4Ycco2OEgA2mDQt15OGCk/ZjrQ=";
vendorHash = "sha256-HTE9vfjRmi5GpMue7lUfd0jmssPgSOljbfPbya4uGsc=";
CGO_ENABLED = "0";
ldfags = [ "-s" "-w" ];
ldflags = [ "-s" ];
checkFlags = [
# Test tries to find files using git

4
pkgs/by-name/li/limine/package.nix
View File

@ -18,7 +18,7 @@ let
llvmPackages = llvmPackages_18;
stdenv = llvmPackages.stdenv;
version = "8.0.13";
version = "8.0.14";
hasI686 =
(if targets == [ ] then stdenv.hostPlatform.isx86_32 else (builtins.elem "i686" targets))
@ -64,7 +64,7 @@ stdenv.mkDerivation {
# Packaging that in Nix is very cumbersome.
src = fetchurl {
url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz";
hash = "sha256-pg0tAn4YlfEzpyxb9QAAR0PApYmtnafMbIXfhHw+w3k=";
hash = "sha256-tj8wFUFveGp10Ls4xWIqqdY6fUHWy3jxsVeJRTz7/9Q=";
};
hardeningDisable = [

8
pkgs/by-name/ma/maa-assistant-arknights/pin.json
View File

@ -1,10 +1,10 @@
{
"stable": {
"version": "5.6.2",
"hash": "sha256-vnCHIKYMvMJPGjQdtGsVwZCEb1eId83yIemSnSuG0DU="
"version": "5.7.0",
"hash": "sha256-OLhoy18/y6Z5KjjbJiQ3r2ZeOBtn62paDu4aNYL3n0w="
},
"beta": {
"version": "5.7.0-beta.1",
"hash": "sha256-FFIL4HZtZaao90SefWeGWr016lqMoDVfRSaFt91q4Zk="
"version": "5.7.0",
"hash": "sha256-OLhoy18/y6Z5KjjbJiQ3r2ZeOBtn62paDu4aNYL3n0w="
}
}

6
pkgs/by-name/md/mdbook-alerts/package.nix
View File

@ -7,7 +7,7 @@
CoreServices ? darwin.apple_sdk.frameworks.CoreServices,
}:
let
version = "0.6.6";
version = "0.6.7";
in
rustPlatform.buildRustPackage {
pname = "mdbook-alerts";
@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
owner = "lambdalisue";
repo = "rs-mdbook-alerts";
rev = "v${version}";
hash = "sha256-npPQU53l/VtTH23YYT6SOa11eUPNcA96al06S5HNNFE=";
hash = "sha256-H3xpaluEUYWuP+JR4Zx8zs/EqeEZPiBa2wcaAtPdvGY=";
};
cargoHash = "sha256-1wumxZoNr1QIit+KjgioG5WlSLSsWfcisChUEISoGQE=";
cargoHash = "sha256-epnhKGvKN/iHcI77wEJlq7A5S2CkVRoPFTD+fGp1BH8=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];

7
pkgs/by-name/op/open-webui/package.nix
View File

@ -7,19 +7,19 @@
}:
let
pname = "open-webui";
version = "0.3.30";
version = "0.3.32";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
rev = "refs/tags/v${version}";
hash = "sha256-zGgCISGpna9L8Eqze0WWagIx26DwhLpeOLCVslpcJ08=";
hash = "sha256-XpPaMGn+JA3Rq+Eb97IGWMLAR+0pI+ZJRxOTmxIMPZg=";
};
frontend = buildNpmPackage {
inherit pname version src;
npmDepsHash = "sha256-508AjFAzQvWPkn+kMv/YQUeG0jikZJJxNkFqfkKi9Ks=";
npmDepsHash = "sha256-tAPI/H5/lv+RuDZ68lL/cZHcOs8H6ZxXSwiFvkp0y4A=";
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
# Until this is solved, running python packages from the browser will not work.
@ -87,6 +87,7 @@ python3.pkgs.buildPythonApplication rec {
flask
flask-cors
fpdf2
ftfy
google-generativeai
langchain
langchain-chroma

0
pkgs/tools/misc/pb/default.nix → pkgs/by-name/pb/pb/package.nix
View File

0
pkgs/development/tools/protoscope/default.nix → pkgs/by-name/pr/protoscope/package.nix
View File

4
pkgs/by-name/qr/qrq/package.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
hash = "sha256-uuETGbv5qm0Z+45+kK66SBHhQ0Puu6I5z+TWIh3iR2g=";
};
sourceRoot = "${src.name}/src";
buildInputs = [
ncurses
pulseaudio
@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
];
postPatch = ''
substituteInPlace src/qrq.c \
substituteInPlace qrq.c \
--replace-fail '[80]' '[4000]' \
--replace-fail '80,' '4000,'
'';

4
pkgs/by-name/re/renode/package.nix
View File

@ -39,11 +39,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "renode";
version = "1.15.2";
version = "1.15.3";
src = fetchurl {
url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
hash = "sha256-4W6/s2XYKj4q31VLz5MohaMdv4rLTaQHCx6AoWxHTvo=";
hash = "sha256-0CZWIwIG85nT7uSHhmBkH21S5mTx2womYWV0HG+g8Mk=";
};
nativeBuildInputs = [

0
pkgs/tools/system/skeema/default.nix → pkgs/by-name/sk/skeema/package.nix
View File

29
pkgs/by-name/ts/tslib/package.nix Normal file
View File

@ -0,0 +1,29 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tslib";
version = "1.23";
hash = "sha256-2YJDADh/WCksAEIjngAdji98YGmwjpvxSBZkxAwFc7k=";
src = fetchFromGitHub {
owner = "libts";
repo = finalAttrs.pname;
rev = finalAttrs.version;
sha256 = finalAttrs.hash;
};
nativeBuildInputs = [ cmake ];
meta = {
description = "Touchscreen access library";
homepage = "http://www.tslib.org/";
license = lib.licenses.lgpl21;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ shogo ];
};
})

55
pkgs/by-name/ty/typstyle/package.nix
View File

@ -1,51 +1,58 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2
, zlib
, stdenv
, darwin
, nix-update-script
, testers
, typstyle
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
libgit2,
zlib,
stdenv,
darwin,
nix-update-script,
versionCheckHook,
}:
rustPlatform.buildRustPackage rec {
pname = "typstyle";
version = "0.11.34";
version = "0.11.35";
src = fetchFromGitHub {
owner = "Enter-tainer";
repo = "typstyle";
rev = "refs/tags/v${version}";
hash = "sha256-6z2jzs5PxsEsCPSm9+sZnBdzh0edLMylaLBvSSPoPNo=";
hash = "sha256-mPppnbgTXJ4ALIHrI0q9UpwGPDoTGitw5KRY8eA/vJg=";
};
cargoHash = "sha256-MaqsAQvh30nDzoxgnFKu7+wvRZ7WvwLgKYM3Fru8qfg=";
cargoHash = "sha256-30xinYXS+OGYE1H0Eutwpjgn3OfFtjTUJInDHvn6/E0=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libgit2
zlib
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
buildInputs =
[
libgit2
zlib
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
# Disabling tests requiring network access
checkFlags = [
"--skip=e2e"
];
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion { package = typstyle; };
};
meta = {

5
pkgs/by-name/wa/wayprompt/package.nix
View File

@ -47,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
"${finalAttrs.deps}"
];
postFixup = ''
substituteInPlace $out/bin/wayprompt-ssh-askpass \
--replace-fail wayprompt $out/bin/wayprompt
'';
meta = {
homepage = "https://git.sr.ht/~leon_plickat/wayprompt";
description = "Multi-purpose (password-)prompt tool for Wayland";

39
pkgs/desktops/lomiri/applications/lomiri/9902-Layout-fallback-file.patch Normal file
View File

@ -0,0 +1,39 @@
From 9e843a203f68ca75d430f1032a92d3c87f9ed2c2 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 29 Sep 2024 12:05:07 +0200
Subject: [PATCH] plugins/AccountsService/AccountsService.cpp: If keymap unset,
read fallbacks from NixOS-specific file
---
plugins/AccountsService/AccountsService.cpp | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/plugins/AccountsService/AccountsService.cpp b/plugins/AccountsService/AccountsService.cpp
index bfc4bf3ce..9308220a9 100644
--- a/plugins/AccountsService/AccountsService.cpp
+++ b/plugins/AccountsService/AccountsService.cpp
@@ -311,6 +311,21 @@ QStringList AccountsService::keymaps() const
return simplifiedMaps;
}
+ QFile fallbackNixosLayouts ("@nixosLayoutFile@");
+ if (fallbackNixosLayouts.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ while (!fallbackNixosLayouts.atEnd()) {
+ QString line = QString(fallbackNixosLayouts.readLine()).simplified();
+ if (!line.isEmpty()) {
+ simplifiedMaps.append(line);
+ }
+ }
+ fallbackNixosLayouts.close();
+ }
+
+ if (!simplifiedMaps.isEmpty()) {
+ return simplifiedMaps;
+ }
+
return {QStringLiteral("us")};
}
--
2.44.1

29
pkgs/desktops/lomiri/applications/lomiri/9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch
View File

@ -1,29 +0,0 @@
From 640cab41986fac83742af39dd19877041a2ab8dc Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 1 Jun 2024 00:22:27 +0200
Subject: [PATCH] Check NIXOS_XKB_LAYOUTS for layouts before falling back to
"us"
---
plugins/AccountsService/AccountsService.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/plugins/AccountsService/AccountsService.cpp b/plugins/AccountsService/AccountsService.cpp
index bcf18246c..f4a7dfaa1 100644
--- a/plugins/AccountsService/AccountsService.cpp
+++ b/plugins/AccountsService/AccountsService.cpp
@@ -295,6 +295,11 @@ QStringList AccountsService::keymaps() const
return simplifiedMaps;
}
+ char* fallbackNixosLayouts = getenv("NIXOS_XKB_LAYOUTS");
+ if (fallbackNixosLayouts != NULL && fallbackNixosLayouts[0] != '\0') {
+ return QString(fallbackNixosLayouts).split(QLatin1Char(','), Qt::SkipEmptyParts);
+ }
+
return {QStringLiteral("us")};
}
--
2.42.0

8
pkgs/desktops/lomiri/applications/lomiri/default.nix
View File

@ -6,6 +6,7 @@
fetchpatch2,
gitUpdater,
linkFarm,
substituteAll,
nixosTests,
ayatana-indicator-datetime,
bash,
@ -116,7 +117,10 @@ stdenv.mkDerivation (finalAttrs: {
})
./9901-lomiri-Disable-Wizard.patch
./9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch
(substituteAll {
src = ./9902-Layout-fallback-file.patch;
nixosLayoutFile = "/etc/" + finalAttrs.finalPackage.passthru.etcLayoutsFile;
})
];
postPatch =
@ -269,12 +273,14 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
etcLayoutsFile = "lomiri/keymaps";
tests = {
inherit (nixosTests.lomiri)
greeter
desktop-basics
desktop-appinteractions
desktop-ayatana-indicators
keymap
;
};
updateScript = gitUpdater { };

5
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -1431,4 +1431,9 @@ self: super: builtins.intersectAttrs super {
"--skip=/Cabal.Paths/paths"
];
}) super.doctest;
# tracked upstream: https://github.com/snapframework/openssl-streams/pull/11
# certificate used only 1024 Bit RSA key and SHA-1, which is not allowed in OpenSSL 3.1+
# security level 2
openssl-streams = appendPatch ./patches/openssl-streams-cert.patch super.openssl-streams;
}

137
pkgs/development/haskell-modules/patches/openssl-streams-cert.patch Normal file
View File

@ -0,0 +1,137 @@
From ae9f8db059b6093092f6bd5155d55557c0892a4e Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Sat, 5 Oct 2024 11:44:45 +0200
Subject: [PATCH] regenerate test certificate to work with OpenSSL security
level 2
Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
test/cert.pem | 43 ++++++++++++++++++++++++---------
test/key.pem | 67 +++++++++++++++++++++++++++++++++++++++------------
2 files changed, 83 insertions(+), 27 deletions(-)
diff --git a/test/cert.pem b/test/cert.pem
index 13a87f5..a9dd418 100644
--- a/test/cert.pem
+++ b/test/cert.pem
@@ -1,14 +1,33 @@
-----BEGIN CERTIFICATE-----
-MIICOzCCAaQCCQChUcwtek3F7DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJD
-SDEPMA0GA1UECAwGWnVyaWNoMQ8wDQYDVQQHDAZadXJpY2gxFzAVBgNVBAoMDlNu
-YXAgRnJhbWV3b3JrMRgwFgYDVQQDDA9HcmVnb3J5IENvbGxpbnMwHhcNMTAxMjEx
-MTk1MjA0WhcNMzgwNDI3MTk1MjA0WjBiMQswCQYDVQQGEwJDSDEPMA0GA1UECAwG
-WnVyaWNoMQ8wDQYDVQQHDAZadXJpY2gxFzAVBgNVBAoMDlNuYXAgRnJhbWV3b3Jr
-MRgwFgYDVQQDDA9HcmVnb3J5IENvbGxpbnMwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-MIGJAoGBAMcWrmVJ0xn3JcKf+b8Y+Bs+rRacodl/R+N7UJXTyfkByB7bzN6VR2h8
-oRYJu7DhETs/w4o/Af9vNwsJBJVovcbV6FAAbl45TMDq2QZVtPwwTDi8R52QbRIR
-WBxge3aHeMUz1hV32iMzGPVe4jKSaO2KcbVOFphwc8VmA59GvShfAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADgYEAXsRchaVlL4RP5V+r1npL7n4W3Ge2O7F+fQ2dX6tNyqeo
-tMAdc6wYahg3m+PejWASVCh0vVEjBx2WYOMRPsmk/DYLUi4UwZYPrvZtbfSbMrD+
-mYmZhqCDM4316qAg5OwcTON3+VZXMwbXCVM+vUCvZIw4xh6ywNjvuQjCzy7oKMg=
+MIIFpTCCA42gAwIBAgIUJuFs2fMmpGUlm+CT7l6v2LdnpeEwDQYJKoZIhvcNAQEL
+BQAwYjELMAkGA1UEBhMCQ0gxDzANBgNVBAgMBlp1cmljaDEPMA0GA1UEBwwGWnVy
+aWNoMRcwFQYDVQQKDA5TbmFwIEZyYW1ld29yazEYMBYGA1UEAwwPR3JlZ29yeSBD
+b2xsaW5zMB4XDTI0MTAwNTA5NDM1NFoXDTQ0MDkzMDA5NDM1NFowYjELMAkGA1UE
+BhMCQ0gxDzANBgNVBAgMBlp1cmljaDEPMA0GA1UEBwwGWnVyaWNoMRcwFQYDVQQK
+DA5TbmFwIEZyYW1ld29yazEYMBYGA1UEAwwPR3JlZ29yeSBDb2xsaW5zMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA26OMdBRG9IybxVYY49z5xp4adabK
+QKMgBctSbY9+AXQ8dR0mPswQRMNG0upQyJJPTFXUBvKr2N2K00XbWIMifwhCfkBo
+9/JsOuQLNH1Dc627/amx9fuRrJJBnVUOZ9YOg9ytjaItXQ0rngv+lz8EH8IL8SB5
+AQJr+MRRNr5JD44+/+au3oyL3eoDkb/MT3y2dyUCX7Kuk49h5iiTsPDp6DLQLxl2
+YegJNh67qrw0gBSjhB0s0Yv7EqVeKTNEx89SkIdOSXh+S3Sf1foAU0Aq3v0a6aIh
+MLrN5Fo3TjQbhF9mlRjYZOM7HbrZsz7X6t77y9Ac4lgFWhbrCdtKFnwP3X1qHAou
+jfzwmnC7Z7h7rzoS0opjE29UcuOPaA7Jw/rbl3SpAab1UVVhOdMxvkJ+gshdJT8W
+uAoovhuyhtimM7l4vkwPqSD5y+h+zNiW5Lx1H1kAsyHeQ8zOI/wnuW4VjvhUb/Q+
+LZWXmzEBZdGXZloj11py6B3b83atHU+R2LZQnDhnjU15JBG7WN7/anExz3Q7rRfs
+oYHa5qoV+sol53VIJDj+6nsJGfbr1WAonLxDOc8B3E7uu6fGSLeoTZj+hKCZhhsD
+1jnlGG1skpYqf+ECXgq8TGlFRjn6ae3Z7Tq/UFu0a+cbsHHBSUwKG17mtaaqbDeY
+8kWUWNDKtUSewb0CAwEAAaNTMFEwHQYDVR0OBBYEFDj0ry4aPDK4/pbxzbLdUrtN
+4EuXMB8GA1UdIwQYMBaAFDj0ry4aPDK4/pbxzbLdUrtN4EuXMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggIBACct1UKUYYORYcjV96HuPVQSN00iLLUj
+C2QWfF2rF6sToX46oEHfwtIpBT3kATB2G8Ltt5OBohek0eLpGIaJyMYlhiRb6ubz
+O8jcgD2d0FKEBAIEYK+UvuKakWKY3C72zNzL89KOkCqS5o8dYXhMtxPi/ncAdyUa
+jIKHhZx1gYIkaYRVgnnLk4NrpIH3WZmwGj5y/k8ha4vvbfg4pf04FAWliqmD+30E
+qyF0GtxhVN7ZffEn610i9DCsxQet5DiThlZMB9gSZK0VqvTdaKR7qmAohEe5mKBr
+/MbERm8E36B1sW3uGTJLu/irFZtoez2IYNBJaatkKjk3bv+cHKV3E/VTKMMKFtLS
+poLtaAZpuLr4Lg1RS1dCU2f6NaNYuKl30ROAf8ro++8Rnn1WMVc+8x3EhyMJzJYT
++NLnB+8PnoOj2jkc0lY+AqbwSREIivRoN1frbqHfsyZc8Mkds1FUCHLun77LMBVi
+HwmG1frnJ6X9actf1sQqXSqD0URenqTpZSu8YKAkhH3oaKm5I0IyYUeynCk1ck8G
+PyiRk2sj4II7nrzZOCJSJsgDweZdqoul3qKki4V/4+sMgmsAIHJYy/nCwl1HThQ8
+XY15cF3dnf1bcly1ooj7bL4DrPuG1oWpzDIlIkJ+ZTsPrKK3/Vy2pUkklKowmq3w
+qHcAZ2oKVR1s
-----END CERTIFICATE-----
diff --git a/test/key.pem b/test/key.pem
index 3db6603..ef99b04 100644
--- a/test/key.pem
+++ b/test/key.pem
@@ -1,15 +1,52 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDHFq5lSdMZ9yXCn/m/GPgbPq0WnKHZf0fje1CV08n5Acge28ze
-lUdofKEWCbuw4RE7P8OKPwH/bzcLCQSVaL3G1ehQAG5eOUzA6tkGVbT8MEw4vEed
-kG0SEVgcYHt2h3jFM9YVd9ojMxj1XuIykmjtinG1ThaYcHPFZgOfRr0oXwIDAQAB
-AoGBAIr+p9UpfIvFRASkYd3sFdQXpwqBYnIR7ePBBVsFWR5TAx+gP2ErAYbOdDyJ
-oRN1nu0psGBFaySlxd0bd6rETLFXMWbA0uDJcqASrlsOhsbhgPH7aExYfAi7eX8h
-FAwD//j2E1sS6WvNWu0YANKR2yrM9R0vcbt0GF7hlmyV7lhRAkEA+6DCI6nfbdvR
-jkvaxzOdC9jY/eBI9a4BbyjPLUSlTuQsGrp6s0Sj1LOQscItzqkPSutugM3f1dlG
-lqq31/fnqQJBAMqMOknRBlOZY8DBfCorvNXAjIenoqlqE1D4yTL+tE5C3zEyvTcF
-jPAaX220vf1OkL1bX4jKUxx8uXIqiYND9McCQQCWoWWWc9qMqUqJJF+TYBJjRSyg
-zeLfL4ssQAHF15Id5/l/BqLtLenlKpkz0EobrJi7ALTl5lhYa/kVuJzVbFIBAkEA
-shE17U9mUHi5yexQTILHMORmp5wo1Of8s2ME/2ANBACmV4pT7ttiXHPTEY+kt90q
-Qk7iXlABYToFjuj2nABSYQJAO6W9P18mM2p6vkiBuNReW6VN/ftYqq5TLK3hXh2Q
-0d5v0eW9ce7CiQueH5kxq44EVVTIDiVLe2pk+BQIntMC8w==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+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
+F3fTQNKQ93zJWtUhTUSPO2BzPnZh8UE=
+-----END PRIVATE KEY-----
--
2.46.0

2073
pkgs/games/mchprs/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

48
pkgs/games/mchprs/default.nix
View File

@ -1,45 +1,51 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, openssl
, sqlite
, zlib
, stdenv
, darwin
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
sqlite,
zlib,
stdenv,
clang,
darwin,
}:
rustPlatform.buildRustPackage rec {
pname = "mchprs";
version = "0.4.1";
version = "0.5.1";
src = fetchFromGitHub {
owner = "MCHPR";
repo = "MCHPRS";
rev = "v${version}";
hash = "sha256-y1ILZvnDWVlghvUVe8xU5wP2TMW+Q/l+V+bqDZrpnBk=";
rev = "refs/tags/v${version}";
hash = "sha256-Jm9ZsqCKOIxZsXQbCluYu7MgOD7hXYljcv/URaNVUW0=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"hematite-nbt-0.5.2" = "sha256-knBmH/32JJclhFZbKTNx5XgLSQ2rIrXUGu8uoAHAXMk=";
"hematite-nbt-0.5.2" = "sha256-ohhsMlRLFNesccxhqn0GAiVswcdMldD3gv0AXcviHU8=";
};
};
nativeBuildInputs = [
pkg-config
clang
rustPlatform.bindgenHook
];
buildInputs = [
openssl
sqlite
zlib
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
];
buildInputs =
[
openssl
sqlite
zlib
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
meta = with lib; {
mainProgram = "mchprs";

7
pkgs/servers/nosql/mongodb/7.0.nix
View File

@ -8,6 +8,7 @@
cctools,
avxSupport ? stdenv.hostPlatform.avxSupport,
nixosTests,
lib,
}:
let
@ -34,7 +35,11 @@ buildMongoDB {
# Fix building with python 3.12 since the imp module was removed
./mongodb-python312.patch
];
# mongodb-7_0's mozjs uses avx2 instructions
# https://github.com/GermanAizek/mongodb-without-avx/issues/16
] ++ lib.optionals (!avxSupport) [ ./mozjs-noavx.patch ];
passthru.tests = {
inherit (nixosTests) mongodb;
};

25
pkgs/servers/nosql/mongodb/mozjs-noavx.patch Normal file
View File

@ -0,0 +1,25 @@
--- a/src/third_party/mozjs/SConscript
+++ b/src/third_party/mozjs/SConscript
@@ -145,8 +145,7 @@ sources = [
]
if env['TARGET_ARCH'] == 'x86_64' and not env.TargetOSIs('windows'):
- env.Append(CCFLAGS=['-mavx2'])
- sources.extend(["extract/mozglue/misc/SIMD_avx2.cpp", "extract/mozglue/misc/SSE.cpp"])
+ sources.extend(["extract/mozglue/misc/SSE.cpp"])
if env.TargetOSIs('windows'):
sources.extend([
diff --git a/src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp b/src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp
index 3893de57b32..4ea0a657fbb 100644
--- a/src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp
+++ b/src/third_party/mozjs/extract/mozglue/misc/SIMD.cpp
@@ -448,7 +448,7 @@ const char* SIMD::memchr8SSE2(const char* ptr, char value, size_t length) {
// assertion failure. Accordingly, we just don't allow that to happen. We
// are not particularly concerned about ensuring that newer 32 bit processors
// get access to the AVX2 functions exposed here.
-# if defined(MOZILLA_MAY_SUPPORT_AVX2) && defined(__x86_64__)
+# if 0
bool SupportsAVX2() { return supports_avx2(); }

14
pkgs/tools/security/galer/default.nix
View File

@ -5,22 +5,22 @@
buildGoModule rec {
pname = "galer";
version = "0.0.2";
version = "0.1.0";
src = fetchFromGitHub {
owner = "dwisiswant0";
repo = pname;
rev = "v${version}";
hash = "sha256-i3rrXpKnUV9REnn4lQWIFpWc2SzkxVomruiAmcMBQ6Q=";
repo = "galer";
rev = "refs/tags/v${version}";
hash = "sha256-/VvN6LjK+V8E9XYarRUI/TPGitMM0a3g1lfdYhV1yP8=";
};
vendorHash = "sha256-2nJgQfSeo9GrK6Kor29esnMEFmd5pTd8lGwzRi4zq1w=";
vendorHash = "sha256-WDOwUjU6AP/8QvqiKTEY6wsMBZQFWn/LGWr8nfqDF+8=";
meta = with lib; {
description = "Tool to fetch URLs from HTML attributes";
mainProgram = "galer";
homepage = "https://github.com/dwisiswant0/galer";
license = with licenses; [ mit ];
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "galer";
};
}

19
pkgs/tools/security/sops/bash_autocomplete Normal file
View File

@ -0,0 +1,19 @@
#!/usr/bin/env bash
# based on https://github.com/urfave/cli/blob/v2.3.0/autocomplete/bash_autocomplete
_cli_bash_autocomplete() {
if [[ "${COMP_WORDS[0]}" != "source" ]]; then
local cur opts
COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}"
if [[ "$cur" == "-"* ]]; then
opts=$("${COMP_WORDS[@]:0:$COMP_CWORD}" "${cur}" --generate-bash-completion)
else
opts=$("${COMP_WORDS[@]:0:$COMP_CWORD}" --generate-bash-completion)
fi
IFS=$'\n' read -d '' -ra COMPREPLY < <(compgen -W "${opts}" -- "${cur}")
return 0
fi
}
complete -o bashdefault -o default -o nospace -F _cli_bash_autocomplete sops

15
pkgs/tools/security/sops/default.nix
View File

@ -1,4 +1,10 @@
{ lib, buildGoModule, fetchFromGitHub, nix-update-script }:
{
lib,
buildGoModule,
fetchFromGitHub,
installShellFiles,
nix-update-script,
}:
buildGoModule rec {
pname = "sops";
@ -19,6 +25,13 @@ buildGoModule rec {
passthru.updateScript = nix-update-script { };
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd sops --bash ${./bash_autocomplete}
installShellCompletion --cmd sops --zsh ${./zsh_autocomplete}
'';
meta = with lib; {
homepage = "https://getsops.io/";
description = "Simple and flexible tool for managing secrets";

25
pkgs/tools/security/sops/zsh_autocomplete Normal file
View File

@ -0,0 +1,25 @@
#compdef sops
## based on https://github.com/urfave/cli/blob/v2.3.0/autocomplete/zsh_autocomplete
_cli_zsh_autocomplete() {
local -a opts
local cur
cur=${words[-1]}
if [[ "$cur" == "-"* ]]; then
opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}")
else
opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
fi
if [[ "${opts[1]}" != "" ]]; then
_describe 'values' opts
else
_files
fi
return
}
compdef _cli_zsh_autocomplete sops

20
pkgs/top-level/all-packages.nix
View File

@ -231,8 +231,6 @@ with pkgs;
althttpd = callPackage ../servers/althttpd { };
amqpcat = callPackage ../development/tools/amqpcat { };
anders = callPackage ../applications/science/logic/anders { };
ariang = callPackage ../servers/ariang { };
@ -325,8 +323,6 @@ with pkgs;
binbloom = callPackage ../tools/security/binbloom { };
bingo = callPackage ../development/tools/bingo { };
bin2c = callPackage ../development/tools/bin2c { };
binserve = callPackage ../servers/binserve {
@ -638,8 +634,6 @@ with pkgs;
gokrazy = callPackage ../development/misc/gokrazy { };
gojq = callPackage ../development/tools/gojq { };
govulncheck = callPackage ../tools/security/govulncheck { };
gpick = callPackage ../tools/misc/gpick { };
@ -5915,8 +5909,6 @@ with pkgs;
syscall_limiter = callPackage ../os-specific/linux/syscall_limiter { };
skeema = callPackage ../tools/system/skeema { };
svt-av1 = callPackage ../tools/video/svt-av1 { };
inherit (callPackages ../servers/rainloop { })
@ -6951,8 +6943,6 @@ with pkgs;
diffutils = callPackage ../tools/text/diffutils { };
dsp = callPackage ../tools/audio/dsp { };
dirdiff = callPackage ../tools/text/dirdiff { };
dwdiff = callPackage ../applications/misc/dwdiff { };
@ -11404,8 +11394,6 @@ with pkgs;
proot = callPackage ../tools/system/proot { };
protoscope = callPackage ../development/tools/protoscope { };
prototypejs = callPackage ../development/libraries/prototypejs { };
proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix {
@ -20263,7 +20251,7 @@ with pkgs;
hwloc = callPackage ../development/libraries/hwloc { };
hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_22; };
hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_23; };
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
@ -20449,8 +20437,6 @@ with pkgs;
jrsonnet = callPackage ../development/compilers/jrsonnet { };
go-jsonnet = callPackage ../development/compilers/go-jsonnet { };
jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { };
jxrlib = callPackage ../development/libraries/jxrlib { };
@ -30429,8 +30415,6 @@ with pkgs;
k3sup = callPackage ../applications/networking/cluster/k3sup { };
kconf = callPackage ../applications/networking/cluster/kconf { };
kail = callPackage ../tools/networking/kail { };
kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { };
@ -31863,8 +31847,6 @@ with pkgs;
metal-cli = callPackage ../development/tools/metal-cli { };
pb = callPackage ../tools/misc/pb { };
pb_cli = callPackage ../tools/misc/pb_cli { };
capture = callPackage ../tools/misc/capture { };