Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-06-26 18:01:17 +00:00 committed by GitHub
commit 677389dc9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
39 changed files with 1380 additions and 549 deletions

View File

@ -67,36 +67,24 @@ in {
};
config = mkIf cfg.enable {
# Largely copied from unit provided with kmscon source
systemd.units."kmsconvt@.service".text = ''
[Unit]
Description=KMS System Console on %I
Documentation=man:kmscon(1)
After=systemd-user-sessions.service
After=plymouth-quit-wait.service
After=systemd-logind.service
After=systemd-vconsole-setup.service
Requires=systemd-logind.service
Before=getty.target
Conflicts=getty@%i.service
OnFailure=getty@%i.service
IgnoreOnIsolate=yes
ConditionPathExists=/dev/tty0
systemd.packages = [ pkgs.kmscon ];
[Service]
ExecStart=
ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p ${autologinArg}
UtmpIdentifier=%I
TTYPath=/dev/%I
TTYReset=yes
TTYVHangup=yes
TTYVTDisallocate=yes
systemd.services."kmsconvt@" = {
after = [ "systemd-logind.service" "systemd-vconsole-setup.service" ];
requires = [ "systemd-logind.service" ];
X-RestartIfChanged=false
'';
serviceConfig.ExecStart = [
""
''
${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p ${autologinArg}
''
];
restartIfChanged = false;
aliases = [ "autovt@.service" ];
};
systemd.suppressedSystemUnits = [ "autovt@.service" ];
systemd.units."kmsconvt@.service".aliases = [ "autovt@.service" ];
systemd.services.systemd-vconsole-setup.enable = false;
systemd.services.reload-systemd-vconsole-setup.enable = false;

View File

@ -321,6 +321,22 @@ in
session include login
'';
login.fprintAuth = mkIf config.services.fprintd.enable false;
gdm-fingerprint.text = mkIf config.services.fprintd.enable ''
auth required pam_shells.so
auth requisite pam_nologin.so
auth requisite pam_faillock.so preauth
auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so
auth optional pam_permit.so
auth required pam_env.so
auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
account include login
password required pam_deny.so
session include login
'';
};
};

View File

@ -64,9 +64,9 @@ let
etcHardlinks = filter (f: f.mode != "symlink" && f.mode != "direct-symlink") etc';
build-composefs-dump = pkgs.runCommand "build-composefs-dump.py"
build-composefs-dump = pkgs.buildPackages.runCommand "build-composefs-dump.py"
{
buildInputs = [ pkgs.python3 ];
buildInputs = [ pkgs.buildPackages.python3 ];
} ''
install ${./build-composefs-dump.py} $out
patchShebangs --host $out

View File

@ -25,13 +25,13 @@
mkDerivation rec {
pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc";
version = "0.29.6";
version = "0.29.7";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
hash = "sha256-q+7NoZQDzEXBOFeob9Om5mnuocbaYjvdckv7Cur7nCI=";
hash = "sha256-+9uBmmdQ/shWYnJ7tM+Y8OgqYcQHHI2qeMw2tl1lE+w=";
};
nativeBuildInputs = [ pkg-config cmake ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "btcd";
version = "0.24.0";
version = "0.24.2";
src = fetchFromGitHub {
owner = "btcsuite";
repo = pname;
rev = "v${version}";
hash = "sha256-TLnJZW2CkvAqPTnJKfBY41siHtdZ+HRABsc+4vnQ9/w=";
hash = "sha256-83eiVYXpyiGgLmYxj3rFk4CHG7F9UQ3vk1ZHm64Cm4A=";
};
vendorHash = "sha256-quJEpSDltXhJcgI9H707p3HeLj1uuLzaMplT+YXzh/4=";
vendorHash = "sha256-ek+gaolwpwoEEWHKYpK2OxCpk/0vywF784J3CC0UCZ4=";
subPackages = [ "." "cmd/*" ];

View File

@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "1r76ikfikagg9v278pgiqhnjsv7pqn0xi372y1l0wsashlxl7kb0";
x86_64-darwin = "156604xzazmb54p0rdkv5wy9livg0xz2jviycdizablmvsxybs57";
aarch64-linux = "0cp120pcjpgf9qvmks9f8l2caxqlvnqvmxa7fh9mf83zpkdmnsnl";
aarch64-darwin = "1k06648jx64irshs0v4qy6xlkd9mk514xf21dlfhvic4aj89kcx9";
armv7l-linux = "0jy8hkbxh1969kskggg2y86cphly9l9gs7y4plj90jmlvlzjjjxm";
x86_64-linux = "01riva442l78d8dyh0wb9iqhjfa1bd48bpc7zfvd4zpz6fwhlkqr";
x86_64-darwin = "1pmvjxagbfrp25i4s66j892xiskrld5z25mkvlsdkddqlvnhanc9";
aarch64-linux = "1lk1p45ibph3arbb5vgkgxlip2jafgmpq40ldpfrh55k6v83zd2q";
aarch64-darwin = "17cd0grmplvk8s5wrcd1v172irrddjcc9drfp7qpvszd3kiy09a7";
armv7l-linux = "1636i9b4fxh2jvakjag38ij6kmj1cf0nlfzyk5rfl06i06gfd6jr";
}.${system} or throwSystem;
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.90.1.24165";
version = "1.90.2.24171";
pname = "vscodium";
executableName = "codium";

