dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-12-16 12:01:30 +00:00 committed by GitHub
commit 5394a299c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 224 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/editorconfig.yml vendored
View File

@ -31,7 +31,8 @@ jobs:
- uses: cachix/install-nix-action@v16
with:
# nixpkgs commit is pinned so that it doesn't break
nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz
# editorconfig-checker 2.4.0
nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz
- name: install editorconfig-checker
run: nix-env -iA editorconfig-checker -f '<nixpkgs>'
- name: Checking EditorConfig

2
nixos/tests/kubernetes/default.nix
View File

@ -1,5 +1,5 @@
{ system ? builtins.currentSystem
, pkgs ? import <nixpkgs> { inherit system; }
, pkgs ? import ../../.. { inherit system; }
}:
let
dns = import ./dns.nix { inherit system pkgs; };

2
nixos/tests/kubernetes/dns.nix
View File

@ -1,4 +1,4 @@
{ system ? builtins.currentSystem, pkgs ? import <nixpkgs> { inherit system; } }:
{ system ? builtins.currentSystem, pkgs ? import ../../.. { inherit system; } }:
with import ./base.nix { inherit system; };
let
domain = "my.zyx";

2
nixos/tests/kubernetes/e2e.nix
View File

@ -1,4 +1,4 @@
{ system ? builtins.currentSystem, pkgs ? import <nixpkgs> { inherit system; } }:
{ system ? builtins.currentSystem, pkgs ? import ../../.. { inherit system; } }:
with import ./base.nix { inherit system; };
let
domain = "my.zyx";

2
nixos/tests/kubernetes/rbac.nix
View File

@ -1,4 +1,4 @@
{ system ? builtins.currentSystem, pkgs ? import <nixpkgs> { inherit system; } }:
{ system ? builtins.currentSystem, pkgs ? import ../../.. { inherit system; } }:
with import ./base.nix { inherit system; };
let

17
pkgs/applications/editors/standardnotes/default.nix
View File

