diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 9ad7c3e422d8..8d9c09561ddb 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -37,6 +37,10 @@ rec { config = "armv6l-unknown-linux-gnueabihf"; } // platforms.raspberrypi; + bluefield2 = { + config = "aarch64-unknown-linux-gnu"; + } // platforms.bluefield2; + remarkable1 = { config = "armv7l-unknown-linux-gnueabihf"; } // platforms.zero-gravitas; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index d574943e47df..0b6a9f3891da 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -209,6 +209,14 @@ rec { # Legacy attribute, for compatibility with existing configs only. raspberrypi2 = armv7l-hf-multiplatform; + # Nvidia Bluefield 2 (w. crypto support) + bluefield2 = { + gcc = { + arch = "armv8-a+fp+simd+crc+crypto"; + cpu = "cortex-a72"; + }; + }; + zero-gravitas = { linux-kernel = { name = "zero-gravitas"; diff --git a/nixos/modules/services/networking/cgit.nix b/nixos/modules/services/networking/cgit.nix index 672b0b030eee..7d1f12fa9146 100644 --- a/nixos/modules/services/networking/cgit.nix +++ b/nixos/modules/services/networking/cgit.nix @@ -14,7 +14,9 @@ let # taken from https://github.com/python/cpython/blob/05cb728d68a278d11466f9a6c8258d914135c96c/Lib/re.py#L251-L266 special = [ "(" ")" "[" "]" "{" "}" "?" "*" "+" "-" "|" "^" "$" "\\" "." "&" "~" - "#" " " "\t" "\n" "\r" "\v" "\f" + "#" " " "\t" "\n" "\r" + " " # \v / 0x0B + " " # \f / 0x0C ]; in replaceStrings special (map (c: "\\${c}") special); diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix index 570b439f4a1e..63ff7eee2ea6 100644 --- a/pkgs/applications/emulators/fs-uae/launcher.nix +++ b/pkgs/applications/emulators/fs-uae/launcher.nix @@ -34,8 +34,11 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' wrapQtApp "$out/bin/fs-uae-launcher" \ - --set PYTHONPATH "$PYTHONPATH" \ - --prefix PATH : ${lib.makeBinPath [ fsuae ]} + --set PYTHONPATH "$PYTHONPATH" + + # fs-uae-launcher search side by side for fs-uae + # see $src/fsgs/plugins/pluginexecutablefinder.py#find_executable + ln -s ${fsuae}/bin/fs-uae $out/bin ''; meta = { diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index cfda9e4e88e3..b313ab2fa1a2 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.1.8"; + version = "3.1.9"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wwK8JI/IP89aRmetUXE+RlrqU8bpfIkzMZ9nF7qFe1Q="; + hash = "sha256-FSXUqnES/YxONwLza4N2C4Ks02OOfRaXHbdBxr85sFg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index d56f5809f30b..5f7d0b5ab3e8 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl, wrapGAppsHook, makeWrapper -, dpkg , alsa-lib , at-spi2-atk , at-spi2-core @@ -7,6 +6,7 @@ , cairo , cups , dbus +, dpkg , expat , fontconfig , freetype @@ -15,32 +15,33 @@ , gnome , gsettings-desktop-schemas , gtk3 -, libuuid -, libdrm , libX11 +, libXScrnSaver , libXcomposite , libXcursor , libXdamage , libXext , libXfixes , libXi -, libxkbcommon , libXrandr , libXrender -, libXScrnSaver -, libxshmfence , libXtst +, libdrm +, libkrb5 +, libuuid +, libxkbcommon +, libxshmfence , mesa , nspr , nss , pango , pipewire +, snappy , udev , wayland +, xdg-utils , xorg , zlib -, xdg-utils -, snappy # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -73,7 +74,7 @@ let libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libxshmfence libXtst libuuid mesa nspr nss pango pipewire udev wayland - xorg.libxcb zlib snappy + xorg.libxcb zlib snappy libkrb5 ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva; diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix index e1909a15e059..8e4630b48e76 100644 --- a/pkgs/development/interpreters/perl/wrapper.nix +++ b/pkgs/development/interpreters/perl/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, perl, buildEnv, makeWrapper +{ lib, perl, buildEnv, makeBinaryWrapper , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" @@ -17,7 +17,7 @@ let inherit ignoreCollisions; extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; # we create wrapper for the binaries in the different packages postBuild = '' diff --git a/pkgs/development/python-modules/cliff/tests.nix b/pkgs/development/python-modules/cliff/tests.nix index 56a29a6ef6ab..a2738cc590e8 100644 --- a/pkgs/development/python-modules/cliff/tests.nix +++ b/pkgs/development/python-modules/cliff/tests.nix @@ -5,11 +5,10 @@ , testscenarios }: -buildPythonPackage rec { +buildPythonPackage { pname = "cliff"; - inherit (cliff) version; - - src = cliff.src; + inherit (cliff) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/pkgs/development/python-modules/debtcollector/tests.nix b/pkgs/development/python-modules/debtcollector/tests.nix index 5c10dc90904d..19386cdb53b8 100644 --- a/pkgs/development/python-modules/debtcollector/tests.nix +++ b/pkgs/development/python-modules/debtcollector/tests.nix @@ -3,11 +3,10 @@ , stestr }: -buildPythonPackage rec { +buildPythonPackage { pname = "debtcollector-tests"; - inherit (debtcollector) version; - - src = debtcollector.src; + inherit (debtcollector) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/pkgs/development/python-modules/dm-haiku/tests.nix b/pkgs/development/python-modules/dm-haiku/tests.nix index 208fb14e76be..dec909729dcf 100644 --- a/pkgs/development/python-modules/dm-haiku/tests.nix +++ b/pkgs/development/python-modules/dm-haiku/tests.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , dm-haiku , chex , cloudpickle @@ -16,9 +15,10 @@ , rlax , distrax , tensorflow-probability -, optax }: +, optax +}: -buildPythonPackage rec { +buildPythonPackage { pname = "dm-haiku-tests"; inherit (dm-haiku) version; diff --git a/pkgs/development/python-modules/flit-core/tests.nix b/pkgs/development/python-modules/flit-core/tests.nix index dd05212407bc..49d6ac89fce6 100644 --- a/pkgs/development/python-modules/flit-core/tests.nix +++ b/pkgs/development/python-modules/flit-core/tests.nix @@ -5,7 +5,7 @@ , testpath }: -buildPythonPackage rec { +buildPythonPackage { pname = "flit-core"; inherit (flit-core) version; diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix index 49208b30fe37..edbb13912ad9 100644 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -10,11 +10,10 @@ }: -buildPythonPackage rec { +buildPythonPackage { pname = "ipykernel-tests"; - inherit (ipykernel) version; - - src = ipykernel.src; + inherit (ipykernel) version src; + format = "other"; dontBuild = true; dontInstall = true; diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix index aa96ed5ae843..148f76d03529 100644 --- a/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/pkgs/development/python-modules/openstacksdk/tests.nix @@ -15,11 +15,9 @@ buildPythonPackage { pname = "openstacksdk-tests"; - inherit (openstacksdk) version; + inherit (openstacksdk) version src; format = "other"; - src = openstacksdk.src; - dontBuild = true; dontInstall = true; diff --git a/pkgs/development/python-modules/optax/tests.nix b/pkgs/development/python-modules/optax/tests.nix index 59fed40bdf08..1ab548f2f399 100644 --- a/pkgs/development/python-modules/optax/tests.nix +++ b/pkgs/development/python-modules/optax/tests.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , dm-haiku , pytest-xdist , pytestCheckHook @@ -9,7 +8,7 @@ , optax }: -buildPythonPackage rec { +buildPythonPackage { pname = "optax-tests"; inherit (optax) version; @@ -31,5 +30,4 @@ buildPythonPackage rec { # See https://github.com/deepmind/optax/issues/323 "examples/lookahead_mnist_test.py" ]; - } diff --git a/pkgs/development/python-modules/os-service-types/tests.nix b/pkgs/development/python-modules/os-service-types/tests.nix index 5958d824d58d..a0996765cb6b 100644 --- a/pkgs/development/python-modules/os-service-types/tests.nix +++ b/pkgs/development/python-modules/os-service-types/tests.nix @@ -7,11 +7,10 @@ , testscenarios }: -buildPythonPackage rec { +buildPythonPackage { pname = "os-service-types-tests"; - inherit (os-service-types) version; - - src = os-service-types.src; + inherit (os-service-types) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/pkgs/development/python-modules/oslo-config/tests.nix b/pkgs/development/python-modules/oslo-config/tests.nix index b2a730928b8f..0540760e57a0 100644 --- a/pkgs/development/python-modules/oslo-config/tests.nix +++ b/pkgs/development/python-modules/oslo-config/tests.nix @@ -9,11 +9,10 @@ , testscenarios }: -buildPythonPackage rec { - pname = "oslo-config-tests"; - inherit (oslo-config) version; - - src = oslo-config.src; +buildPythonPackage { +pname = "oslo-config-tests"; + inherit (oslo-config) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/pkgs/development/python-modules/oslotest/tests.nix b/pkgs/development/python-modules/oslotest/tests.nix index fb18e64bb9d9..f80073e1c1bd 100644 --- a/pkgs/development/python-modules/oslotest/tests.nix +++ b/pkgs/development/python-modules/oslotest/tests.nix @@ -4,11 +4,10 @@ , stestr }: -buildPythonPackage rec { +buildPythonPackage { pname = "oslotest-tests"; - inherit (oslotest) version; - - src = oslotest.src; + inherit (oslotest) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix index 47be8ef19f07..05266a0eb7df 100644 --- a/pkgs/development/python-modules/pbr/tests.nix +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -10,11 +10,10 @@ , virtualenv }: -buildPythonPackage rec { +buildPythonPackage { pname = "pbr"; - inherit (pbr) version; - - src = pbr.src; + inherit (pbr) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/pkgs/development/python-modules/pyre-extensions/default.nix b/pkgs/development/python-modules/pyre-extensions/default.nix new file mode 100644 index 000000000000..dd9868d2078d --- /dev/null +++ b/pkgs/development/python-modules/pyre-extensions/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +# build inputs +, typing-extensions +, typing-inspect +}: +let + pname = "pyre-extensions"; + version = "0.0.30"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disable = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-unkjxIbgia+zehBiOo9K6C1zz/QkJtcRxIrwcOW8MbI="; + }; + + propagatedBuildInputs = [ + typing-extensions + typing-inspect + ]; + + pythonImportsCheck = [ "pyre_extensions" ]; + + meta = with lib; { + description = "This module defines extensions to the standard “typing” module that are supported by the Pyre typechecker"; + homepage = "https://pypi.org/project/pyre-extensions"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-asyncio/tests.nix b/pkgs/development/python-modules/pytest-asyncio/tests.nix index 6a471513112a..94e6e1855afb 100644 --- a/pkgs/development/python-modules/pytest-asyncio/tests.nix +++ b/pkgs/development/python-modules/pytest-asyncio/tests.nix @@ -6,7 +6,7 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytest-asyncio-tests"; inherit (pytest-asyncio) version; diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 88a11a121960..de841e5f1fe2 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-iKBbR4h9J9OiQMHjUHxUVk+NbCRUYmIPtWxRwVVGQtY="; + hash = "sha256-voeJkwe/7nta2B19+Y5d27XTkhQ/nbWt6MXOicYQZnU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-manilaclient/tests.nix b/pkgs/development/python-modules/python-manilaclient/tests.nix index 37357d779b16..d1ceb5ed7431 100644 --- a/pkgs/development/python-modules/python-manilaclient/tests.nix +++ b/pkgs/development/python-modules/python-manilaclient/tests.nix @@ -7,11 +7,10 @@ , python-openstackclient }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-manilaclient-tests"; - inherit (python-manilaclient) version; - - src = python-manilaclient.src; + inherit (python-manilaclient) version src; + format = "other"; dontBuild = true; dontInstall = true; diff --git a/pkgs/development/python-modules/semaphore-bot/default.nix b/pkgs/development/python-modules/semaphore-bot/default.nix new file mode 100644 index 000000000000..7725b48adac4 --- /dev/null +++ b/pkgs/development/python-modules/semaphore-bot/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, attrs +, anyio +}: + +buildPythonPackage rec { + pname = "semaphore-bot"; + version = "0.16.0"; + format = "setuptools"; + + src = fetchPypi { + inherit version pname; + hash = "sha256-EOUvzW4a8CgyQSxb2fXnIWfOYs5Xe0v794vDIruSHmI="; + }; + + postPatch = '' + substituteInPlace setup.py --replace "anyio>=3.5.0,<=3.6.2" "anyio" + ''; + + propagatedBuildInputs = [ + anyio + attrs + python-dateutil + ]; + + # Upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "semaphore" ]; + + meta = with lib; { + description = "Simple rule-based bot library for Signal Private Messenger"; + homepage = "https://github.com/lwesterhof/semaphore"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/setuptools-scm/tests.nix b/pkgs/development/python-modules/setuptools-scm/tests.nix index 9bbdb1c6946c..b679a0f5ca4c 100644 --- a/pkgs/development/python-modules/setuptools-scm/tests.nix +++ b/pkgs/development/python-modules/setuptools-scm/tests.nix @@ -7,13 +7,11 @@ , virtualenv }: -buildPythonPackage rec { +buildPythonPackage { pname = "setuptools-scm-tests"; - inherit (setuptools-scm) version; + inherit (setuptools-scm) version src; format = "other"; - src = setuptools-scm.src; - dontBuild = true; dontInstall = true; diff --git a/pkgs/development/python-modules/stestr/tests.nix b/pkgs/development/python-modules/stestr/tests.nix index b66310f2dc63..f4964fa8f66e 100644 --- a/pkgs/development/python-modules/stestr/tests.nix +++ b/pkgs/development/python-modules/stestr/tests.nix @@ -2,11 +2,10 @@ , stestr }: -buildPythonPackage rec { +buildPythonPackage { pname = "stestr-tests"; - inherit (stestr) version; - - src = stestr.src; + inherit (stestr) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix index cb8e479377a8..4ada58e1d992 100644 --- a/pkgs/development/python-modules/uvicorn/tests.nix +++ b/pkgs/development/python-modules/uvicorn/tests.nix @@ -12,10 +12,9 @@ , wsproto }: -buildPythonPackage rec { +buildPythonPackage { pname = "uvicorn-tests"; inherit (uvicorn) version; - format = "other"; src = uvicorn.testsout; diff --git a/pkgs/development/python-modules/wasmer/tests.nix b/pkgs/development/python-modules/wasmer/tests.nix index 523d06a401ad..e46c9f7ac670 100644 --- a/pkgs/development/python-modules/wasmer/tests.nix +++ b/pkgs/development/python-modules/wasmer/tests.nix @@ -6,7 +6,7 @@ , wasmer-compiler-singlepass }: -buildPythonPackage rec { +buildPythonPackage { pname = "wasmer-tests"; inherit (wasmer) version; diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix new file mode 100644 index 000000000000..cd6c6aa0ebdb --- /dev/null +++ b/pkgs/development/python-modules/xformers/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pythonRelaxDepsHook +, which +# runtime dependencies +, numpy +, torch +, pyre-extensions +# check dependencies +, pytestCheckHook +, pytest-cov +# , pytest-mpi +, pytest-timeout +# , pytorch-image-models +, hydra-core +, fairscale +, scipy +, cmake +, openai-triton +, networkx +}: +let + version = "0.0.20"; +in +buildPythonPackage { + pname = "xformers"; + inherit version; + format = "setuptools"; + + disable = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "xformers"; + rev = "v${version}"; + hash = "sha256-OFH4I3eTKw1bQEKHh1AvkpcoShKK5R5674AoJ/mY85I="; + fetchSubmodules = true; + }; + + preBuild = '' + cat << EOF > ./xformers/version.py + # noqa: C801 + __version__ = "${version}" + EOF + ''; + + nativeBuildInputs = [ + pythonRelaxDepsHook + which + ]; + + pythonRelaxDeps = [ + "pyre-extensions" + ]; + + propagatedBuildInputs = [ + numpy + torch + pyre-extensions + ]; + + pythonImportsCheck = [ "xformers" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + pytest-timeout + hydra-core + fairscale + scipy + cmake + networkx + openai-triton + ]; + + meta = with lib; { + description = "XFormers: A collection of composable Transformer building blocks"; + homepage = "https://github.com/facebookresearch/xformers"; + changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3aa53619666d..174f2e0eae81 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.401.1"; + version = "2.401.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-YAtz6r95eFLjmRlUG4T3aG/2Abl8d7ROsAhD65HH3Ww="; + hash = "sha256-hr2OCytRB1yZsA1DYDwoWEQL8BHs0Imlx5HQyWTUBoI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 72a85fb5b4a8..7c35fb29a942 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.6.13"; + version = "0.6.14"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "6d4pDuAJCgUIFpmp8gGLn2rHvpQ54I6vCXU2WmIYe0M="; + sha256 = "adXsZjg2dmUzaKTBARfS195y3eTUgiOep5pr6y36c6g="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "Hr3c0840fz47jDNjigTsz7HEUSP6btXVDFUUtDtdO5I="; + sha256 = "IHGYARyeRHN3vORW/fBX7+j3vpfQX+ZQWX2TcIOrMHc="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "H7pjr6ySoxYOGrOpLjzMb/b3BiG50XSmMi6atQooRN4="; + sha256 = "uESJFXTVXpK2HPUszU0l5Jgnvz28toBP/0DgVFvqYGY="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "f3VysZdTfs4G4a48AahbaEACVpiKPG7OfbAYTCGHi1k="; + sha256 = "5iU+1FevTjjzo/qN0zjIoCQflbWCmdfMXkx+6BOEEcc="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 9f09e1b74aac..51bc4396c6e4 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.3.2"; + version = "5.3.3"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-UdRtrQiHbBc8VoVUulDCZmAfZ1YTVdgNfeF91HomSqc="; + sha256 = "sha256-uNp6jQAlSOQlZ26PBYofBWANhKEnkYN+PTOSy8bQQ/o="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 9da25e22eaa9..62757b5457e3 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-6rjcoruv+egIDL3kZPIVEMpigDV1j5jjRer3bDvCjjU="; + sha256 = "sha256-nAcwH4RVvRPZfPnXyPDOO5GFpUxIBmJzl3QH+5G6jcY="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-lYf3ARw2TX9dfX2z8W3OY7h+AqocfSdYcGgjvf8h5Bc="; + vendorHash = "sha256-ODOAxH73AflCp9tLeYMU46bqr3MAS1casuGAFWuLYjA="; proxyVendor = true; doCheck = false; diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index beb64df19577..a5144fe2cef6 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -110,4 +110,14 @@ let in { gcc = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = false;})) tests); llvm = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = true;})) tests); + + # see https://github.com/NixOS/nixpkgs/issues/213453 + # this is a good test of a lot of tricky glibc/libgcc corner cases + mbuffer = let + mbuffer = pkgs.pkgsCross.aarch64-multiplatform.mbuffer; + emulator = with lib.systems; (elaborate examples.aarch64-multiplatform).emulator pkgs; + in + pkgs.runCommand "test-mbuffer" {} '' + echo hello | ${emulator} ${mbuffer}/bin/mbuffer + ''; } diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index 5ca592aa4565..abb8f695ebcc 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -1,39 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, fuse }: +{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, gitUpdater }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "9pfs"; - version = "unstable-2015-09-18"; + version = "0.3"; src = fetchFromGitHub { - owner = "mischief"; + owner = "ftrvxmtrx"; repo = "9pfs"; - rev = "7f4ca4cd750d650c1215b92ac3cc2a28041960e4"; - sha256 = "007s2idsn6bspmfxv1qabj39ggkgvn6gwdbhczwn04lb4c6gh3xc"; + rev = version; + sha256 = "sha256-ywWG/H2ilt36mjlDSgIzYpardCFXpmbLiml6wy47XuA="; }; - # Upstream development has stopped and is no longer accepting patches - # https://github.com/mischief/9pfs/pull/3 - patches = [ ./fix-darwin-build.patch ]; - - preConfigure = - '' - substituteInPlace Makefile --replace '-g bin' "" - installFlagsArray+=(BIN=$out/bin MAN=$out/share/man/man1) - mkdir -p $out/bin $out/share/man/man1 - ''; - + makeFlags = [ "BIN=$(out)/bin" "MAN=$(out)/share/man/man1" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: lib/auth_rpc.o:/build/source/lib/../9pfs.h:35: multiple definition of - # `logfile'; 9pfs.o:/build/source/9pfs.h:35: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - enableParallelBuilding = true; + passthru.updateScript = gitUpdater { }; + meta = { - homepage = "https://github.com/mischief/9pfs"; + homepage = "https://github.com/ftrvxmtrx/9pfs"; description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/filesystems/9pfs/fix-darwin-build.patch b/pkgs/tools/filesystems/9pfs/fix-darwin-build.patch deleted file mode 100644 index a565248f19d5..000000000000 --- a/pkgs/tools/filesystems/9pfs/fix-darwin-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6b7863b51c97f8ecd9a93fc4347f8938f9b5c05f Mon Sep 17 00:00:00 2001 -From: midchildan -Date: Tue, 30 Mar 2021 22:21:51 +0900 -Subject: [PATCH] build: fix build for macOS - ---- - 9pfs.c | 4 ++-- - libc.h | 4 ++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/9pfs.c b/9pfs.c -index 2c481bd..f5c487c 100644 ---- a/9pfs.c -+++ b/9pfs.c -@@ -30,7 +30,7 @@ - enum - { - CACHECTLSIZE = 8, /* sizeof("cleared\n") - 1 */ -- MSIZE = 8192 -+ MSIZE_9P = 8192 - }; - - void dir2stat(struct stat*, Dir*); -@@ -505,7 +505,7 @@ main(int argc, char *argv[]) - freeaddrinfo(ainfo); - - init9p(); -- msize = _9pversion(MSIZE); -+ msize = _9pversion(MSIZE_9P); - if(doauth){ - authfid = _9pauth(AUTHFID, user, NULL); - ai = auth_proxy(authfid, auth_getkey, "proto=p9any role=client"); -diff --git a/libc.h b/libc.h -index 099adba..aac03c5 100644 ---- a/libc.h -+++ b/libc.h -@@ -61,6 +61,10 @@ typedef unsigned char uchar; - typedef unsigned long long uvlong; - typedef long long vlong; - -+#ifndef __GLIBC__ -+typedef unsigned long ulong; -+#endif -+ - typedef - struct Qid - { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a94ab6135041..52f5d9859b4e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7961,6 +7961,8 @@ self: super: with self; { pyrdfa3 = callPackage ../development/python-modules/pyrdfa3 { }; + pyre-extensions = callPackage ../development/python-modules/pyre-extensions { }; + pyrevolve = callPackage ../development/python-modules/pyrevolve { }; pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; @@ -11287,6 +11289,8 @@ self: super: with self; { semantic-version = callPackage ../development/python-modules/semantic-version { }; + semaphore-bot = callPackage ../development/python-modules/semaphore-bot { }; + semver = callPackage ../development/python-modules/semver { }; send2trash = callPackage ../development/python-modules/send2trash { }; @@ -13483,6 +13487,8 @@ self: super: with self; { inherit (pkgs) graphviz; }; + xformers = callPackage ../development/python-modules/xformers { }; + xgboost = callPackage ../development/python-modules/xgboost { inherit (pkgs) xgboost; };