mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-06 04:27:27 +03:00
Merge master into staging-next
This commit is contained in:
commit
2f49e0bb89
@ -10,15 +10,11 @@
|
||||
, icu
|
||||
, curl
|
||||
, outputsSupport ? true # outputs screen
|
||||
, visualizerSupport ? false, fftw ? null # visualizer screen
|
||||
, visualizerSupport ? false, fftw # visualizer screen
|
||||
, clockSupport ? true # clock screen
|
||||
, taglibSupport ? true, taglib ? null # tag editor
|
||||
, taglibSupport ? true, taglib # tag editor
|
||||
}:
|
||||
|
||||
assert visualizerSupport -> (fftw != null);
|
||||
assert taglibSupport -> (taglib != null);
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ncmpcpp";
|
||||
version = "0.9.2";
|
||||
@ -29,19 +25,23 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
configureFlags = [ "BOOST_LIB_SUFFIX=" ]
|
||||
++ optional outputsSupport "--enable-outputs"
|
||||
++ optional visualizerSupport "--enable-visualizer --with-fftw"
|
||||
++ optional clockSupport "--enable-clock"
|
||||
++ optional taglibSupport "--with-taglib";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
strictDeps = true;
|
||||
|
||||
configureFlags = [ "BOOST_LIB_SUFFIX=" ]
|
||||
++ lib.optional outputsSupport "--enable-outputs"
|
||||
++ lib.optional visualizerSupport "--enable-visualizer --with-fftw"
|
||||
++ lib.optional clockSupport "--enable-clock"
|
||||
++ lib.optional taglibSupport "--with-taglib";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optional taglibSupport taglib;
|
||||
|
||||
buildInputs = [ boost libmpdclient ncurses readline libiconv icu curl ]
|
||||
++ optional visualizerSupport fftw
|
||||
++ optional taglibSupport taglib;
|
||||
++ lib.optional visualizerSupport fftw
|
||||
++ lib.optional taglibSupport taglib;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A featureful ncurses based MPD client inspired by ncmpc";
|
||||
homepage = "https://rybczak.net/ncmpcpp/";
|
||||
changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md";
|
||||
|
@ -24,13 +24,13 @@
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "elements" else "elementsd";
|
||||
version = "0.21.0.2";
|
||||
version = "22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ElementsProject";
|
||||
repo = "elements";
|
||||
rev = "elements-${version}";
|
||||
sha256 = "sha256-5b3wylp9Z2U0ueu2gI9jGeWiiJoddjcjQ/6zkFATyvA=";
|
||||
sha256 = "sha256-n98bz1W9hoJ5JDH34LG7R6igEIY1j4mRbO2PKnV8R2U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
@ -4149,6 +4149,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/";
|
||||
};
|
||||
|
||||
lsp-inlayhints-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp-inlayhints.nvim";
|
||||
version = "2022-09-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lvimuser";
|
||||
repo = "lsp-inlayhints.nvim";
|
||||
rev = "9bcd6fe25417b7808fe039ab63d4224f2071d24a";
|
||||
sha256 = "1dla9mlvqsm0mvmcdz734sjimrq24af9pbirgsf17fsqsyrlf9hg";
|
||||
};
|
||||
meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/";
|
||||
};
|
||||
|
||||
lsp-overloads-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp-overloads.nvim";
|
||||
version = "2022-08-12";
|
||||
|
@ -347,6 +347,7 @@ https://github.com/ldelossa/litee-symboltree.nvim/,,
|
||||
https://github.com/ldelossa/litee.nvim/,,
|
||||
https://github.com/folke/lsp-colors.nvim/,,
|
||||
https://github.com/lukas-reineke/lsp-format.nvim/,HEAD,
|
||||
https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD,
|
||||
https://github.com/Issafalcon/lsp-overloads.nvim/,main,
|
||||
https://github.com/ahmedkhalf/lsp-rooter.nvim/,,
|
||||
https://github.com/nvim-lua/lsp-status.nvim/,,
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -3,10 +3,10 @@
|
||||
rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "104.0.2";
|
||||
version = "105.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "bf0d972add11566f5ef6402a22abd82122945de9fa9aab6ed7bb7e41d0843d41948a6d95c0769b0b704c066c8ff6e3f3bf26fcf288c64cd3b3f09a13d4dd467d";
|
||||
sha512 = "a48f323f874b538402630a9094daa83189b3ca319feddc80fd66d087eca13f21c8b2d85be9c29e948c18cb7c524adac44e135adcde4d4592738e104ae9c1a734";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -28,11 +28,11 @@ rec {
|
||||
|
||||
firefox-esr-102 = buildMozillaMach rec {
|
||||
pname = "firefox-esr-102";
|
||||
version = "102.2.0esr";
|
||||
version = "102.3.0esr";
|
||||
applicationName = "Mozilla Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "06d753867ccfe1b2c79148cc60bc816b47a2abfa98219808868e9028bef1763d982ef7012698d06b8959cce79163d7926baf5f9d5ca9daa18c51fbf0efc59993";
|
||||
sha512 = "35357791f4de8b474780083a22fb52b7846b8012cbf01403f2b9526151d11c196ce0f9fba8e0f16d8235d7259af6fba1bc3acbb5b7e79129a28f390467aa7556";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notmuch";
|
||||
version = "0.36";
|
||||
version = "0.37";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
|
||||
sha256 = "0h6f6mh9m9vrijm638x5sbsl321b74a25cdasbxhx67x62w320hk";
|
||||
sha256 = "sha256-DnZt8ot4v064I1Ymqx9S8E8eNmZJMlqM6NPJCGAnhvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -3,8 +3,8 @@
|
||||
|
||||
extra-cmake-modules, kdoctools,
|
||||
|
||||
coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor,
|
||||
libXtst, libXft, pam, wayland, xmessage, xprop, xrdb, xsetroot,
|
||||
coreutils, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor,
|
||||
libXtst, libXft, pam, wayland, xmessage, xsetroot,
|
||||
|
||||
baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash,
|
||||
kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime,
|
||||
@ -62,10 +62,7 @@ mkDerivation {
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"''
|
||||
''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"''
|
||||
''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"''
|
||||
''-DNIXPKGS_XPROP="${getBin xprop}/bin/xprop"''
|
||||
''-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT="${getBin dbus}/bin/dbus-update-activation-environment"''
|
||||
''-DNIXPKGS_START_KDEINIT_WRAPPER="${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"''
|
||||
''-DNIXPKGS_KDEINIT5_SHUTDOWN="${getBin kinit}/bin/kdeinit5_shutdown"''
|
||||
];
|
||||
|
@ -1,19 +1,23 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sfsexp";
|
||||
version = "1.3";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sexpr/sexpr-${version}.tar.gz";
|
||||
sha256 = "18gdwxjja0ip378hlzs8sp7q2g6hrmy7x10yf2wnxfmmylbpqn8k";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mjsottile";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TCAxofSRbyIdwowhHhPn483UA+QOHkLMz0P2LIi0ncA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small, fast s-expression library";
|
||||
homepage = "http://sexpr.sourceforge.net/";
|
||||
description = "Small Fast S-Expression Library";
|
||||
homepage = "https://github.com/mjsottile/sfsexp";
|
||||
maintainers = with maintainers; [ jb55 ];
|
||||
license = licenses.gpl3;
|
||||
platforms = with platforms; unix;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sofia-sip";
|
||||
version = "1.13.8";
|
||||
version = "1.13.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freeswitch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RtYeZFQu0YvD709KNmwPPlOLMl01Ox58cpNYygvDn78=";
|
||||
sha256 = "sha256-xF2LFbxGhA/gF7Z2LX3WYq3nXOLi0ARGGR4Dd3PCftk=";
|
||||
};
|
||||
|
||||
buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration;
|
||||
|
@ -5,6 +5,7 @@
|
||||
, perl
|
||||
, python3
|
||||
, ruby
|
||||
, gi-docgen
|
||||
, bison
|
||||
, gperf
|
||||
, cmake
|
||||
@ -12,12 +13,12 @@
|
||||
, pkg-config
|
||||
, gettext
|
||||
, gobject-introspection
|
||||
, libnotify
|
||||
, gnutls
|
||||
, libgcrypt
|
||||
, libgpg-error
|
||||
, gtk3
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, libwebp
|
||||
, libwpe
|
||||
, libwpe-fdo
|
||||
@ -65,17 +66,18 @@
|
||||
, systemdSupport ? stdenv.isLinux
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "webkitgtk";
|
||||
version = "2.36.7";
|
||||
version = "2.38.0";
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
separateDebugInfo = stdenv.isLinux;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-DCYM8rMvBIHQF2cN/tG2HlVJZ80GcZVgbJ+etf5zF0M=";
|
||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-+c5jdaO24TKbC2CfRpIeJifcetYiSze5Z6supkO8D70=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
@ -115,6 +117,7 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
python3
|
||||
ruby
|
||||
gi-docgen
|
||||
glib # for gdbus-codegen
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
wayland # for wayland-scanner
|
||||
@ -136,7 +139,6 @@ stdenv.mkDerivation rec {
|
||||
libidn
|
||||
libintl
|
||||
lcms2
|
||||
libnotify
|
||||
libpthreadstubs
|
||||
libtasn1
|
||||
libwebp
|
||||
@ -162,7 +164,7 @@ stdenv.mkDerivation rec {
|
||||
# (We pick just that one because using the other headers from `sdk` is not
|
||||
# compatible with our C++ standard library. This header is already in
|
||||
# the standard library on aarch64)
|
||||
runCommand "${pname}_headers" { } ''
|
||||
runCommand "webkitgtk_headers" { } ''
|
||||
install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h
|
||||
''
|
||||
) ++ lib.optionals stdenv.isLinux [
|
||||
@ -179,6 +181,9 @@ stdenv.mkDerivation rec {
|
||||
geoclue2
|
||||
] ++ lib.optionals withLibsecret [
|
||||
libsecret
|
||||
] ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [
|
||||
xorg.libXcomposite
|
||||
wayland-protocols
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -206,6 +211,8 @@ stdenv.mkDerivation rec {
|
||||
"-DUSE_APPLE_ICU=OFF"
|
||||
"-DUSE_OPENGL_OR_ES=OFF"
|
||||
"-DUSE_SYSTEM_MALLOC=ON"
|
||||
] ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [
|
||||
"-DUSE_GTK4=ON"
|
||||
] ++ lib.optionals (!systemdSupport) [
|
||||
"-DUSE_SYSTEMD=OFF"
|
||||
] ++ lib.optionals (stdenv.isLinux && enableGLES) [
|
||||
@ -221,6 +228,11 @@ stdenv.mkDerivation rec {
|
||||
sed 43i'#include <CommonCrypto/CommonCryptor.h>' -i Source/WTF/wtf/RandomDevice.cpp
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
meta = with lib; {
|
||||
@ -231,4 +243,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = teams.gnome.members;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonopy";
|
||||
version = "2.16.1";
|
||||
version = "2.16.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-vtOHZpnrAGd8rBh0cyynrfUqTXq41ePRZpEre9HXRWU=";
|
||||
sha256 = "sha256-tOTkI71BkqKgnX5HrzlPLVohSMtrSpHs9PzeuWQOVis=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
37
pkgs/development/python-modules/sphinxemoji/default.nix
Normal file
37
pkgs/development/python-modules/sphinxemoji/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, sphinx }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxemoji";
|
||||
version = "0.2.0";
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sphinx-contrib";
|
||||
repo = "emojicodes"; # does not match pypi name
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TLhjpJpUIoDAe3RZ/7sjTgdW+5s7OpMEd1/w0NyCQ3A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx ];
|
||||
|
||||
nativeBuildInputs = [ sphinx ];
|
||||
|
||||
postBuild = ''
|
||||
PYTHONPATH=$PWD:$PYTHONPATH make -C docs html
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/doc/python/$pname
|
||||
cp -r ./docs/build/html $out/share/doc/python/$pname
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "sphinxemoji" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extension to use emoji codes in your Sphinx documentation";
|
||||
homepage = "https://github.com/sphinx-contrib/emojicodes";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
};
|
||||
}
|
46
pkgs/development/tools/explain/default.nix
Normal file
46
pkgs/development/tools/explain/default.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, libtool, bison, groff, ghostscript, gettext
|
||||
, acl, libcap, lsof }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "explain";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libexplain/libexplain-${version}.tar.gz";
|
||||
hash = "sha256-KIY7ZezMdJNOI3ysQTZMs8GALDbJ4jGO0EF0YP7oP4A=";
|
||||
};
|
||||
|
||||
patches = let
|
||||
debian-src = "https://sources.debian.org/data/main";
|
||||
debian-ver = "${version}.D001-12";
|
||||
debian-patch = fname: hash: fetchpatch {
|
||||
name = fname;
|
||||
url = "${debian-src}/libe/libexplain/${debian-ver}/debian/patches/${fname}";
|
||||
hash = hash;
|
||||
};
|
||||
in [
|
||||
(debian-patch "sanitize-bison.patch"
|
||||
"sha256-gU6JG32j2yIOwehZTUSvIr4TSDdlg+p1U3bhfZHMEDY=")
|
||||
(debian-patch "03_fsflags-4.5.patch"
|
||||
"sha256-ML7Qvf85vEBp+iwm6PSosMAn/frYdEOSHRToEggmR8M=")
|
||||
(debian-patch "linux5.11.patch"
|
||||
"sha256-N7WwnTfwOxBfIiKntcFOqHTH9r2gd7NMEzic7szzR+Y=")
|
||||
(debian-patch "termiox-no-more-exists-since-kernel-5.12.patch"
|
||||
"sha256-cocgEYKoDMDnGk9VNQDtgoVxMGnnNpdae0hzgUlacOw=")
|
||||
(debian-patch "gcc-10.patch"
|
||||
"sha256-YNcYGyOOqPUuwpUpXGcR7zsWbepVg8SAqcVKlxENSQk=")
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ libtool bison groff ghostscript gettext ];
|
||||
buildInputs = [ acl libcap lsof ];
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "doc" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library and utility to explain system call errors";
|
||||
homepage = "http://libexplain.sourceforge.net";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ McSinyx ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pet";
|
||||
@ -17,6 +17,15 @@ buildGoModule rec {
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd pet \
|
||||
--zsh ./misc/completions/zsh/_pet
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple command-line snippet manager, written in Go";
|
||||
homepage = "https://github.com/knqyf263/pet";
|
||||
|
391
pkgs/development/tools/rust/cargo-auditable/Cargo.lock
generated
Normal file
391
pkgs/development/tools/rust/cargo-auditable/Cargo.lock
generated
Normal file
@ -0,0 +1,391 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "adler"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
||||
|
||||
[[package]]
|
||||
name = "ahash"
|
||||
version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"once_cell",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "auditable-extract"
|
||||
version = "0.3.1"
|
||||
dependencies = [
|
||||
"binfarce",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "auditable-serde"
|
||||
version = "0.5.0"
|
||||
dependencies = [
|
||||
"cargo-lock",
|
||||
"cargo_metadata",
|
||||
"semver",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"topological-sort",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||
|
||||
[[package]]
|
||||
name = "binfarce"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "18464ccbb85e5dede30d70cc7676dc9950a0fb7dbf595a43d765be9123c616a2"
|
||||
|
||||
[[package]]
|
||||
name = "camino"
|
||||
version = "1.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cargo-auditable"
|
||||
version = "0.5.1"
|
||||
dependencies = [
|
||||
"auditable-extract",
|
||||
"auditable-serde",
|
||||
"cargo_metadata",
|
||||
"miniz_oxide",
|
||||
"object",
|
||||
"pico-args",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cargo-lock"
|
||||
version = "8.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c4c54d47a4532db3494ef7332c257ab57b02750daae3250d49e01ee55201ce8"
|
||||
dependencies = [
|
||||
"semver",
|
||||
"serde",
|
||||
"toml",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cargo-platform"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cargo_metadata"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3abb7553d5b9b8421c6de7cb02606ff15e0c6eea7d8eadd75ef013fd636bec36"
|
||||
dependencies = [
|
||||
"camino",
|
||||
"cargo-platform",
|
||||
"semver",
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "crc32fast"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "form_urlencoded"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
|
||||
dependencies = [
|
||||
"percent-encoding",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.11.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.12.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
||||
|
||||
[[package]]
|
||||
name = "idna"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
|
||||
dependencies = [
|
||||
"unicode-bidi",
|
||||
"unicode-normalization",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "1.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"hashbrown 0.12.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.132"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.5.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
|
||||
dependencies = [
|
||||
"adler",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "object"
|
||||
version = "0.28.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"hashbrown 0.11.2",
|
||||
"indexmap",
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.14.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
|
||||
|
||||
[[package]]
|
||||
name = "percent-encoding"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
|
||||
|
||||
[[package]]
|
||||
name = "pico-args"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.43"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rust-audit-info"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
"auditable-extract",
|
||||
"miniz_oxide",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
|
||||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
version = "1.0.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.144"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.144"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.85"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.99"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tinyvec"
|
||||
version = "1.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
|
||||
dependencies = [
|
||||
"tinyvec_macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tinyvec_macros"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.5.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "topological-sort"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-bidi"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-normalization"
|
||||
version = "0.1.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
|
||||
dependencies = [
|
||||
"tinyvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
version = "2.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
|
||||
dependencies = [
|
||||
"form_urlencoded",
|
||||
"idna",
|
||||
"percent-encoding",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
version = "0.9.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.11.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
28
pkgs/development/tools/rust/cargo-auditable/default.nix
Normal file
28
pkgs/development/tools/rust/cargo-auditable/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-auditable";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-secure-code";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m3M2uTQIOLK14VJ5mQfHw72hgAyJBVO2OAzDglByLmo=";
|
||||
};
|
||||
|
||||
# not using fetchCrate since it has two binary crates
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to make production Rust binaries auditable";
|
||||
homepage = "https://github.com/rust-secure-code/cargo-auditable";
|
||||
changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tally";
|
||||
version = "1.0.13";
|
||||
version = "1.0.14";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-9w3/zQqcHtZ91WDolAru9aNG9pV8HuXvujvp3NlOcgU=";
|
||||
sha256 = "sha256-hsKrkLkHD5NM3sSVHKIa/dxiW5TszryX8bksGqpZ9fI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-CGP3KMJFDIl+MLzI9aQ2OM4tUuOQEtG4nET14zt7PD0=";
|
||||
cargoSha256 = "sha256-9ozabY3tsgQa6nsSsF07juOM+oFJSXGcYOz3uju/tLg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
DiskArbitration
|
||||
|
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hyperrogue";
|
||||
version = "12.0u";
|
||||
version = "12.1a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zenorogue";
|
||||
repo = "hyperrogue";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zG8Z+wpwr5z2r2CcjNxKOdiqXUN0AFChZcihUWel68A=";
|
||||
sha256 = "sha256-VmWZkIjDy/yv0g9YCW9x8b0LE5guHIA/KZc3OXJoCdA=";
|
||||
};
|
||||
|
||||
CXXFLAGS = [
|
||||
|
@ -113,18 +113,10 @@
|
||||
, docbook_xml_dtd_45
|
||||
}:
|
||||
|
||||
assert withResolved -> (libgcrypt != null && libgpg-error != null);
|
||||
assert withImportd ->
|
||||
(curl.dev != null && zlib != null && xz != null && libgcrypt != null
|
||||
&& gnutar != null && gnupg != null && withCompression);
|
||||
|
||||
assert withEfi -> (gnu-efi != null);
|
||||
assert withRemote -> lib.getDev curl != null;
|
||||
assert withImportd -> withCompression;
|
||||
assert withCoredump -> withCompression;
|
||||
|
||||
assert withHomed -> withCryptsetup;
|
||||
|
||||
assert withCryptsetup -> (cryptsetup != null);
|
||||
let
|
||||
wantCurl = withRemote || withImportd;
|
||||
wantGcrypt = withResolved || withImportd;
|
||||
|
@ -4,15 +4,16 @@
|
||||
, python3
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klipper";
|
||||
version = "unstable-2022-09-11";
|
||||
version = "unstable-2022-09-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KevinOConnor";
|
||||
repo = "klipper";
|
||||
rev = "ee5bdbadd1d00cf161e0b2cdfbcf5c622abc8326";
|
||||
sha256 = "sha256-nVnJQEi6xNMNpC5byG1ce3M5hpJOd53g1ugjHXKY2zI=";
|
||||
rev = "7527e57e5a778d069aaa05b01e03869c63a1a712";
|
||||
sha256 = "sha256-k3tvV7uCdmPN4SvZixvPmOqt5jTN9tz0W6SUXN5g3Ss=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/klippy";
|
||||
@ -23,13 +24,14 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ (python3.withPackages (p: with p; [ cffi pyserial greenlet jinja2 markupsafe ])) ];
|
||||
|
||||
# we need to run this to prebuild the chelper.
|
||||
postBuild = "python ./chelper/__init__.py";
|
||||
postBuild = ''
|
||||
python ./chelper/__init__.py
|
||||
'';
|
||||
|
||||
# 2022-06-28: Python 3 is already supported in klipper, alas shebangs remained
|
||||
# the same - we replace them in patchPhase.
|
||||
patchPhase = ''
|
||||
for F in klippy.py console.py parsedump.py; do
|
||||
substituteInPlace $F \
|
||||
# Python 3 is already supported but shebangs aren't updated yet
|
||||
postPatch = ''
|
||||
for file in klippy.py console.py parsedump.py; do
|
||||
substituteInPlace $file \
|
||||
--replace '/usr/bin/env python2' '/usr/bin/env python'
|
||||
done
|
||||
'';
|
||||
|
@ -125,6 +125,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
# Using c++14 because of build error
|
||||
# gsm_at.h:94:32: error: ISO C++17 does not allow dynamic exception specifications
|
||||
CXXFLAGS = "-std=c++14";
|
||||
|
||||
CFLAGS = "-D_ANSI_SOURCE";
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
@ -54,6 +54,9 @@ in
|
||||
, confDir
|
||||
, stateDir
|
||||
, storeDir
|
||||
|
||||
# passthru tests
|
||||
, pkgsi686Linux
|
||||
}: let
|
||||
self = stdenv.mkDerivation {
|
||||
pname = "nix";
|
||||
@ -194,6 +197,16 @@ self = stdenv.mkDerivation {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
inherit aws-sdk-cpp boehmgc;
|
||||
|
||||
perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; inherit Security; });
|
||||
|
||||
tests = {
|
||||
nixi686 = pkgsi686Linux.nixVersions.${"nix_${lib.versions.major version}_${lib.versions.minor version}"};
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Powerful package manager that makes package management reliable and reproducible";
|
||||
longDescription = ''
|
||||
@ -209,11 +222,5 @@ self = stdenv.mkDerivation {
|
||||
platforms = platforms.unix;
|
||||
outputsToInstall = [ "out" ] ++ optional enableDocumentation "man";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit aws-sdk-cpp boehmgc;
|
||||
|
||||
perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; inherit Security; });
|
||||
};
|
||||
};
|
||||
in self
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -29,6 +30,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-m1UhyjD5ydSgCTBu6sECLlxFx0rnQxFnBA7frbdUqU8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# sss: use BN_set_word(x, 0) instead of BN_zero(), fixes build issue with different versions of openssl
|
||||
(fetchurl {
|
||||
url = "https://github.com/latchset/clevis/commit/ee1dfedb9baca107e66a0fec76693c9d479dcfd9.patch";
|
||||
sha256 = "sha256-GeklrWWlAMALDLdnn6+0Bi0l+bXrIbYkgIyI94WEybM=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
for f in $(find src/ -type f); do
|
||||
grep -q "/bin/cat" "$f" && substituteInPlace "$f" \
|
||||
|
@ -5,24 +5,16 @@
|
||||
, libtool
|
||||
, pkg-config
|
||||
, psmisc
|
||||
, argp-standalone ? null
|
||||
, argp-standalone
|
||||
, openssl
|
||||
, jitterentropy ? null, withJitterEntropy ? true
|
||||
, jitterentropy, withJitterEntropy ? true
|
||||
# WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS
|
||||
# https://www.nist.gov/programs-projects/nist-randomness-beacon
|
||||
, curl ? null, jansson ? null, libxml2 ? null, withNistBeacon ? false
|
||||
, libp11 ? null, opensc ? null, withPkcs11 ? true
|
||||
, librtlsdr ? null, withRtlsdr ? true
|
||||
, curl, jansson, libxml2, withNistBeacon ? false
|
||||
, libp11, opensc, withPkcs11 ? true
|
||||
, librtlsdr, withRtlsdr ? true
|
||||
}:
|
||||
|
||||
assert (stdenv.hostPlatform.isMusl) -> argp-standalone != null;
|
||||
assert (withJitterEntropy) -> jitterentropy != null;
|
||||
assert (withNistBeacon) -> curl != null && jansson != null && libxml2 != null;
|
||||
assert (withPkcs11) -> libp11 != null && opensc != null;
|
||||
assert (withRtlsdr) -> librtlsdr != null;
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rng-tools";
|
||||
version = "6.15";
|
||||
@ -37,24 +29,24 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ autoreconfHook libtool pkg-config ];
|
||||
|
||||
configureFlags = [
|
||||
(enableFeature (withJitterEntropy) "jitterentropy")
|
||||
(withFeature (withNistBeacon) "nistbeacon")
|
||||
(withFeature (withPkcs11) "pkcs11")
|
||||
(withFeature (withRtlsdr) "rtlsdr")
|
||||
(lib.enableFeature (withJitterEntropy) "jitterentropy")
|
||||
(lib.withFeature (withNistBeacon) "nistbeacon")
|
||||
(lib.withFeature (withPkcs11) "pkcs11")
|
||||
(lib.withFeature (withRtlsdr) "rtlsdr")
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ optionals (stdenv.hostPlatform.isMusl) [ argp-standalone ]
|
||||
++ optionals (withJitterEntropy) [ jitterentropy ]
|
||||
++ optionals (withNistBeacon) [ curl jansson libxml2 ]
|
||||
++ optionals (withPkcs11) [ libp11 openssl ]
|
||||
++ optionals (withRtlsdr) [ librtlsdr ];
|
||||
++ lib.optionals stdenv.hostPlatform.isMusl [ argp-standalone ]
|
||||
++ lib.optionals withJitterEntropy [ jitterentropy ]
|
||||
++ lib.optionals withNistBeacon [ curl jansson libxml2 ]
|
||||
++ lib.optionals withPkcs11 [ libp11 openssl ]
|
||||
++ lib.optionals withRtlsdr [ librtlsdr ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = [
|
||||
"AR:=$(AR)" # For cross-compilation
|
||||
] ++ optionals (withPkcs11) [
|
||||
] ++ lib.optionals withPkcs11 [
|
||||
"PKCS11_ENGINE=${opensc}/lib/opensc-pkcs11.so" # Overrides configure script paths
|
||||
];
|
||||
|
||||
@ -70,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A random number generator daemon";
|
||||
homepage = "https://github.com/nhorman/rng-tools";
|
||||
changelog = "https://github.com/nhorman/rng-tools/releases/tag/v${version}";
|
||||
|
@ -1,14 +1,65 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, libestr, json_c, zlib, docutils, fastJson
|
||||
, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null
|
||||
, libdbi ? null, net-snmp ? null, libuuid ? null, curl ? null, gnutls ? null
|
||||
, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
|
||||
, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
|
||||
, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null
|
||||
, libmaxminddb ? null
|
||||
, nixosTests ? null
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, libestr
|
||||
, json_c
|
||||
, zlib
|
||||
, docutils
|
||||
, fastJson
|
||||
, withKrb5 ? true
|
||||
, libkrb5
|
||||
, withSystemd ? stdenv.isLinux
|
||||
, systemd
|
||||
, withJemalloc ? true
|
||||
, jemalloc
|
||||
, withMysql ? true
|
||||
, libmysqlclient
|
||||
, withPostgres ? true
|
||||
, postgresql
|
||||
, withDbi ? true
|
||||
, libdbi
|
||||
, withNetSnmp ? true
|
||||
, net-snmp
|
||||
, withUuid ? true
|
||||
, libuuid
|
||||
, withCurl ? true
|
||||
, curl
|
||||
, withGnutls ? true
|
||||
, gnutls
|
||||
, withGcrypt ? true
|
||||
, libgcrypt
|
||||
, withLognorm ? true
|
||||
, liblognorm
|
||||
, withMaxminddb ? true
|
||||
, libmaxminddb
|
||||
, withOpenssl ? true
|
||||
, openssl
|
||||
, withRelp ? true
|
||||
, librelp
|
||||
, withKsi ? true
|
||||
, libksi
|
||||
, withLogging ? true
|
||||
, liblogging
|
||||
, withNet ? true
|
||||
, libnet
|
||||
, withHadoop ? true
|
||||
, hadoop
|
||||
, withRdkafka ? true
|
||||
, rdkafka
|
||||
, withMongo ? true
|
||||
, libmongo-client
|
||||
, mongoc
|
||||
, withCzmq ? true
|
||||
, czmq
|
||||
, withRabbitmq ? true
|
||||
, rabbitmq-c
|
||||
, withHiredis ? true
|
||||
, hiredis
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rsyslog";
|
||||
version = "8.2208.0";
|
||||
@ -18,98 +69,122 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-FN5o57jlqwxdc0+C4tyf/yLNf0cQrWkHJ+sQp7mz314=";
|
||||
};
|
||||
|
||||
#patches = [ ./fix-gnutls-detection.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [
|
||||
fastJson libestr json_c zlib docutils libkrb5 jemalloc
|
||||
postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl
|
||||
librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq
|
||||
rabbitmq-c hiredis mongoc libmaxminddb
|
||||
] ++ lib.optional (libmysqlclient != null) libmysqlclient
|
||||
++ lib.optional stdenv.isLinux systemd;
|
||||
fastJson
|
||||
libestr
|
||||
json_c
|
||||
zlib
|
||||
docutils
|
||||
] ++ lib.optional withKrb5 libkrb5
|
||||
++ lib.optional withJemalloc jemalloc
|
||||
++ lib.optional withPostgres postgresql
|
||||
++ lib.optional withDbi libdbi
|
||||
++ lib.optional withNetSnmp net-snmp
|
||||
++ lib.optional withUuid libuuid
|
||||
++ lib.optional withCurl curl
|
||||
++ lib.optional withGnutls gnutls
|
||||
++ lib.optional withGcrypt libgcrypt
|
||||
++ lib.optional withLognorm liblognorm
|
||||
++ lib.optional withOpenssl openssl
|
||||
++ lib.optional withRelp librelp
|
||||
++ lib.optional withKsi libksi
|
||||
++ lib.optional withLogging liblogging
|
||||
++ lib.optional withNet libnet
|
||||
++ lib.optional withHadoop hadoop
|
||||
++ lib.optional withRdkafka rdkafka
|
||||
++ lib.optionals withMongo [ libmongo-client mongoc ]
|
||||
++ lib.optional withCzmq czmq
|
||||
++ lib.optional withRabbitmq rabbitmq-c
|
||||
++ lib.optional withHiredis hiredis
|
||||
++ lib.optional withMaxminddb libmaxminddb
|
||||
++ lib.optional withMysql libmysqlclient
|
||||
++ lib.optional withSystemd systemd;
|
||||
|
||||
configureFlags = [
|
||||
configureFlags = with lib; [
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
"--with-systemdsystemunitdir=\${out}/etc/systemd/system"
|
||||
(enableFeature true "largefile")
|
||||
(enableFeature true "regexp")
|
||||
(enableFeature (libkrb5 != null) "gssapi-krb5")
|
||||
(enableFeature true "klog")
|
||||
(enableFeature true "kmsg")
|
||||
(enableFeature (systemd != null) "imjournal")
|
||||
(enableFeature true "inet")
|
||||
(enableFeature (jemalloc != null) "jemalloc")
|
||||
(enableFeature true "unlimited-select")
|
||||
(enableFeature false "debug")
|
||||
(enableFeature false "debug-symbols")
|
||||
(enableFeature true "debugless")
|
||||
(enableFeature false "valgrind")
|
||||
(enableFeature false "diagtools")
|
||||
(enableFeature true "usertools")
|
||||
(enableFeature (libmysqlclient != null) "mysql")
|
||||
(enableFeature (postgresql != null) "pgsql")
|
||||
(enableFeature (libdbi != null) "libdbi")
|
||||
(enableFeature (net-snmp != null) "snmp")
|
||||
(enableFeature (libuuid != null) "uuid")
|
||||
(enableFeature (curl != null) "elasticsearch")
|
||||
(enableFeature (gnutls != null) "gnutls")
|
||||
(enableFeature (libgcrypt != null) "libgcrypt")
|
||||
(enableFeature true "rsyslogrt")
|
||||
(enableFeature true "rsyslogd")
|
||||
(enableFeature true "mail")
|
||||
(enableFeature (liblognorm != null) "mmnormalize")
|
||||
(enableFeature (libmaxminddb != null) "mmdblookup")
|
||||
(enableFeature true "mmjsonparse")
|
||||
(enableFeature true "mmaudit")
|
||||
(enableFeature true "mmanon")
|
||||
(enableFeature true "mmutf8fix")
|
||||
(enableFeature true "mmcount")
|
||||
(enableFeature true "mmsequence")
|
||||
(enableFeature true "mmfields")
|
||||
(enableFeature true "mmpstrucdata")
|
||||
(enableFeature (openssl != null) "mmrfc5424addhmac")
|
||||
(enableFeature (librelp != null) "relp")
|
||||
(enableFeature (libksi != null) "ksi-ls12")
|
||||
(enableFeature (liblogging != null) "liblogging-stdlog")
|
||||
(enableFeature (liblogging != null) "rfc3195")
|
||||
(enableFeature true "imfile")
|
||||
(enableFeature false "imsolaris")
|
||||
(enableFeature true "imptcp")
|
||||
(enableFeature true "impstats")
|
||||
(enableFeature true "omprog")
|
||||
(enableFeature (libnet != null) "omudpspoof")
|
||||
(enableFeature true "omstdout")
|
||||
(enableFeature (systemd != null) "omjournal")
|
||||
(enableFeature true "pmlastmsg")
|
||||
(enableFeature true "pmcisconames")
|
||||
(enableFeature true "pmciscoios")
|
||||
(enableFeature true "pmaixforwardedfrom")
|
||||
(enableFeature true "pmsnare")
|
||||
(enableFeature true "omruleset")
|
||||
(enableFeature true "omuxsock")
|
||||
(enableFeature true "mmsnmptrapd")
|
||||
(enableFeature (hadoop != null) "omhdfs")
|
||||
(enableFeature (rdkafka != null) "omkafka")
|
||||
(enableFeature (libmongo-client != null) "ommongodb")
|
||||
(enableFeature (czmq != null) "imczmq")
|
||||
(enableFeature (czmq != null) "omczmq")
|
||||
(enableFeature (rabbitmq-c != null) "omrabbitmq")
|
||||
(enableFeature (hiredis != null) "omhiredis")
|
||||
(enableFeature (curl != null) "omhttpfs")
|
||||
(enableFeature true "generate-man-pages")
|
||||
(enableFeature true "largefile")
|
||||
(enableFeature true "regexp")
|
||||
(enableFeature withKrb5 "gssapi-krb5")
|
||||
(enableFeature true "klog")
|
||||
(enableFeature true "kmsg")
|
||||
(enableFeature withSystemd "imjournal")
|
||||
(enableFeature true "inet")
|
||||
(enableFeature withJemalloc "jemalloc")
|
||||
(enableFeature true "unlimited-select")
|
||||
(enableFeature withCurl "clickhouse")
|
||||
(enableFeature false "debug")
|
||||
(enableFeature false "debug-symbols")
|
||||
(enableFeature true "debugless")
|
||||
(enableFeature false "valgrind")
|
||||
(enableFeature false "diagtools")
|
||||
(enableFeature withCurl "fmhttp")
|
||||
(enableFeature true "usertools")
|
||||
(enableFeature withMysql "mysql")
|
||||
(enableFeature withPostgres "pgsql")
|
||||
(enableFeature withDbi "libdbi")
|
||||
(enableFeature withNetSnmp "snmp")
|
||||
(enableFeature withUuid "uuid")
|
||||
(enableFeature withCurl "elasticsearch")
|
||||
(enableFeature withGnutls "gnutls")
|
||||
(enableFeature withGcrypt "libgcrypt")
|
||||
(enableFeature true "rsyslogrt")
|
||||
(enableFeature true "rsyslogd")
|
||||
(enableFeature true "mail")
|
||||
(enableFeature withLognorm "mmnormalize")
|
||||
(enableFeature withMaxminddb "mmdblookup")
|
||||
(enableFeature true "mmjsonparse")
|
||||
(enableFeature true "mmaudit")
|
||||
(enableFeature true "mmanon")
|
||||
(enableFeature true "mmutf8fix")
|
||||
(enableFeature true "mmcount")
|
||||
(enableFeature true "mmsequence")
|
||||
(enableFeature true "mmfields")
|
||||
(enableFeature true "mmpstrucdata")
|
||||
(enableFeature withOpenssl "mmrfc5424addhmac")
|
||||
(enableFeature withRelp "relp")
|
||||
(enableFeature withKsi "ksi-ls12")
|
||||
(enableFeature withLogging "liblogging-stdlog")
|
||||
(enableFeature withLogging "rfc3195")
|
||||
(enableFeature true "imfile")
|
||||
(enableFeature false "imsolaris")
|
||||
(enableFeature true "imptcp")
|
||||
(enableFeature true "impstats")
|
||||
(enableFeature true "omprog")
|
||||
(enableFeature withNet "omudpspoof")
|
||||
(enableFeature true "omstdout")
|
||||
(enableFeature withSystemd "omjournal")
|
||||
(enableFeature true "pmlastmsg")
|
||||
(enableFeature true "pmcisconames")
|
||||
(enableFeature true "pmciscoios")
|
||||
(enableFeature true "pmaixforwardedfrom")
|
||||
(enableFeature true "pmsnare")
|
||||
(enableFeature true "omruleset")
|
||||
(enableFeature true "omuxsock")
|
||||
(enableFeature true "mmsnmptrapd")
|
||||
(enableFeature withHadoop "omhdfs")
|
||||
(enableFeature withRdkafka "omkafka")
|
||||
(enableFeature withMongo "ommongodb")
|
||||
(enableFeature withCzmq "imczmq")
|
||||
(enableFeature withCzmq "omczmq")
|
||||
(enableFeature withRabbitmq "omrabbitmq")
|
||||
(enableFeature withHiredis "omhiredis")
|
||||
(enableFeature withCurl "omhttp")
|
||||
(enableFeature true "generate-man-pages")
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
nixos-rsyslogd = nixosTests.rsyslogd;
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.rsyslog.com/";
|
||||
description = "Enhanced syslog implementation";
|
||||
changelog = "https://raw.githubusercontent.com/rsyslog/rsyslog/v${version}/ChangeLog";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
@ -1,60 +0,0 @@
|
||||
From 588b4ca7412326abd51a5b2060eafbc04611e419 Mon Sep 17 00:00:00 2001
|
||||
From: Radovan Sroka <rsroka@redhat.com>
|
||||
Date: Tue, 11 Aug 2015 17:09:15 +0200
|
||||
Subject: [PATCH] Fix detection of the GnuTLS package
|
||||
|
||||
This commit fixes a number of issues that cropped up from these changes:
|
||||
23c5b3e replace deprecated GnuTLS functions with newer ones if available
|
||||
88f0651 bugfix: ommysql did not work when gnutls was enabled
|
||||
ce560b6 build system: Failure action in AC_CHECK_LIB check for
|
||||
|
||||
The solution is based on the assumption that the call to AC_CHECK_LIB()
|
||||
was added purely to satisfy the subsequent calls to AC_CHECK_FUNCS().
|
||||
23c5b3e had the unintentional result of libgnutls being added to LIBS
|
||||
and linked to undesired components.
|
||||
The next commit removed libgnutls from LIBS which made the following
|
||||
calls to AC_CHECK_FUNCS() nonfunctional.
|
||||
Another commit made the processing not stop upon detecting a missing
|
||||
component which, again, makes the calls to AC_CHECK_FUNCS() malfunction.
|
||||
|
||||
The solution is to get rid of AC_CHECK_LIB() and temporarily override
|
||||
LIBS for use by AC_CHECK_FUNCS().
|
||||
---
|
||||
configure.ac | 14 ++++----------
|
||||
1 file changed, 4 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 6f82f0c..ba3f791 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -763,18 +763,13 @@ AC_ARG_ENABLE(gnutls,
|
||||
if test "x$enable_gnutls" = "xyes"; then
|
||||
PKG_CHECK_MODULES(GNUTLS, gnutls >= 1.4.0)
|
||||
AC_DEFINE([ENABLE_GNUTLS], [1], [Indicator that GnuTLS is present])
|
||||
- AC_CHECK_LIB(
|
||||
- [gnutls],
|
||||
- [gnutls_global_init],
|
||||
- [
|
||||
- AC_DEFINE(HAVE_LIB_GNUTLS, 1, [gnutls is available])
|
||||
- ],
|
||||
- [AC_MSG_WARN([gnutls_global_init function missing or not detected])],
|
||||
- []
|
||||
- )
|
||||
+ save_libs=$LIBS
|
||||
+ LIBS="$LIBS $GNUTLS_LIBS"
|
||||
AC_CHECK_FUNCS(gnutls_certificate_set_retrieve_function,,)
|
||||
AC_CHECK_FUNCS(gnutls_certificate_type_set_priority,,)
|
||||
+ LIBS=$save_libs
|
||||
fi
|
||||
+
|
||||
AM_CONDITIONAL(ENABLE_GNUTLS, test x$enable_gnutls = xyes)
|
||||
|
||||
# libgcrypt support
|
||||
@@ -1655,7 +1650,6 @@ else
|
||||
AC_MSG_NOTICE([Not running from git source])
|
||||
fi
|
||||
|
||||
-
|
||||
AM_CONDITIONAL(ENABLE_GENERATE_MAN_PAGES, test x$have_to_generate_man_pages = xyes)
|
||||
|
||||
# rst2man
|
@ -4742,34 +4742,35 @@ with pkgs;
|
||||
rsbep = callPackage ../tools/backup/rsbep { };
|
||||
|
||||
rsyslog = callPackage ../tools/system/rsyslog {
|
||||
hadoop = null; # Currently Broken
|
||||
libksi = null; # Currently Broken
|
||||
withHadoop = false; # Currently Broken
|
||||
withKsi = false; # Currently Broken
|
||||
};
|
||||
|
||||
rsyslog-light = rsyslog.override {
|
||||
libkrb5 = null;
|
||||
systemd = null;
|
||||
jemalloc = null;
|
||||
libmysqlclient = null;
|
||||
postgresql = null;
|
||||
libdbi = null;
|
||||
net-snmp = null;
|
||||
libuuid = null;
|
||||
gnutls = null;
|
||||
libgcrypt = null;
|
||||
liblognorm = null;
|
||||
openssl = null;
|
||||
librelp = null;
|
||||
libksi = null;
|
||||
liblogging = null;
|
||||
libnet = null;
|
||||
hadoop = null;
|
||||
rdkafka = null;
|
||||
libmongo-client = null;
|
||||
czmq = null;
|
||||
rabbitmq-c = null;
|
||||
hiredis = null;
|
||||
libmaxminddb = null;
|
||||
withKrb5 = false;
|
||||
withSystemd = false;
|
||||
withJemalloc = false;
|
||||
withMysql = false;
|
||||
withPostgres = false;
|
||||
withDbi = false;
|
||||
withNetSnmp = false;
|
||||
withUuid = false;
|
||||
withCurl = false;
|
||||
withGnutls = false;
|
||||
withGcrypt = false;
|
||||
withLognorm = false;
|
||||
withMaxminddb = false;
|
||||
withOpenssl = false;
|
||||
withRelp = false;
|
||||
withKsi = false;
|
||||
withLogging = false;
|
||||
withNet = false;
|
||||
withHadoop = false;
|
||||
withRdkafka = false;
|
||||
withMongo = false;
|
||||
withCzmq = false;
|
||||
withRabbitmq = false;
|
||||
withHiredis = false;
|
||||
};
|
||||
|
||||
rtrtr = callPackage ../servers/rtrtr {
|
||||
@ -14532,6 +14533,7 @@ with pkgs;
|
||||
cargo-audit = callPackage ../development/tools/rust/cargo-audit {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
cargo-auditable = callPackage ../development/tools/rust/cargo-auditable { };
|
||||
cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
openssl = openssl_1_1;
|
||||
@ -15655,7 +15657,9 @@ with pkgs;
|
||||
|
||||
srelay = callPackage ../tools/networking/srelay { };
|
||||
|
||||
xidel = callPackage ../tools/text/xidel { };
|
||||
xidel = callPackage ../tools/text/xidel {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
|
||||
asdf-vm = callPackage ../tools/misc/asdf-vm { };
|
||||
|
||||
@ -16388,6 +16392,8 @@ with pkgs;
|
||||
|
||||
eweb = callPackage ../development/tools/literate-programming/eweb { };
|
||||
|
||||
explain = callPackage ../development/tools/explain { };
|
||||
|
||||
funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
|
||||
|
||||
license_finder = callPackage ../development/tools/license_finder { };
|
||||
@ -22201,6 +22207,11 @@ with pkgs;
|
||||
libsoup = libsoup_3;
|
||||
};
|
||||
|
||||
webkitgtk_5_0 = webkitgtk.override {
|
||||
libsoup = libsoup_3;
|
||||
gtk3 = gtk4;
|
||||
};
|
||||
|
||||
websocketpp = callPackage ../development/libraries/websocket++ { };
|
||||
|
||||
webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { stdenv = gcc10StdenvCompat; };
|
||||
|
@ -10452,6 +10452,8 @@ in {
|
||||
|
||||
sphinx-copybutton = callPackage ../development/python-modules/sphinx-copybutton { };
|
||||
|
||||
sphinxemoji = callPackage ../development/python-modules/sphinxemoji { };
|
||||
|
||||
sphinx-inline-tabs = callPackage ../development/python-modules/sphinx-inline-tabs { };
|
||||
|
||||
sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { };
|
||||
|
Loading…
Reference in New Issue
Block a user