View File

@ -27,11 +27,11 @@
version = "2024-05-13";
};
ungoogled-patches = {
hash = "sha256-lj/XYWkEo7M1i3D5e1MVXTXh02U55lNoo+sxKpu8FNc=";
rev = "126.0.6478.114-1";
hash = "sha256-DLxtXcm4gPVzBeGxjD4harmdQWoH8LKn6GBlhtq/MVM=";
rev = "126.0.6478.126-1";
};
};
hash = "sha256-sXP+/KXDoy3QnRoa9acGbsXKVCPspyNGtZTLMHBqxvw=";
version = "126.0.6478.114";
hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0=";
version = "126.0.6478.126";
};
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "odo";
version = "3.15.0";
version = "3.16.1";
src = fetchFromGitHub {
owner = "redhat-developer";
repo = "odo";
rev = "v${version}";
sha256 = "sha256-UPq211Lo95r2b/Ov/a7uhb5p9M3MlNd72VwkMXPHy2Y=";
sha256 = "sha256-zEN8yfjW3JHf6OzPQC6Rg2/hJ+3d9d2nYhz60BdSK9s=";
};
vendorHash = null;

File diff suppressed because it is too large Load Diff

View File

@ -17,21 +17,20 @@
}:
rustPlatform.buildRustPackage rec {
pname = "mullvad";
version = "2024.1";
version = "2024.3";
src = fetchFromGitHub {
owner = "mullvad";
repo = "mullvadvpn-app";
rev = version;
hash = "sha256-syIBYZe+e6i5A6Te51eNKcwwycnRhO1o2tP+z81NYXQ=";
hash = "sha256-poQtE+XIlPcL9viAau+70xWx1fPrTXJXMcuPvXlqjZg=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"nix-0.26.1" = "sha256-b5bLeZVNbJE7aBnyzl0qvo0mXFeXa4hAZiuT1VJiFLk=";
"udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4=";
"hickory-proto-0.24.0" = "sha256-IqGVoQ1vRruCcaDr82ARkvSo42Pe9Q6iJIWnSd6GqEg=";
"udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4=";
};
};

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "cvemap";
version = "0.0.6";
version = "0.0.7";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cvemap";
rev = "refs/tags/v${version}";
hash = "sha256-aeUYcgBTHWWLTuAXnnc73yXaC3yLZzruqvedUYCnht4=";
hash = "sha256-Ste08J3KIJmugKZegU82wq6N+B5DaHc8Z0UtqKsUYE8=";
};
vendorHash = "sha256-VQGWi01mOP2N4oYsaDK7wn/+hSFEDHhSma9DOZ06Z3k=";
vendorHash = "sha256-+gYJkKJLUsCbh0JhVNOdr8U5pgWYjD56KZ0VePoYecU=";
subPackages = [
"cmd/cvemap/"

View File

@ -0,0 +1,26 @@
{
"name": "dotenv-cli",
"description": "A global executable to run applications with the ENV variables loaded by dotenv",
"version": "7.4.3",
"author": "entropitor",
"bin": {
"dotenv": "./cli.js"
},
"dependencies": {
"cross-spawn": "^7.0.3",
"dotenv": "^16.3.0",
"dotenv-expand": "^10.0.0",
"minimist": "^1.2.6"
},
"devDependencies": {
"standard": "^16.0.4"
},
"license": "MIT",
"main": "index.js",
"preferGlobal": true,
"repository": "entropitor/dotenv-cli",
"scripts": {
"lint": "standard"
},
"resolutions": {}
}

View File

@ -0,0 +1,34 @@
{
lib,
mkYarnPackage,
fetchYarnDeps,
fetchFromGitHub,
nix-update-script
}: mkYarnPackage rec {
pname = "dotenv-cli";
version = "7.4.3";
src = fetchFromGitHub {
owner = "entropitor";
repo = "dotenv-cli";
rev = "v${version}";
hash = "sha256-kR9LSHvbvKLuJBGrsmYMeqF3s8SF+/99OeNlKp9azI8=";
};
packageJSON = ./package.json;
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-Sx5DHUAXquqMqJgvhvHcRPqkfWN49+6icUQIos6OHCg=";
};
passthru.updateScript = nix-update-script { };
meta = {
description = "CLI to load dotenv files";
homepage = "https://github.com/entropitor/dotenv-cli";
changelog = "https://github.com/entropitor/dotenv-cli/releases/tag/v${version}";
license = lib.licenses.mit;
mainProgram = "dotenv";
maintainers = with lib.maintainers; [ pyrox0 ];
};
}

