diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index f3af6d9e8bf1..26c1a7684a42 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.18"; + stable = "0.0.19"; ptb = "0.0.29"; canary = "0.0.136"; } else { @@ -14,7 +14,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "1hl01rf3l6kblx5v7rwnwms30iz8zw6dwlkjsx2f1iipljgkh5q4"; + sha256 = "GfSyddbGF8WA6JmHo4tUM27cyHV5kRAyrEiZe1jbA5A="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 370c37ffec23..1e1263755b76 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-+lwq4WTPeELjugTg9l1wvoe0VTqRK2lC1jaFIwXMrL0="; + sha256 = "sha256-crlOF8FoLlDulJJ8t8M1kk6JhSZdJU1VtR+G0O6VngM="; }; vendorSha256 = null; diff --git a/pkgs/development/compilers/hare/default.nix b/pkgs/development/compilers/hare/default.nix new file mode 100644 index 000000000000..c04897fad1bb --- /dev/null +++ b/pkgs/development/compilers/hare/default.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + + harec = callPackage ./harec { }; + hare = callPackage ./hare { }; +}) diff --git a/pkgs/development/compilers/hare/config-template.mk b/pkgs/development/compilers/hare/hare/config-template.mk similarity index 100% rename from pkgs/development/compilers/hare/config-template.mk rename to pkgs/development/compilers/hare/hare/config-template.mk diff --git a/pkgs/development/compilers/hare/hare.nix b/pkgs/development/compilers/hare/hare/default.nix similarity index 88% rename from pkgs/development/compilers/hare/hare.nix rename to pkgs/development/compilers/hare/hare/default.nix index e24fc68ab422..9411f4e4e905 100644 --- a/pkgs/development/compilers/hare/hare.nix +++ b/pkgs/development/compilers/hare/hare/default.nix @@ -9,16 +9,15 @@ , substituteAll }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hare"; - version = "unstable-2022-06-18"; + version = "unstable-2022-07-30"; src = fetchFromSourcehut { - name = pname + "-src"; owner = "~sircmpwn"; - repo = pname; - rev = "ac9b2c35c09d555e09dbd81c5ed95bdfa14313ba"; - hash = "sha256-eeS14LGkbi9IamvKzK+HF0Rvk9NFp4QVYcrHwNSNBx4="; + repo = "hare"; + rev = "296925c91d79362d6b8ac94e0336a38e9af0f1c9"; + hash = "sha256-LeIUnpTMZ6vxgAy/LPm9/IMit41RgezdVESIv+gQFHc="; }; patches = [ ./disable-failing-test-cases.patch ]; @@ -37,7 +36,6 @@ stdenv.mkDerivation rec { qbe ]; - setupHook = ./setup-hook.sh; strictDeps = true; configurePhase = @@ -86,6 +84,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/hare --prefix PATH : ${binPath} ''; + setupHook = ./setup-hook.sh; + meta = with lib; { homepage = "http://harelang.org/"; description = @@ -94,4 +94,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; inherit (harec.meta) platforms badPlatforms; }; -} +}) diff --git a/pkgs/development/compilers/hare/disable-failing-test-cases.patch b/pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch similarity index 100% rename from pkgs/development/compilers/hare/disable-failing-test-cases.patch rename to pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch diff --git a/pkgs/development/compilers/hare/setup-hook.sh b/pkgs/development/compilers/hare/hare/setup-hook.sh similarity index 100% rename from pkgs/development/compilers/hare/setup-hook.sh rename to pkgs/development/compilers/hare/hare/setup-hook.sh diff --git a/pkgs/development/compilers/hare/harec.nix b/pkgs/development/compilers/hare/harec/default.nix similarity index 78% rename from pkgs/development/compilers/hare/harec.nix rename to pkgs/development/compilers/hare/harec/default.nix index 4c77a77bd0d1..bdc9ef56b9d1 100644 --- a/pkgs/development/compilers/hare/harec.nix +++ b/pkgs/development/compilers/hare/harec/default.nix @@ -4,16 +4,15 @@ , qbe }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "harec"; - version = "unstable-2022-06-20"; + version = "unstable-2022-07-02"; src = fetchFromSourcehut { - name = pname + "-src"; owner = "~sircmpwn"; - repo = pname; - rev = "2eccbc4b959a590dda91143c8487edda841106d9"; - hash = "sha256-pwy7cNxAqIbhx9kpcjfgk7sCEns9oA6zhKSQJdHLZCM="; + repo = "harec"; + rev = "56359312644f76941de1878d33a1a0b840be8056"; + hash = "sha256-8SFYRJSvX8hmsHBgaLUfhLUV7d54im22ETZds1eASc4="; }; nativeBuildInputs = [ @@ -42,4 +41,4 @@ stdenv.mkDerivation rec { lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64); badPlatforms = with platforms; darwin; }; -} +}) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 64fc6a165c47..d3b736fbe0f0 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -18,7 +18,6 @@ , google-cloud-cpp , grpc , gtest -, jemalloc , libbacktrace , lz4 , minio @@ -56,55 +55,58 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "634739c664433cec366b4b9a81d1e1044a8c5eda"; - hash = "sha256-r1WVgJJsI7v485L6Qb+5i7kFO4Tvxyk1T0JBb4og6pg="; + rev = "5bab2f264a23f5af68f69ea93d24ef1e8e77fc88"; + hash = "sha256-Pxx8ohUpXb5u1995IvXmxQMqWiDJ+7LAll/AjQP7ph8="; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "acd375eb86a81cd856476fca0f52ba6036a067ff"; - hash = "sha256-z/kmi+4dBO/dsVkJA4NgUoxl0pXi8RWIGvI8MGu/gcc="; + rev = "aafd3fc9df431c2625a514fb46626e5614f1d199"; + hash = "sha256-cO5t/mgsbBhbSefx8EMGTyxmgTjhZ8mFujkFQ3p/JS0="; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "8.0.0"; + version = "9.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-rZoFcFEXyYnBFrrprHBJL+AVBQ4bgPsOOP3ktdhjqqM="; + hash = "sha256-qaAz8KNJAomZj0WGgNGVec8HkRcXumWv3my4AHD3qbU="; }; sourceRoot = "apache-arrow-${version}/cpp"; # versions are all taken from - # https://github.com/apache/arrow/blob/apache-arrow-8.0.0/cpp/thirdparty/versions.txt + # https://github.com/apache/arrow/blob/apache-arrow-${version}/cpp/thirdparty/versions.txt + # jemalloc: arrow uses a custom prefix to prevent default allocator symbol + # collisions as well as custom build flags ${if enableJemalloc then "ARROW_JEMALLOC_URL" else null} = fetchurl { - url = "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"; - hash = "sha256-NDMOXOJ2CZ4uiVDZM121qHVomkxqVnUe87HYxTf4h/Y="; + url = "https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2"; + hash = "sha256-LbgtHnEZ3z5xt2QCGbbf6EeJvAU3mDw7esT3GJrs/qo="; }; + # mimalloc: arrow uses custom build flags for mimalloc ARROW_MIMALLOC_URL = fetchFromGitHub { owner = "microsoft"; repo = "mimalloc"; - rev = "v1.7.3"; - hash = "sha256-Ca877VitpWyKmZNHavqgewk/P+tyd2xHDNVqveKh87M="; + rev = "v2.0.6"; + hash = "sha256-u2ITXABBN/dwU+mCIbL3tN1f4c17aBuSdNTV+Adtohc="; }; ARROW_XSIMD_URL = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; - rev = "7d1778c3b38d63db7cec7145d939f40bc5d859d1"; - hash = "sha256-89AysBUVnTdWyMPazeJegnQ6WEH90Ns7qQInZLMSXY4="; + rev = "8.1.0"; + hash = "sha256-Aqs6XJkGjAjGAp0PprabSM4m+32M/UXpSHppCHdzaZk="; }; ARROW_SUBSTRAIT_URL = fetchFromGitHub { owner = "substrait-io"; repo = "substrait"; - rev = "e1b4c04a1b518912f4c4065b16a1b2c0ac8e14cf"; - hash = "sha256-56FSjDngsROSHLjMv+OYAIYqphEu3GzgIMHbgh/ZQw0="; + rev = "v0.6.0"; + hash = "sha256-hxCBomL4Qg9cHLRg9ZiO9k+JVOZXn6f4ikPtK+V9tno="; }; patches = [ @@ -159,7 +161,6 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}" "-DARROW_BUILD_TESTS=ON" @@ -168,7 +169,7 @@ stdenv.mkDerivation rec { "-DARROW_EXTRA_ERROR_CONTEXT=ON" "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" "-DARROW_DEPENDENCY_SOURCE=SYSTEM" - "-DThrift_SOURCE=AUTO" # search for Thrift using pkg-config (ThriftConfig.cmake requires OpenSSL and libevent) + "-Dxsimd_SOURCE=AUTO" "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_COMPUTE=ON" "-DARROW_CSV=ON" @@ -229,6 +230,7 @@ stdenv.mkDerivation rec { ]; in lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}"; + __darwinAllowLocalNetworking = true; installCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio; installCheckPhase = let diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index b133f9867d32..a5a41813bc3e 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -25,13 +25,17 @@ stdenv.mkDerivation rec { }; # Adapted from running a cmake build - passthru.cmake-config = writeTextDir "c-ares-config.cmake" + passthru.cmake-config = let + extension = if stdenv.hostPlatform.isStatic then ".a" else stdenv.hostPlatform.extensions.sharedLibrary; + buildType = if stdenv.hostPlatform.isStatic then "STATIC" else "SHARED"; + buildTypeLower = if stdenv.hostPlatform.isStatic then "static" else "shared"; + in writeTextDir "c-ares-config.cmake" '' set(c-ares_INCLUDE_DIR "${self}/include") set(c-ares_LIBRARY c-ares::cares) - add_library(c-ares::cares SHARED IMPORTED) + add_library(c-ares::cares ${buildType} IMPORTED) set_target_properties(c-ares::cares PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${self}/include" @@ -39,12 +43,12 @@ stdenv.mkDerivation rec { ) set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(c-ares::cares PROPERTIES - IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${stdenv.targetPlatform.extensions.sharedLibrary}" - IMPORTED_SONAME_RELEASE "libcares${stdenv.targetPlatform.extensions.sharedLibrary}" + IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${extension}" + IMPORTED_SONAME_RELEASE "libcares${extension}" ) - add_library(c-ares::cares_shared INTERFACE IMPORTED) - set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") - set(c-ares_SHARED_LIBRARY c-ares::cares_shared) + add_library(c-ares::cares_${buildTypeLower} INTERFACE IMPORTED) + set_target_properties(c-ares::cares_${buildTypeLower} PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") + set(c-ares_${buildType}_LIBRARY c-ares::cares_${buildTypeLower}) ''; }; in self diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/development/libraries/libstrophe/default.nix index e0dfd4b3cc60..49779f825009 100644 --- a/pkgs/development/libraries/libstrophe/default.nix +++ b/pkgs/development/libraries/libstrophe/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libstrophe"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "strophe"; repo = pname; rev = version; - sha256 = "sha256-hNUpHuLwnq66w/VbVAv3QqBFOXDOzd/xPtGGX+j9K2U="; + sha256 = "sha256-jT4VIqqUldCj3Rsb5MC74WXYQyTqOZxzFADf47TBV8c="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/tllist/default.nix b/pkgs/development/libraries/tllist/default.nix index ed957f95776c..e5cdad0aae63 100644 --- a/pkgs/development/libraries/tllist/default.nix +++ b/pkgs/development/libraries/tllist/default.nix @@ -5,16 +5,16 @@ , ninja }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tllist"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "tllist"; - rev = version; - sha256 = "wJEW7haQBtCR2rffKOFyqH3aq0eBr6H8T6gnBs2bNRg="; + rev = finalAttrs.version; + hash = "sha256-4WW0jGavdFO3LX9wtMPzz3Z1APCPgUQOktpmwAM0SQw="; }; nativeBuildInputs = [ meson ninja ]; @@ -38,9 +38,8 @@ stdenv.mkDerivation rec { primitive data types are supported as well as aggregated ones such as structs, enums and unions. ''; - license = licenses.mit; maintainers = with maintainers; [ fionera AndersonTorres ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/ocaml-modules/faraday/async.nix b/pkgs/development/ocaml-modules/faraday/async.nix index 05b085f92aca..9e4a9b24cea9 100644 --- a/pkgs/development/ocaml-modules/faraday/async.nix +++ b/pkgs/development/ocaml-modules/faraday/async.nix @@ -1,15 +1,15 @@ -{ buildDunePackage, fetchpatch, faraday, core, async }: +{ buildDunePackage, lib, fetchpatch, faraday, core, async }: buildDunePackage rec { pname = "faraday-async"; - inherit (faraday) version src useDune2; + inherit (faraday) version src; - patches = fetchpatch { + patches = lib.optional (lib.versionAtLeast async.version "0.15") (fetchpatch { url = "https://github.com/inhabitedtype/faraday/commit/31c3fc7f91ecca0f1deea10b40fd5e33bcd35f75.patch"; sha256 = "05z5gk7hxq7qvwg6f73hdhfcnx19p1dq6wqh8prx667y8zsaq2zj"; - }; + }); - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ faraday core async ]; diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 8a1bec8d2070..604d1f37e2d3 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "1.2.8"; + version = "1.2.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-h3I/BsFnluPnGSHDbkq04oFGJo74QnxY56X3kCokFwQ="; + hash = "sha256-9ejha07hYwB/BZ7hmJHhmLb313ZrTvEXBylswJMlBmU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 19e2cc827b94..508d6670c6d2 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -55,7 +55,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "dill>=0.3.1.1,<0.3.2" "dill" \ - --replace "pyarrow>=0.15.1,<8.0.0" "pyarrow" + --replace "pyarrow>=0.15.1,<8.0.0" "pyarrow" \ + --replace "numpy>=1.14.3,<1.23.0" "numpy" \ + --replace "pymongo>=3.8.0,<4.0.0" "pymongo" ''; sourceRoot = "source/sdks/python"; @@ -90,6 +92,8 @@ buildPythonPackage rec { typing-extensions ]; + enableParallelBuilding = true; + pythonImportsCheck = [ "apache_beam" ]; diff --git a/pkgs/development/python-modules/dask-gateway/default.nix b/pkgs/development/python-modules/dask-gateway/default.nix index 5f2634a17480..f0e5a54c95bf 100644 --- a/pkgs/development/python-modules/dask-gateway/default.nix +++ b/pkgs/development/python-modules/dask-gateway/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , aiohttp , dask , distributed @@ -10,12 +10,17 @@ buildPythonPackage rec { pname = "dask-gateway"; # update dask-gateway lock step with dask-gateway-server version = "2022.6.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-i0OFXjvDg+D4Sdyg6rluP0k6/Ecr+VZn+RiIEQONQX0="; + src = fetchFromGitHub { + owner = "dask"; + repo = "dask-gateway"; + rev = "refs/tags/${version}"; + hash = "sha256-PsagZdEPpeuZH9hFL98xB5z6zOdd4Cx/skGQ0eOYkCA="; }; + sourceRoot = "source/dask-gateway"; + propagatedBuildInputs = [ aiohttp dask @@ -31,6 +36,6 @@ buildPythonPackage rec { description = "A client library for interacting with a dask-gateway server"; homepage = "https://gateway.dask.org/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index 69aad6af3f2e..d8f5913acc63 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-LLKhYLzGUQRx4ciWv1TilYvTOO0sj6rdkPlJLPZ8VXA="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'pyarrow>=3.0.0, <9.0dev' 'pyarrow>=3.0.0, <10.0dev' + ''; + propagatedBuildInputs = [ numpy packaging diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 27db85ab488c..da01f970df32 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace 'pyarrow >= 3.0.0, < 8.0dev' 'pyarrow >= 3.0.0, < 9.0dev' + --replace 'pyarrow >= 3.0.0, < 9.0dev' 'pyarrow >= 3.0.0, < 10.0dev' ''; propagatedBuildInputs = [ @@ -84,6 +84,7 @@ buildPythonPackage rec { "test__initiate_resumable_upload" "test__initiate_resumable_upload_mtls" "test__initiate_resumable_upload_with_retry" + "test_table_clones" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 340907e0ed8f..0acaf7842069 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.6.0"; + version = "13.7.0"; src = fetchFromGitHub { owner = "ocrmypdf"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-EY0dXma6tyXLT8XogS5iFdVgJPrtwB9YVrplhDT4gWw="; + hash = "sha256-cw2wZMPhWzxRpeM90g9NmuYBYpU13R2iDzs7a8SS/CY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ocrmypdf/paths.patch b/pkgs/development/python-modules/ocrmypdf/paths.patch index 9b1eed233cbb..71d96c9a98eb 100644 --- a/pkgs/development/python-modules/ocrmypdf/paths.patch +++ b/pkgs/development/python-modules/ocrmypdf/paths.patch @@ -1,8 +1,8 @@ diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py -index 4da65483..af750249 100644 +index 9e21c33c..21f134b3 100644 --- a/src/ocrmypdf/_exec/ghostscript.py +++ b/src/ocrmypdf/_exec/ghostscript.py -@@ -35,15 +35,7 @@ log = logging.getLogger(__name__) +@@ -32,15 +32,7 @@ log = logging.getLogger(__name__) # Most reliable what to get the bitness of Python interpreter, according to Python docs _IS_64BIT = sys.maxsize > 2**32 @@ -20,10 +20,10 @@ index 4da65483..af750249 100644 def version(): diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py -index 2e8a058b..65a09088 100644 +index 0f8f7392..db792b10 100644 --- a/src/ocrmypdf/_exec/jbig2enc.py +++ b/src/ocrmypdf/_exec/jbig2enc.py -@@ -14,7 +14,7 @@ from ocrmypdf.subprocess import get_version, run +@@ -12,7 +12,7 @@ from ocrmypdf.subprocess import get_version, run def version(): @@ -32,7 +32,7 @@ index 2e8a058b..65a09088 100644 def available(): -@@ -27,7 +27,7 @@ def available(): +@@ -25,7 +25,7 @@ def available(): def convert_group(*, cwd, infiles, out_prefix): args = [ @@ -41,7 +41,7 @@ index 2e8a058b..65a09088 100644 '-b', out_prefix, '-s', # symbol mode (lossy) -@@ -46,7 +46,7 @@ def convert_group_mp(args): +@@ -44,7 +44,7 @@ def convert_group_mp(args): def convert_single(*, cwd, infile, outfile): @@ -51,10 +51,10 @@ index 2e8a058b..65a09088 100644 proc = run(args, cwd=cwd, stdout=fstdout, stderr=PIPE) proc.check_returncode() diff --git a/src/ocrmypdf/_exec/pngquant.py b/src/ocrmypdf/_exec/pngquant.py -index ca8a4542..d0544174 100644 +index 64e91139..ab5b9c49 100644 --- a/src/ocrmypdf/_exec/pngquant.py +++ b/src/ocrmypdf/_exec/pngquant.py -@@ -19,7 +19,7 @@ from ocrmypdf.subprocess import get_version, run +@@ -17,7 +17,7 @@ from ocrmypdf.subprocess import get_version, run def version(): @@ -63,7 +63,7 @@ index ca8a4542..d0544174 100644 def available(): -@@ -46,7 +46,7 @@ def input_as_png(input_file: Path): +@@ -44,7 +44,7 @@ def input_as_png(input_file: Path): def quantize(input_file: Path, output_file: Path, quality_min: int, quality_max: int): with input_as_png(input_file) as input_stream: args = [ @@ -73,10 +73,10 @@ index ca8a4542..d0544174 100644 '--skip-if-larger', '--quality', diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py -index 01177cac..665f1145 100644 +index ad98836a..a12d3002 100644 --- a/src/ocrmypdf/_exec/tesseract.py +++ b/src/ocrmypdf/_exec/tesseract.py -@@ -114,7 +114,7 @@ class TesseractVersion(Version): +@@ -111,7 +111,7 @@ class TesseractVersion(Version): def version() -> str: @@ -84,8 +84,8 @@ index 01177cac..665f1145 100644 + return get_version('@tesseract@', regex=r'tesseract\s(.+)') - def has_user_words(): -@@ -141,7 +141,7 @@ def get_languages(): + def has_user_words() -> bool: +@@ -138,7 +138,7 @@ def get_languages() -> set[str]: msg += output return msg @@ -94,20 +94,20 @@ index 01177cac..665f1145 100644 try: proc = run( args_tess, -@@ -163,7 +163,7 @@ def get_languages(): +@@ -160,7 +160,7 @@ def get_languages() -> set[str]: - def tess_base_args(langs: List[str], engine_mode: Optional[int]) -> List[str]: + def tess_base_args(langs: list[str], engine_mode: int | None) -> list[str]: - args = ['tesseract'] + args = ['@tesseract@'] if langs: args.extend(['-l', '+'.join(langs)]) if engine_mode is not None: diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py -index 479959ef..cc15fdec 100644 +index d7f24265..d14f85de 100644 --- a/src/ocrmypdf/_exec/unpaper.py +++ b/src/ocrmypdf/_exec/unpaper.py -@@ -69,7 +69,7 @@ class UnpaperImageTooLargeError(Exception): +@@ -66,7 +66,7 @@ class UnpaperImageTooLargeError(Exception): def version() -> str: @@ -115,13 +115,13 @@ index 479959ef..cc15fdec 100644 + return get_version('@unpaper@') - SUFFIXES = {'1': '.pbm', 'L': '.pgm', 'RGB': '.ppm'} -@@ -123,7 +123,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[Tuple[Path, Path, Path]]: + SUPPORTED_MODES = {'1', 'L', 'RGB'} +@@ -120,7 +120,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]: def run_unpaper( - input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: List[str] + input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: list[str] ) -> None: - args_unpaper = ['unpaper', '-v', '--dpi', str(round(dpi, 6))] + mode_args + args_unpaper = ['@unpaper@', '-v', '--dpi', str(round(dpi, 6))] + mode_args - with _setup_unpaper_io(input_file) as (input_pnm, output_pnm, tmpdir): + with _setup_unpaper_io(input_file) as (input_png, output_pnm, tmpdir): # To prevent any shenanigans from accepting arbitrary parameters in diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 07b2389039b6..886b1ffb82ae 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "5.3.1"; + version = "5.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-QYSI0oWuDw19EF8pwh3t1+VOY3Xe/AZxL1uARufg/nE="; + hash = "sha256-b4QUn+wfkk6Yx74ViBg6yaE1+bXtxidoyXYgBaJ9iiM="; }; patches = [ diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 53dde0cd0f61..bdd907176f99 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -79,6 +79,8 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; + __darwinAllowLocalNetworking = true; + preBuild = '' export PYARROW_PARALLEL=$NIX_BUILD_CORES ''; @@ -111,8 +113,10 @@ buildPythonPackage rec { preCheck = '' shopt -s extglob - rm -r pyarrow/!(tests) - '' + lib.optionalString stdenv.isDarwin '' + rm -r pyarrow/!(conftest.py|tests) + mv pyarrow/conftest.py pyarrow/tests/parent_conftest.py + substituteInPlace pyarrow/tests/conftest.py --replace ..conftest .parent_conftest + '' + lib.optionalString stdenv.isDarwin '' # OSError: [Errno 24] Too many open files ulimit -n 1024 ''; diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index f6828470fcb2..704d39099d73 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpcui"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XDVt5fml2zYXOcZYXnxxGu4uaUA75DnRlFkbcc6tDag="; + sha256 = "sha256-9rKZFbRJn/Rv/9vznBujEt0bSCvx9eLKADoYc4pXBeY="; }; - vendorSha256 = "sha256-jHNjvh4rpZdQ/RC9gN3KXnuOLkJX8Ow5GV+Qwfyvx1o="; + vendorSha256 = "sha256-DTLguUSFgGOF+okHQdFxL944NA+WPWT1zaeu38p1p0M="; doCheck = false; diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index 40c28a2a1d15..7df4c51f035f 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "grpcurl"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "fullstorydev"; repo = "grpcurl"; rev = "v${version}"; - sha256 = "sha256-dS9r738y0B+p2eoo1NV54OEeRzsj9fOs09NB3HRKmJY="; + sha256 = "sha256-03Uo40kz9CNK3lC91J8smDlviRNQymP95DWmIMwZF/E="; }; subPackages = [ "cmd/grpcurl" ]; - vendorSha256 = "sha256-3f/GcOonE46GjCztjShRsisS/QGPjM4IJelZ8jAiSWU="; + vendorSha256 = "sha256-xe3xb1+qa53Xph+CLcUqxJYeD9d4kBaY6SJfc7bhjQY="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index da4822408310..b2a8d4a5a659 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -581,6 +581,7 @@ mapAliases ({ ### H ### hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 + inherit (harePackages) hare harec; # Added 2022-08-10 hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05 heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bca8e9b3c3d7..6da2a56a64d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2535,9 +2535,13 @@ with pkgs; hime = callPackage ../tools/inputmethods/hime {}; - himitsu = callPackage ../tools/security/himitsu { }; + himitsu = callPackage ../tools/security/himitsu { + inherit (harePackages) hare; + }; - himitsu-firefox = callPackage ../tools/security/himitsu-firefox { }; + himitsu-firefox = callPackage ../tools/security/himitsu-firefox { + inherit (harePackages) hare; + }; hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; @@ -7211,8 +7215,7 @@ with pkgs; llvmPackages = llvmPackages_9; }; - harec = callPackage ../development/compilers/hare/harec.nix { }; - hare = callPackage ../development/compilers/hare/hare.nix { }; + harePackages = recurseIntoAttrs (callPackage ../development/compilers/hare { }); ham = pkgs.perlPackages.ham;