@ -2,19 +2,20 @@
, fetchurl, libsecret, gtk3, gsettings-desktop-schemas }:
let
version = "3.8.18";
version = "3.9.5";
pname = "standardnotes";
name = "${pname}-${version}";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
plat = {
i386-linux = "i386";
i686-linux = "i386";
x86_64-linux = "x86_64";
}.${stdenv.hostPlatform.system};
}.${stdenv.hostPlatform.system} or throwSystem;
sha256 = {
i386-linux = "1xiypsmvpk8i6kab862pipbdfb0y5d5355hdwjmva7v7g26aa7h7";
x86_64-linux = "03qlxlgyypnvcr40jh6i4wriyax2jbfhrb798cq0n7qlc1y4pg8r";
}.${stdenv.hostPlatform.system};
i686-linux = "sha256-7Mo8ELFV6roZ3IYWBtB2rRDAzJrq4ht9f1v6uohsauw=";
x86_64-linux = "sha256-9VPYII9E8E3yL7UuU0+GmaK3qxWX4bwfACDl7F7sngo=";
}.${stdenv.hostPlatform.system} or throwSystem;
src = fetchurl {
url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-linux-${plat}.AppImage";
@ -60,7 +61,7 @@ in appimageTools.wrapType2 rec {
'';
homepage = "https://standardnotes.org";
license = licenses.agpl3;
maintainers = with maintainers; [ mgregoire ];
platforms = [ "i386-linux" "x86_64-linux" ];
maintainers = with maintainers; [ mgregoire chuangzhu ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

4
pkgs/applications/misc/archivy/default.nix
View File

@ -53,11 +53,11 @@ with py.pkgs;
buildPythonApplication rec {
pname = "archivy";
version = "1.4.0";
version = "1.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-wQuR7cltDLr2u8BQ851MSjKmeLW8mQ/3bdEF5c9nxL0=";
sha256 = "sha256-97ACQ3qp9ciw0kHwKwmatzCBl4XZr+6poejBM/0D4k8=";
};
# Relax some dependencies

6
pkgs/applications/version-management/git-and-tools/delta/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.11.2";
version = "0.11.3";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
sha256 = "sha256-GboG7Ia27CTisY0YCFiAhzoCMxMAXlCeAPll19+JoxM=";
sha256 = "sha256-qpoXUzXRcsUi1WHZAYGgnEaNxBYEQAdkXAz7YPiPae8=";
};
cargoSha256 = "sha256-JEIMZFDEWaKXfe4OzaAxMop0XYQAcz8L7hcTBD8DJio=";
cargoSha256 = "sha256-eds2W47+lOwO/HHKR+IjXOJOD8p1OYkk5qilDYTOUyk=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/applications/virtualization/lima/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "lima";
version = "0.7.4";
version = "0.8.0";
src = fetchFromGitHub {
owner = "lima-vm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pn8GtFAZMQyFjOpn6blNBoDgQL7X1gaYjGsQHwvMzaQ=";
sha256 = "sha256-bO7o3z9E7mGiUtlqI+mhhh+D6CG9j3BZ7IB8o/LDUPM=";
};
vendorSha256 = "sha256-egZFJSGnFYfOcBMNNEsPV6ngf3ddoYCSntnuloYfpxo=";
vendorSha256 = "sha256-MDmRkGa1m3YuUbffCwoChG0Fg74jyuQQ6ljfDlLatjI=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

4
pkgs/development/coq-modules/category-theory/default.nix
View File

@ -5,6 +5,8 @@ with lib; mkCoqDerivation {
pname = "category-theory";
owner = "jwiegley";
release."20211213".rev = "449e30e929d56f6f90c22af2c91ffcc4d79837be";
release."20211213".sha256 = "sha256:0vgfmph5l1zn6j4b851rcm43s8y9r83swsz07rpzhmfg34pk0nl0";
release."20210730".rev = "d87937faaf7460bcd6985931ac36f551d67e11af";
release."20210730".sha256 = "04x7433yvibxknk6gy4971yzb4saa3z4dnfy9n6irhyafzlxyf0f";
release."20190414".rev = "706fdb4065cc2302d92ac2bce62cb59713253119";
@ -14,7 +16,7 @@ with lib; mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.13"; out = "20210730"; }
{ case = range "8.10" "8.14"; out = "20211213"; }
{ case = range "8.8" "8.9"; out = "20190414"; }
{ case = range "8.6" "8.7"; out = "20180709"; }
] null;

24
pkgs/development/embedded/platformio/core.nix
View File

@ -9,6 +9,16 @@
let
python = python3.override {
packageOverrides = self: super: {
aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec {
version = "0.8.0";
src = fetchFromGitHub {
owner = "Tinche";
repo = "aiofiles";
rev = "v${version}";
sha256 = "0mr9pzji4vqyf2yzh8yxz5q7fm8mgmkimx1xh49wh625m72pxcap";
};
});
asgiref = super.asgiref.overridePythonAttrs (oldAttrs: rec {
version = "3.4.1";
src = fetchFromGitHub {
@ -41,22 +51,12 @@ let
});
uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec {
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "encode";
repo = "uvicorn";
rev = version;
sha256 = "074smp3448wcazlhc7sb8r54l4kfavr6yks3w5x60zl1qpijf52r";
};
});
zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec {
version = "0.36.13";
src = fetchFromGitHub {
owner = "jstasiak";
repo = "python-zeroconf";
rev = version;
sha256 = "aYNb67ESyz2Q2CKLhG+/Z8Xtt0Js8uf+xrVSEpY0X8c=";
sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s";
};
});
};

4
pkgs/development/embedded/platformio/default.nix
View File