View File

@ -0,0 +1,70 @@
{ lib
, fetchFromGitHub
, python3Packages
, cmake
, xvfb-run
, firefox-esr
, geckodriver
, makeWrapper
}:
python3Packages.buildPythonApplication rec {
pname = "eye-witness";
version = "20230525.1";
format = "other";
src = fetchFromGitHub {
owner = "redsiege";
repo = "EyeWitness";
rev = "v${version}";
hash = "sha256-nSPpPbwqagc5EadQ4AHgLhjQ0kDjmbdcwE/PL5FDL4I=";
};
build-system = with python3Packages; [
setuptools
] ++ [
makeWrapper
];
dependencies = with python3Packages; [
selenium
fuzzywuzzy
pyvirtualdisplay
pylev
netaddr
pydevtool
] ++ [
firefox-esr
xvfb-run
geckodriver
];
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share/eyewitness}
cp -R * $out/share/eyewitness
runHook postInstall
'';
fixupPhase = ''
runHook preFixup
makeWrapper "${python3Packages.python.interpreter}" "$out/bin/eyewitness" \
--set PYTHONPATH "$PYTHONPATH" \
--add-flags "$out/share/eyewitness/Python/EyeWitness.py"
runHook postFixup
'';
meta = with lib; {
description = "Take screenshots of websites, and identify admin interfaces";
homepage = "https://github.com/redsiege/EyeWitness";
changelog = "https://github.com/redsiege/EyeWitness/blob/${src.rev}/CHANGELOG";
license = licenses.gpl3Only;
maintainers = with maintainers; [ tochiaha ];
mainProgram = "eye-witness";
platforms = platforms.all;
};
}

View File

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "grype";
version = "0.79.0";
version = "0.79.1";
src = fetchFromGitHub {
owner = "anchore";
repo = "grype";
rev = "refs/tags/v${version}";
hash = "sha256-fFiZ6GOKaHcBnxakhd3Mdm1hHmfAwyq/ScBNUwrm0vw=";
hash = "sha256-Ih1xja20e3wCZ68kRA9bK8jh+pw/5KtlgeE3dDjqeE0=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -30,7 +30,7 @@ buildGoModule rec {
proxyVendor = true;
vendorHash = "sha256-PIs+6P7w6vjOOpH96KEdG6tHRCU7ijtdyS/1C77BPDw=";
vendorHash = "sha256-iSpSJwAHB/HJ3Ut1VgUBd1yCwOaM4f3ihR0J4YjMVxM=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -10,17 +10,18 @@
, openssl
, pkg-config
, zlib
, unstableGitUpdater
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "rakshasa-libtorrent";
version = "0.13.8+date=2021-08-07";
version = "0.13.8-unstable-2023-03-16";
src = fetchFromGitHub {
owner = "rakshasa";
repo = "libtorrent";
rev = "53596afc5fae275b3fb5753a4bb2a1a7f7cf6a51";
hash = "sha256-gyl/jfbptHz/gHkkVGWShhv1Z7o9fa9nJIz27U2A6wg=";
rev = "91f8cf4b0358d9b4480079ca7798fa7d9aec76b5";
hash = "sha256-mEIrMwpWMCAA70Qb/UIOg8XTfg71R/2F4kb3QG38duU=";
};
nativeBuildInputs = [
@ -36,13 +37,15 @@ stdenv.mkDerivation rec {
zlib
];
passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
enableParallelBuilding = true;
meta = with lib; {
meta = {
homepage = "https://github.com/rakshasa/libtorrent";
description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ebzzry codyopel ];
platforms = platforms.unix;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ];
platforms = lib.platforms.unix;
};
}

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nix-unit";
version = "2.18.0";
version = "2.23.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-unit";
rev = "v${finalAttrs.version}";
hash = "sha256-9wq14p+85oW4HlD42NJ0jyA++z3nEYjFQ6uT40xdfbc=";
hash = "sha256-sDYeiwVo6+GL4/AHadeExVqE9j3wzdUsyMLs1OYQW7Y=";
};
buildInputs = [
@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
# We pin the nix version to a known working one here as upgrades can likely break the build.
# Since the nix language is rather stable we don't always need to have the latest and greatest for unit tests
# On each update of nix unit we should re-evaluate what version we need.
nixVersions.nix_2_18
nixVersions.nix_2_23
boost
];

