diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-28 00:02:41 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-28 00:02:41 +0000 |
commit | ad369759ced7138a3f9237023127816ada303357 (patch) | |
tree | 9c324c7245343ba2bd28b68611b412a76f01722a /pkgs/development | |
parent | 000714440790bc7681f32f01aee24171eac711ae (diff) | |
parent | 439979770648799a08e59ae1f3c8083043955468 (diff) | |
download | nixlib-ad369759ced7138a3f9237023127816ada303357.tar nixlib-ad369759ced7138a3f9237023127816ada303357.tar.gz nixlib-ad369759ced7138a3f9237023127816ada303357.tar.bz2 nixlib-ad369759ced7138a3f9237023127816ada303357.tar.lz nixlib-ad369759ced7138a3f9237023127816ada303357.tar.xz nixlib-ad369759ced7138a3f9237023127816ada303357.tar.zst nixlib-ad369759ced7138a3f9237023127816ada303357.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development')
35 files changed, 257 insertions, 209 deletions
diff --git a/pkgs/development/compilers/otus-lisp/default.nix b/pkgs/development/compilers/otus-lisp/default.nix deleted file mode 100644 index 5338734e6c6d..000000000000 --- a/pkgs/development/compilers/otus-lisp/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, xxd }: - -stdenv.mkDerivation rec { - pname = "otus-lisp"; - version = "2.4"; - - src = fetchFromGitHub { - owner = "yuriy-chumak"; - repo = "ol"; - rev = version; - sha256 = "sha256-+6qH1BhvMkuG2rUOfo9qMjMjhCib9KONQTBWS27c3Ts="; - }; - - nativeBuildInputs = [ xxd ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = { - description = "A purely functional dialect of Lisp"; - homepage = "https://yuriy-chumak.github.io/ol/"; - license = with lib.licenses; [ mit lgpl3Only ]; # dual licensed - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ nagy ]; - }; -} diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 9b9c21f86b6f..a7b53bb8d465 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "mujs"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { url = "https://mujs.com/downloads/mujs-${version}.tar.gz"; - hash = "sha256-4sXuVBbf2iIwx6DLeJXfmpstWyBluxjn5k3sKnlqvhs="; + hash = "sha256-wBVHWID2o4LnBhaclDcafdbMIgeIMvbghlr4KJwu9Cs="; }; buildInputs = [ readline ]; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index bb2ff11be3d8..b4cd3ca75ee1 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec{ pname = "gloox"; - version = "1.0.27"; + version = "1.0.28"; src = fetchurl { url = "https://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "sha256-C4tzcUObxY2eUThLYWyWSxi3tBuHrxt4VRBDgO2ob/s="; + sha256 = "sha256-WRvRLCSe3gtQoe9rmawN6O+cG6T9Lhhvl6dAIVzFlmw="; }; # needed since gcc12 diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index f3be75f0dcbe..fe9442b7d80d 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { pname = "hiredis"; version = "1.2.0"; + nativeBuildInputs = [openssl]; src = fetchFromGitHub { owner = "redis"; @@ -12,6 +13,7 @@ stdenv.mkDerivation rec { }; PREFIX = "\${out}"; + USE_SSL = 1; meta = with lib; { homepage = "https://github.com/redis/hiredis"; diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index e2bbd8a485d2..7b317ecec5a5 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -31,13 +31,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libblockdev"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${finalAttrs.version}-1"; - hash = "sha256-vQ+JHMhfCNb5PALGL9FchRYPHGj+6oQpRfmmGS0ZczI="; + hash = "sha256-9tPI8FyHQ9i7p4HLrxiseIH8Y5uqnlsNjcZ1qIHCcRY="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index a535763b8c19..af028888b23b 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libwebsockets"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "warmcat"; repo = "libwebsockets"; rev = "v${version}"; - hash = "sha256-why8LAcc4XN0JdTJ1JoNWijKENL5mOHBsi9K4wpYr2c="; + hash = "sha256-IXA9NUh55GtZmn4BhCXntVdHcKZ34iZIJ/0wlySj0/M="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 163281ef4890..df5fab1839cd 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "log4cplus"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "mirror://sourceforge/log4cplus/log4cplus-${version}.tar.bz2"; - sha256 = "sha256-oElFrKX7wEh1A8hSvvuc3vvDrj/mFLCKkFMz9t91Q4c="; + sha256 = "sha256-ZZfeeCd15OD7qP3K2TjDcJ/YOagITEtu3648xQRuJog="; }; meta = { diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index a1aee4dd8f51..aebd14780636 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "matio"; - version = "1.5.23"; + version = "1.5.26"; src = fetchurl { url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz"; - sha256 = "sha256-n5Hq5mHfRupTwxGhstz/cgUQlbAjxhLXy/wJQGyfTW4="; + sha256 = "sha256-i0fCn1jkaNunpVVTccanKtTGqosV9FmysLZaMDwGOTM="; }; meta = with lib; { diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index f8c3193b8355..bb7553c2eb3e 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.15"; + version = "3.2.16"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "sha256-1mT0mcwssqe+DN502ExkcC/q3w9uBmlTil2gVJsMvvc="; + sha256 = "sha256-JX20mpuLO+UoNc8iQlXEHAbH9sfblkBbM1gE27Ve0ac="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index 286b34379dc2..70105872ba77 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.19"; + version = "1.4.20"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KP79i1yYJ6jrsdtS85fHOmJV+oAL/MNgc9On4RfOTwo="; + sha256 = "sha256-BaCF1r5mOYxj0zKc11uoKI9gVKuxWd8GaneGcV+qIFg="; }; patches = [ diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 73b32488065e..df6be72adea8 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -2,14 +2,14 @@ let pname = "php-cs-fixer"; - version = "3.37.1"; + version = "3.40.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-zKPkxHPF8StDgs1DC+WKVvo3VGzs+lJElRHliKUXtcw="; + sha256 = "sha256-9Qoehww0u5FeJwVrn+xBf7f/IgKfIoK7KI1NwOCZH80="; }; dontUnpack = true; diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index e3fb71d744ba..39d1edbe0fe1 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -3,64 +3,70 @@ , fetchurl , php , openssl -, openssl_1_1 +, hiredis , zstd , lz4 , autoPatchelfHook +, writeShellScript +, curl +, common-updater-scripts }: let - version = "0.6.3"; - system = stdenv.hostPlatform.system; - phpVersion = lib.versions.majorMinor php.version; - variation = { + version = "0.6.8"; + hashes = { "aarch64-darwin" = { platform = "darwin-arm64"; - hashes = { - "8.0" = "00a7pyf9na7hjifkmp2482c7sh086w72zniqgr4cz2rhz7hnqp7p"; - "8.1" = "0mg6nsllycgjxxinn8s30y9sk06g40vk8blnpx0askjw5zdsf5y7"; - "8.2" = "0qmcbrj6jaxczv25rdgfjrj9nwq4vb2faw7kzlyxrvvzb5pyn9dm"; - "8.3" = "1hqjy5y4q3alxvrj7xksaf7vvmz8p51bgzxbvmzdx6jnl63dix33"; + hash = { + "8.0" = "sha256-DDn5JcRux8DN1728cqMWL7eMwueiY+jO/+fw2+ND394="; + "8.1" = "sha256-4r954EKFUA45G55MpnnKcYONCNe45dIffiygs6r8OOI="; + "8.2" = "sha256-qB2IWSsyAKzbUxjt2nz5uLp7PkgPPna1mEBqvz8oTHc="; + "8.3" = "sha256-0s+4zNknH8lEfGS8oU3JjVEuX3mZEo9AULE0hlv11mQ="; }; }; "aarch64-linux" = { platform = "debian-aarch64+libssl3"; - hashes = { - "8.0" = "19zzw4324z096b6bph1686r30i4i2kwmlmmcqmb33lqkr9b9n5ag"; - "8.1" = "0j6wpwy8d67pqij4v8m2xwydfddzr7nn4c3lyrssp8llbn4ghwpn"; - "8.2" = "1nbajvi5zk6z8qr32l86p65f1zxv12kald56pg8k7bj4axlj2pmy"; - "8.3" = "1sn638g2636m6s3lv2cclza9lzmzgqxamcga7jz3ijhn2ja6znbv"; + hash = { + "8.0" = "sha256-tLrampq1BBrhC+F/v2vcNBJp+16wzjHC8CGFKSswPUo="; + "8.1" = "sha256-DQG3maP9ImwSCTEmP152l5wr7A964lg9kNFAmVQhPqA="; + "8.2" = "sha256-3Ygb2J+MFL+H1zsepBaQKg/ybqgXVwFWt2QrNRctT8o="; + "8.3" = "sha256-MKpN09+Ai9NFARUEL+pkxQxbpRpFTx78als8ViXMdB8="; }; }; "x86_64-darwin" = { platform = "darwin-x86-64"; - hashes = { - "8.0" = "13q6va9lxgfyx86xw20iqjz4s9r9xms74ywb2hgqrhs5mjnazzz4"; - "8.1" = "1ncih5bf0jcylpl0nj8hi50kcwb4nl1g0ql359dgg9gp8s1b4hmw"; - "8.2" = "150difm3vg0g2pl5hb5cci4jzybd7jcd7prjdv3rmwsi91gsydlv"; - # 8.3 for this platform does not exist + hash = { + "8.0" = "sha256-jYnhJowVgryKSec+rOfyBiH2gZyasr1h1I+sjPiLods="; + "8.1" = "sha256-VKvVo6so0NOfiq7JjnanBEUDa1Iqmkn9egKnOJSCHTg="; + "8.2" = "sha256-WXWhSljy199UbZiEjfC50XvnKfVEU54lPa6e2+jCqiQ="; + "8.3" = "sha256-CrJoONSm0aXlBWjsRqAJC39qB4tHkMuLAvM5d847DsE="; }; }; "x86_64-linux" = { platform = "debian-x86-64+libssl3"; - hashes = { - "8.0" = "1qvd5r591kp7qf9pkymz78s8llzs1vxjwqhwy9rvma21hh6gd8ld"; - "8.1" = "0fm9ppgx7qaggid134qnl9jkq5h97dac2ax21f1f1d0k8f5blmc2"; - "8.2" = "0g2yqwfrigf047dqkrvfcj318lvgp38zy522ry484mrgq7iqwvb8"; - "8.3" = "06mi3yr7k1a9icdljzl76xvrw6xqnvwiavgzx2g487s097mycjp4"; + hash = { + "8.0" = "sha256-kzPlotJWsUIhYUFUwcXEBGv5eNfCNLDNgrs+IqZPH5c="; + "8.1" = "sha256-QBnKHXBW2XpD4GvphzyMPiIrOfs9pzyG2Fv/VyV+h9k="; + "8.2" = "sha256-yk+dkULtWVIccKurBdT96HOPbW8Q9l44iYpAAcoZYog="; + "8.3" = "sha256-MpMupGFGxipghoA57EOytSsDsm9b25rc/VPIza+QMfM="; }; }; - }.${system} or (throw "Unsupported platform for relay: ${system}"); + }; + + makeSource = { system, phpMajor }: fetchurl { + url = "https://builds.r2.relay.so/v${version}/relay-v${version}-php" + + phpMajor + "-" + hashes.${system}.platform + ".tar.gz"; + sha256 = hashes.${system}.hash.${phpMajor} or (throw "Unsupported PHP version for relay ${phpMajor} on ${system}"); + }; in stdenv.mkDerivation (finalAttrs: { inherit version; pname = "relay"; extensionName = "relay"; - src = fetchurl { - url = "https://builds.r2.relay.so/v${finalAttrs.version}/relay-v${finalAttrs.version}-php" - + phpVersion + "-" + variation.platform + ".tar.gz"; - sha256 = variation.hashes.${phpVersion} or (throw "Unsupported PHP version for relay ${phpVersion} on ${system}"); + src = makeSource { + system = stdenv.hostPlatform.system; + phpMajor = lib.versions.majorMinor php.version; }; nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook @@ -79,13 +85,14 @@ stdenv.mkDerivation (finalAttrs: { '' + (if stdenv.isDarwin then let args = lib.strings.concatMapStrings - (v: " -change /Users/administrator/dev/relay-dev/relay-deps/build/arm64/lib/${v.name}" - + " ${lib.strings.makeLibraryPath [ v.value ]}/${v.name}") + (v: " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}") (with lib.attrsets; [ - (nameValuePair "libssl.1.1.dylib" openssl_1_1) - (nameValuePair "libcrypto.1.1.dylib" openssl_1_1) - (nameValuePair "libzstd.1.dylib" zstd) - (nameValuePair "liblz4.1.dylib" lz4) + (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis.1.1.0.dylib" hiredis) + (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" openssl) + (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib" openssl) + (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib" openssl) + (nameValuePair "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib" zstd) + (nameValuePair "/opt/homebrew/opt/lz4/lib/liblz4.1.dylib" lz4) ]); in # fixDarwinDylibNames can't be used here because we need to completely remap .dylibs, not just add absolute paths @@ -101,6 +108,47 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + updateScript = writeShellScript "update-${finalAttrs.pname}" '' + set -o errexit + export PATH="$PATH:${lib.makeBinPath [ curl common-updater-scripts ]}" + NEW_VERSION=$(curl --silent https://builds.r2.relay.so/meta/builds | tail -n1 | cut -c2-) + + if [[ "${version}" = "$NEW_VERSION" ]]; then + echo "The new version same as the old version." + exit 0 + fi + + for source in ${lib.concatStringsSep " " (builtins.attrNames finalAttrs.passthru.updateables)}; do + update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "0" "sha256-${lib.fakeSha256}" + update-source-version "$UPDATE_NIX_ATTR_PATH.updateables.$source" "$NEW_VERSION" + done + ''; + + # All sources for updating by the update script. + updateables = + builtins.listToAttrs + # Collect all leaf attributes (containing hashes). + (lib.collect + (attrs: attrs ? name) + # create an attr containing + (lib.mapAttrsRecursive + ( + path: _value: + lib.nameValuePair + (builtins.replaceStrings [ "." ] [ "_" ] (lib.concatStringsSep "_" path)) + (finalAttrs.finalPackage.overrideAttrs (attrs: { + src = makeSource { + system = builtins.head path; + phpMajor = builtins.head (builtins.tail (builtins.tail path)); + }; + })) + ) + (lib.filterAttrsRecursive (name: _value: name != "platform") hashes) + ) + ); + }; + meta = with lib; { description = "Next-generation Redis extension for PHP"; changelog = "https://github.com/cachewerk/relay/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index 8aa2719385ad..6069d06d9984 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "accuweather"; - version = "2.1.0"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7uCR/xUARUakODeLVdI13D9ZksvN9c63o3Q0MlJp8cs="; + hash = "sha256-hbmeQnxVhBbXKHNdeXzAwRnMKBNvKsdfHg8MzALinhc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index 80ff09aa25e7..64b4718a2bc2 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "agate-excel"; - version = "0.3.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IfrbPmQnGh4OMEiWJl16UUfI6X/UWj/p6J2+3Y2DzuM="; + hash = "sha256-KEJmGMkHRxEebVZumD2Djx4vrmQeppcNessOnUs4QJE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 84019037d526..1cfee59a0003 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-Wts2qVTZFTLR2Ru3bSiobGOyegiNoGl3xOrZdDRh7iU="; + hash = "sha256-4mvd5G4qpebocg74Kz/+XtJovDnGJJYPigyhke9YDjA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 2dc5bd55ee73..a76f39fc2a52 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -37,19 +37,20 @@ # tests , freezegun , pytestCheckHook +, pytest-order , pytest-xdist }: buildPythonPackage rec { pname = "moto"; - version = "4.2.6"; + version = "4.2.10"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-zgpV1+dWxZpaQ5LHCXqlylPgCqLdP3AACTNWvhXnrvk="; + hash = "sha256-kllf4odHSjGsPvhHlB67CX6P+ww9bBBuR89XPbBpM7I="; }; nativeBuildInputs = [ @@ -95,12 +96,20 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun pytestCheckHook + pytest-order pytest-xdist ] ++ passthru.optional-dependencies.all; + # Some tests depend on AWS credentials environment variables to be set. + env.AWS_ACCESS_KEY_ID = "ak"; + env.AWS_SECRET_ACCESS_KEY = "sk"; + pytestFlagsArray = [ "-m" "'not network and not requires_docker'" + # Matches upstream configuration, presumably due to expensive setup/teardown. + "--dist" "loadscope" + # Fails at local name resolution "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header" "--deselect=tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins" @@ -120,21 +129,17 @@ buildPythonPackage rec { # https://github.com/getmoto/moto/pull/6938 "--deselect=tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers" - # Racy, expects two timestamp two differ - # https://github.com/getmoto/moto/issues/6946 - "--deselect=tests/test_databrew/test_databrew_recipes.py::test_publish_recipe" + # Flaky under parallel execution + "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get" + "--deselect=tests/test_core/test_moto_api.py::TestModelDataResetForClassDecorator::test_should_find_bucket" ]; disabledTestPaths = [ - # Requires pytest-ordering, which is unmaintained - # https://github.com/getmoto/moto/issues/6937 - # botocore.exceptions.NoCredentialsError: Unable to locate credentials - "tests/test_dynamodb/test_dynamodb_statements.py" - "tests/test_lakeformation/test_resource_tags_integration.py" - "tests/test_redshiftdata/test_redshiftdata.py" - "tests/test_s3/test_s3_file_handles.py" - "tests/test_s3/test_s3.py" - "tests/test_s3/test_s3_select.py" + # Flaky under parallel execution, Connection Reset errors to localhost. + "tests/test_moto_api/recorder/test_recorder.py" + + # Flaky under parallel execution + "tests/test_resourcegroupstaggingapi/*.py" # Tries to access the network "tests/test_batch/test_batch_jobs.py" diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index 56036d21c109..fd2fb808bb43 100644 --- a/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.4.0"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-gxoBc7PjS4EQix38VNX6u9cwy4FCjENcUN1euOJJLCo="; + hash = "sha256-EV5Md7dAkHcBbfF4DhmUHwKxjlXI4Jbb1VryeOwRTWo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index 30c63528514f..6f1affd9063e 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -3,64 +3,59 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, pyparsing -, numpy +# needed to build , cython +, oldest-supported-numpy +, setuptools +, setuptools-scm +, wheel +# needed to run , astropy -, astropy-helpers +, numpy +, pyparsing +# needed to check , pytestCheckHook , pytest-astropy }: buildPythonPackage rec { pname = "pyregion"; - version = "2.1.1"; + version = "2.2.0"; + pyproject = true; # pypi src contains cython-produced .c files which don't compile # with python3.9 src = fetchFromGitHub { owner = "astropy"; repo = pname; - rev = "v${version}"; - hash = "sha256-xo+XbBJ2HKql9rd7Ma84JofRg8M4u6vmz44Qo8JhEBc="; + rev = version; + hash = "sha256-r2STKnZwNvonXATrQ5q9NVD9QftlWI1RWl4F+GZSxVg="; + }; + + env = { + SETUPTOOLS_SCM_PRETEND_VERSION = version; + } // lib.optionalAttrs stdenv.cc.isClang { + # Try to remove on next update. generated code returns a NULL in a + # function where an int is expected. + NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; }; propagatedBuildInputs = [ - pyparsing - numpy astropy - cython + numpy + pyparsing ]; - # Upstream patches needed for the tests to pass - # See https://github.com/astropy/pyregion/pull/157/ - patches = [ - (fetchpatch { - url = "https://github.com/astropy/pyregion/pull/157/commits/082649730d353a0d0c0ee9619be1aa501aabba62.patch"; - hash = "sha256-4mHZt3S29ZfK+QKavm6DLBwVxGl/ga7W7GEcQ5ewxuo="; - }) - (fetchpatch { - url = "https://github.com/astropy/pyregion/pull/157/commits/c448a465dd56887979da62aec6138fc89bb37b19.patch"; - hash = "sha256-GEtvScmVbAdE4E5Xx0hNOPommvzcnJ3jNZpBmY3PbyE="; - }) + nativeBuildInputs = [ + cython + oldest-supported-numpy + setuptools + setuptools-scm + wheel ]; - nativeBuildInputs = [ astropy-helpers cython ]; - nativeCheckInputs = [ pytestCheckHook pytest-astropy ]; - disabledTests = lib.optionals (!stdenv.hostPlatform.isDarwin) [ - # Skipping 2 tests because it's failing. Domain knowledge was unavailable on decision. - # Error logs: https://gist.github.com/superherointj/3f616f784014eeb2e3039b0f4037e4e9 - "test_calculate_rotation_angle" - "test_region" - ]; - - # Disable automatic update of the astropy-helper module - postPatch = '' - substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" - ''; - # Tests must be run in the build directory preCheck = '' pushd build/lib.* @@ -70,6 +65,7 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/astropy/pyregion/blob/${version}/CHANGES.rst"; description = "Python parser for ds9 region files"; homepage = "https://github.com/astropy/pyregion"; license = licenses.mit; diff --git a/pkgs/development/python-modules/vncdo/default.nix b/pkgs/development/python-modules/vncdo/default.nix index 5f27bba823c4..51b5abbe9ea2 100644 --- a/pkgs/development/python-modules/vncdo/default.nix +++ b/pkgs/development/python-modules/vncdo/default.nix @@ -1,39 +1,57 @@ -{ lib, fetchFromGitHub -, buildPythonPackage, isPy27 +{ lib +, buildPythonPackage +, fetchFromGitHub +, pexpect , pillow +, pycryptodomex +, pytestCheckHook +, pythonOlder +, pyvirtualdisplay +, setuptools , twisted -, pexpect -, nose -, ptyprocess }: buildPythonPackage rec { pname = "vncdo"; version = "1.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sibson"; repo = "vncdotool"; rev = "refs/tags/v${version}"; - sha256 = "sha256-m8msWa8uUuDEjEUlXHCgYi0HFPKXLVXpXLyuQ3quNbA="; + hash = "sha256-m8msWa8uUuDEjEUlXHCgYi0HFPKXLVXpXLyuQ3quNbA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pillow + pycryptodomex twisted + ]; + + nativeCheckInputs = [ pexpect - nose - ptyprocess + pytestCheckHook + pyvirtualdisplay ]; - doCheck = !isPy27; + pythonImportsCheck = [ + "vncdotool" + ]; meta = with lib; { + description = "A command line VNC client and Python library"; homepage = "https://github.com/sibson/vncdotool"; - description = "A command line VNC client and python library"; + changelog = "https://github.com/sibson/vncdotool/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ elitak ]; - mainProgram = pname; + mainProgram = "vncdo"; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index bf71a5a14cd3..1bca71009a99 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { hash = "sha256-Tcle9otT1eBN/RzajwKZDUq8xX0Lhi2t74OvhUrvHZE="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov --cov-report xml --tb=short" "" + ''; + nativeBuildInputs = [ cython ]; @@ -39,11 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov --cov-report xml --tb=short" "" - ''; - preCheck = '' cd test ''; @@ -55,11 +55,15 @@ buildPythonPackage rec { disabledTests = [ # Don't tests CLI "test_cli_as_executable" + # OSError: invalid ppem value + "test_recolor_too_small" + "test_coloring_black_works" ]; meta = with lib; { description = "Word cloud generator in Python"; homepage = "https://github.com/amueller/word_cloud"; + changelog = "https://github.com/amueller/word_cloud/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ jm2dev ]; }; diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index 7b5e3522ef3b..dc60f5ec377b 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.9.0"; + version = "0.9.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-bd0epx3AciECCYi4OYG2WzTVhZ+JYnf5ebDZoMrPfmo="; + sha256 = "sha256-PfevtQpbJeo2U/qeYcJP4Et/HUASOZssRu2IXtOLWKw="; }; - cargoHash = "sha256-RjjYfdcdJzIxnJFZqx93KADihN5YK+bCuk1QaPhVuGQ="; + cargoHash = "sha256-1nPXyFzRmum1CvOFdcqNOQzFVcFFKwPdt2qzXxMssf0="; cargoBuildFlags = [ "--bin" "svlint" ]; diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 9e7a9ca27cda..228002d3753e 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.22"; + version = "0.8.24"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-/LKsaWqJZG9LdUt9zVAspLOYGr0TrhOJB4j0Vv40rkE="; + hash = "sha256-/ZCXS7B/V5iBTuvt0U9QUaaPFVLHWKnXg0v9fcsSNAE="; }; - vendorHash = "sha256-nfSqu1u7NWbZYL7CEZ/i2tdxQBblRbwJwdwoEtol/Us="; + vendorHash = "sha256-hWmk/QmkSvRvjt9vcPG07sVwWlqfZrYvY0MGaeKhvTI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 13921b61ff94..1ef71d380c32 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "delve"; - version = "1.21.0"; + version = "1.21.2"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-bDxpXm53PCdUQDq6pIigutY1JxrGWfsPkVSA+0i3vr0="; + sha256 = "sha256-DgRqdO7ztQ57B6N9ABcI2D/SQkUVh/IUib8/xk3EeRA="; }; vendorHash = null; diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index 7a5df1067e0e..307b568c833f 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -12,16 +12,16 @@ # buildGoModule rec { buildGo120Module rec { pname = "gomplate"; - version = "3.11.5"; + version = "3.11.6"; src = fetchFromGitHub { owner = "hairyhenderson"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cBSOfjU7A6B7+5zQLGtGLx9kORsjH/IzGgkjwjjTcYY="; + hash = "sha256-IXNI+VkmW7k+Hkx2gv8OCpfAe4qJ3sH9KT/mO8y3JcU="; }; - vendorHash = "sha256-thsa15CDD7+gCSPSU4xDbovETREeuL4gV6TjdcImj9w="; + vendorHash = "sha256-DAtgebWwGBYioKTvW2qtzy+GPxYE2SuXIYpex6M85Vc="; postPatch = '' # some tests require network access diff --git a/pkgs/development/tools/initool/default.nix b/pkgs/development/tools/initool/default.nix index 76ab9f805abe..5658ba1eafdf 100644 --- a/pkgs/development/tools/initool/default.nix +++ b/pkgs/development/tools/initool/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "initool"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "dbohdan"; repo = pname; rev = "v${version}"; - hash = "sha256-qi8K3O6K9ZIKFlNFJ3O9/iKE+8M/mf/8V8qgl1BOaKo="; + hash = "sha256-wb9hJ0R1R7kYt+TWznqfVGKms3hQjzB8TJYpS89da/E="; }; nativeBuildInputs = [ mlton ]; diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index ab33801962c2..3cee6dd3b708 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.6.8"; + version = "0.6.11"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-l6jhdTPtt+OPZOzsRJ4F9VVFaLYhaoUUjqtiP40ADPE="; + hash = "sha256-ZLZGPigZSrW2C909Kc8t0U3+5sWRGkhT820fl+k37x4="; }; - cargoHash = "sha256-LgkcVlUCILRmYd+INLe4FiexR+Exmc/tPIYQ+hUypMc="; + cargoHash = "sha256-dONoaLX2nlnJIjnRPSgQ5oHWqWw632nSpoWUOiU0w58="; meta = with lib; { description = "A cmake lsp based on tower-lsp and treesitter"; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 70ebddff118a..246aab1363b8 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.1.3"; + version = "4.1.6"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-9d46sXrG9tYhtAoIGzy7JYnt+wfS4vtGu81MS4W9c1s="; + sha256 = "sha256-WuIWOV449kVUEH1ruTQkutYNFqPD+QsFAdJJeiZK0Kw="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 8fa555cf809b..5145b3f27521 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -12,42 +12,42 @@ let phpMajor = lib.versions.majorMinor php.version; - version = "1.91.0"; + version = "1.92.0"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-PIpfTeHWVO8MJ4+c8o1iC477M+HXzuHbnwv1EkYkQHY="; - "8.2" = "sha256-wEdEFooXlJTeuVfMeX3OI3uKJ5Acj1ZqmVYt6fyGQXI="; + "8.1" = "sha256-XXwsX4kJ/ubu8AjGj+baGM6SLJCTeefKCynpZ6UVyQo="; + "8.2" = "sha256-2pScIG8tWLrgd+dzUYWpV9Y4lcIujN4BTX6qzfmaank="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-yEfWtUegN4HVRS95eY3vYA97iGAaY2gxoGtb9DZpXhY="; - "8.2" = "sha256-FGbgozRmniS/rtAcvPiA+w8miauc8Gr/np5NdP4iGT8="; + "8.1" = "sha256-I+LTPimETlKVx6gTOfsxHlgphhkjlMxoGorVQkRWVP0="; + "8.2" = "sha256-Or5qIBDuHVfq7BEfnUtT2PMFNlt5Us1aWqtM+4ExOAA="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-zfVx3NGkjhZK7YjTi8FBJyrn++Ub7vlFDCmiY/7F/yE="; - "8.2" = "sha256-gMoBIsvnR6lQMT4IaHWJEp+GbU/Yiid+pmDejR/vAUA="; + "8.1" = "sha256-SID/iTmrSBfz41joG8JaVi7zwEb5OHQ3dRp8PpN+HSg="; + "8.2" = "sha256-GveRe/XdY2d6X/m7ofyr+6Ha2GfnDtNL+M/VnZqMcqo="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-UDd4knBfgdUriJ6N1cfka/iCIjaWiOgIbrq6kNkYUjA="; - "8.2" = "sha256-BZzFVLfebKzuSDz2DQEwd9HOxJ1nZSNmQHpayiGe8qI="; + "8.1" = "sha256-iT2oURI7suabC16ti6TQMBigU35TIujWpXSNdXIZDD4="; + "8.2" = "sha256-cmfANcQEn7IIe7uovACBAuqyo7SPZZOhwtdlPMiKTWI="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-51w3Ji8R6ulloZuTPHu/0gkYiq33H1tMOwrGe2DWtRI="; - "8.2" = "sha256-0p6CNKjhdD3L6x6gtMKLTKrHUO4LMwXpVU7hR32ejMI="; + "8.1" = "sha256-zGunEfOLm7LmOoQcrkRFX8oZQQJIrXPKct5hNJyOlug="; + "8.2" = "sha256-qzt9NVKZYoJMKaX+u8CbGJR5dfUtSRYjV45mvSWl/P8="; }; }; }; diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 37593e0090ca..a17c2b44e8a4 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.12.21"; + version = "1.12.23"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-SjA5J9fILU/FBNXRS/cvGZVWAK2qqOyMsd6wC/CJYaE="; + hash = "sha256-dBEdd6ZwSVaQSeIWRPUIMRY6wyLuFiXwtYViQUDUjj8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/phpunit/composer.lock b/pkgs/development/tools/misc/phpunit/composer.lock index 3ae3a0fc52cf..b5b0a7cedb7f 100644 --- a/pkgs/development/tools/misc/phpunit/composer.lock +++ b/pkgs/development/tools/misc/phpunit/composer.lock @@ -234,16 +234,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.7", + "version": "10.1.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "355324ca4980b8916c18b9db29f3ef484078f26e" + "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/355324ca4980b8916c18b9db29f3ef484078f26e", - "reference": "355324ca4980b8916c18b9db29f3ef484078f26e", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/a56a9ab2f680246adcf3db43f38ddf1765774735", + "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735", "shasum": "" }, "require": { @@ -300,7 +300,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.7" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.9" }, "funding": [ { @@ -308,7 +308,7 @@ "type": "github" } ], - "time": "2023-10-04T15:34:17+00:00" + "time": "2023-11-23T12:23:20+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1470,16 +1470,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -1508,7 +1508,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -1516,7 +1516,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" } ], "packages-dev": [], diff --git a/pkgs/development/tools/misc/phpunit/default.nix b/pkgs/development/tools/misc/phpunit/default.nix index 90feb8628e08..3442f95c3164 100644 --- a/pkgs/development/tools/misc/phpunit/default.nix +++ b/pkgs/development/tools/misc/phpunit/default.nix @@ -2,19 +2,19 @@ php.buildComposerProject (finalAttrs: { pname = "phpunit"; - version = "10.4.1"; + version = "10.4.2"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-AKUMCa8QuXqE0HrMaxR8SvhdoYjL/CmaTzf5UhszPPw="; + hash = "sha256-7hgDeg8K+Iuo8Lb8mV5ACQV3BDBotKIZ0/IdlLCXuIc="; }; - # TODO: Open a PR against https://github.com/sebastianbergmann/phpunit - # Missing `composer.lock` from the repository. + # Add missing composer.lock + # https://github.com/sebastianbergmann/phpunit/pull/5576 composerLock = ./composer.lock; - vendorHash = "sha256-xFXf9Nc6OxvZJ4Bt9zFhhdsJY4VwnztfCE4j5tOqQKQ="; + vendorHash = "sha256-PYcXB8MEhZabAreR2GluyrEkgnTvUEgEkfFnUT5Fqps="; meta = { changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md"; diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix index d53eec12e806..c3edb02cd8fe 100644 --- a/pkgs/development/tools/parsing/peg/default.nix +++ b/pkgs/development/tools/parsing/peg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "peg"; - version = "0.1.18"; + version = "0.1.19"; src = fetchurl { url = "${meta.homepage}/${pname}-${version}.tar.gz"; - sha256 = "114h1y4k8fwcq9m0hfk33dsp7ah8zxzjjzlk71x4iirzczfkn690"; + sha256 = "sha256-ABPdg6Zzl3hEWmS87T10ufUMB1U/hupDMzrl+rXCu7Q="; }; preBuild="makeFlagsArray+=( PREFIX=$out )"; diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/development/tools/parsing/re-flex/default.nix index 6e224c7178a9..85150a04884b 100644 --- a/pkgs/development/tools/parsing/re-flex/default.nix +++ b/pkgs/development/tools/parsing/re-flex/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - sha256 = "sha256-gk+VVfjVPopuzhrEuWNxQxKYjOFbqOGD9YS1npN71Bg="; + sha256 = "sha256-AP8889MQSAq/CIfZRDOkaqkTrT6EPqHK0bbeLa9v6h8="; }; nativeBuildInputs = [ boost autoconf automake ]; diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index 8a0bbe36ab3c..864e2a8c372c 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -4,16 +4,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.5.3"; + version = "0.5.4"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-cYfQ27QPdx3TA7zUZ7x0+kIr//EXL+a2APK5pnlupJM="; + sha256 = "sha256-xjyzGrcr3yVny70P5BvV9meshOcvbf6BWhuBE1PlK4Q="; }; - vendorHash = "sha256-UbzMkHpmIfJoCToAT1vOYJvqkhxSGogohT2aemegZ94="; + vendorHash = "sha256-JIvFHaq9RCqDurKTnoT9/yJevHotuG22AyizTMLtHPc="; outputs = [ "out" ] ++ bins; diff --git a/pkgs/development/tools/schemacrawler/default.nix b/pkgs/development/tools/schemacrawler/default.nix index 7db69d7a1561..21706c964237 100644 --- a/pkgs/development/tools/schemacrawler/default.nix +++ b/pkgs/development/tools/schemacrawler/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemacrawler"; - version = "16.20.4"; + version = "16.20.5"; src = fetchzip { url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-wNvFutxB34gjBCwVPIj/5jjjk0/IjH0EbD++FxxuweM="; + hash = "sha256-QgR7r8SXJfostcAEmznZcW+LSTMP0l3GZ8csQl/uPZU="; }; nativeBuildInputs = [ makeWrapper ]; |