@ -4,14 +4,14 @@
let
callPackage = newScope self;
version = "5.2.3";
version = "5.2.4";
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
src = fetchFromGitHub {
owner = "platformio";
repo = "platformio-core";
rev = "v${version}";
sha256 = "0wbmwawn25srkyrd6hwrgli1himzsj08vbm76fgnpqdc84n78ckl";
sha256 = "1dhyxrdxrca669qm6alxxn2jmvcwlpqrx9kfwh4iqy9za5717ag9";
};
self = {

2
pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
View File

@ -6,7 +6,7 @@ index 416dccfd..896c3649 100644
@staticmethod
@memoized(expire="1h")
def load_spdx_licenses():
- version = "3.14"
- version = "3.15"
- spdx_data_url = (
- "https://raw.githubusercontent.com/spdx/license-list-data/"
- "v%s/json/licenses.json" % version

8
pkgs/development/libraries/tdlib/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "tdlib";
version = "1.7.9";
version = "1.7.10";
src = fetchFromGitHub {
owner = "tdlib";
repo = "td";
# https://github.com/tdlib/td/issues/1718
rev = "7d41d9eaa58a6e0927806283252dc9e74eda5512";
sha256 = "09b7srbfqi4gmg5pdi398pr0pxihw4d3cw85ycky54g862idzqs8";
# https://github.com/tdlib/td/issues/1790
rev = "a53cb30e99f937cfd64e0266fa558785a184a553";
sha256 = "FX+66JRsigauLq2JLx0InWiedGeQJ9+ox+D/Bqik9ik=";
};
buildInputs = [ gperf openssl readline zlib ];

4
pkgs/development/python-modules/aiohue/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "aiohue";
version = "3.0.3";
version = "3.0.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ajDwA8zFBQdFeI3oUBBWQZA13PNust21BWxrsB7PcTQ=";
sha256 = "sha256-qOtfr6rrV+E/vdY3AprJ5G7p+VzYDVk1aq9/F0O0mLE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-nest-sdm/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "google-nest-sdm";
version = "0.4.6";
version = "0.4.8";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "allenporter";
repo = "python-google-nest-sdm";
rev = version;
sha256 = "sha256-oMYCBmqDTPcGHwP3LFYX3CdbHw2hg41EQQv8iiv+ljE=";
sha256 = "sha256-HHjCML/55jthqZ5WjNNsldr+8nul8bd8N9aNAoe/iBw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pykeyatome/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pykeyatome";
version = "1.1.2";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "jugla";
repo = "pyKeyAtome";
rev = "V${version}";
sha256 = "sha256-5aKZaS+BFKR1ldAY3BlS/oqYGz1C+ZRkNL9ez/etWh4=";
sha256 = "173bf4nrj4jqp2119gfmbra7rhbr30bkjkd44rw9450nmpfmh7pk";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pysmappee/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pysmappee";
version = "0.2.27";
version = "0.2.29";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "smappee";
repo = pname;
rev = version;
sha256 = "sha256-CzdkeC53ye+IMeGUiD1mK84h2ruC1/ZpjlDjuWMVoyQ=";
sha256 = "sha256-Ffi55FZsZUKDcS4qV46NpRK3VP6axzrL2BO+hYW7J9E=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pytest-httpserver/default.nix
View File

@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "pytest-httpserver";
version = "1.0.2";
version = "1.0.3";
src = fetchPypi {
pname = "pytest_httpserver";
inherit version;
sha256 = "sha256-JwH9HZgU1YVR+dEETbM1xrqYcxaTZsWDSVI6WM907UA=";
sha256 = "87561c4fa6a7bc306d76d1979a3eb9d54eb26bfb2f3f51f1643bf3c090ce629d";
};
propagatedBuildInputs = [ werkzeug ];

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -46,13 +46,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.660";
version = "2.0.664";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
sha256 = "sha256-ebVOEtJTlYaj9sYJsJ8BBxx+2PSyzbwivQIph3slaho=";
sha256 = "sha256-t7u47gkUtn9EwBWtz97GkiM8tyGCFk4S5UTQ+OosI2o=";
};
nativeBuildInputs = with py.pkgs; [

6
pkgs/development/tools/krankerl/default.nix
View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "krankerl";
version = "0.13.2";
version = "0.13.3";
src = fetchFromGitHub {
owner = "ChristophWurst";
repo = "krankerl";
rev = "v${version}";
sha256 = "sha256-Kol39AtM5m6FC+s5SDbQhWuASkGbeXPlmSGb7axEuK8=";
sha256 = "sha256-/zRO+CVYQgx9/j14zgNm/ABzLprt0OYne+O6hOEjSEw=";
};
cargoSha256 = "sha256-bPcKe3vE3VIjLJ4iYdF3Gt0sID09gRpxG5TpTGWhnPs=";
cargoSha256 = "sha256-LWQRFgDxl2yxP+v1TUENaTGrA/udh84AJvWIkfTJezM=";
nativeBuildInputs = [
pkg-config

84
pkgs/misc/emulators/ares/default.nix Normal file
View File

@ -0,0 +1,84 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, alsa-lib
, gtksourceview3
, libXv
, openal
, libpulseaudio
, libao
, udev
, SDL2
}:
stdenv.mkDerivation rec {
pname = "ares";
version = "126";
src = fetchFromGitHub {
owner = "ares-emulator";
repo = "ares";
rev = "v${version}";
sha256 = "1rj4vmz8lvpmfc6wni7222kagnw9f6jda9rcb6qky2kpizlp2d24";
};
parallel-rdp = fetchFromGitHub {
owner = "Themaister";
repo = "parallel-rdp-standalone";
rev = "0dcebe11ee79288441e40e145c8f340d81f52316";
sha256 = "1avp4wyfkhk5yfjqx5w3jbqghn2mq5la7k9248kjmnp9n9lip6w9";
};
patches = [
./fix-ruby.patch
];
enableParallelBuilding = true;
dontConfigure = true;
nativeBuildInputs = [
pkg-config
];
buildInputs = [
alsa-lib
gtksourceview3
libXv
openal
libpulseaudio
libao
udev
SDL2
];
buildPhase = ''
runHook preBuild
rm -rf ares/n64/vulkan/parallel-rdp
ln -sf ${parallel-rdp} ares/n64/vulkan/parallel-rdp
make -C desktop-ui -j $NIX_BUILD_CORES openmp=true vulkan=true local=false hiro=gtk3
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share/{applications,ares,pixmaps}}
cp desktop-ui/out/ares $out/bin
cp desktop-ui/resource/ares.desktop $out/share/applications
cp desktop-ui/resource/{ares{.ico,.png},font.png} $out/share/pixmaps
cp -r ares/{Shaders,System} $out/share/ares
runHook postInstall
'';
meta = with lib; {
homepage = "https://ares.dev";
description = "Open-source multi-system emulator with a focus on accuracy and preservation";
license = licenses.isc;
maintainers = with maintainers; [ Madouura ];
platforms = platforms.all;
};
}

27
pkgs/misc/emulators/ares/fix-ruby.patch Normal file
View File

@ -0,0 +1,27 @@
diff --git a/ruby/GNUmakefile b/ruby/GNUmakefile
index e85a51701..7fca89e0f 100644
--- a/ruby/GNUmakefile
+++ b/ruby/GNUmakefile
@@ -8,19 +8,9 @@ ifeq ($(ruby),)
ruby += audio.openal
ruby += input.quartz #input.carbon
else ifeq ($(platform),linux)
- pkg_check1 = $(if $(shell test -e /usr/lib/lib$1.so && echo 1),$2)
- pkg_check2 = $(if $(shell test -e /usr/lib/$(shell uname -m)-linux-gnu/lib$1.so && echo 1),$2)
- pkg_check = $(call pkg_check1,$1,$2) $(call pkg_check2,$1,$2)
- ruby += video.glx video.glx2 video.xshm
- ruby += $(call pkg_check,Xv,video.xvideo)
- ruby += audio.oss audio.alsa
- ruby += $(call pkg_check,openal,audio.openal)
- ruby += $(call pkg_check,pulse,audio.pulseaudio)
- ruby += $(call pkg_check,pulse-simple,audio.pulseaudiosimple)
- ruby += $(call pkg_check,ao,audio.ao)
- ruby += input.xlib
- ruby += $(call pkg_check,udev,input.udev)
- ruby += $(call pkg_check,SDL2,input.sdl)
+ ruby += video.glx video.glx2 video.xshm video.xvideo
+ ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao
+ ruby += input.xlib input.udev input.sdl
else ifeq ($(platform),bsd)
pkg_check = $(if $(shell test -e /usr/local/lib/lib$1.so && echo 1),$2)
ruby += video.glx video.glx2 video.xshm

6
pkgs/misc/openrussian-cli/default.nix
View File

@ -25,12 +25,6 @@ stdenv.mkDerivation rec {
dontConfigure = true;
# Disable check as it's too slow.
# doCheck = true;
#This is needed even though it's the default for some reason.
checkTarget = "check";
# Can't use "make install" here
installPhase = ''
runHook preInstall

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.12.1";
version = "2021.12.2";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];

4
pkgs/servers/home-assistant/default.nix
View File

@ -252,7 +252,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.12.1";
hassVersion = "2021.12.2";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -269,7 +269,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256:11qlalfzykbq5ydn2cagkqcbvdjkmjcdpp6lgiys9lyrw1rxycnb";
hash = "sha256:0rb6kwvrjq258qv8xh4qbpw3n91bb263dcqp3f1dg45n8mbcdr60";
};
# leave this in, so users don't have to constantly update their downstream patch handling