View File

@ -1,19 +1,31 @@
{ lib, stdenv, fetchFromGitHub, cmake, openssl, paho-mqtt-c, enableStatic ? stdenv.hostPlatform.isStatic, enableShared ? !stdenv.hostPlatform.isStatic }:
{
lib,
stdenv,
fetchFromGitHub,
cmake,
openssl,
paho-mqtt-c,
enableStatic ? stdenv.hostPlatform.isStatic,
enableShared ? !stdenv.hostPlatform.isStatic,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "paho.mqtt.cpp";
version = "1.3.2";
version = "1.4.0";
src = fetchFromGitHub {
owner = "eclipse";
repo = "paho.mqtt.cpp";
rev = "v${version}";
hash = "sha256-c2umToT4w+L7bgzp1bCEcb0ECHvxKZ2t6JI5SmUySPo=";
rev = "v${finalAttrs.version}";
hash = "sha256-XAQSNjO34b2BPzAf7x4a+74UdKFH5lYNMJm4kE16nkA=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl paho-mqtt-c ];
buildInputs = [
openssl
paho-mqtt-c
];
cmakeFlags = [
(lib.cmakeBool "PAHO_WITH_SSL" true)
@ -28,4 +40,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
};
}
})

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "poutine";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "boostsecurityio";
repo = "poutine";
rev = "refs/tags/v${version}";
hash = "sha256-T81Qi79VaZzfKL4niTZQW+gwwiBcyInALrvyUg1V4Ck=";
hash = "sha256-mB/d3EWBWHx7zrMGRPGOJc2uD3MlhXV8H2WfNiKlzdE=";
};
vendorHash = "sha256-/chq40j+puAI3KdI15vbZwrnzCKrU7g+Z/t9aOXQ1Sg=";
vendorHash = "sha256-HYuyGSatUOch73IKc7/9imhwz0Oz6Mrccs2HKVQtaVE=";
ldflags = [
"-s"

View File

@ -1,10 +1,11 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, autoconf-archive
, autoreconfHook
, cppunit
, curl
, fetchFromGitHub
, installShellFiles
, libsigcxx
, libtool
, libtorrent
@ -14,19 +15,22 @@
, xmlrpc_c
, zlib
, nixosTests
, unstableGitUpdater
}:
stdenv.mkDerivation {
pname = "rakshasa-rtorrent";
version = "0.9.8+date=2022-06-20";
version = "0.9.8-unstable-2023-03-16";
src = fetchFromGitHub {
owner = "rakshasa";
repo = "rtorrent";
rev = "92bec88d0904bfb31c808085c2fd0f22d0ec8db7";
hash = "sha256-er7UdIb+flhq0ye76UmomgfHV2ZSBROpXmfrNDHwTWw=";
rev = "1da0e3476dcabbf74b2e836d6b4c37b4d96bde09";
hash = "sha256-OXOZSMuNAU+VGwNyyfzcmkTRjDJq9HsKUNxZDYpSvFQ=";
};
outputs = [ "out" "man" ];
passthru = {
inherit libtorrent;
};
@ -34,6 +38,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoconf-archive
autoreconfHook
installShellFiles
pkg-config
];
@ -54,24 +59,26 @@ stdenv.mkDerivation {
"--with-posix-fallocate"
];
passthru.tests = {
inherit (nixosTests) rtorrent;
passthru = {
updateScript = unstableGitUpdater { tagPrefix = "v"; };
tests = {
inherit (nixosTests) rtorrent;
};
};
enableParallelBuilding = true;
postInstall = ''
mkdir -p $out/share/man/man1 $out/share/doc/rtorrent
mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1
mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc
installManPage doc/old/rtorrent.1
install -Dm644 doc/rtorrent.rc-example -t $out/share/doc/rtorrent/rtorrent.rc
'';
meta = with lib; {
meta = {
homepage = "https://rakshasa.github.io/rtorrent/";
description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ebzzry codyopel ];
platforms = platforms.unix;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ];
platforms = lib.platforms.unix;
mainProgram = "rtorrent";
};
}

