diff options
Diffstat (limited to 'pkgs/development')
35 files changed, 194 insertions, 146 deletions
diff --git a/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch b/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch index 26ecef25649..38fb965b472 100644 --- a/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch +++ b/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch @@ -1,13 +1,13 @@ -diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt -index e1a29b884d17..9d542f8fbfc1 100644 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9bcc135665d0..d38679ed41e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -64,7 +64,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - - set(LLVM_MAIN_INCLUDE_DIR ${MAIN_INCLUDE_DIR} CACHE PATH "Path to llvm/include") - set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") -- set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") +@@ -74,7 +74,7 @@ if(LLD_BUILT_STANDALONE) + + set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") + set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") +- set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") + set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") - + find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index de2dae156ee..b521aaef106 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -2,24 +2,24 @@ , lib , fetchFromGitHub , unstableGitUpdater +, dosbox # Docs cause an immense increase in build time, up to 2 additional hours , withDocs ? false -, dosbox , ghostscript , withGUI ? false }: stdenv.mkDerivation rec { pname = "open-watcom-v2"; - version = "unstable-2022-01-18"; + version = "unstable-2022-02-22"; name = "${pname}-unwrapped-${version}"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "f09e0c969c45679c048180f2dc6b3dbbe69e42a0"; - sha256 = "dEjG4L/VVufSAerKcXPUqZ7esz4m8/210ZshVz4SNAA="; + rev = "9e25b3d6b8066f09b4f7131a31de1cf2af691e9a"; + sha256 = "1w336070kmhc6cmn2aqr8vm0fmw3yza2n0w4asvs2kqxjgmbn6i2"; }; postPatch = '' @@ -41,8 +41,7 @@ stdenv.mkDerivation rec { --replace '-static' "" ''; - nativeBuildInputs = [ ] - ++ lib.optional (withDocs || withGUI) dosbox + nativeBuildInputs = [ dosbox ] ++ lib.optional withDocs ghostscript; configurePhase = '' @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { export OWGUINOBUILD=${if withGUI then "0" else "1"} export OWNOBUILD= export OWDISTRBUILD=0 - export OWDOSBOX=${lib.optionalString (withDocs || withGUI) "${dosbox}/bin/dosbox"} + export OWDOSBOX=${dosbox}/bin/dosbox export OWVERBOSE=0 export OWRELROOT=$out diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 406ff81fe8e..96b677b27b5 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -1,8 +1,7 @@ -{ lib, stdenv -, pantheon -, autoconf -, automake -, libtool +{ stdenv +, lib +, autoreconfHook +, gitUpdater , gnome , which , fetchgit @@ -23,26 +22,24 @@ stdenv.mkDerivation rec { pname = "bamf"; - version = "0.5.5"; + version = "0.5.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchgit { url = "https://git.launchpad.net/~unity-team/bamf"; - rev = "${version}+21.10.20210710-0ubuntu1"; - sha256 = "0iwz5z5cz9r56pmfjvjd2kcjlk416dw6g38svs33ynssjgsqbdm0"; + rev = version; + sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ="; }; nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ lxml ])) # Tests - autoconf - automake + autoreconfHook dbus docbook_xsl gnome.gnome-common gobject-introspection gtk-doc - libtool pkg-config vala which @@ -69,22 +66,23 @@ stdenv.mkDerivation rec { "--enable-headless-tests" ]; - # fix paths + # Fix paths makeFlags = [ "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/" "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; - preConfigure = '' - ./autogen.sh - ''; - # TODO: Requires /etc/machine-id doCheck = false; - # glib-2.62 deprecations + # Ignore deprecation errors NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + passthru.updateScript = gitUpdater { + inherit pname version; + ignoredVersions = ".ubuntu.*"; + }; + meta = with lib; { description = "Application matching framework"; longDescription = '' diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix index 1a8ea5c1ae5..5eb6ceb204e 100644 --- a/pkgs/development/libraries/highfive/default.nix +++ b/pkgs/development/libraries/highfive/default.nix @@ -11,7 +11,7 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { - pname = "highfive"; + pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; version = "2.3.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 71109775722..27af3be4f2d 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -10,11 +10,11 @@ let inherit (hdf5) mpiSupport mpi; in stdenv.mkDerivation rec { - pname = "netcdf"; + pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; version = "4.8.0"; # Remove patch mentioned below on upgrade src = fetchurl { - url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz"; + url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-${version}.tar.gz"; sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7"; }; diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix index 385f2d84f8a..e42ee750cc0 100644 --- a/pkgs/development/libraries/ngt/default.nix +++ b/pkgs/development/libraries/ngt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "NGT"; - version = "v1.12.3-alpha"; + version = "1.12.3-alpha"; src = fetchFromGitHub { owner = "yahoojapan"; diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index baae8ae81b7..6392383c983 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.9"; + version = "3.2.10"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "1vcxxnhsskvnkmk5ial31mvbhs1jwriw8ngyhfslbd30fr9ylw08"; + sha256 = "0v0w98m11r2rqvlrxssnzhqkaxmpbi5s3rkk3csfzhhkpgiv46km"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/development/libraries/rang/default.nix index 79ab52fc835..050beef5ea3 100644 --- a/pkgs/development/libraries/rang/default.nix +++ b/pkgs/development/libraries/rang/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "rang"; - version = "v3.1.0"; + version = "3.1.0"; src = fetchFromGitHub { - "owner" = "agauniyal"; + owner = "agauniyal"; repo = "rang"; - "rev" = "cabe04d6d6b05356fa8f9741704924788f0dd762"; - "sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; + rev = "cabe04d6d6b05356fa8f9741704924788f0dd762"; + sha256 = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; }; nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 5fa77aa8293..604e3a31dde 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { - pname = "sqlite"; + pname = "sqlite${optionalString interactive "-interactive"}"; version = "3.38.0"; # nixpkgs-update: no auto update diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index abc5bd2c5b7..275a95d5208 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -336,7 +336,7 @@ let src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-xLmVyO/L6C4ZdHzHqiJVq3ZfDWSym29x75JcwJx746ps61UcNEg4ozSwN9ud7UjXLntdXe1xDLNOUO1lc7LN5g=="; + sha512 = "sha512-dAld12vtwdz9Rz01nOjmnXe+vHana5PSog8t0XGgLemKsUVsaupYpr74AHaS3s78SaTS5s2HOghnJF+jn91ZrA=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index cae0b10ea69..451fb9e7fa1 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -17,30 +17,21 @@ buildPythonPackage rec { pname = "aioitertools"; - version = "0.8.0"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8b02facfbc9b0f1867739949a223f3d3267ed8663691cc95abd94e2c1d8c2b46"; + hash = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - (fetchpatch { - # Fix TypeError: wait() got an unexpected keyword argument 'loop' - # See https://github.com/omnilib/aioitertools/issues/84 - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/packages/python-aioitertools/trunk/python310.patch"; - sha256 = "sha256-F10sduGaLBcxEoP83N/lGpZIlzkM2JTnQnhHKFwc7P0="; - }) - ]; - nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; @@ -53,7 +44,7 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables."; + description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables"; license = licenses.mit; homepage = "https://pypi.org/project/aioitertools/"; maintainers = with maintainers; [ teh ]; diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index 4a2a2803d3a..0fcf5966d68 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.2"; + version = "1.7.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-bRGt6gIUpDgTiHv+caN3tamVXkyCbI/9NBtJTjqyUmA="; + sha256 = "sha256-WHcsqVG/ESndqKKA01FUfegycgv3tcKfrDEDknmAuKY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 112f12e5f25..a63df0d7d39 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -21,7 +21,7 @@ , visualizationSupport ? false }: buildPythonPackage rec { - pname = "binwalk"; + pname = "binwalk${lib.optionalString visualizationSupport "-full"}"; version = "2.3.3"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix index 01ff36e6379..cc89020e443 100644 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -1,22 +1,23 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, pythonOlder , poetry-core -, aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "garages-amsterdam"; - version = "3.2.1"; + version = "4.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "garages_amsterdam"; rev = "v${version}"; - sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9"; + sha256 = "sha256-3YSCf5sUnq2+Bt7LA30XeIMg4zsaPF3K5SVzGZ68SbY="; }; postPatch = '' @@ -35,7 +36,9 @@ buildPythonPackage rec { # The only test requires network access doCheck = false; - pythonImportsCheck = [ "garages_amsterdam" ]; + pythonImportsCheck = [ + "garages_amsterdam" + ]; meta = with lib; { description = "Python client for getting garage occupancy in Amsterdam"; diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index ab42e8fffbf..e9587d0b765 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "v${version}"; - sha256 = "15kk0zhhja0yqah09wzpg6912zd5bjmk84ab1n5nwryicpg44hqk"; + sha256 = "sha256-XR6TqIrbCR93Qe9cRMgJ0aT/6ZZFj+6Mz+9GhiMD8lM="; }; # Patch path to GLFW shared object diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 741882bdbd3..466b3ae4770 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "5.1.1"; + version = "5.2.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "d9db8c43d552f541ea072d4727d1e955bc2368b095dd86c5429a845c9d8aed8f"; + sha256 = "sha256-JRc6wIFGnPnWIVFMZXbGz0bznIJfF4uMueeDdKY3sL8="; }; propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 51b76fc532b..6bd707a3f6a 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -9,7 +9,10 @@ , ipython , jupyter-client , ipykernel +, packaging +, psutil , tornado +, tqdm , isPy3k , futures ? null }: @@ -25,7 +28,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel tornado + propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel packaging psutil tornado tqdm ] ++ lib.optionals (!isPy3k) [ futures ]; # Requires access to cluster diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index a616a83255b..d5e53654019 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -64,8 +64,15 @@ buildPythonPackage rec { "tests/" ]; - # See https://github.com/google/jax/issues/9705. - disabledTests = lib.optionals usingMKL [ "test_custom_root_with_aux" ]; + # See + # * https://github.com/google/jax/issues/9705 + # * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921 + # * https://github.com/NixOS/nixpkgs/issues/161960 + disabledTests = lib.optionals usingMKL [ + "test_custom_linear_solve_cholesky" + "test_custom_root_with_aux" + "testEigvalsGrad_shape" + ]; pythonImportsCheck = [ "jax" diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index fd7bf7bc09c..faf3b958162 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -1,6 +1,8 @@ -{ buildPythonPackage -, lib +{ lib +, buildPythonPackage , fetchPypi +, psutil +, pythonOlder }: buildPythonPackage rec { @@ -8,15 +10,25 @@ buildPythonPackage rec { version = "1.5.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "e13b148008adeb2793cf8b55bcd20fdcec4f763f2d3bf3c45f5e5e5d1df7d228"; + hash = "sha256-4TsUgAit6yeTz4tVvNIP3OxPdj8tO/PEX15eXR330ig="; }; - meta = { - description = "A library to choose unique available network ports."; + propagatedBuildInputs = [ + psutil + ]; + + pythonImportsCheck = [ + "portpicker" + ]; + + meta = with lib; { + description = "Library to choose unique available network ports"; homepage = "https://github.com/google/python_portpicker"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ danharaj ]; + license = licenses.asl20; + maintainers = with maintainers; [ danharaj ]; }; } diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index aafd60c0dba..d10e20eb0b2 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -1,21 +1,35 @@ -{ lib, fetchPypi, buildPythonPackage -, importlib-metadata, importlib-resources, six, traits +{ lib +, fetchPypi +, buildPythonPackage +, importlib-metadata +, importlib-resources +, traits +, pythonOlder }: buildPythonPackage rec { pname = "pyface"; - version = "7.4.0"; + version = "7.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-r8Awj9dOYPWxh1Ar2JK/nhuY8hAGFO4+6yr9yq7Pb6s="; + sha256 = "sha256-UtzzZ5yj5hCjynxLmQSpbGkWiASNtdflKvjlAZ5HrbY="; }; - propagatedBuildInputs = [ importlib-metadata importlib-resources six traits ]; + propagatedBuildInputs = [ + importlib-metadata + importlib-resources + traits + ]; doCheck = false; # Needs X server - pythonImportsCheck = [ "pyface" ]; + pythonImportsCheck = [ + "pyface" + ]; meta = with lib; { description = "Traits-capable windowing framework"; diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 293d9771280..c5557b3fa6d 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -4,6 +4,7 @@ , pkg-config , python , dbus-python +, packaging , enlightenment }: @@ -11,18 +12,18 @@ buildPythonPackage rec { pname = "python-efl"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r"; + sha256 = "0dj6f24n33hkpy0bkdclnzpxhvs8vpaxqaf7hkw0di19pjwrq25h"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ enlightenment.efl ]; - propagatedBuildInputs = [ dbus-python ]; + propagatedBuildInputs = [ dbus-python packaging ]; preConfigure = '' NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE" @@ -39,8 +40,8 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Python bindings for EFL and Elementary"; - homepage = "https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"; + description = "Python bindings for Enlightenment Foundation Libraries"; + homepage = "https://github.com/DaveMDS/python-efl"; platforms = platforms.linux; license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index d109a6cce74..606b2879908 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "rstcheck"; - version = "v3.3.1"; + version = "3.3.1"; src = fetchFromGitHub { owner = "myint"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "sha256-4AhENuT+LtUMCi+aaI/rKa2gHti8sKGLdVGjdRithXI="; }; diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index f74332e5364..5aac18d2107 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -1,24 +1,40 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , installShellFiles +, pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "xkcdpass"; version = "1.19.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c5a2e948746da6fe504e8404284f457d8e98da6df5047c6bb3f71b18882e9d2a"; + hash = "sha256-xaLpSHRtpv5QToQEKE9FfY6Y2m31BHxrs/cbGIgunSo="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "xkcdpass" + ]; - pythonImportsCheck = [ "xkcdpass" ]; + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/redacted/XKCD-password-generator/issues/138 + "test_entropy_printout_valid_input" + ]; postInstall = '' installManPage *.? @@ -27,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate secure multiword passwords/passphrases, inspired by XKCD"; - homepage = "https://pypi.python.org/pypi/xkcdpass/"; + homepage = "https://github.com/redacted/XKCD-password-generator"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 218c2edd0ac..fdee7ace495 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.20.0"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DvLrytLp28TVFVdkmWg19cC2VRetFcSx7dmsO4HQqVo="; + hash = "sha256-JstIHc61TFQEgRHr54N4Doq6ML0EcIcDGTEJ/tbrC2A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index 1cb2780cc94..f91706b97d1 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zfec"; - version = "1.5.5"; + version = "1.5.7.2"; src = fetchPypi { inherit pname version; - sha256 = "6033b2f3cc3edacf3f7eeed5f258c1ebf8a1d7e5e35b623db352512ce564e5ca"; + sha256 = "sha256-TuUZvg3MfaLohIK8/Av5d6Ql4dfoJ4z1u7uNAPiir7Y="; }; propagatedBuildInputs = [ pyutil ]; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 1bef8cd0758..d5d393ee96e 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.6.2"; + version = "5.6.4"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-R53S2+v0qCY5Q7Uf2gQ4veaOzYN2iE6F00+ERvknD2g="; + sha256 = "sha256-rqGlp9fHTF1z8A+DROYfzHXi5xfLMdUWzssGN5uHQmE="; }; preBuild = '' diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 67433ab5d88..972d3199aa3 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.287.1"; + version = "2.288.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-4SPrtX3j8blWTYnSkD2Z7IecZvI4xdAqHRJ1lBM0aAo="; + hash = "sha256-vl8p+isoK+yczmsMO2YjnmJQW/k0jLgCUbhQa/wG650="; }; nativeBuildInputs = [ @@ -184,6 +184,11 @@ stdenv.mkDerivation rec { "EnsureDotnetsdkPowershellDownloadScriptUpToDate" ] ++ [ "GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" ] + # Tests for trimmed runner packages which aim at reducing the update size. Not relevant for Nix. + ++ map (x: "GitHub.Runner.Common.Tests.PackagesTrimL0.${x}") [ + "RunnerLayoutParts_CheckExternalsHash" + "RunnerLayoutParts_CheckDotnetRuntimeHash" + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index eee49d1c6fc..48456166b92 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-pP5gNWRucr2rJqBPBt4Y/akf7tABFWhmr3EWC3/kj+g="; + sha256 = "sha256-0m0RjIasEGB9QxZc7wKCMLnxHXkSlvCDA2QWa87mRRs="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-F105SOFWEhFVGMmPOEdBZwhNHCYkRh1HI7fESzL2uQw="; + cargoSha256 = "sha256-KNQa+wLLl4abz48QKYkWu7A+FTGIyB+1EWAnLuWpJwc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index bc77416896d..050b971af94 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-Q5ROUXOeqZfIZdrYwP3uaCy+Nh1FggJRUaNF0mMN7d4="; + sha256 = "sha256-ssc6djhSk0xV4jdlTmehWX6UMBPAuebtYlzWRZ/32mM="; }; - cargoSha256 = "sha256-sCijb9/Of38IebulGmdqSewBRrOCH4RzFopFC0cOPrI="; + cargoSha256 = "sha256-ynYK37nCfIiy1CHBEQ/vMHOAPY/pp/lF/tSl9MJD7fY="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/misc/qtspim/default.nix b/pkgs/development/tools/misc/qtspim/default.nix index 842cf0eb5b4..7329ad50967 100644 --- a/pkgs/development/tools/misc/qtspim/default.nix +++ b/pkgs/development/tools/misc/qtspim/default.nix @@ -1,23 +1,17 @@ { lib, stdenv, fetchsvn, wrapQtAppsHook, qtbase, qttools, qmake, bison, flex, ... }: stdenv.mkDerivation rec { pname = "qtspim"; - version = "9.1.22"; + version = "9.1.23"; src = fetchsvn { url = "https://svn.code.sf.net/p/spimsimulator/code/"; - rev = "r739"; - sha256 = "1kazfgrbmi4xq7nrkmnqw1280rhdyc1hmr82flrsa3g1b1rlmj1s"; + rev = "r749"; + sha256 = "0iazl7mlcilrdbw8gb98v868a8ldw2lmkn1xs8hnfvr93l6aj0rp"; }; postPatch = '' cd QtSpim - # Patches from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=qtspim - sed -i 's/zero_imm/is_zero_imm/g' parser_yacc.cpp - sed -i 's/^int data_dir/bool data_dir/g' parser_yacc.cpp - sed -i 's/^int text_dir/bool text_dir/g' parser_yacc.cpp - sed -i 's/^int parse_error_occurred/bool parse_error_occurred/g' parser_yacc.cpp - substituteInPlace QtSpim.pro --replace /usr/lib/qtspim/lib $out/lib substituteInPlace menu.cpp \ --replace /usr/lib/qtspim/bin/assistant ${qttools.dev}/bin/assistant \ diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 723e5d8bb2d..173ff4770da 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -3,12 +3,12 @@ buildGoPackage rec { pname = "packet"; - version = "v2.2.2"; + version = "2.2.2"; goPackagePath = "github.com/ebsarr/packet"; src = fetchgit { - rev = version; + rev = "v${version}"; url = "https://github.com/ebsarr/packet"; sha256 = "18n8f2rlab4icb28k1b9gnh30zy382v792x07fmcdqq4nkw6wvwf"; }; diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index 3ae31bbadb9..77928a1f22a 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/pkgs/development/tools/scenebuilder/default.nix @@ -64,11 +64,11 @@ let ''; desktopItem = makeDesktopItem { - name = "Scene Builder"; + name = "scenebuilder"; exec = "scenebuilder"; icon = "scenebuilder"; comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - desktopName = pname; + desktopName = "Scene Builder"; mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; categories = [ "Development" ]; }; diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 8d8b1a004d5..9ee452b26f9 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, fetchurl, writeText, php, makeWrapper }: +{ stdenv +, lib +, fetchurl +, formats +, installShellFiles +, makeWrapper +, php +}: + let - version = "2.5.0"; + version = "2.6.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; - sha256 = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; + hash = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; }; - ini = writeText "php.ini" '' - [PHP] - memory_limit = -1 ; no limit as composer uses a lot of memory + ini = (formats.ini { }).generate "php.ini" { + PHP.memory_limit = -1; # no limit as composer uses a lot of memory + Phar."phar.readonly" = "Off"; + }; - [Phar] - phar.readonly = Off - ''; in stdenv.mkDerivation rec { pname = "wp-cli"; @@ -21,19 +27,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - sha256 = "sha256-vghT6fRD84SFZgcIcdNE6K2B6x4V0V3PkyS0p14nJ4k="; + hash = "sha256-0WZSjKtgvIIpwGcp5wc4OPu6aNaytXRQTLAniDXIeIg="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildCommand = '' dir=$out/share/wp-cli - mkdir -p $out/bin $dir - install -Dm444 ${src} $dir/wp-cli install -Dm444 ${ini} $dir/php.ini - install -Dm444 ${completion} $out/share/bash-completion/completions/wp + installShellCompletion --bash --name wp ${completion} + mkdir -p $out/bin makeWrapper ${lib.getBin php}/bin/php $out/bin/wp \ --add-flags "-c $dir/php.ini" \ --add-flags "-f $dir/wp-cli" diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 483523e1807..bfe18fc4758 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.20.2"; + version = "4.21.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-vhHT9re35aT+TUYhl4rxv4PE/sd7Vp1PoFbS8s5lWLE="; + sha256 = "sha256-283xe7FVHYSsRl4cZD7WDzIW1gqNAFsNrWYJkthZheU="; }; - vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE="; + vendorSha256 = "sha256-F11FnDYJ59aKrdRXDPpKlhX52yQXdaN1sblSkVI2j9w="; doCheck = false; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 2ab433d79b6..7de71132d6a 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.300"; + version = "0.0.301"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-hwFnS8GLqGS28AdBgpIn2gRCKgJQSALDVLh5QdObV6g="; + sha256 = "sha256-UwouKnUfEcYpwtLXxwe93mHzVvj/+72FSQ0OW55oztE="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-o5c3wbETEwnQ7IH8YM0xHSCXTnWTvZ5kvqRqoA3QkGc="; + vendorSha256 = "sha256-VKX/Wt7CQy3w4Zv51M/IF1RIPpn7nTCL1T6jJ+oxti4="; doCheck = false; |