diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index 301c223147a1..c9f50e8bcf9b 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mympd"; - version = "11.0.3"; + version = "11.0.4"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${version}"; - sha256 = "sha256-pDM9igAX1iUi/yC8/Jqobaixkw6klEVcd0sAn0Ufdjk="; + sha256 = "sha256-uDr0QyyYROpaWQ7sv/JeI9IHwdJaFWorIqWMHs5XKU4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 131dd4457d58..8d376730a90b 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -9,15 +9,15 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pineapple-pictures"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; - rev = version; - hash = "sha256-6peNZc+rrQrUFSrn1AK8lZsy4RQf9DwpmXY0McfEus8="; + rev = finalAttrs.version; + hash = "sha256-dD0pHqw1Gxp+yxzYdm2ZgxiHKyuJKBGYpjv99B1Da1g="; }; nativeBuildInputs = [ @@ -36,12 +36,12 @@ stdenv.mkDerivation rec { "-DPREFER_QT_5=OFF" ]; - meta = with lib; { + meta = { description = "Homebrew lightweight image viewer"; homepage = "https://github.com/BLumia/pineapple-pictures"; - license = licenses.mit; - platforms = platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; mainProgram = "ppic"; - maintainers = with maintainers; [ rewine ]; + maintainers = with lib.maintainers; [ rewine ]; }; -} +}) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d7feab443544..29d12c70afbf 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1179,11 +1179,11 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-ccQwHQlJTqNRNdcz1gd58rzauBcCgV3bGpoKIThruDQ=", + "hash": "sha256-+xqt0y/DIx+h8L+73B00ou0Cy9f60sGijgw95N8eROk=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.36.1", + "rev": "v1.37.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 282d45513ced..4e11d9fe3863 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -1,6 +1,6 @@ { lib , writeShellScript -, buildFHSEnv +, buildFHSEnvBubblewrap , stdenvNoCC , fetchurl , autoPatchelfHook @@ -40,11 +40,12 @@ let }; insync-pkg = stdenvNoCC.mkDerivation { - inherit pname version meta; + name = "${pname}-pkg-${version}"; + inherit version meta; src = fetchurl { # Find a binary from https://www.insynchq.com/downloads/linux#ubuntu. - url = "https://cdn.insynchq.com/builds/linux/${pname}_${version}-lunar_amd64.deb"; + url = "https://cdn.insynchq.com/builds/linux/insync_${version}-lunar_amd64.deb"; sha256 = "sha256-BxTFtQ1rAsOuhKnH5vsl3zkM7WOd+vjA4LKZGxl4jk0="; }; @@ -66,7 +67,7 @@ let installPhase = '' runHook preInstall - mkdir -p $out/bin $out/lib $out/share + mkdir -p $out cp -R usr/* $out/ # use system glibc @@ -75,6 +76,9 @@ let # remove badly packaged plugins rm $out/lib/insync/PySide2/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so + # remove the unused vendor wrapper + rm $out/bin/insync + runHook postInstall ''; @@ -82,37 +86,40 @@ let dontStrip = true; }; - insync-fhsenv = buildFHSEnv { - name = "${pname}-${version}"; - inherit meta; +in buildFHSEnvBubblewrap { + name = pname; + inherit meta; - # for including insync's xdg data dirs - extraOutputsToInstall = [ "share" ]; + targetPkgs = pkgs: with pkgs; [ + insync-pkg + libudev0-shim + ]; - targetPkgs = pkgs: with pkgs; [ - insync-pkg - libudev0-shim - ]; - - runScript = writeShellScript "insync-wrapper.sh" '' + runScript = writeShellScript "insync-wrapper.sh" '' # QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary. - export QT_STYLE_OVERRIDE=Fusion + echo Unsetting QT_STYLE_OVERRIDE=$QT_STYLE_OVERRIDE + echo Unsetting QT_QPA_PLATFORMTHEME=$QT_QPA_PLATFORMTHEME + unset QT_STYLE_OVERRIDE + unset QPA_PLATFORMTHEME + # xkb configuration needed: https://github.com/NixOS/nixpkgs/issues/236365 export XKB_CONFIG_ROOT=${xkeyboard_config}/share/X11/xkb/ - exec "${insync-pkg.outPath}/lib/insync/insync" "$@" + echo XKB_CONFIG_ROOT=$XKB_CONFIG_ROOT + + # For debuging: + # export QT_DEBUG_PLUGINS=1 + # find -L /usr/share -name "*insync*" + + exec /usr/lib/insync/insync "$@" ''; - # "insync start" command starts a daemon. - dieWithParent = false; - }; - -in stdenvNoCC.mkDerivation { - inherit pname version meta; - - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - ln -s ${insync-fhsenv}/bin/${insync-fhsenv.name} $out/bin/insync - ln -s ${insync-pkg}/share $out/share - ''; + # As intended by this bubble wrap, share as much namespaces as possible with user. + unshareUser = false; + unshareIpc = false; + unsharePid = false; + unshareNet = false; + unshareUts = false; + unshareCgroup = false; + # Since "insync start" command starts a daemon, this daemon should die with it. + dieWithParent = false; } diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 43b04ba1eedd..b3337b7f55c8 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.62"; + version = "1.8.66"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XypOQNETmxg9DYcuCGkXH9/LwCq+pR23KbNfP0mfs3I="; + hash = "sha256-tIwXiDHEmFHF5Jdv25hPkzEqAdig+i5h4fW6SGIrZDM="; }; postPatch = '' diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 8b9fd0470569..eda7ba8c5543 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230815132423"; + version = "20230825070717"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-rz7oxcmIQJ9cM7KbQ+zBcBmggGhhhGFad9k0hGLgVgY="; + hash = "sha256-xB+8WhFnaQ8YD99FcihqI58R8fxiBAzQK5b4VVdWbMo="; }; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; meta = with lib; { diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index 712dcf12215d..357401aaf43b 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lobster"; - version = "2023.9"; + version = "2023.11"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; rev = "v${version}"; - sha256 = "sha256-30OOdl/BzWJeLhSWuzLAhwELRPcOJIi7FqwL/ztUOUo="; + sha256 = "sha256-c0EElDvoFzIZvYZpjWd9az+KUxDXTETOp89I/tRCrQ0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index 464ef4fc301d..725f7654de9b 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,11 +5,13 @@ let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.15" "8.18"; out = "1.5.0"; } { case = range "8.15" "8.17"; out = "1.4.0"; } { case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; } { case = isEq "8.11"; out = "0.10.0"; } ] null; + release."1.5.0".sha256 = "sha256-Lia3o156Pbe8rDHOA1IniGYsG5/qzZkzDKdHecfmS+c="; release."1.4.0".sha256 = "sha256-tOed9UU3kMw6KWHJ5LVLUFEmzHx1ImutXQvZ0ldW9rw="; release."1.3.0".sha256 = "17k7rlxdx43qda6i1yafpgc64na8br285cb0mbxy5wryafcdrkrc"; release."1.2.1".sha256 = "sha256-pQYZJ34YzvdlRSGLwsrYgPdz3p/l5f+KhJjkYT08Mj0="; diff --git a/pkgs/development/libraries/oneDNN/2.nix b/pkgs/development/libraries/oneDNN/2.nix index fd47a05a1bc9..8851b09214f1 100644 --- a/pkgs/development/libraries/oneDNN/2.nix +++ b/pkgs/development/libraries/oneDNN/2.nix @@ -1,17 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: # This was originally called mkl-dnn, then it was renamed to dnnl, and it has # just recently been renamed again to oneDNN. See here for details: # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "2.7.1"; + version = "2.7.5"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; - rev = "v${version}"; - sha256 = "sha256-HBCuSZkApd/6UkAxz/KDFb/gyX2SI1S2GwgXAXSTU/c="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-oMPBORAdL2rk2ewyUrInYVHYBRvuvNX4p4rwykO3Rhs="; }; outputs = [ "out" "dev" "doc" ]; @@ -30,12 +34,12 @@ stdenv.mkDerivation rec { --replace "\''${_IMPORT_PREFIX}/" "" ''; - meta = with lib; { + meta = { + changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}"; description = "oneAPI Deep Neural Network Library (oneDNN)"; homepage = "https://01.org/oneDNN"; - changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ alexarice bhipple ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ alexarice bhipple ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index f7495d3e9c8c..7448a99439d0 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -1,17 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: # This was originally called mkl-dnn, then it was renamed to dnnl, and it has # just recently been renamed again to oneDNN. See here for details: # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; version = "3.2.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; - rev = "v${version}"; - sha256 = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8="; }; outputs = [ "out" "dev" "doc" ]; @@ -30,12 +34,12 @@ stdenv.mkDerivation rec { --replace "\''${_IMPORT_PREFIX}/" "" ''; - meta = with lib; { + meta = { + changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}"; description = "oneAPI Deep Neural Network Library (oneDNN)"; homepage = "https://01.org/oneDNN"; - changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ bhipple ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bhipple ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 4467ce3de8cd..ad3130a4ca0f 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -12,6 +12,9 @@ else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" }: +let p5 = camlp5; in +let camlp5 = p5.override { legacy = true; }; in + let fetched = coqPackages.metaFetch ({ release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s="; diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index a40b51498eb2..baa4ddacfec5 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.13.10"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-IylA73N3bZOs5HjQGbT6xqokb73iO3bdg5M2KCTX3p4="; + hash = "sha256-cx22otbBCSFRTfr+wY1+k5kyX6h9mTQfRBfPw3rplzY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index ac36041deb2b..4a17769e18e8 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "curtsies"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YtEPNJxVOEUwZVan8mY86WsJjYxbvEDa7Hpu7d4WIrA="; + hash = "sha256-br4zIVvXyShRpQYEnHIMykz1wZLBZlwdepigTEcCdg4="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Curses-like terminal wrapper, with colored strings!"; homepage = "https://github.com/bpython/curtsies"; + changelog = "https://github.com/bpython/curtsies/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; broken = stdenv.isDarwin; diff --git a/pkgs/development/python-modules/ipfshttpclient/default.nix b/pkgs/development/python-modules/ipfshttpclient/default.nix index b3c912551d48..1ac7fdd3cf75 100644 --- a/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -1,7 +1,7 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchFromGitHub +, flit-core , pythonOlder , python , py-multiaddr @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "ipfshttpclient"; version = "0.8.0a2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -32,6 +32,10 @@ buildPythonPackage rec { hash = "sha256-OmC67pN2BbuGwM43xNDKlsLhwVeUbpvfOazyIDvoMEA="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ py-multiaddr requests @@ -85,7 +89,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "ipfshttpclient" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "A python client library for the IPFS API"; homepage = "https://github.com/ipfs-shipyard/py-ipfs-http-client"; license = licenses.mit; diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 1c64471778a6..ec7a53f423a0 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -16,7 +16,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.36.0"; + version = "1.37.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; rev = "v${version}"; - hash = "sha256-/umpMkD+WEpBmw2cRb71PtOMd1sRNfwmURKdaRy4Qsc="; + hash = "sha256-7egK76A3+C+JPbCNFXDd4qTjepBRSZgtQmFrE/jWJN4="; }; patches = [ @@ -88,6 +88,7 @@ buildPythonPackage rec { driver = playwright-driver; browsers = playwright-driver.browsers; }; + updateScript = ./update.sh; }; meta = with lib; { diff --git a/pkgs/development/python-modules/playwright/update.sh b/pkgs/development/python-modules/playwright/update.sh index 464f9a3cba05..23c327608865 100755 --- a/pkgs/development/python-modules/playwright/update.sh +++ b/pkgs/development/python-modules/playwright/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix-prefetch common-updater-scripts node2nix +#!nix-shell -i bash -p curl gnused nix-prefetch common-updater-scripts node2nix jq set -euo pipefail root="$(dirname "$(readlink -f "$0")")" diff --git a/pkgs/development/python-modules/pygobject-stubs/default.nix b/pkgs/development/python-modules/pygobject-stubs/default.nix new file mode 100644 index 000000000000..77ec68ea2884 --- /dev/null +++ b/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, black +, codespell +, isort +, mypy +, pre-commit +, pygobject3 +}: + +buildPythonPackage rec { + pname = "pygobject-stubs"; + version = "2.8.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pygobject"; + repo = "pygobject-stubs"; + rev = "v${version}"; + hash = "sha256-8TB8eqXPhvoKtyQ8+hnCQnH4NwO2WC1NYAxmVj+FCvg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + # This package does not include any tests. + doCheck = false; + + meta = with lib; { + description = "PEP 561 Typing Stubs for PyGObject"; + homepage = "https://github.com/pygobject/pygobject-stubs"; + changelog = "https://github.com/pygobject/pygobject-stubs/blob/${src.rev}/CHANGELOG.md"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ hacker1024 ]; + }; +} diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index c25d11eb1180..374f7d26c9d0 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.39"; + version = "2.4.40"; src = fetchPypi { inherit pname version; - hash = "sha256-rS1EZGGAcWEi7MK565oii+KUaqACruLrWXNcB/aXPek="; + hash = "sha256-PWpVKtNEof/54MgRNhrJ2LuCAc9qrK1yJNUW+gN8yzA="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index fd3d4276f1eb..1bebbc731100 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "rmssIpXp6bwrrxtbH45catYxQh/7K+tkQtvfKYBToNk="; + sha256 = "HBjtR2OTzWgMdm8oBfBuJaxP4arAokOMUnRECEsTvg8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index fd92a8035839..690dd71d4328 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.32.4"; + version = "2.33.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-8J8SEPsRj6T6kpCTaouHEojLJQD4K0894m5ldVGdy6I="; + sha256 = "sha256-HQBGKWJSjo4ox8YEeQhzM8r+GxuEMsj3SiFAO78j0bA="; }; preCheck = '' diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index a09f226b3f13..02355cb9846c 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, perl, makeWrapper , rresult, bos, ocaml_pcre, re, camlp-streams +, legacy ? false }: if lib.versionOlder ocaml.version "4.02" @@ -7,7 +8,7 @@ then throw "camlp5 is not available for OCaml ${ocaml.version}" else let params = - if lib.versionAtLeast ocaml.version "4.12" + if lib.versionAtLeast ocaml.version "4.12" && !legacy then rec { version = "8.00.05"; diff --git a/pkgs/development/web/playwright-test/node-packages.json b/pkgs/development/web/playwright-test/node-packages.json index 87012158d5e4..b079fb119e9e 100644 --- a/pkgs/development/web/playwright-test/node-packages.json +++ b/pkgs/development/web/playwright-test/node-packages.json @@ -1,3 +1,3 @@ [ - {"@playwright/test": "1.34.3"} + {"@playwright/test": "1.37.0"} ] diff --git a/pkgs/development/web/playwright-test/node-packages.nix b/pkgs/development/web/playwright-test/node-packages.nix index 329452c14bee..63abea2981b0 100644 --- a/pkgs/development/web/playwright-test/node-packages.nix +++ b/pkgs/development/web/playwright-test/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@types/node-20.2.5" = { + "@types/node-20.5.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.2.5"; + version = "20.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz"; - sha512 = "JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.5.0.tgz"; + sha512 = "Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q=="; }; }; "fsevents-2.3.2" = { @@ -22,30 +22,30 @@ let sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; }; - "playwright-core-1.34.3" = { + "playwright-core-1.37.0" = { name = "playwright-core"; packageName = "playwright-core"; - version = "1.34.3"; + version = "1.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.34.3.tgz"; - sha512 = "2pWd6G7OHKemc5x1r1rp8aQcpvDh7goMBZlJv6Co5vCNLVcQJdhxRL09SGaY6HcyHH9aT4tiynZabMofVasBYw=="; + url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.0.tgz"; + sha512 = "1c46jhTH/myQw6sesrcuHVtLoSNfJv8Pfy9t3rs6subY7kARv0HRw5PpyfPYPpPtQvBOmgbE6K+qgYUpj81LAA=="; }; }; }; in { - "@playwright/test-1.34.3" = nodeEnv.buildNodePackage { + "@playwright/test-1.37.0" = nodeEnv.buildNodePackage { name = "_at_playwright_slash_test"; packageName = "@playwright/test"; - version = "1.34.3"; + version = "1.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/@playwright/test/-/test-1.34.3.tgz"; - sha512 = "zPLef6w9P6T/iT6XDYG3mvGOqOyb6eHaV9XtkunYs0+OzxBtrPAAaHotc0X+PJ00WPPnLfFBTl7mf45Mn8DBmw=="; + url = "https://registry.npmjs.org/@playwright/test/-/test-1.37.0.tgz"; + sha512 = "181WBLk4SRUyH1Q96VZl7BP6HcK0b7lbdeKisn3N/vnjitk+9HbdlFz/L5fey05vxaAhldIDnzo8KUoy8S3mmQ=="; }; dependencies = [ - sources."@types/node-20.2.5" + sources."@types/node-20.5.0" sources."fsevents-2.3.2" - sources."playwright-core-1.34.3" + sources."playwright-core-1.37.0" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 3ee02fe402ec..1046647a277a 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -30,15 +30,15 @@ let { pname = "playwright-driver"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.34.3"; + version = "1.37.0"; src = fetchurl { url = "https://playwright.azureedge.net/builds/driver/${filename}"; sha256 = { - x86_64-linux = "1xh05v3yqa8gkwayhl4nffgjcnlakpyyi17hwzh0wqzrbwwn0cs8"; - aarch64-linux = "18jxbmhiqda5pzrv6b3n7xi14xg4zvlh6sn7hc3b3hckl77vl933"; - x86_64-darwin = "0fy5nxbvp1kxplavj832gxiznjqpvl0ww869hsfj0h1fibhly7cy"; - aarch64-darwin = "11msl4pnmr8cmlw32xq2qvfz3g3fy0azvq134a47c0fnpj2gd5zl"; + x86_64-linux = "1lkmanr402ar9njwb7dgyzparjyr1r9krz9ad7b8c6hi3fjvrj0y"; + aarch64-linux = "13nfva9jfmjyjxm1my0aq8ngn6ha0fdrpfv28gm351n0j9cjlvqh"; + x86_64-darwin = "0q1qmgypngxs9ipb6dlhk1xccyzw6frzr835ijifpypgp4xmz2gi"; + aarch64-darwin = "1mq1868s06wgfgi3nhdrzsdqi3cl08lrkiz5q06mg1s724b2sf0v"; }.${system} or throwSystem; }; diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix index dae5cf783010..3c7312f8c27a 100644 --- a/pkgs/shells/fish/plugins/pure.nix +++ b/pkgs/shells/fish/plugins/pure.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "pure"; - version = "4.1.1"; + version = "4.7.0"; src = fetchFromGitHub { owner = "pure-fish"; repo = "pure"; rev = "v${version}"; - sha256 = "1x1h65l8582p7h7w5986sc9vfd7b88a7hsi68dbikm090gz8nlxx"; + hash = "sha256-2ZNb6aB7rIubTfRVRb42xmCdImQmtGGubo0TBwSPHEo="; }; # The tests aren't passing either on the project's CI. diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index d7bf8a9b9031..a06074b688d6 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -1,38 +1,56 @@ { lib , fetchFromGitHub , python3 +, softhsm }: python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "4.5.1"; + version = "4.6.2"; + + format = "setuptools"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - hash = "sha256-FKFw7czXzC8F3OXjlLoJEFaqsSgqWz0ZEqd7KjCy5Ik="; + hash = "sha256-3uvTyJrGCpulu/MR/VfCgnIxibxJj2ehBIBSveq7EfI="; }; + postPatch = '' + patchShebangs ci + + substituteInPlace test/test_espsecure_hsm.py \ + --replace "/usr/lib/softhsm" "${lib.getLib softhsm}/lib/softhsm" + ''; + propagatedBuildInputs = with python3.pkgs; [ bitstring cryptography ecdsa pyserial reedsolo + pyyaml + python-pkcs11 ]; nativeCheckInputs = with python3.pkgs; [ pyelftools pytestCheckHook + softhsm ]; # tests mentioned in `.github/workflows/test_esptool.yml` checkPhase = '' runHook preCheck + export SOFTHSM2_CONF=$(mktemp) + echo "directories.tokendir = $(mktemp -d)" > "$SOFTHSM2_CONF" + ./ci/setup_softhsm2.sh + pytest test/test_imagegen.py pytest test/test_espsecure.py + pytest test/test_espsecure_hsm.py pytest test/test_merge_bin.py pytest test/test_image_info.py pytest test/test_modules.py diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index 5f2a8852e319..ea882749a534 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "routino"; - version = "3.3.3"; + version = "3.4.1"; src = fetchurl { url = "https://routino.org/download/${pname}-${version}.tgz"; - sha256 = "1xa7l2bjn832nk6bc7b481nv8hd2gj41jwhg0d2qy10lqdvjpn5b"; + hash = "sha256-C6qNKljRdV0ProbgSxfrZLgZH+Pl8kcpKmTb83GLhSs="; }; patchFlags = [ "-p0" ]; @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.routino.org/"; + changelog = "http://routino.org/software/NEWS.txt"; description = "OpenStreetMap Routing Software"; license = licenses.agpl3Plus; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 2a89c46f0ab1..7c8913a7f430 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "sha256-ijbJ3ttSLO3UL8TBdayJeYcsBMisv4vICQW3+ZhVsuM="; + hash = "sha256-iNTuLcN9bsBPyXZ8SL96moFaI2pTcEhFey8+4xo9iyk="; }; nativeBuildInputs = [ @@ -37,8 +37,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for DNS benchmaring"; homepage = "https://www.dns-oarc.net/tools/dnsperf"; + changelog = "https://github.com/DNS-OARC/dnsperf/releases/tag/v${version}"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ vcunat ]; + mainProgram = "dnsperf"; + maintainers = with maintainers; [ vcunat mfrw ]; }; } diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix index e348b081bd12..52997fc24259 100644 --- a/pkgs/tools/security/ssh-to-age/default.nix +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-guBwwIXKAr9rtkiitFPs+usdzCQacnXcn5bTtQY77AY="; + sha256 = "sha256-vER4PG2LFi/NM9TmCffqsF3aR4ZycwWVeKls2fNupo0="; }; - vendorHash = "sha256-NEHZ2ZakkO6Yw2pZdKIfCp9NzjgIRIVxARpcQOBGse4="; + vendorHash = "sha256-g8qVV2cd7nxBN/BGNz28gJbtNkCUDJDdSdupXxhFw9Q="; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/wayland/wl-clipboard/default.nix b/pkgs/tools/wayland/wl-clipboard/default.nix index 141e2e11d025..8d812ac1685b 100644 --- a/pkgs/tools/wayland/wl-clipboard/default.nix +++ b/pkgs/tools/wayland/wl-clipboard/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "wl-clipboard"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "bugaevc"; repo = "wl-clipboard"; rev = "v${version}"; - hash = "sha256-L4k2jOZ2YtkFpDs2+LAUElYl5aNSC42QxkbMNJ2ZhWQ="; + hash = "sha256-BYRXqVpGt9FrEBYQpi2kHPSZyeMk9o1SXkxjjcduhiY="; }; strictDeps = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 465a228e5ce9..f9fb2d228153 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13222,7 +13222,9 @@ with pkgs; }; soapui = callPackage ../applications/networking/soapui { - jdk = jdk11; + jdk = if stdenv.isDarwin + then (jdk11.override { enableJavaFX = true; }) + else jdk11; }; sockdump = callPackage ../tools/networking/sockdump { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 726b95b1ce3c..446eccfa1955 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9144,6 +9144,8 @@ self: super: with self; { inherit (pkgs.buildPackages) meson; }; + pygobject-stubs = callPackage ../development/python-modules/pygobject-stubs { }; + pygogo = callPackage ../development/python-modules/pygogo { }; pygpgme = callPackage ../development/python-modules/pygpgme { };