View File

@ -0,0 +1,44 @@
{ lib
, fetchFromGitHub
, rustPlatform
, pkg-config
, openssl
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "rustmission";
version = "0.3.3";
src = fetchFromGitHub {
owner = "intuis";
repo = "rustmission";
rev = "v${version}";
hash = "sha256-OOewobyfJYnspeXFYzTP7SLrNQRnDl0jv81TJjQAdUE=";
};
cargoHash = "sha256-dLddB+YA1uC8CVMVI1aVo1oMufxRupW26hGkb8796Ek=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
# There is no tests
doCheck = false;
meta = {
description = "A TUI for the Transmission daemon";
homepage = "https://github.com/intuis/rustmission";
changelog = "https://github.com/intuis/rustmission/releases/tag/v${version}";
license = lib.licenses.gpl3Only;
mainProgram = "rustmission";
maintainers = with lib.maintainers; [ anas ];
platforms = with lib.platforms; unix ++ windows;
};
}

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "syft";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "anchore";
repo = "syft";
rev = "refs/tags/v${version}";
hash = "sha256-fTqyFsFWSsVt2Thd15nlsmnNIhQSLAv9SaaaVJWto/8=";
hash = "sha256-S61O/JxVu60GS/T9jVBuebn+EFBwB5jiSEkKV/h/S+s=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -28,7 +28,7 @@ buildGoModule rec {
# hash mismatch with darwin
proxyVendor = true;
vendorHash = "sha256-U4PZPUsfWCJB2YFJkirF8Q46pRmhKqzSnk7GpKOrfbU=";
vendorHash = "sha256-WSDbTI0U3Vqkfy8fxuqq9G5uBnBQ3421vyn6RriQx/U=";
nativeBuildInputs = [ installShellFiles ];

File diff suppressed because it is too large Load Diff

View File

@ -22,20 +22,20 @@
rustPlatform.buildRustPackage rec {
pname = "wlx-overlay-s";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "galister";
repo = "wlx-overlay-s";
rev = "v${version}";
hash = "sha256-9ess8/H7cByNYFNHvCi0124xCBwXk+PTNhAZKBcS08A=";
hash = "sha256-4sW/WxoN5jAomA/aFAAH8z8CAB7zsevpBllSwaQWSmU=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"vulkano-0.34.0" = "sha256-0ZIxU2oItT35IFnS0YTVNmM775x21gXOvaahg/B9sj8=";
"ovr_overlay-0.0.0" = "sha256-d38LqhKOp9tHbiK4eU7OPdFvkExqaJN1tB6y2qqPm9U=";
"vulkano-0.34.0" = "sha256-o1KP/mscMG5j3U3xtei/2nMNEh7jLedcW1P0gL9Y1Rc=";
"wlx-capture-0.3.11" = "sha256-CmFnVfA3MAYXSejn9GpuaNCRu4HiX0CN0j3aN4Pxvjw=";
};
};

View File

