diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 9e1b1be292ea..0863358d43c7 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -15,6 +15,14 @@
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 diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 0fe860ff7094..f92feb9560fb 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -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 diff --git a/nixos/modules/services/networking/powerdns.nix b/nixos/modules/services/networking/powerdns.nix index 8cae61b83543..b035698456c0 100644 --- a/nixos/modules/services/networking/powerdns.nix +++ b/nixos/modules/services/networking/powerdns.nix @@ -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" ]; }; }; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 64cba1b52a60..9773ecb825cd 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -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-* diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4789d394b73e..94aa4d74feb6 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -78,5 +78,6 @@ rec { }).override { crashreporterSupport = false; enableOfficialBranding = false; + pgoSupport = false; # Profiling gets stuck and doesn't terminate. }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index d559976d8003..e2d4a76df7d0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -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" }; } diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index f4077cac5b22..d01c28be92c6 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -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 diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix index a0a068dc1422..4ab48c484426 100644 --- a/pkgs/development/libraries/robin-map/default.nix +++ b/pkgs/development/libraries/robin-map/default.nix @@ -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 ]; diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix deleted file mode 100644 index 46e3b6f16cce..000000000000 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ /dev/null @@ -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 < "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 ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 2f9aeea1d628..800b1c1e531a 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 5cd42884d5b0..1e657fce8dd1 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "sha256-THTlhOfXAPaqTt1qBkht+D67bw6M175QLvXoUMgjks4="; }; - useDune2 = true; + minimalOCamlVersion = "4.03"; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index 531f811cc431..c76eac45b35d 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -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 ]; }; diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 6b0008912906..ffe8479b67e9 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -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 diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 860362971b23..f17ff4f71c6f 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 82c1145f9e3f..03dacdef89ba 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -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}",' ''; diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix index db9fbba25b71..17d6d85c3ce2 100644 --- a/pkgs/development/python-modules/aiowebostv/default.nix +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index ee261946a1ec..47cd54405f86 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -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"; diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index 08b810f752d1..ea12d27e56bc 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -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; { diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix index 7abb6250ac61..baa318bba461 100644 --- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix @@ -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 diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index f273b1a6428c..ea14989dbb13 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 61c383dca6ed..b73baab08108 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 1df738f80fb7..6b39369eeb03 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 848bb7d76ebe..fcacc7cbf763 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/metar/default.nix b/pkgs/development/python-modules/metar/default.nix index 2c518561b999..9c4b30925783 100644 --- a/pkgs/development/python-modules/metar/default.nix +++ b/pkgs/development/python-modules/metar/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index 599b1d70d42e..5723138ecc3e 100644 --- a/pkgs/development/python-modules/minidb/default.nix +++ b/pkgs/development/python-modules/minidb/default.nix @@ -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 ]; }; - } + diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index bbf95e98cffe..5546f58b2624 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 60d09f35a464..0c3aeada8e80 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -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 = [ diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/pdns/default.nix similarity index 100% rename from pkgs/servers/dns/powerdns/default.nix rename to pkgs/servers/dns/pdns/default.nix diff --git a/pkgs/servers/dns/powerdns/version.patch b/pkgs/servers/dns/pdns/version.patch similarity index 100% rename from pkgs/servers/dns/powerdns/version.patch rename to pkgs/servers/dns/pdns/version.patch diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 966040428382..b55b47cd7afd 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -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 = [ diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 6f7b86f04489..d258337e40e7 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -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; [ diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 959712488a20..4b4bbd3788b3 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -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 ]; }; } diff --git a/pkgs/tools/security/sshuttle/sudo.patch b/pkgs/tools/security/sshuttle/sudo.patch index 6e8634bd4a1f..d00aab087948 100644 --- a/pkgs/tools/security/sshuttle/sudo.patch +++ b/pkgs/tools/security/sshuttle/sudo.patch @@ -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) + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index efe678cfbbd4..53fe9ead208d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -923,6 +923,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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2187c38b988..fc896529534b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23236,9 +23236,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 { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 880048ebc58e..5a4a03fda066 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -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 { };