mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
80ddf916da
@ -15,6 +15,14 @@
|
||||
<section xml:id="sec-release-22.05-highlights">
|
||||
<title>Highlights</title>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>firefox</literal> browser on
|
||||
<literal>x86_64-linux</literal> is now making use of
|
||||
profile-guided optimization resulting in a much more
|
||||
responsive browsing experience.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>security.acme.defaults</literal> has been added to
|
||||
|
||||
@ -6,6 +6,10 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
## Highlights {#sec-release-22.05-highlights}
|
||||
|
||||
- The `firefox` browser on `x86_64-linux` is now making use of
|
||||
profile-guided optimization resulting in a much more responsive
|
||||
browsing experience.
|
||||
|
||||
- `security.acme.defaults` has been added to simplify configuring
|
||||
settings for many certificates at once. This also opens up the
|
||||
the option to use DNS-01 validation when using `enableACME` on
|
||||
|
||||
@ -24,14 +24,14 @@ in {
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd.packages = [ pkgs.powerdns ];
|
||||
systemd.packages = [ pkgs.pdns ];
|
||||
|
||||
systemd.services.pdns = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" "mysql.service" "postgresql.service" "openldap.service" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = [ "" "${pkgs.powerdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ];
|
||||
ExecStart = [ "" "${pkgs.pdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -83,6 +83,7 @@
|
||||
, gssSupport ? true, libkrb5
|
||||
, jemallocSupport ? true, jemalloc
|
||||
, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages
|
||||
, pgoSupport ? (stdenv.isLinux && stdenv.isx86_64 && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run
|
||||
, pipewireSupport ? waylandSupport && webrtcSupport
|
||||
, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
|
||||
, waylandSupport ? true, libxkbcommon, libdrm
|
||||
@ -98,10 +99,18 @@
|
||||
, googleAPISupport ? geolocationSupport
|
||||
, webrtcSupport ? !privacySupport
|
||||
|
||||
# digital rights managemewnt
|
||||
|
||||
# This flag controls whether Firefox will show the nagbar, that allows
|
||||
# users at runtime the choice to enable Widevine CDM support when a site
|
||||
# requests it.
|
||||
# Controlling the nagbar and widevine CDM at runtime is possible by setting
|
||||
# `browser.eme.ui.enabled` and `media.gmp-widevinecdm.enabled` accordingly
|
||||
, drmSupport ? true
|
||||
|
||||
## other
|
||||
|
||||
, crashreporterSupport ? false
|
||||
, drmSupport ? false
|
||||
, safeBrowsingSupport ? false
|
||||
|
||||
# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
|
||||
@ -126,7 +135,7 @@
|
||||
}:
|
||||
|
||||
assert stdenv.cc.libc or null != null;
|
||||
assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "pipewireSupport requires both wayland and webrtc support.";
|
||||
assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "${pname}: pipewireSupport requires both wayland and webrtc support.";
|
||||
|
||||
let
|
||||
flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
|
||||
@ -140,12 +149,10 @@ let
|
||||
bootBintools = null;
|
||||
};
|
||||
|
||||
buildStdenv = if ltoSupport
|
||||
# LTO requires LLVM bintools including ld.lld and llvm-ar.
|
||||
then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {
|
||||
inherit (llvmPackages) bintools;
|
||||
})
|
||||
else stdenv;
|
||||
# LTO requires LLVM bintools including ld.lld and llvm-ar.
|
||||
buildStdenv = overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {
|
||||
inherit (llvmPackages) bintools;
|
||||
});
|
||||
|
||||
# Compile the wasm32 sysroot to build the RLBox Sandbox
|
||||
# https://hacks.mozilla.org/2021/12/webassembly-and-back-again-fine-grained-sandboxing-in-firefox-95/
|
||||
@ -164,6 +171,13 @@ buildStdenv.mkDerivation ({
|
||||
|
||||
inherit src unpackPhase meta;
|
||||
|
||||
# Add another configure-build-profiling run before the final configure phase if we build with pgo
|
||||
preConfigurePhases = lib.optionals pgoSupport [
|
||||
"configurePhase"
|
||||
"buildPhase"
|
||||
"profilingPhase"
|
||||
];
|
||||
|
||||
patches = [
|
||||
]
|
||||
++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch
|
||||
@ -199,6 +213,7 @@ buildStdenv.mkDerivation ({
|
||||
which
|
||||
wrapGAppsHook
|
||||
]
|
||||
++ lib.optionals pgoSupport [ xvfb-run ]
|
||||
++ extraNativeBuildInputs;
|
||||
|
||||
setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags.
|
||||
@ -214,6 +229,9 @@ buildStdenv.mkDerivation ({
|
||||
export MOZ_OBJDIR=$(pwd)/mozobj
|
||||
export MOZBUILD_STATE_PATH=$(pwd)/mozbuild
|
||||
|
||||
# Don't try to send libnotify notifications during build
|
||||
export MOZ_NOSPAM=1
|
||||
|
||||
# Set consistent remoting name to ensure wmclass matches with desktop file
|
||||
export MOZ_APP_REMOTINGNAME="${binaryName}"
|
||||
|
||||
@ -228,6 +246,25 @@ buildStdenv.mkDerivation ({
|
||||
# RBox WASM Sandboxing
|
||||
export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc
|
||||
export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++
|
||||
'' + lib.optionalString pgoSupport ''
|
||||
if [ -e "$TMPDIR/merged.profdata" ]; then
|
||||
echo "Configuring with profiling data"
|
||||
for i in "''${!configureFlagsArray[@]}"; do
|
||||
if [[ ''${configureFlagsArray[i]} = "--enable-profile-generate=cross" ]]; then
|
||||
unset 'configureFlagsArray[i]'
|
||||
fi
|
||||
done
|
||||
configureFlagsArray+=(
|
||||
"--enable-profile-use=cross"
|
||||
"--with-pgo-profile-path="$TMPDIR/merged.profdata""
|
||||
"--with-pgo-jarlog="$TMPDIR/jarlog""
|
||||
)
|
||||
else
|
||||
echo "Configuring to generate profiling data"
|
||||
configureFlagsArray+=(
|
||||
"--enable-profile-generate=cross"
|
||||
)
|
||||
fi
|
||||
'' + lib.optionalString googleAPISupport ''
|
||||
# Google API key used by Chromium and Firefox.
|
||||
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
|
||||
@ -258,7 +295,6 @@ buildStdenv.mkDerivation ({
|
||||
"--with-system-webp"
|
||||
"--with-system-zlib"
|
||||
]
|
||||
++ lib.optional (!ltoSupport) "--with-clang-path=${llvmPackages.clang}/bin/clang"
|
||||
# LTO is done using clang and lld on Linux.
|
||||
++ lib.optionals ltoSupport [
|
||||
"--enable-lto=cross" # Cross-Language LTO
|
||||
@ -277,7 +313,7 @@ buildStdenv.mkDerivation ({
|
||||
++ flag gssSupport "negotiateauth"
|
||||
++ flag webrtcSupport "webrtc"
|
||||
++ flag crashreporterSupport "crashreporter"
|
||||
++ lib.optional drmSupport "--enable-eme=widevine"
|
||||
++ lib.optional (!drmSupport) "--disable-eme"
|
||||
|
||||
++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
|
||||
else [ "--disable-debug" "--enable-optimize" ])
|
||||
@ -336,10 +372,35 @@ buildStdenv.mkDerivation ({
|
||||
++ lib.optional jemallocSupport jemalloc
|
||||
++ extraBuildInputs;
|
||||
|
||||
profilingPhase = lib.optionalString pgoSupport ''
|
||||
# Package up Firefox for profiling
|
||||
./mach package
|
||||
|
||||
# Run profiling
|
||||
(
|
||||
export HOME=$TMPDIR
|
||||
export LLVM_PROFDATA=llvm-profdata
|
||||
export JARLOG_FILE="$TMPDIR/jarlog"
|
||||
|
||||
xvfb-run -w 10 -s "-screen 0 1920x1080x24" \
|
||||
./mach python ./build/pgo/profileserver.py
|
||||
)
|
||||
|
||||
# Copy profiling data to a place we can easily reference
|
||||
cp ./merged.profdata $TMPDIR/merged.profdata
|
||||
|
||||
# Clean build dir
|
||||
./mach clobber
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
cd mozobj
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
cd ..
|
||||
'';
|
||||
|
||||
makeFlags = extraMakeFlags;
|
||||
separateDebugInfo = enableDebugSymbols;
|
||||
enableParallelBuilding = true;
|
||||
@ -347,6 +408,10 @@ buildStdenv.mkDerivation ({
|
||||
# tests were disabled in configureFlags
|
||||
doCheck = false;
|
||||
|
||||
preInstall = ''
|
||||
cd mozobj
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString buildStdenv.isLinux ''
|
||||
# Remove SDK cruft. FIXME: move to a separate output?
|
||||
rm -rf $out/share/idl $out/include $out/lib/${binaryName}-devel-*
|
||||
|
||||
@ -78,5 +78,6 @@ rec {
|
||||
}).override {
|
||||
crashreporterSupport = false;
|
||||
enableOfficialBranding = false;
|
||||
pgoSupport = false; # Profiling gets stuck and doesn't terminate.
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ let
|
||||
in
|
||||
|
||||
rec {
|
||||
thunderbird = common rec {
|
||||
thunderbird = (common rec {
|
||||
pname = "thunderbird";
|
||||
version = "91.7.0";
|
||||
application = "comm/mail";
|
||||
@ -35,5 +35,7 @@ rec {
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbird-unwrapped";
|
||||
};
|
||||
}).override {
|
||||
pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable"
|
||||
};
|
||||
}
|
||||
|
||||
@ -60,7 +60,7 @@ in rec {
|
||||
gnome41Extensions = mapUuidNames (produceExtensionsList "41");
|
||||
gnome42Extensions = mapUuidNames (produceExtensionsList "42");
|
||||
|
||||
gnomeExtensions = lib.trivial.pipe (gnome41Extensions // gnome42Extensions) [
|
||||
gnomeExtensions = lib.trivial.pipe (gnome40Extensions // gnome41Extensions // gnome42Extensions) [
|
||||
# Apply some custom patches for automatically packaged extensions
|
||||
(callPackage ./extensionOverrides.nix {})
|
||||
# Add all manually packaged extensions
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "robin-map";
|
||||
version = "0.6.3";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tessil";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1li70vwsksva9c4yly90hjafgqfixi1g6d52qq9p6r60vqc4pkjj";
|
||||
sha256 = "sha256-h59khOUg7vzw64EAMT/uzTKHzx2M9q+pc2BhfGQiY3Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }:
|
||||
|
||||
let inherit (lib) getVersion versionAtLeast; in
|
||||
|
||||
assert versionAtLeast (getVersion ocaml) "4.00.0";
|
||||
assert versionAtLeast (getVersion findlib) "1.3.3";
|
||||
|
||||
if versionAtLeast ocaml.version "4.06"
|
||||
then throw "bolt is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bolt";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://forge.ocamlcore.org/frs/download.php/1043/bolt-${version}.tar.gz";
|
||||
sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild which camlp4 ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/bolt/bolt.1.4/files/opam.patch";
|
||||
sha256 = "08cl39r98w312sw23cskd5wian6zg20isn9ki41hnbcgkazhi7pb";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patch myocamlbuild.ml <<EOF
|
||||
70,74c70
|
||||
< let camlp4of =
|
||||
< try
|
||||
< let path_bin = Filename.concat (Sys.getenv "PATH_OCAML_PREFIX") "bin" in
|
||||
< Filename.concat path_bin "camlp4of"
|
||||
< with _ -> "camlp4of" in
|
||||
---
|
||||
> let camlp4of = "camlp4of" in
|
||||
EOF
|
||||
'';
|
||||
|
||||
# The custom `configure` script does not expect the --prefix
|
||||
# option. Installation is handled by ocamlfind.
|
||||
dontAddPrefix = true;
|
||||
dontAddStaticConfigureFlags = true;
|
||||
configurePlatforms = [ ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
buildFlags = [ "all" ];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "tests";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://bolt.x9c.fr";
|
||||
description = "A logging tool for the OCaml language";
|
||||
longDescription = ''
|
||||
Bolt is a logging tool for the OCaml language. It is inspired by and
|
||||
modeled after the famous log4j logging framework for Java.
|
||||
'';
|
||||
license = licenses.lgpl3;
|
||||
platforms = ocaml.meta.platforms or [ ];
|
||||
maintainers = [ maintainers.jirkamarsik ];
|
||||
};
|
||||
}
|
||||
@ -241,6 +241,13 @@ with self;
|
||||
doCheck = false; # we don't have quickcheck_deprecated
|
||||
};
|
||||
|
||||
core_unix = janePackage {
|
||||
pname = "core_unix";
|
||||
hash = "0irfmpx6iksxk2r8mdizjn75h71qh4p2f1s9x2ggckzqj9y904ck";
|
||||
meta.description = "Unix-specific portions of Core";
|
||||
propagatedBuildInputs = [ core ];
|
||||
};
|
||||
|
||||
csvfields = janePackage {
|
||||
pname = "csvfields";
|
||||
hash = "09jmz6y6nwd96dcx6g8ydicxssi72v1ks276phbc9n19wwg9hkaz";
|
||||
|
||||
@ -11,7 +11,7 @@ buildDunePackage rec {
|
||||
sha256 = "sha256-THTlhOfXAPaqTt1qBkht+D67bw6M175QLvXoUMgjks4=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
nativeBuildInputs = [ cppo ];
|
||||
|
||||
|
||||
@ -3,6 +3,9 @@ let
|
||||
pname = "uutf";
|
||||
in
|
||||
|
||||
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.03")
|
||||
"${pname} is not available with OCaml ${ocaml.version}"
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-${pname}-${version}";
|
||||
version = "1.0.3";
|
||||
@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Non-blocking streaming Unicode codec for OCaml";
|
||||
homepage = "https://erratique.ch/software/uutf";
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
inherit (ocaml.meta) platforms;
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
};
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
|| lib.versionOlder "4.13" ocaml.version
|
||||
then throw "wasm is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone";
|
||||
version = "0.1.2";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "Noltari";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-8OpC/w83us85NWpRXXLsWsLNiPG3v+8BHAToADdLaP4=";
|
||||
hash = "sha256-jMmPACC8eVDYqBI2642R/ChKFObmK+yWRzRBQUmi1C0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, backoff
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
@ -12,8 +13,8 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiogithubapi";
|
||||
version = "22.2.4";
|
||||
format = "setuptools";
|
||||
version = "22.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -21,9 +22,13 @@ buildPythonPackage rec {
|
||||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-2RYpeyX88+eEilK/wLDJ6Ock1JBgIUPWbm/ZBJSQ2pg=";
|
||||
hash = "sha256-5gKANZtDhIoyfyLdS15JDWTxHBFkaHDUlbVVhRs7MSE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
@ -39,7 +44,7 @@ buildPythonPackage rec {
|
||||
postPatch = ''
|
||||
# Upstream is releasing with the help of a CI to PyPI, GitHub releases
|
||||
# are not in their focus
|
||||
substituteInPlace setup.py \
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'version="main",' 'version="${version}",'
|
||||
'';
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiowebostv";
|
||||
version = "0.1.3";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UKDcIo0jhI84WDcSK3fciRqzKjHwbZXkqHjdo7Xt4iE=";
|
||||
hash = "sha256-A7GiAQIuEXmCfo2pDJESCdAEaLumi1ACXnBMdGKwSvE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,15 +8,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncstdlib";
|
||||
version = "3.10.3";
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "3.10.4";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxfischer2781";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Q547XKsn4/U7XbDhZADF4qPpFxAGPmv9bAXSQZnNUIo=";
|
||||
hash = "sha256-zPWXI5iHMCkSVjyNRcXplTadobYCeMv3Unjt+QVF8D8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -27,7 +28,9 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "asyncstdlib" ];
|
||||
pythonImportsCheck = [
|
||||
"asyncstdlib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library that extends the Python asyncio standard library";
|
||||
|
||||
@ -3,28 +3,30 @@
|
||||
, fetchPypi
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, msrestazure
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-cognitiveservices";
|
||||
version = "13.0.0";
|
||||
version = "13.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "dc6116e8394d45312c7ad5a9098ce0dd2370bd92d43afd33d8b3bfab724fa498";
|
||||
hash = "sha256-FXS834v5uDGiEGcQMIv9iaHxhfcW9uY3VmX7l91Tfj4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
# has no tests
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -5,17 +5,20 @@
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-signalr";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "43fe90b5c5eb5aa00afcaf2895f1d4417f89ddb7f76bd61204e1253a6767ef7c";
|
||||
hash = "sha256-lUNIDyP5W+8aIX7manfMqaO2IJJm/+2O+Buv+Bh4EZE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -23,7 +26,6 @@ buildPythonPackage rec {
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
# has no tests
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "elastic-apm";
|
||||
version = "6.8.0";
|
||||
version = "6.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
owner = "elastic";
|
||||
repo = "apm-agent-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5G+ALFDEClItXvSQFGari0QdhW+RGV8FukxUoxqphFg=";
|
||||
sha256 = "sha256-bH7XCk1jPsGalFQ68rQhSyZv9nCZE+xUJyWX828PQQI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-vision";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Ty80C73K3/TebsdSHinmp2y8TKgOftqT5PIDafq1GgM=";
|
||||
hash = "sha256-4NTWyf3rndw1zHINlBMtoEmdfSXGnU/jEhxab807Vg4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "0.38.5";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-RzTRRWHmdEjDQM/x4pX1gy7mIJD3K2hjQRAkz53xL50=";
|
||||
sha256 = "sha256-neYFYzBNx/Rm3PWCsQ5ooisU3Z+kJO+O+KNpbwSsUB4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mcstatus";
|
||||
version = "9.0.2";
|
||||
version = "9.0.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "py-mine";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+wSBdsTI+vyCLvf+0R6oeWnUc123uLMyjQcp/zUYDOQ=";
|
||||
hash = "sha256-ckT3eSjOgIG2/Ci9Ig6QLCrO9iMF9VyZNJy9KfHUg4A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -22,6 +22,11 @@ buildPythonPackage rec {
|
||||
url = "https://github.com/python-metar/python-metar/commit/716fa76682e6c2936643d1cf62e3d302ef29aedd.patch";
|
||||
hash = "sha256-y82NN+KDryOiH+eG+2ycXCO9lqQLsah4+YpGn6lM2As=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# Fix failing test: https://github.com/python-metar/python-metar/issues/165
|
||||
url = "https://github.com/python-metar/python-metar/commit/a4f9a4764b99bb0313876366d30728169db2770b.patch";
|
||||
hash = "sha256-sURHUb4gCKVMqEWFklTsxF0kr0SxC02Yr0287rZIvC0=";
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
@ -1,32 +1,37 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
|
||||
, nose
|
||||
, pytest
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "minidb";
|
||||
version = "2.0.5";
|
||||
disabled = !isPy3k;
|
||||
version = "2.0.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thp";
|
||||
repo = "minidb";
|
||||
rev = version;
|
||||
sha256 = "sha256-aUXsp0E89OxCgTaz7MpKmqTHZfnjDcyHa8Ckzof9rfg=";
|
||||
hash = "sha256-H7W+GBapT9uJgbPlARp4ZLKTN7hZlF/FbNo7rObqDM4=";
|
||||
};
|
||||
|
||||
# module imports are incompatible with python2
|
||||
doCheck = isPy3k;
|
||||
checkInputs = [ nose pytest ];
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"minidb"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple SQLite3-based store for Python objects";
|
||||
description = "SQLite3-based store for Python objects";
|
||||
homepage = "https://thp.io/2010/minidb/";
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.tv ];
|
||||
maintainers = with maintainers; [ tv ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ormar";
|
||||
version = "0.10.25";
|
||||
version = "0.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "collerek";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-AggrsXw9fUYfc38AiSDSoh7SIEf4gPf+LlAvrxZiFL4=";
|
||||
hash = "sha256-I41asBWwOwmi6Yhw/JZ/EcpDWMAoPyxPIGIPiZQV+Yk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.3.10";
|
||||
version = "1.3.12";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XvQDCCxqqY902cpn7Ee48XOvbjBhs0UsJH/b4skjazE=";
|
||||
hash = "sha256-guL//OHiwlKN55kyoRPIUXuoHOVrho+vSgeV3SAdfNM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "check_ssl_cert";
|
||||
version = "2.22.0";
|
||||
version = "2.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ytnaygAVKppyyUnxfMlwf9GvHzt8SN5I+b2FTcyaM/4=";
|
||||
sha256 = "sha256-RGl6Fgm9FVaZQMWHl93RwHvrScz69VgbIyDBqMh3PVo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -22,11 +22,11 @@ let
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "salt";
|
||||
version = "3004";
|
||||
version = "3004.1";
|
||||
|
||||
src = py.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "PVNWG8huAU3KLsPcmBB5vgTVXqBHiQyr3iXlsQv6WxM=";
|
||||
hash = "sha256-fzRKJDJkik8HjapazMaNzf/hCVzqE+wh5QQTVg8Ewpg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sshuttle";
|
||||
version = "1.0.5";
|
||||
version = "1.1.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fd8c691aac2cb80933aae7f94d9d9e271a820efc5c48e73408f1a90da426a1bd";
|
||||
sha256 = "sha256-IfuRvfOStQ5422uNdelbc6ydr9Nh4mV+eE5nRWEhkxU=";
|
||||
};
|
||||
|
||||
patches = [ ./sudo.patch ];
|
||||
@ -27,9 +27,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.psutil ];
|
||||
|
||||
checkInputs = with python3Packages; [ mock pytestCheckHook flake8 ];
|
||||
checkInputs = with python3Packages; [ pytestCheckHook ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/sshuttle \
|
||||
@ -45,6 +43,6 @@ python3Packages.buildPythonApplication rec {
|
||||
Works with Linux and Mac OS and supports DNS tunneling.
|
||||
'';
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ domenkozar carlosdagos ];
|
||||
maintainers = with maintainers; [ domenkozar carlosdagos SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@ index cab5b1c..e89f8a6 100644
|
||||
@@ -192,7 +192,7 @@ class FirewallClient:
|
||||
|
||||
self.auto_nets = []
|
||||
python_path = os.path.dirname(os.path.dirname(__file__))
|
||||
|
||||
- argvbase = ([sys.executable, sys.argv[0]] +
|
||||
+ argvbase = ([sys.argv[0]] +
|
||||
['-v'] * (helpers.verbose or 0) +
|
||||
|
||||
@ -922,6 +922,7 @@ mapAliases ({
|
||||
polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22
|
||||
polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
|
||||
poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22
|
||||
powerdns = pdns; # Added 2022-03-28
|
||||
|
||||
# postgresql
|
||||
postgresql96 = postgresql_9_6;
|
||||
|
||||
@ -23231,9 +23231,7 @@ with pkgs;
|
||||
|
||||
semodule-utils = callPackage ../os-specific/linux/semodule-utils { };
|
||||
|
||||
powerdns = callPackage ../servers/dns/powerdns {
|
||||
boost = boost172;
|
||||
};
|
||||
pdns = callPackage ../servers/dns/pdns { };
|
||||
|
||||
powerdns-admin = callPackage ../applications/networking/powerdns-admin { };
|
||||
|
||||
|
||||
@ -83,8 +83,6 @@ let
|
||||
bls12-381-unix = callPackage ../development/ocaml-modules/bls12-381/unix.nix { };
|
||||
bls12-381-legacy = callPackage ../development/ocaml-modules/bls12-381/legacy.nix { };
|
||||
|
||||
bolt = callPackage ../development/ocaml-modules/bolt { };
|
||||
|
||||
bos = callPackage ../development/ocaml-modules/bos { };
|
||||
|
||||
bz2 = callPackage ../development/ocaml-modules/bz2 { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user