diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-04 06:01:09 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-04 06:01:09 +0000 |
commit | ae91e9a96086fac86b57c34953fc5fb97490c832 (patch) | |
tree | 2c6c02cf4d411ced25d02f4a148fda92a977fa37 /pkgs/development | |
parent | 2e0f3bc57b3cbb7fedf6eacf77acec05a212348c (diff) | |
parent | 0a55d764ac14ac5e02fa386d5088f12e73f37e36 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
18 files changed, 142 insertions, 59 deletions
diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index b658cece4d8ab..f0c6924995717 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "23.01"; + version = "23.02"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-/XfwQUkhn82vAKa7ZyiPbD4c7XJhCIncxvWkj/m2P0M="; + sha256 = "sha256-ycBwkFPzmOMG3umsznVtmE4MXunqCdjPpHgV73T/PMY="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index 39d714ce84e8a..6e5795cd30430 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -19,7 +19,8 @@ }: let - rocfft = stdenv.mkDerivation (finalAttrs: { + # This is over 3GB, to allow hydra caching we separate it + rf = stdenv.mkDerivation (finalAttrs: { pname = "rocfft"; version = "5.4.2"; @@ -112,27 +113,23 @@ let }; }); - rocfft-zero = runCommand "rocfft-zero" { preferLocalBuild = true; } '' - mkdir -p $out - cp -a ${rocfft}/lib/librocfft-device-0* $out + rf-zero = runCommand "librocfft-device-0.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; - rocfft-one = runCommand "rocfft-one" { preferLocalBuild = true; } '' - mkdir -p $out - cp -a ${rocfft}/lib/librocfft-device-1* $out + rf-one = runCommand "librocfft-device-1.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; - rocfft-two = runCommand "rocfft-two" { preferLocalBuild = true; } '' - mkdir -p $out - cp -a ${rocfft}/lib/librocfft-device-2* $out + rf-two = runCommand "librocfft-device-2.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; - rocfft-three = runCommand "rocfft-three" { preferLocalBuild = true; } '' - mkdir -p $out - cp -a ${rocfft}/lib/librocfft-device-3* $out + rf-three = runCommand "librocfft-device-3.so.0.1" { preferLocalBuild = true; } '' + cp -a ${rf}/lib/$name $out ''; in stdenv.mkDerivation { - inherit (rocfft) pname version outputs src passthru meta; + inherit (rf) pname version outputs src passthru meta; dontUnpack = true; dontPatch = true; @@ -143,16 +140,15 @@ in stdenv.mkDerivation { runHook preInstall mkdir -p $out/lib - - for path in ${rocfft-zero} ${rocfft-one} ${rocfft-two} ${rocfft-three}; do - cp -as $path/* $out/lib - done - - cp -an ${rocfft}/* $out + cp -as ${rf-zero} $out/lib/${rf-zero.name} + cp -as ${rf-one} $out/lib/${rf-one.name} + cp -as ${rf-two} $out/lib/${rf-two.name} + cp -as ${rf-three} $out/lib/${rf-three.name} + cp -an ${rf}/* $out '' + lib.optionalString buildTests '' - cp -a ${rocfft.test} $test + cp -a ${rf.test} $test '' + lib.optionalString buildBenchmarks '' - cp -a ${rocfft.benchmark} $benchmark + cp -a ${rf.benchmark} $benchmark '' + '' runHook postInstall ''; @@ -160,18 +156,18 @@ in stdenv.mkDerivation { # Fix paths preFixup = '' substituteInPlace $out/include/*.h $out/rocfft/include/*.h \ - --replace "${rocfft}" "$out" + --replace "${rf}" "$out" patchelf --set-rpath \ - $(patchelf --print-rpath $out/lib/librocfft.so | sed 's,${rocfft}/lib,'"$out/lib"',') \ + $(patchelf --print-rpath $out/lib/librocfft.so | sed 's,${rf}/lib,'"$out/lib"',') \ $out/lib/librocfft.so '' + lib.optionalString buildTests '' patchelf --set-rpath \ - $(patchelf --print-rpath $test/bin/rocfft-test | sed 's,${rocfft}/lib,'"$out/lib"',') \ + $(patchelf --print-rpath $test/bin/rocfft-test | sed 's,${rf}/lib,'"$out/lib"',') \ $test/bin/rocfft-test '' + lib.optionalString buildBenchmarks '' patchelf --set-rpath \ - $(patchelf --print-rpath $benchmark/bin/rocfft-rider | sed 's,${rocfft}/lib,'"$out/lib"',') \ + $(patchelf --print-rpath $benchmark/bin/rocfft-rider | sed 's,${rf}/lib,'"$out/lib"',') \ $benchmark/bin/rocfft-rider ''; } diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 6eeb158a6ba18..da022c1e7f190 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "2.2.7"; + version = "3.0.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CN7dzQodxrqr5nSwfG/4ghGEksEj0oH1bwGQUnGn/8Q="; + sha256 = "sha256-19xeS3+t6bc3XFaKJEdbe+gQJMrCogyu8yYO8LUSh7Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 74f24b2028eb2..558ce409d4b68 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "7.1.0"; + version = "7.2.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-HkcjjEqp5owMU2ej/XB7psOUm0qvkSsGRArXjdK/AY0="; + sha256 = "sha256-YOLBpY8c6zShkLfDgPezOG0ec2kGGVSx+LjKPfdgY8w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dataset/default.nix b/pkgs/development/python-modules/dataset/default.nix index 514876761ebfe..d437c5794feb5 100644 --- a/pkgs/development/python-modules/dataset/default.nix +++ b/pkgs/development/python-modules/dataset/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "dataset"; - version = "1.5.2"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TDZ6fAqFxOdI79o07uMAw/zD8HbHXDKQt0mnoFM1yEc="; + hash = "sha256-fNvJBdZjtYKvhGzwULfP2iDNUrqhxiwRlhlFrHfmGdU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/peewee-migrate/default.nix b/pkgs/development/python-modules/peewee-migrate/default.nix new file mode 100644 index 0000000000000..d86e447711c48 --- /dev/null +++ b/pkgs/development/python-modules/peewee-migrate/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# runtime +, cached-property +, click +, peewee + +# tests +, psycopg2 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "peewee-migrate"; + version = "1.6.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "klen"; + repo = "peewee_migrate"; + rev = "refs/tags/${version}"; + hash = "sha256-gUtxsvPj8pwzijia313d553j9U2LP5vKJHxVU1SqsV8="; + }; + + postPatch = '' + sed -i '/addopts/d' setup.cfg + ''; + + propagatedBuildInputs = [ + peewee + click + ] ++ lib.optionals (pythonOlder "3.8") [ + cached-property + ]; + + pythonImportsCheck = [ + "peewee_migrate" + ]; + + nativeCheckInputs = [ + psycopg2 + pytestCheckHook + ]; + + meta = with lib; { + description = "Simple migration engine for Peewee"; + homepage = "https://github.com/klen/peewee_migrate"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index c4c6edffc2800..89a51051d6965 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "6.2.8"; + version = "6.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-0E+kkvxT1jLfoBg3C9BfbSqfIX3K/Z5kK1kCdOks2Hk="; + hash = "sha256-Obsg5fsTv/7uiFRbzGp90+d90e2dX7CWMMRMgiQvNyc="; }; patches = [ diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 0dbc1880be884..b143a6c40fd29 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.62"; + version = "2.0.97"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-Kex9xIjcAYCzHeqWoDAIgTMuih0s42/O2zfTYxWEqbM="; + hash = "sha256-cYwH2o2ss8qnOST8Cjh+88PNM5NTO2B11PW7mWS1ctk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix new file mode 100644 index 0000000000000..db5ea8ad1f7df --- /dev/null +++ b/pkgs/development/python-modules/qpageview/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, python3Packages +, pythonOlder +}: + +python3Packages.buildPythonPackage rec { + pname = "qpageview"; + version = "0.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "frescobaldi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-XFMTOD7ums8sbFHUViEI9q6/rCjUmEtXAdd3/OmLsHU="; + }; + + propagatedBuildInputs = with python3Packages; [ pyqt5 poppler-qt5 pycups ]; + + pythonImportsCheck = [ "qpageview" ]; + + meta = with lib; { + description = "A page-based viewer widget for Qt5/PyQt5"; + homepage = "https://github.com/frescobaldi/qpageview"; + changelog = "https://github.com/frescobaldi/qpageview/blob/${src.rev}/ChangeLog"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ camillemndn ]; + }; +} diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 672a0916b22f3..1c191cc2991a3 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.18.1"; + version = "3.18.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8Jw5YmHsATchcchiPqxqxA+PYgl7elqZLqG8vTu/b0k="; + sha256 = "sha256-lVoBBBrzyhrSmR2FM0xo8UJBCOShwaYOrIpeAwQn76M="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 647bfbbafc765..b4440f68d6c57 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.1.12"; + version = "2023.1.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-66Rg2DJg/PNkjXyKy/IgQ0T9eF+JD7rstoZKf7nwaS4="; + hash = "sha256-7T/U4dLqd8qe03k4BYJWbmADpU1wo+VSGpsqeJZgk2I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 4681e4829f487..4d9223f7d93af 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "3.4.1"; + version = "3.7.0"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "twitchAPI"; inherit version; - hash = "sha256-q35ijx4zDR07k9al11T1H7SPYG9M8g8+rD/TNrkL2Ek="; + hash = "sha256-zmMzHuaSsuj2MxkmQyzROrZ/zxO0/I7llKlnpZzauDw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix index f26c85f58f394..47dfe467d2431 100644 --- a/pkgs/development/python-modules/webauthn/default.nix +++ b/pkgs/development/python-modules/webauthn/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "webauthn"; - version = "1.6.0"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - hash = "sha256-Ts0zKnQg1EaBNB9xQmzOpEVwDSFwHNjIhEP1jTwEOFI="; + hash = "sha256-iAEvWFxJGf4H2PEseG+ykt9sriGyNvbmj4+NZFcPGPk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 65e6dd4b2a8c1..0f8f5828ac0dc 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-bS/7S4PxZSTYvxLFmC486PBHNhkGUIPAnUJQztp3ouw="; + sha256 = "sha256-56VznyGZtSYKyjQRej1QduG/99OYObYNmplsGSckgKg="; }; vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY="; diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index e9bf373451332..85f19d899ed65 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdsh"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "zimbatm"; repo = "mdsh"; rev = "v${version}"; - sha256 = "1ki6w3qf8ipcf7ch5120mj16vs7yan8k9zjd25v8x6vbsd1iccgy"; + hash = "sha256-Y8ss/aw01zpgM6Z6fCGshP21kcdSOTVG/VqL8H3tlls="; }; - cargoSha256 = "0x5fd47rjmzzmwgj14gbj0rbxwbphd7f63mis4ivwlwc9ikjxdxb"; + cargoSha256 = "sha256-8o4gN6mqUU+o80IqlAYAD5qpZBSQ/FY5HoNbpwzTm0A="; meta = with lib; { description = "Markdown shell pre-processor"; diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 469c68e2044b1..7a50b2df240c3 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-Eprsy/wd5lMBXk3yVGhofYD9ZBfdmjGMwXZ61RMgd4k="; + hash = "sha256-0pnPffvKcBpBir0l6rpp7iVbF9XlMTCG2mifzYkEQ7s="; }; vendorHash = "sha256-Yi+4fGCHLH/kA4DuPI2uQ/27xhMd4cPFkTWlI6Bc13A="; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index bf1aacc1a4eca..ba799c7267ba2 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.240"; + version = "0.0.241"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-10pGcvMz+5obtk1lo2pg3D/VtBDhsVRsCZ+Tg1lp3qM="; + sha256 = "sha256-yrwrkU19LBM3gac70Y1UamZTdamuJdrMX4U88zGgJJs="; }; - cargoSha256 = "sha256-4u05UeMw0dX0A1SjFsaUvFgPPAFbCS4POrsZuePEafc="; + cargoSha256 = "sha256-RzGYh0zspP+sG7k+XwDy9kaTIGIEoOEV3ZoqVf0X0GA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index 36658b506a41f..5441946052b35 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU="; + sha256 = "sha256-er3BPQ10ERCIBn0xx0jjyMBybnUBMyX76tqYEYe2WYQ="; }; - vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk="; + vendorHash = "sha256-3PyyR9d5m33ohbcstREvTOtWwMIrbFNvFyBY1F+6R+4="; subPackages = [ "cmd/zed" "cmd/zq" ]; |