4
pkgs/servers/home-assistant/frontend.nix
View File

@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20211212.0";
version = "20211215.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-cYh8xBUS8rb2koNAq8JwWtrOHSF1jC5v0lq+W1SwiXI=";
sha256 = "sha256-G2w+L+tQi47JOygYZ1+VtC96FBPet5klkW0LUeaxWBY=";
};
# there is nothing to strip in this package

4
pkgs/tools/misc/esphome/default.nix
View File

@ -17,14 +17,14 @@ let
in
with python.pkgs; buildPythonApplication rec {
pname = "esphome";
version = "2021.12.0";
version = "2021.12.1";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-OiqY72XuzkdVxrUyPwAgH/Lnrht4lTlLYOirjF9UpjM=";
sha256 = "sha256-sxGlvbWlHrAVjCIKx4WsnmKQN4iOVfX+vnkntqceHDA=";
};
patches = [

6
pkgs/tools/misc/topgrade/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "8.0.3";
version = "8.1.2";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yk8mW07VmABq4XSOcNKYSs04xpZQfzdDBeQFGFP6u/Y=";
sha256 = "sha256-2ID3VVT4cQ1yZAD2WVKqkoE7qbe2nNMp1nlwfTxmlZo=";
};
cargoSha256 = "sha256-rX4ZfcGlKe+v9UvvfWODaulAVkUbq2jvtuHP504uiX4=";
cargoSha256 = "sha256-o1V6u7FmP+p+ApL0AmaqTQTZ2f0sZTpx2ro4lR/DFi8=";
buildInputs = lib.optional stdenv.isDarwin Foundation;