@ -79,6 +79,7 @@ mapAliases {
inherit (pkgs) degit; # added 2023-08-18
inherit (pkgs) diagnostic-languageserver; # added 2024-06-25
inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18
inherit (pkgs) dotenv-cli; # added 2024-06-26
eask = pkgs.eask; # added 2023-08-17
inherit (pkgs.elmPackages) elm-test;
eslint_d = pkgs.eslint_d; # Added 2023-05-26

View File

@ -89,7 +89,6 @@
, "csslint"
, "dhcp"
, "diff2html-cli"
, "dotenv-cli"
, "dotenv-vault"
, "elasticdump"
, "@electron-forge/cli"

View File

@ -68617,35 +68617,6 @@ in
bypassCache = true;
reconstructLock = true;
};
dotenv-cli = nodeEnv.buildNodePackage {
name = "dotenv-cli";
packageName = "dotenv-cli";
version = "7.4.2";
src = fetchurl {
url = "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-7.4.2.tgz";
sha512 = "SbUj8l61zIbzyhIbg0FwPJq6+wjbzdn9oEtozQpZ6kW2ihCcapKVZj49oCT3oPM+mgQm+itgvUQcG5szxVrZTA==";
};
dependencies = [
sources."cross-spawn-7.0.3"
sources."dotenv-16.4.5"
sources."dotenv-expand-10.0.0"
sources."isexe-2.0.0"
sources."minimist-1.2.8"
sources."path-key-3.1.1"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."which-2.0.2"
];
buildInputs = globalBuildInputs;
meta = {
description = "A global executable to run applications with the ENV variables loaded by dotenv";
homepage = "https://github.com/entropitor/dotenv-cli#readme";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
dotenv-vault = nodeEnv.buildNodePackage {
name = "dotenv-vault";
packageName = "dotenv-vault";

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "pyogrio";
version = "0.8.0";
version = "0.9.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -25,15 +25,12 @@ buildPythonPackage rec {
owner = "geopandas";
repo = "pyogrio";
rev = "v${version}";
hash = "sha256-h4Rv5xOWSJSv0nLbosviz5EiF/IsZO5wzBel9YRd0Bg=";
hash = "sha256-HC7+dDehDwEIDQnCMYrsC1jE78AyfHqEhfOZLYSzTIw=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "versioneer[toml]==0.28" "versioneer[toml]"
'' + lib.optionalString (!pythonOlder "3.12") ''
substituteInPlace setup.py \
--replace-fail "distutils" "setuptools._distutils"
'';
nativeBuildInputs = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1175";
version = "3.0.1176";
pyproject = true;
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-TpLPYwSzZDqvXfeePFgayS0KzeaTDMCEvOzdj1/uHjM=";
hash = "sha256-/0qLZDAqY0Q1pROy6YDtvziAnkwM/WCmqzpkmSx2TPU=";
};
build-system = [ setuptools ];

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "voluptuous";
version = "0.14.2";
version = "0.15.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "alecthomas";
repo = "voluptuous";
rev = "refs/tags/${version}";
hash = "sha256-2a4lid9NibbvhHfs/fcyHgPRZ2HirIKuPYxMsl5oA4o=";
hash = "sha256-/K1r+YkiRq/p8kwPXr/RrE6h0c94rbmWITrRSM+COKQ=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cargo
, cmake
, ninja
@ -35,19 +36,19 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "18.2";
version = "18.3";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
hash = "sha256-KerV174GPF2htfaQo5gRFLgpnGf9UoS0zQ/yd/SDFkQ=";
hash = "sha256-QefbA6ncxMDHmd7tBH1bU+8FoVVJVdEtOuVXEvteSOE=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
inherit src;
hash = "sha256-cAz98SspJ5QFjw7rXtdmfShllAx89pg+PUs20bkmBCg=";
hash = "sha256-XwSdDvE0p/A+6ZbV82K78jgIxGs71fu7ZDGTl0I0cCI=";
};
nativeBuildInputs = [
@ -91,6 +92,13 @@ stdenv.mkDerivation rec {
Security
]);
patches = [
(fetchpatch {
url = "https://github.com/ddnet/ddnet/pull/8517/commits/c840bf45016a30e629f7684df5fab5d07b2c70d5.patch";
hash = "sha256-UG7pi0Xh/nAHFEF1RIyNZLewF+NFilTLARbV5oUlftc=";
})
];
postPatch = ''
substituteInPlace src/engine/shared/storage.cpp \
--replace /usr/ $out/

View File

@ -1,4 +1,4 @@
{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre, version, hash }:
{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre, version, hash, udev }:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "papermc";
@ -21,7 +21,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
install -D $src $out/share/papermc/papermc.jar
makeWrapper ${lib.getExe jre} "$out/bin/minecraft-server" \
--append-flags "-jar $out/share/papermc/papermc.jar nogui"
--append-flags "-jar $out/share/papermc/papermc.jar nogui" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
runHook postInstall
'';

View File

@ -7,11 +7,11 @@
}:
mkKdeDerivation rec {
pname = "kirigami-addons";
version = "1.2.1";
version = "1.3.0";
src = fetchurl {
url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz";
hash = "sha256-ZXQm+exVz+xafwSEjtK03yrIv8szwlYmrSOSGdRE7pg=";
hash = "sha256-9eRNen19/YZsUpuwBPcgQBNgmhbJdXCR/NssbFvgD/M=";
};
extraBuildInputs = [qtdeclarative];

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "intel-compute-runtime";
version = "24.17.29377.6";
version = "24.22.29735.20";
src = fetchFromGitHub {
owner = "intel";
repo = "compute-runtime";
rev = version;
hash = "sha256-+bx6P1vZlgolHrINzkH4ukXT+hgAtH18DOX6vb9vPVs=";
hash = "sha256-M+buuVTd0w1Js6eDKln+LFhQgeNU4KCbN6vK8PyUdG8=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "knot-dns";
version = "3.3.6";
version = "3.3.7";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "c81801e9d6c64c97777cacf47e260f46f37799180d906457a53a9f13dd0f9987";
sha256 = "18ceb398578342e9a3d5b75f2423945a2f8d1d7c730f24f4d2aa4a24b50e831d";
};
outputs = [ "bin" "out" "dev" ];

View File

@ -10,12 +10,12 @@
callPackage ../nginx/generic.nix args rec {
pname = "openresty";
nginxVersion = "1.21.4";
version = "${nginxVersion}.3";
nginxVersion = "1.25.3";
version = "${nginxVersion}.1";
src = fetchurl {
url = "https://openresty.org/download/openresty-${version}.tar.gz";
sha256 = "sha256-M6hMY8/Z5GsOXGLrLdx7gGi9ouFoYxQ0O4n8P/0kzdM=";
sha256 = "sha256-MuwaJTpaEyUDVaB1/mW31j7EXFYLviEzUPCZKlfNed8=";
};
# generic.nix applies fixPatch on top of every patch defined there.
@ -40,7 +40,8 @@ callPackage ../nginx/generic.nix args rec {
configureFlags = [ "--with-http_postgres_module" ];
postInstall = ''
ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty
ln -s $out/luajit/bin/luajit-2.1.ROLLING $out/bin/luajit-openresty
ln -sf $out/nginx/bin/nginx $out/bin/openresty
ln -s $out/nginx/bin/nginx $out/bin/nginx
ln -s $out/nginx/conf $out/conf
ln -s $out/nginx/html $out/html

View File

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
version = "6.9";
version = "6.9.1";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
hash = "sha256-fhSl1ZfzI919G0U+Ok5mGn6fB+oGDvv/T3b/gxWRfeg=";
hash = "sha256-7VSz1w0MfBHaBCipz6WoHLguYzFkx7pXz2cU+LaUGLo=";
};
nativeBuildInputs = [

View File

@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "11.9.1";
version = "11.10.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
rev = "refs/tags/v${version}";
hash = "sha256-8i2oNeFxpxhFxFlJR3ib0M1W9NNtqgGjlnKsqzLkf68=";
hash = "sha256-tV7QDa7XSkr+HwegOwEnOjtn1IrLhE0PfrhjjRz0JbM=";
};
proxyVendor = true;
vendorHash = "sha256-va23lTCCL/4EpTkBPH+rqZj4f+O4vAg2/nXGMEDNGXU=";
vendorHash = "sha256-KS+fuoLFueI5cHQLiM1g6Qxq4UFKNVGauvchx2aP+RY=";
subPackages = [ "apps/cnspec" ];

View File

@ -10204,10 +10204,6 @@ with pkgs;
libnids = callPackage ../tools/networking/libnids { };
rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent {
libtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix { };
};
jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent {
libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { };
};
@ -11469,8 +11465,6 @@ with pkgs;
paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { };
paho-mqtt-cpp = callPackage ../development/libraries/paho-mqtt-cpp { };
pakcs = callPackage ../development/compilers/pakcs {
# Doesn't compile with GHC 9.0 due to whitespace syntax changes
# see also https://github.com/NixOS/nixpkgs/issues/166108