Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
652204165d
@ -12868,13 +12868,6 @@
|
||||
fingerprint = "9B1A 7906 5D2F 2B80 6C8A 5A1C 7D2A CDAF 4653 CF28";
|
||||
}];
|
||||
};
|
||||
ninjatrappeur = {
|
||||
email = "felix@alternativebit.fr";
|
||||
matrix = "@ninjatrappeur:matrix.org";
|
||||
github = "NinjaTrappeur";
|
||||
githubId = 1219785;
|
||||
name = "Félix Baylac-Jacqué";
|
||||
};
|
||||
nintron = {
|
||||
email = "nintron@sent.com";
|
||||
github = "Nintron27";
|
||||
@ -13979,6 +13972,13 @@
|
||||
githubId = 627831;
|
||||
name = "Hoang Xuan Phu";
|
||||
};
|
||||
picnoir = {
|
||||
email = "felix@alternativebit.fr";
|
||||
matrix = "@picnoir:alternativebit.fr";
|
||||
github = "picnoir";
|
||||
githubId = 1219785;
|
||||
name = "Félix Baylac-Jacqué";
|
||||
};
|
||||
piegames = {
|
||||
name = "piegames";
|
||||
email = "nix@piegames.de";
|
||||
|
||||
@ -146,6 +146,6 @@ in {
|
||||
};
|
||||
|
||||
};
|
||||
meta.maintainers = with lib.maintainers; [ ninjatrappeur ];
|
||||
meta.maintainers = with lib.maintainers; [ picnoir ];
|
||||
meta.doc = ./pleroma.md;
|
||||
}
|
||||
|
||||
@ -65,7 +65,7 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: {
|
||||
in import ./make-test-python.nix ({pkgs, ... }: {
|
||||
name = "networkd";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ ninjatrappeur ];
|
||||
maintainers = [ picnoir ];
|
||||
};
|
||||
nodes = {
|
||||
node1 = { pkgs, ... }@attrs:
|
||||
|
||||
@ -7,20 +7,27 @@
|
||||
, file
|
||||
, libintl
|
||||
, hicolor-icon-theme
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "geany";
|
||||
version = "1.38";
|
||||
version = "2.0";
|
||||
|
||||
outputs = [ "out" "dev" "doc" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.geany.org/${pname}-${version}.tar.bz2";
|
||||
sha256 = "abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546";
|
||||
url = "https://download.geany.org/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-VltM0vAxHB46Fn7HHEoy26ZC4P5VSuW7a4F3t6dMzJI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# The test runs into UB in headless environments and crashes at least on headless Darwin.
|
||||
# Remove if https://github.com/geany/geany/pull/3676 is merged (or the issue fixed otherwise).
|
||||
./disable-test-sidebar.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
intltool
|
||||
@ -28,6 +35,7 @@ stdenv.mkDerivation rec {
|
||||
which
|
||||
file
|
||||
hicolor-icon-theme
|
||||
python3
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
@ -35,6 +43,11 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
patchShebangs --build tests/ctags/runner.sh
|
||||
patchShebangs --build scripts
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -61,9 +74,9 @@ stdenv.mkDerivation rec {
|
||||
- Plugin interface
|
||||
'';
|
||||
homepage = "https://www.geany.org/";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ frlan ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "geany";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
11
pkgs/applications/editors/geany/disable-test-sidebar.patch
Normal file
11
pkgs/applications/editors/geany/disable-test-sidebar.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/tests/Makefile.in 2023-10-19 18:10:06.000000000 +0200
|
||||
+++ b/tests/Makefile.in 2023-11-10 00:13:09.816498568 +0100
|
||||
@@ -86,7 +86,7 @@
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
-check_PROGRAMS = test_utils$(EXEEXT) test_sidebar$(EXEEXT)
|
||||
+check_PROGRAMS = test_utils$(EXEEXT)
|
||||
subdir = tests
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
|
||||
@ -30,21 +30,21 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "01xw0dpwb4ih2xlpgc0yq48wqb5nmicz98srbgz01sbmyji8x1lf";
|
||||
x86_64-darwin = "13i449px6pajb94ymvi6vwmm25vyyh4vjrb86yiq4dcx1plcrxfc";
|
||||
aarch64-linux = "174zl811pv5rznxz3fh7bkwz9iini8lmb8xfjs4i14sym7sxw5x3";
|
||||
aarch64-darwin = "05kjmhr3dwbj16k4ilc8nl6ckm21fyak6pr1zzdxywqb5qd7qwr8";
|
||||
armv7l-linux = "0icc4cx5p5fxsi8cz3mxik4vnmrv2dvfzm220nl9p13bn1ri3f6s";
|
||||
x86_64-linux = "1vdgc4mnysij2sf87d5dfh0yw9j2a58lvmnwzzsj1icaydhkhfjy";
|
||||
x86_64-darwin = "0zxky35ifgjwb6p41mi3z34fvn49fpl09r1n9kp46ip8mqsm7gm7";
|
||||
aarch64-linux = "0qv0gbkfx78a393x44g6zmi5gs57d2cnjqlwfv0yrhkgi5s8v1ma";
|
||||
aarch64-darwin = "1rl4256h8i52akzy8g2bkydsi5llp05qqj0jr2di896x4niw57iz";
|
||||
armv7l-linux = "18mcf5x3h3mwlvhkl86b2wcl0adj7pr4aqr12va07mwlh2fp83h4";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.84.0";
|
||||
version = "1.84.2";
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "d037ac076cee195194f93ce6fe2bdfe2969cc82d";
|
||||
rev = "1a5daa3a0231a0fbba4f14db7ec463cf99d7768e";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
@ -68,7 +68,7 @@ in
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "017g82h3jcygm6hi0s36ij8vxggz7p5j36nww5f53kn6a1s1wzcx";
|
||||
sha256 = "18kx7szx1v7dk0qqsw6cf40zd8mrc7a8snvm6i1n8q039d9mx2jz";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0cqkxd4pywkrvg3b96f1dyain6vlrb3di8a0yskmq3h58qd6k8rc";
|
||||
x86_64-darwin = "09y3whpp2z8fgb42pb9lw0b4wn0np3rdjkn5l1kldjljfrcwcn9g";
|
||||
aarch64-linux = "1kh8qylj77km8jhmx9a2bck7y4bb0fjx46sll7swagxz27b8ahi0";
|
||||
aarch64-darwin = "14g60sx3c5m02ly880sxwhmzvpxqw4pfij2ibgyprzdlpap0r2b0";
|
||||
armv7l-linux = "1s4rpd5p4kwmi89cml1106l9dccdwnqq3lyr8ym781pj9p75i8wp";
|
||||
x86_64-linux = "1v2lcbmb0g3pw58mmiqd2j9c7r7dcl371nxc6w9rsmcbf7s0f8h0";
|
||||
x86_64-darwin = "11if8l556rsvacwbsknv2hnqfwkad99klgnwx4kjcbm8g63ra3ab";
|
||||
aarch64-linux = "1fmahjn99cvylm8r4cf4b1654gyyk6n6mqad1l0cncpypdxc2pdw";
|
||||
aarch64-darwin = "053jnxpkpfh5a8nfx557ib6byhi4dd1dnxasp4igy59cbx25an9q";
|
||||
armv7l-linux = "0qc48mg34pkr23p3wnlczvfspfii3qn6ikbkgj1qsagxn9ycqjak";
|
||||
}.${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.83.1.23285";
|
||||
version = "1.84.2.23314";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }:
|
||||
{ mkDerivation, lib, stdenv, fetchFromGitHub, fetchpatch, qtbase, vcg, glew, qmake, libGLU, eigen, libGL }:
|
||||
|
||||
|
||||
mkDerivation {
|
||||
@ -12,12 +12,23 @@ mkDerivation {
|
||||
sha256 = "16254cnr60ihcn7bki7wl1qm6gkvzb99cn66md1pnb7za8nvzf4j";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase vcg glew ];
|
||||
patches = [
|
||||
# https://github.com/cfcohen/openbrf/pull/7
|
||||
(fetchpatch {
|
||||
name = "fix-build-against-newer-vcglib.patch";
|
||||
url = "https://github.com/cfcohen/openbrf/commit/6d82a25314a393e72bfbe2ffc3965bcac407df4c.patch";
|
||||
hash = "sha256-rNxAw6Le6QXMSirIAMhMmqVgNJLq6osnEOhWrY3mTpM=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ qtbase vcg glew eigen ];
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
qmakeFlags = [ "openBrf.pro" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-isystem ${lib.getDev eigen}/include/eigen3";
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's,^VCGLIB .*,VCGLIB = ${vcg}/include,' openBrf.pro
|
||||
'';
|
||||
|
||||
@ -47,7 +47,7 @@ in
|
||||
'';
|
||||
homepage = "https://www.scuttlebutt.nz/";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ asymmetric ninjatrappeur cyplo ];
|
||||
maintainers = with maintainers; [ asymmetric picnoir cyplo ];
|
||||
mainProgram = "ssb-patchwork";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
@ -70,11 +70,11 @@ in
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "recoll";
|
||||
version = "1.35.0";
|
||||
version = "1.36.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-5msEeHCdrpPS0VMCVohYNllaFJJdXRn8laY6BNBt+UE=";
|
||||
hash = "sha256-vf0o0wBcG3878YD4mTUhni2aTUU9AJkG4an1oaRc4yw=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
description = "Pan-unicode version of Fixedsys, a classic DOS font";
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.publicDomain;
|
||||
maintainers = [ lib.maintainers.ninjatrappeur ];
|
||||
maintainers = [ lib.maintainers.picnoir ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,10 +17,10 @@
|
||||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-whiskermenu-plugin";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
rev-prefix = "v";
|
||||
odd-unstable = false;
|
||||
sha256 = "sha256-5ojcIOVIa9WKL2e6iZwRgrAINSM8750zciCwpn9vzJU=";
|
||||
sha256 = "sha256-cKEybD/eTHdS1LXSS1r6QTBnfDiX7nYwnmGKTaagbrs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "18.2.4";
|
||||
version = "18.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-m82UfhcmAFBDfSVmia6nhBB2qyQjSZJbXtzD/sGeqk4=";
|
||||
hash = "sha256-hIwVnslBxWMjWxj1NN8If4MQn2jpFYyjmAVykQeY0hc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,17 +1,15 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "backports-strenum";
|
||||
version = "1.2.4";
|
||||
format = "pyproject";
|
||||
version = "1.2.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -19,15 +17,11 @@ buildPythonPackage rec {
|
||||
owner = "clbarnes";
|
||||
repo = "backports.strenum";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AhAMVawnBMJ45a3mpthUZvqTeqeCB1Uco4MSusLyA4E=";
|
||||
hash = "sha256-jbMR9VAGsMAJTP2VQyRr+RPYwWwk8hGAYs4KoZEWa7U=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
poetry-core
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -6,24 +6,24 @@
|
||||
, mkdocs-mermaid2-plugin
|
||||
, mkdocstrings
|
||||
, networkx
|
||||
, pygraphviz
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "canals";
|
||||
version = "0.8.1";
|
||||
format = "pyproject";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepset-ai";
|
||||
repo = pname;
|
||||
repo = "canals";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XC4CxvDghz8/LReeYjHEVtd8j2ZN4jd+x7vP6N8BKpc=";
|
||||
hash = "sha256-5pRrpi1qxkFgGqcw7Nfc5rnOTra27H31DLKCglkPf6s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -32,15 +32,11 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
networkx
|
||||
requests
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
graphviz = [
|
||||
pygraphviz
|
||||
];
|
||||
mermaid = [
|
||||
requests
|
||||
];
|
||||
docs = [
|
||||
mkdocs-material
|
||||
mkdocs-mermaid2-plugin
|
||||
@ -54,7 +50,7 @@ buildPythonPackage rec {
|
||||
|
||||
disabledTestPaths = [
|
||||
# Test requires internet connection to mermaid.ink
|
||||
"test/pipelines/integration"
|
||||
"test/pipeline/integration"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclonedx-python-lib";
|
||||
version = "4.2.3";
|
||||
version = "5.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "CycloneDX";
|
||||
repo = "cyclonedx-python-lib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-I94YsfDJ+FGQBRWCRKum917tXJ5vFm/cWbbM+NpwA4M=";
|
||||
hash = "sha256-M3aR3lCNtPIve1o16QLSnxrULhtXkuOXNYtOv2FmPMQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -78,9 +78,11 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# These tests require network access.
|
||||
# These tests require network access
|
||||
"test_bom_v1_3_with_metadata_component"
|
||||
"test_bom_v1_4_with_metadata_component"
|
||||
# AssertionError: <ValidationError: "{'algorithm': 'ES256', ...
|
||||
"TestJson"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-objects";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-D0GNigdphMArcpU6eI4roiiarIop3qW1tW2KIvJhlWU=";
|
||||
hash = "sha256-kTp0CowXtnLXetcnoCeqlXoadgaQhL5mTYTfq9QLIl8=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dns";
|
||||
version = "0.34.1";
|
||||
version = "0.34.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RPpi7pPFHGxXIWBY2S0qkRa3E6SocanRajqDuZ4wwfk=";
|
||||
hash = "sha256-/GG9jPBw6Hqstidi6ypa8VUHBsmIgdeurrru0RKAr9M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-firestore";
|
||||
version = "2.13.0";
|
||||
version = "2.13.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-QKI6rrgJeC93AGL8JTWZMqbj4P/2WPs+LP0VunrQnlk=";
|
||||
hash = "sha256-vRTS65rjWNIQWM4JHBPeoRkX4m8cQ3OKUenOqLSbTzg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "holidays";
|
||||
version = "0.35";
|
||||
version = "0.36";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "dr-prodigy";
|
||||
repo = "python-holidays";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FrAqVLyEtjhpiu1XdFY5yOstKKjXhRTv9PeaFlJaf8k=";
|
||||
hash = "sha256-pYlirojeHi10kUcjcvpfBYpIzbYmIlFgOLfy7WRhACU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lupupy";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-g2EEyPhsQZ+VKP/kSjZdQ9ns0NlptH8l2h0vTTLpF54=";
|
||||
hash = "sha256-mij5WGIl60D7ya1SdIvZ8TEgIZhJ9Xd2kcUnnbO1dD4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,18 +6,21 @@
|
||||
, grpcio
|
||||
, protobuf
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygnmi";
|
||||
version = "0.8.12";
|
||||
version = "0.8.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "akarneliuk";
|
||||
repo = "pygnmi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5dAjN/HDFKQmJIjhergBjSmHQKhBxqy/Jneh1pLCHrw=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-NkByimHk1DoBjMMD7ywplo38VxBpp1pnClYUzhtKwY4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -35,11 +38,14 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pygnmi" ];
|
||||
pythonImportsCheck = [
|
||||
"pygnmi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pure Python gNMI client to manage network functions and collect telemetry";
|
||||
homepage = "https://github.com/akarneliuk/pygnmi";
|
||||
changelog = "https://github.com/akarneliuk/pygnmi/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@ -3,26 +3,27 @@
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, pytz
|
||||
, xmltodict
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymetno";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "PyMetno";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NikfHQwVviCKWGfY1atirFVaqWQHfXg8WAgZIDnGn4Q=";
|
||||
hash = "sha256-wRSUIaonjjucLM+A4GsF9Lrq2vZYCquEvblbmjKYpQE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
pytz
|
||||
xmltodict
|
||||
];
|
||||
|
||||
@ -36,6 +37,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "A library to communicate with the met.no API";
|
||||
homepage = "https://github.com/Danielhiversen/pyMetno/";
|
||||
changelog = "https://github.com/Danielhiversen/pyMetno/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ flyfloh ];
|
||||
};
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyreadstat";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "Roche";
|
||||
repo = "pyreadstat";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Rd2nHsEYfr1I5gu2+iXIdHKvF/QgMD+vK6SIK/ytrmo=";
|
||||
hash = "sha256-+wa8HxQyEwdGF2LWJXTZ/gOFpC8P9+k5p4Lj3ePP2n8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmart";
|
||||
version = "1.2.5";
|
||||
version = "1.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "truenas";
|
||||
repo = "py-SMART";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NqE7Twl1kxXrASyxw35xIOTB+LThU0a45NCxh8SUxfI=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1k+5XnIT/AfZmzKUxkyU/uc0eW05CvugpY6OdJCoALc=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysptk";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dFqNWJRDDTlvveZVv3WWUi+KJ8sey4N0qRuBcqmkWIM=";
|
||||
hash = "sha256-QUgBA/bchWTaJ54u/ubcRfoVcDeV77wSnHOjkgfVauE=";
|
||||
};
|
||||
|
||||
PYSPTK_BUILD_VERSION = 0;
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytapo";
|
||||
version = "3.2.18";
|
||||
version = "3.3.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-z3HD7sjDg8dMNpd93PiN+nSzKTVCw+OJnfKX07e1+sg=";
|
||||
hash = "sha256-kY1tPkzmUN5eb6YeUp/WSVmDloVSJbM5TXEFyfoXc/g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -32,7 +32,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-arango";
|
||||
version = "7.6.2";
|
||||
version = "7.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
owner = "ArangoDB-Community";
|
||||
repo = "python-arango";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1n+3Rl945NQ3Ugd6UKhN429vTz1ky2Qr43fI0TrgrBU=";
|
||||
hash = "sha256-lZ+9l1kPE/Piw1QLYW+qjFQmTtZd4m/kDOTOxkTsla0=";
|
||||
};
|
||||
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
66
pkgs/development/python-modules/pytrydan/default.nix
Normal file
66
pkgs/development/python-modules/pytrydan/default.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, httpx
|
||||
, orjson
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, respx
|
||||
, rich
|
||||
, syrupy
|
||||
, tenacity
|
||||
, typer
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytrydan";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgomes";
|
||||
repo = "pytrydan";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9PyRICtZ+0Ezinu28oFgFOSnOyCmD7zZbdc/chN+sCo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=pytrydan --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
orjson
|
||||
rich
|
||||
tenacity
|
||||
typer
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
respx
|
||||
syrupy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pytrydan"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to interface with V2C EVSE Trydan";
|
||||
homepage = "https://github.com/dgomes/pytrydan";
|
||||
changelog = "https://github.com/dgomes/pytrydan/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -3,33 +3,16 @@
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.7.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "CycloneDX";
|
||||
repo = "cyclonedx-python-lib";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.5.15";
|
||||
format = "setuptools";
|
||||
version = "3.0.32";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
repo = "checkov";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PVx66Ipvf+rISkuu9dw2ecFXXmuzITg2PogqRktFh5M=";
|
||||
hash = "sha256-YOZ7F/bxbnBh3mhiFL3cMMAc3qeOMab48LcvYeJgfrg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -45,12 +28,12 @@ buildPythonApplication rec {
|
||||
"pycep-parser"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pythonRelaxDepsHook
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiodns
|
||||
aiohttp
|
||||
aiomultiprocess
|
||||
@ -82,6 +65,7 @@ buildPythonApplication rec {
|
||||
prettytable
|
||||
pycep-parser
|
||||
pyyaml
|
||||
pydantic
|
||||
rustworkx
|
||||
semantic-version
|
||||
spdx-tools
|
||||
@ -92,7 +76,7 @@ buildPythonApplication rec {
|
||||
update_checker
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
aioresponses
|
||||
mock
|
||||
pytest-asyncio
|
||||
@ -119,12 +103,10 @@ buildPythonApplication rec {
|
||||
# Tests are comparing console output
|
||||
"cli"
|
||||
"console"
|
||||
# Starting to fail after 2.3.205
|
||||
"test_non_multiline_pair"
|
||||
"test_secret_value_in_keyword"
|
||||
"test_runner_verify_secrets_skip_invalid_suppressed"
|
||||
"test_runner_verify_secrets_skip_all_no_effect"
|
||||
# Assertion error
|
||||
"test_runner"
|
||||
# AssertionError: assert ['<?xml versi...
|
||||
"test_get_cyclonedx_report"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
@ -144,6 +126,8 @@ buildPythonApplication rec {
|
||||
"tests/kubernetes/"
|
||||
"tests/sca_package_2"
|
||||
"tests/terraform/"
|
||||
"cdk_integration_tests/"
|
||||
"sast_integration_tests"
|
||||
# Performance tests have no value for us
|
||||
"performance_tests/test_checkov_performance.py"
|
||||
# No Helm
|
||||
|
||||
@ -22,7 +22,6 @@
|
||||
, file
|
||||
, substituteAll
|
||||
, writeTextFile
|
||||
, writeShellApplication
|
||||
}:
|
||||
|
||||
let
|
||||
@ -129,16 +128,6 @@ let
|
||||
|
||||
defaultShellPath = lib.makeBinPath defaultShellUtils;
|
||||
|
||||
bashWithDefaultShellUtils = writeShellApplication {
|
||||
name = "bash";
|
||||
text = ''
|
||||
if [[ "$PATH" == "/no-such-path" ]]; then
|
||||
export PATH=${defaultShellPath}
|
||||
fi
|
||||
exec ${bash}/bin/bash "$@"
|
||||
'';
|
||||
};
|
||||
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
|
||||
system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
|
||||
@ -431,8 +420,8 @@ stdenv.mkDerivation rec {
|
||||
# If you add more replacements here, you must change the grep above!
|
||||
# Only files containing /bin are taken into account.
|
||||
substituteInPlace "$path" \
|
||||
--replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash \
|
||||
--replace "/usr/bin/env bash" ${bashWithDefaultShellUtils}/bin/bash \
|
||||
--replace /bin/bash ${bash}/bin/bash \
|
||||
--replace "/usr/bin/env bash" ${bash}/bin/bash \
|
||||
--replace "/usr/bin/env python" ${python3}/bin/python \
|
||||
--replace /usr/bin/env ${coreutils}/bin/env \
|
||||
--replace /bin/true ${coreutils}/bin/true
|
||||
@ -447,17 +436,17 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# bazel test runner include references to /bin/bash
|
||||
substituteInPlace tools/build_rules/test_rules.bzl \
|
||||
--replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash
|
||||
--replace /bin/bash ${bash}/bin/bash
|
||||
|
||||
for i in $(find tools/cpp/ -type f)
|
||||
do
|
||||
substituteInPlace $i \
|
||||
--replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash
|
||||
--replace /bin/bash ${bash}/bin/bash
|
||||
done
|
||||
|
||||
# Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
|
||||
substituteInPlace scripts/bootstrap/compile.sh \
|
||||
--replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash
|
||||
--replace /bin/bash ${bash}/bin/bash
|
||||
|
||||
# add nix environment vars to .bazelrc
|
||||
cat >> .bazelrc <<EOF
|
||||
|
||||
@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://w1.fi/hostapd/";
|
||||
description = "A user space daemon for access point and authentication servers";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ninjatrappeur hexa ];
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
homepage = "https://github.com/twosigma/nsncd";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ flokli ninjatrappeur ];
|
||||
maintainers = with maintainers; [ flokli picnoir ];
|
||||
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
|
||||
@ -164,7 +164,7 @@ beamPackages.mixRelease rec {
|
||||
description = "ActivityPub microblogging server";
|
||||
homepage = "https://git.pleroma.social/pleroma/pleroma";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ ninjatrappeur yuka kloenk yayayayaka ];
|
||||
maintainers = with maintainers; [ picnoir yuka kloenk yayayayaka ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
530
pkgs/tools/security/chainsaw/Cargo.lock
generated
530
pkgs/tools/security/chainsaw/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -7,20 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "chainsaw";
|
||||
version = "2.7.3";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WithSecureLabs";
|
||||
repo = "chainsaw";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-plfEVVMbiTXzBhshO3NZVeuHuNeI9+Lcw1G5xeBiTks=";
|
||||
hash = "sha256-IBMMZ4NKD7BR3l06C7Y7pRL+pB8p6Ssx6RoXlH2XKyg=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"notatin-1.0.0" = "sha256-eeryJhH7kX8QWwVuEq5RzanVT2FBfFJWAzUDFgUKqR8=";
|
||||
};
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
|
||||
@ -5,17 +5,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnspec";
|
||||
version = "9.5.2";
|
||||
version = "9.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-p2FxP67zXpYje+ZS0qsuTL98b8B0YvHRiBb7CxUu/f0=";
|
||||
hash = "sha256-aFQStXwoko2YA77d+H76AScNCNqC56CyJe5cz74SYdg=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-XbPa1nag6eSaUcl2dxmvng5gbSJH2htsa22LDseECaQ=";
|
||||
vendorHash = "sha256-fOSFOUrcxw/77vgPziigkSea93xR2k0Tr/cMGtX+3tc=";
|
||||
|
||||
subPackages = [
|
||||
"apps/cnspec"
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-11-08";
|
||||
version = "2023-11-11";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6GGDWI2NOWoPg5DyOjrsnmNzViBBUz9ZY5pO3BFoCOU=";
|
||||
hash = "sha256-oB28qKIvGHh/h726Wsy8C/zt3rFLBHcP5iRZe3U76U0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ggshield";
|
||||
version = "1.20.0";
|
||||
version = "1.21.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GitGuardian";
|
||||
repo = "ggshield";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-J2kz8PcR6f7u9+pI1jGAYCakSwj0/WKskQLWuYC5+Hs=";
|
||||
hash = "sha256-wAYjt/sTo62wn1sdW9ATkzL54mhHj3soAn8+vsX4ZYw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gotestwaf";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wallarm";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jiEs5/HWNZ3DmahWVC6j2eJqFyCAibp1rFS+gtK7haI=";
|
||||
hash = "sha256-Ypcn6rsimID5B+xrdetxQTopg+xvkNILJFGKf2dbO8k=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.41"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.42"
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: dccba8b77c15014ff479b439e98a9b69880424c6
|
||||
ref: refs/tags/6.3.41
|
||||
revision: adf413fba45b298c4e16f7f1043dc69f99d2fbdb
|
||||
ref: refs/tags/6.3.42
|
||||
specs:
|
||||
metasploit-framework (6.3.41)
|
||||
metasploit-framework (6.3.42)
|
||||
actionpack (~> 7.0.0)
|
||||
activerecord (~> 7.0.0)
|
||||
activesupport (~> 7.0.0)
|
||||
|
||||
@ -15,13 +15,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.3.41";
|
||||
version = "6.3.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-y8SCoUfsE3CIerhWc7dZ5QAc+r+ilOAkrAmYZI8YNWU=";
|
||||
sha256 = "sha256-6ddW6VlbWV71BERJISF67UPRcwLQY8Hpw4kf80lCNBE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -654,12 +654,12 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "dccba8b77c15014ff479b439e98a9b69880424c6";
|
||||
sha256 = "0r9m327n9609mhjf1552pzx1q075b6vp6mmqga4704zc8yhq5i6b";
|
||||
rev = "adf413fba45b298c4e16f7f1043dc69f99d2fbdb";
|
||||
sha256 = "049l894z67w9qglw2qyh09rx2hzdg8hj2ja40ksmwnavb7lmdmz9";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.3.41";
|
||||
version = "6.3.42";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "consul-template";
|
||||
version = "0.34.0";
|
||||
version = "0.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "consul-template";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LqgA990os33Hftu8+h/HKnOcGcKsAXVuQl1hmCmA5n4=";
|
||||
hash = "sha256-/Tf4himhvX7RP+zCd4Dhgcrdo+19Unm2ypaZxGiAfrc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zY6c9Wnq00cAuw0WIK3XsTZ1/YL8lnzSEnusUY5VsxY=";
|
||||
vendorHash = "sha256-I/prgTUk5FviC9STb7+Yq0VJ1BzlKpnK+Ko21ut1sP4=";
|
||||
|
||||
# consul-template tests depend on vault and consul services running to
|
||||
# execute tests so we skip them here
|
||||
|
||||
@ -24676,7 +24676,7 @@ with pkgs;
|
||||
});
|
||||
|
||||
libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix {
|
||||
inherit lib pkgs qt5;
|
||||
inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope;
|
||||
});
|
||||
|
||||
# plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
|
||||
|
||||
@ -11690,6 +11690,8 @@ self: super: with self; {
|
||||
|
||||
pytricia = callPackage ../development/python-modules/pytricia { };
|
||||
|
||||
pytrydan = callPackage ../development/python-modules/pytrydan { };
|
||||
|
||||
pyttsx3 = callPackage ../development/python-modules/pyttsx3 { };
|
||||
|
||||
pytube = callPackage ../development/python-modules/pytube { };
|
||||
|
||||
@ -7,13 +7,19 @@
|
||||
|
||||
|
||||
{ lib
|
||||
, pkgs
|
||||
, qt5
|
||||
, __splicedPackages
|
||||
, makeScopeWithSplicing'
|
||||
, generateSplicesForMkScope
|
||||
}:
|
||||
|
||||
(lib.makeScope pkgs.newScope ( self:
|
||||
|
||||
let
|
||||
pkgs = __splicedPackages;
|
||||
qt5 = __splicedPackages.qt5;
|
||||
in
|
||||
|
||||
makeScopeWithSplicing' {
|
||||
otherSplices = generateSplicesForMkScope "libsForQt5";
|
||||
f = (self: let
|
||||
libsForQt5 = self;
|
||||
callPackage = self.callPackage;
|
||||
|
||||
@ -59,7 +65,9 @@ let
|
||||
};
|
||||
in (lib.makeOverridable mkMaui attrs);
|
||||
|
||||
in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // {
|
||||
noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideScope'" "overrideDerivation" ];
|
||||
|
||||
in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // {
|
||||
|
||||
inherit kdeFrameworks plasmaMobileGear plasma5 kdeGear mauiPackages qt5;
|
||||
|
||||
@ -253,4 +261,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
|
||||
xp-pen-g430-driver = callPackage ../os-specific/linux/xp-pen-drivers/g430 { };
|
||||
|
||||
yuview = callPackage ../applications/video/yuview { };
|
||||
})))
|
||||
}) // lib.optionalAttrs pkgs.config.allowAliases {
|
||||
# remove after 23.11 branch-off and backport removal to 23.11
|
||||
# 23.11 will have a warning for this in `makeScope` itself
|
||||
overrideScope' = lib.warn "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;
|
||||
}));
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user