4
pkgs/tools/security/log4j-vuln-scanner/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "log4j-vuln-scanner";
version = "0.7.1";
version = "0.8.1";
src = fetchFromGitHub {
owner = "hillu";
repo = "local-log4j-vuln-scanner";
rev = "v${version}";
sha256 = "sha256-YEXYZtjcZTl+9IgRuSRK/pvnISuW6Jbwuv+dqr4pork=";
sha256 = "sha256-qmm+5UATARuKyZltiVtIp/jOn0eUenWt7ztIfrN4q+0=";
};
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";

34
pkgs/tools/security/logmap/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "logmap";
version = "unstable-2021-12-15";
format = "other";
src = fetchFromGitHub {
owner = "zhzyker";
repo = pname;
rev = "5040707b4ae260830072de93ccd6a23615073abf";
sha256 = "sha256-LOGjK5l/gaKObWbC9vaLruE8DdDsabztnEW/TjvCdtE=";
};
propagatedBuildInputs = with python3.pkgs; [
requests
];
installPhase = ''
runHook preInstall
install -vD ${pname}.py $out/bin/${pname}
runHook postInstall
'';
meta = with lib; {
description = "Tools for fuzzing Log4j2 jndi injection";
homepage = "https://github.com/zhzyker/logmap";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
};
}

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

@ -7486,6 +7486,8 @@ with pkgs;
logcheck = callPackage ../tools/system/logcheck { };
logmap = callPackage ../tools/security/logmap { };
logmein-hamachi = callPackage ../tools/networking/logmein-hamachi { };
logkeys = callPackage ../tools/security/logkeys { };
@ -8347,7 +8349,9 @@ with pkgs;
openrgb = libsForQt5.callPackage ../applications/misc/openrgb { };
openrussian-cli = callPackage ../misc/openrussian-cli { };
openrussian-cli = callPackage ../misc/openrussian-cli {
luaPackages = lua53Packages;
};
opensc = callPackage ../tools/security/opensc {
inherit (darwin.apple_sdk.frameworks) Carbon PCSC;
@ -32264,6 +32268,8 @@ with pkgs;
antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { };
ares = callPackage ../misc/emulators/ares { };
atari800 = callPackage ../misc/emulators/atari800 { };
ataripp = callPackage ../misc/emulators/atari++ { };