diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index cf5dd6c09163..4ca2666503ee 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1921,10 +1921,51 @@ - ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which + ORY Kratos was updated to version 0.9.0-alpha.3, which introduces some breaking changes: + + + All endpoints at the Admin API are now exposed at + /admin/. For example, endpoint + https://kratos:4434/identities is now + exposed at + https://kratos:4434/admin/identities + + + + + Configuration key + selfservice.whitelisted_return_urls has + been renamed to allowed_return_urls + + + + + The password_identifier form field of + the password login strategy has been renamed to + identifier to make compatibility with + passwordless flows possible. + + + + + Instead of having a global + default_schema_url which developers + used to update their schema, you now need to define the + default_schema_id which must reference + schema ID in your config. + + + + + Calling /self-service/recovery without + flow ID or with an invalid flow ID while authenticated + will now respond with an error instead of redirecting to + the default page. + + If you are relying on the SQLite images, update your @@ -1961,6 +2002,18 @@ Notes for v0.8.2-alpha-1 + + + Release + Notes for v0.9.0-alpha-1 + + + + + Release + Notes for v0.9.0-alpha-3 + + diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 675a53996efd..46cc70f51249 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -716,13 +716,21 @@ In addition to numerous new and upgraded packages, this release has the followin - `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`. -- ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which introduces some breaking changes: +- ORY Kratos was updated to version 0.9.0-alpha.3, which introduces some breaking changes: + - All endpoints at the Admin API are now exposed at `/admin/`. For example, endpoint `https://kratos:4434/identities` is now exposed at `https://kratos:4434/admin/identities` + - Configuration key `selfservice.whitelisted_return_urls` has been renamed to `allowed_return_urls` + - The `password_identifier` form field of the password login strategy has been renamed to `identifier` to make compatibility with passwordless flows possible. + - Instead of having a global `default_schema_url` which developers used to update their schema, you now need to define the `default_schema_id` which must reference schema ID in your config. + - Calling `/self-service/recovery` without flow ID or with an invalid flow ID while authenticated will now respond with an error instead of redirecting to the default page. - If you are relying on the SQLite images, update your Docker Pull commands as follows: - `docker pull oryd/kratos:{version}` - Additionally, all passwords now have to be at least 8 characters long. - For more details, see: - [Release Notes for v0.8.1-alpha-1](https://github.com/ory/kratos/releases/tag/v0.8.1-alpha.1) - [Release Notes for v0.8.2-alpha-1](https://github.com/ory/kratos/releases/tag/v0.8.2-alpha.1) + - [Release Notes for v0.9.0-alpha-1](https://github.com/ory/kratos/releases/tag/v0.9.0-alpha.1) + - [Release Notes for v0.9.0-alpha-3](https://github.com/ory/kratos/releases/tag/v0.9.0-alpha.3) + - `fetchFromSourcehut` now allows fetching repositories recursively using `fetchgit` or `fetchhg` if the argument `fetchSubmodules` diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 1d26782b6ae0..4abf799d0155 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, pkg-config , ncurses, db , popt, libtool +, libiconv, CoreServices # Sound sub-systems -, alsaSupport ? true, alsa-lib +, alsaSupport ? (!stdenv.isDarwin), alsa-lib , pulseSupport ? true, libpulseaudio, autoreconfHook , jackSupport ? true, libjack2 , ossSupport ? true @@ -64,7 +65,8 @@ in stdenv.mkDerivation rec { ++ opt wavpackSupport wavpack # Misc ++ opt curlSupport curl - ++ opt samplerateSupport libsamplerate; + ++ opt samplerateSupport libsamplerate + ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; configureFlags = [ # Sound sub-systems @@ -97,6 +99,6 @@ in stdenv.mkDerivation rec { homepage = "http://moc.daper.net/"; license = licenses.gpl2; maintainers = with maintainers; [ aethelz pSub jagajaga ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index ee77144104c2..1ea01353f80a 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -72,6 +72,7 @@ mkDerivation rec { ] ++ lib.optionals withGstreamer (with gst_all_1; [ glib-networking gstreamer + gst-libav gst-plugins-base gst-plugins-good gst-plugins-bad diff --git a/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix index 7fd3280d807f..df001ea8ff73 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix @@ -25,6 +25,6 @@ trivialBuild { ''; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; - maintainers = with maintainers; [ aidalgol ]; + maintainers = with lib.maintainers; [ aidalgol ]; }; } diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index 4486381b8b34..ef82703ac4cf 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage { pname = "faircamp"; - version = "unstable-2022-01-19"; + version = "unstable-2022-03-20"; # TODO when switching to a stable release, use fetchFromGitea and add a # version test. Meanwhile, fetchgit is used to make unstableGitUpdater work. src = fetchgit { url = "https://codeberg.org/simonrepp/faircamp.git"; - rev = "f8ffc7a35a12251b83966b35c63f72b4912f75a9"; - sha256 = "sha256-9t42+813IPLUChbLkcwzoCr7FXSL1g+ZG6I3d+7pmec="; + rev = "863cecb468a58a774bd2d1d93f99f3c8ecd8205c"; + sha256 = "sha256-JodIo601BYesbiHarnBk4/GuFR/bpCswxQbaysRP+CI="; }; - cargoHash = "sha256-24ALBede3W8rjlBRdtL0aazRyK1RmNLdHF/bt5i4S5Y="; + cargoHash = "sha256-XqsUUc+s01t4KHtktbNhm52r0NeLbcBg5DVw3Xn0oZk="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix index 043f607c010d..a2892e9fa894 100644 --- a/pkgs/applications/misc/kratos/default.nix +++ b/pkgs/applications/misc/kratos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kratos"; - version = "0.8.3-alpha.1.pre.0"; + version = "0.9.0-alpha.3"; src = fetchFromGitHub { owner = "ory"; repo = "kratos"; rev = "v${version}"; - sha256 = "1225paf0x6lb6cb3q5f4lyz0r426ifx4x8145q7nsc6v64srck2y"; + sha256 = "1x6g5mbbz1nkqi814dcyvdn8dyizpilzsb9cqijw0kpw4y3px757"; }; - vendorSha256 = "10zhxbccjsp6hbmk2lnvbag6c92hz703mcaigaj4wvlf7glpldm6"; + vendorSha256 = "1v29g302zqh7sc5s53dyz1mki0iijnr6nfj4fajayz2n7bfw3kh1"; subPackages = [ "." ]; diff --git a/pkgs/applications/video/mpv/scripts/autocrop.nix b/pkgs/applications/video/mpv/scripts/autocrop.nix new file mode 100644 index 000000000000..645a4dd16899 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/autocrop.nix @@ -0,0 +1,19 @@ +{ stdenvNoCC, mpv-unwrapped, lib }: + +stdenvNoCC.mkDerivation rec { + pname = "mpv-autocrop"; + version = mpv-unwrapped.version; + src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autocrop.lua"; + dontBuild = true; + dontUnpack = true; + installPhase = '' + install -Dm644 ${src} $out/share/mpv/scripts/autocrop.lua + ''; + passthru.scriptName = "autocrop.lua"; + + meta = { + description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video."; + homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autocrop.lua"; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/autodeint.nix b/pkgs/applications/video/mpv/scripts/autodeint.nix new file mode 100644 index 000000000000..b5369b748faf --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/autodeint.nix @@ -0,0 +1,19 @@ +{ stdenvNoCC, mpv-unwrapped, lib }: + +stdenvNoCC.mkDerivation rec { + pname = "mpv-autodeint"; + version = mpv-unwrapped.version; + src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autodeint.lua"; + dontBuild = true; + dontUnpack = true; + installPhase = '' + install -Dm644 ${src} $out/share/mpv/scripts/autodeint.lua + ''; + passthru.scriptName = "autodeint.lua"; + + meta = { + description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video."; + homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autodeint.lua"; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index b381d3ccca17..9e6de7890a48 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "22.1"; + version = "23.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KWCGcGB4HCpV7uSM4otQhSGEzQ+1jQip2fiAysNN54k="; + sha256 = "0gq23zhpl1rw8i3yv0f058lycsr078yfy8vkb5w382pifgrww1zh"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "sha256-R70H1R9jFnQyOLI4UNuRzpOAAnGSBGpiHFKbxP2472o="; + cargoSha256 = "0r3r6r5scbw23ipz24glcyvaxx9sffy8kp27fpqvwdha915c1zkp"; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/desktops/gnome/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix index 867534ba61d0..559b5edf0a3f 100644 --- a/pkgs/desktops/gnome/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome/extensions/impatience/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-impatience"; - version = "unstable-2019-09-23"; + version = "unstable-2022-03-26"; src = fetchFromGitHub { owner = "timbertson"; repo = "gnome-shell-impatience"; - rev = "43e4e0a1e0eeb334a2da5224ce3ab4fdddf4f1b2"; - sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx"; + rev = "cf7c0bb8776af9a16e4ae114df0cc65869fb669d"; + sha256 = "sha256-z/pZxSEFELtg7kueS2i6gN1+VbN0m4mxc34pOCMak5g="; }; buildInputs = [ diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/development/compilers/uasm/default.nix index bd4d61d698cb..7356175c87c4 100644 --- a/pkgs/development/compilers/uasm/default.nix +++ b/pkgs/development/compilers/uasm/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, testVersion +, uasm +}: stdenv.mkDerivation rec { pname = "uasm"; @@ -14,9 +20,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-CIbHPKJa60SyJeFgF1Tux7RfJZBChhUVXR7HGa+gCtQ="; }; + patches = lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "fix-v2_55-compilation-on-macos.patch"; + url = "https://github.com/Terraspace/UASM/commit/b50c430cc3083c7f32e288a9f64fe1cafb03091d.patch"; + sha256 = "sha256-FGFB282LSEKtGD1cIRH+Qi5bye5Gx4xb0Ty4J03xjCU"; + }) + ]; + enableParallelBuilding = true; - makefile = "gccLinux64.mak"; + makefile = + if stdenv.isDarwin then + "ClangOSX64.mak" + else + "gccLinux64.mak"; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' runHook preInstall @@ -27,10 +47,16 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests.version = testVersion { + package = uasm; + command = "uasm -h"; + version = "v${version}"; + }; + meta = with lib; { homepage = "http://www.terraspace.co.uk/uasm.html"; description = "A free MASM-compatible assembler based on JWasm"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ thiagokokada ]; license = licenses.watcom; }; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 90fe46582672..84d54b3bc35e 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aPTwN5DuUFPqLDwq73KvmBR8tEN5bIX6/JOZMfOAoow="; + sha256 = "sha256-g1o/udsIFLJ+gunvI2QtsnksPaa946jWKkcdmdGmQ/k="; }; passthru = { diff --git a/pkgs/development/ocaml-modules/rebez/default.nix b/pkgs/development/ocaml-modules/rebez/default.nix new file mode 100644 index 000000000000..b82c2ba74827 --- /dev/null +++ b/pkgs/development/ocaml-modules/rebez/default.nix @@ -0,0 +1,22 @@ +{ buildDunePackage, fetchFromGitHub, lib, reason }: + +buildDunePackage rec { + pname = "rebez"; + version = "unstable-2019-06-20"; + + src = fetchFromGitHub { + owner = "jchavarri"; + repo = "rebez"; + rev = "03fa3b707abb28fdd710eb9e57ba40d9cd6ae163"; + sha256 = "sha256-khZSwtwW+mP/EvAvIZMQyOb6FgNR+gmzpBZoD9ZPkpY="; + }; + + nativeBuildInputs = [ reason ]; + + meta = with lib; { + description = "Cubic bezier implementation in Reason / OCaml"; + homepage = "https://github.com/jchavarri/rebez/"; + maintainers = with maintainers; [ superherointj ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index dbc684281fb4..f54ffc9d4ce9 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.8"; + version = "1.4.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ts3PnL1ePWJHHaLuC0eQKqBOt+HeEeAayeVBAIhnUWs="; + sha256 = "sha256-KfNf09L8WF8Op+uVLRttROIgXpY79v0HfMv8b2qMSxE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 5087884074d8..658ec10a0ae2 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.11.0"; + version = "2.11.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FEWXGSkneduhO9+YlzrZvpJHUsI7TeagVLwBdMEIRvw="; + hash = "sha256-1uDRoS9nyZCLPdbiAQBADoiwqaVBzj1NMpZXdJQYoxQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index ab689bda51ef..cc43d411039f 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.13.8"; + version = "0.13.9"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-n1ckAHU31Lo/CdhKxa4sOWuNLg565BB0XKcmpZovCMs="; + hash = "sha256-9XUzHfezr+bhQt6OKYiVEaCHqqWE6J7Y4Rj3MmaMAXA="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 8ce81bc3d616..d9e37f1b8826 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.5.0"; + version = "4.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-x1AhiARXZXcky3A+DJXoCrvkqsonlkgdrdr6es/VY3s="; + hash = "sha256-2ojnH+ySoU+1jOyIaKv366BAGI3Nzjac4QUK3RllhvY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 050e3f27bf71..8279f0ac9769 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -1,17 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "bitstruct"; - version = "8.13.0"; + version = "8.14.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e4fZ5B/1UqjK4G6iNow3crbzECvatLZeeTvnWQ1p8Ds="; + hash = "sha256-IwwZHHXxUm9pIs2wjqtvUsBVRS4iOb9WOPAunP04LJE="; }; + pythonImportsCheck = [ + "bitstruct" + ]; + meta = with lib; { - homepage = "https://github.com/eerimoq/bitstruct"; description = "Python bit pack/unpack package"; + homepage = "https://github.com/eerimoq/bitstruct"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; }; diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index ff642c8930e5..b6c5f02fb8e1 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "commoncode"; - version = "30.0.0"; + version = "30.1.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6SeU4u6pfDuGCgCYAO5fdbWBxW9XN3WvM8j6DwUlFwM="; + sha256 = "sha256-KymdX+5CAYSRpOwpqQ1DMCFWqkeMAmOHjVnBZTji76I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index cf55a56bdd17..c3abc2163be7 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -7,6 +7,7 @@ , pytest-asyncio , aiosqlite , databases +, fetchpatch , flask , httpx , passlib @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.75.1"; + version = "0.75.2"; format = "flit"; disabled = pythonOlder "3.6"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = version; - sha256 = "sha256-tSZ5isMzDhDsuVNQdoYXG0IYkgCvdVdARtFXELNjTtk="; + hash = "sha256-B4q3Q256Sj4jTQt1TDm3fiEaQKdVxddCF9+KsxkkTWo="; }; propagatedBuildInputs = [ @@ -50,6 +51,16 @@ buildPythonPackage rec { trio ]; + patches = [ + # Bump starlette, https://github.com/tiangolo/fastapi/pull/4483 + (fetchpatch { + name = "support-later-starlette.patch"; + # PR contains multiple commits + url = "https://patch-diff.githubusercontent.com/raw/tiangolo/fastapi/pull/4483.patch"; + sha256 = "sha256-ZWaqAd/QYEYRL1hSQdXdFPgWgdmOill2GtmEn33vz2U="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "starlette ==" "starlette >=" @@ -70,10 +81,13 @@ buildPythonPackage rec { disabledTests = [ "test_get_custom_response" - # Failed: DID NOT RAISE "test_websocket_invalid_data" "test_websocket_no_credentials" + # TypeError: __init__() missing 1...starlette-releated + "test_head" + "test_options" + "test_trace" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index b7fc364958dd..e86013605e7b 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.4.1"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fastai"; repo = pname; - rev = version; - sha256 = "sha256-qZsCsMwZxJsnznQ/C1SUPexkquv0tIyCkNYL5f2k0FU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-0q+qFrfMsXkwgu08igt2kHZ9c3/aqz/inCpJXkPZsdg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index e9587d0b765c..accd8fcf5b91 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.1"; + version = "2.5.3"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; - rev = "v${version}"; - sha256 = "sha256-XR6TqIrbCR93Qe9cRMgJ0aT/6ZZFj+6Mz+9GhiMD8lM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-LaK/lYCUN7PDy8QsaGCnQPM1nvQNeBRTdEEkKtaMUHA="; }; # Patch path to GLFW shared object diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index d6cc1f35e61c..1fbe806db3c4 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.8.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FLnEEsbTie1Z/9Y8nLzvLFbxiexUL4GFa8jCcEAYK1s="; + hash = "sha256-Gy/CS06uGQyQoPLjm8ChR6MkO6CYkpC/n5wM/VncDDs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index 111d7e00d1b2..09539b590cb3 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "matthiask"; repo = pname; rev = version; - sha256 = "sha256-1JSdi1PFM+N+UuEPfgWkOZw8S2PZ4ntadU0wnVJNnjw="; + hash = "sha256-1JSdi1PFM+N+UuEPfgWkOZw8S2PZ4ntadU0wnVJNnjw="; }; propagatedBuildInputs = [ @@ -31,7 +31,9 @@ buildPythonPackage rec { ]; disabledTests = [ + # Tests are sensitive to output "test_billion_laughs" + "test_10_broken_html" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index dadd872adcda..5e738adb62bf 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -43,6 +43,12 @@ buildPythonPackage rec { requests-mock ]; + postPatch = '' + # https://github.com/hacf-fr/meteofrance-api/pull/378 + substituteInPlace pyproject.toml \ + --replace 'pytz = ">=2020.4,<2022.0"' 'pytz = ">=2020.4,<2023.0"' + ''; + pythonImportsCheck = [ "meteofrance_api" ]; diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index ecc040f080bb..fe0933f7bd9e 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,19 +8,18 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.21.27.post1"; + version = "1.21.34"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LPc7ejocoSEtVaSW2Iye9EQiMrY4YU91bYSa4F3NRlg="; + hash = "sha256-gXvMC+GZknL+jYG9ZQD1/dqRhMwXrZvXG8CvCFYxdco="; }; propagatedBuildInputs = [ boto3 - ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 5546f58b2624..8678e512fdf0 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -70,8 +70,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'SQLAlchemy = ">=1.3.18,<=1.4.29"' 'SQLAlchemy = ">=1.3.18"' \ - --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.5.5"' 'databases = ">=0.5.5"' + --replace 'SQLAlchemy = ">=1.3.18,<=1.4.31"' 'SQLAlchemy = ">=1.3.18"' \ + --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<=0.5.5"' 'databases = ">=0.5.5"' ''; disabledTests = [ @@ -84,8 +84,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/collerek/ormar"; description = "Async ORM with fastapi in mind and pydantic validation"; + homepage = "https://github.com/collerek/ormar"; license = licenses.mit; maintainers = with maintainers; [ andreasfelix ]; }; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index ec077edfeb6b..69a1b01f063d 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.79"; + version = "2.1.80"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XIqof/RZL1dmfPU6NVtkf18zrkG5RPOesGfsDDrPhQ8="; + hash = "sha256-m9HMvLoFpg5aUoNknLdF7X++XEk9j70+qaid627uYvs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 2b55ced11711..f22df192148b 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.25.0"; + version = "1.26.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-i8/HmxxqoFj1OEwtXjF/u+yOmQ33RJbVHYmx78/d9Ng="; + sha256 = "sha256-niXqE6W3/Mg7AmBR18bk3NUiHpUOvlOT3nFaP+oVJ9M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index e47e0366c863..7a967c48a042 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -1,30 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, vcversioner , mock -, pytestCheckHook , pytest-asyncio , pytest-trio -, twisted +, pytestCheckHook , pythonOlder +, twisted +, typing-extensions +, vcversioner }: buildPythonPackage rec { pname = "pyee"; version = "9.0.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI="; + hash = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI="; }; buildInputs = [ vcversioner ]; + propagatedBuildInputs = [ + typing-extensions + ]; + checkInputs = [ mock pytest-asyncio @@ -33,7 +39,9 @@ buildPythonPackage rec { twisted ]; - pythonImportsCheck = [ "pyee" ]; + pythonImportsCheck = [ + "pyee" + ]; meta = with lib; { description = "A port of Node.js's EventEmitter to Python"; diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix index f4ea169b01e4..26b23477f939 100644 --- a/pkgs/development/python-modules/pykeyatome/default.nix +++ b/pkgs/development/python-modules/pykeyatome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykeyatome"; - version = "1.4.1"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jugla"; repo = "pyKeyAtome"; - rev = "V${version}"; - sha256 = "sha256-Gv418i2JLoovwagkZpv8PIJPW3I/0pRmXR/PJOJ2NBc="; + rev = "refs/tags/V${version}"; + sha256 = "sha256-LIPNCItD+qmk9NKAYbhEQC/A05Le9CNXECg7X2SlfdI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index 14c74cc8669c..e92776e72a29 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "6.6.1"; + version = "6.6.2"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-8oqbnCAMq29QIp9ETbMa3Ve8tTuJzQ0D8KlOYnLdUgQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-W5ukrhqJTgOXM9MnbZWvNy9TCoEUGrFYfD+zGGNU07w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyppeteer/default.nix b/pkgs/development/python-modules/pyppeteer/default.nix index 153be45ca8f5..a1857ec72067 100644 --- a/pkgs/development/python-modules/pyppeteer/default.nix +++ b/pkgs/development/python-modules/pyppeteer/default.nix @@ -1,6 +1,7 @@ { lib , appdirs , buildPythonPackage +, certifi , fetchFromGitHub , importlib-metadata , poetry-core @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "pyppeteer"; - version = "0.2.6"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-mMFQp8GMjKUc3yyB4c8Tgxut7LkMFa2cySO3iSA/aI4="; + sha256 = "sha256-izMaWtJdkLHMQbyq7o7n46xB8dOHXZ5uO0UXt+twjL4="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ appdirs + certifi importlib-metadata pyee tqdm @@ -49,6 +51,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace 'pyee = "^8.1.0"' 'pyee = "*"' \ --replace 'websockets = "^9.1"' 'websockets = "*"' ''; diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index f7be7f0107c0..995c7e206faf 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { version = "8.2.20220204150214"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PlPb/nE3eWueUTWSDpa7JxPe2ee+KFna5VTR3IsClwQ="; + hash = "sha256-PlPb/nE3eWueUTWSDpa7JxPe2ee+KFna5VTR3IsClwQ="; }; propagatedBuildInputs = [ @@ -37,9 +37,11 @@ buildPythonPackage rec { ]; disabledTests = [ - # setup for these tests requires network access + # Setup for these tests requires network access "test_secondaryFiles" "test_outputBinding" + # Test requires network + "test_yaml_tab_error" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index b2362d8ed778..c0bd1751bf12 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.72.0"; + version = "2.73.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nKjoejNzV9IAjSdP9WNi8hnnNnEDC+KmNnSN7rE3d/s="; + hash = "sha256-Z5JG1mPaX7OElL48OoIljUdqu4TKrmfwrh85Z81i0zo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index 2ae36cd5408d..f68ec91e1cbb 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -1,31 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, nose +{ lib +, buildPythonPackage +, fetchPypi , lxml , requests , pyparsing +, pythonOlder }: + buildPythonPackage rec { pname = "twill"; - version = "3.0.1"; + version = "3.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "57cde4c3a2265f1a14d80007aa4f66c2135d509555499e9b156d2b4cf5048c2c"; + hash = "sha256-dWtrdkiR1+IBfeF9jwbOjKE2UMXDJji0iOb+USbY7zk="; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ lxml requests pyparsing ]; - doCheck = false; # pypi package comes without tests, other homepage does not provide all verisons + pythonImportsCheck = [ + "twill" + ]; + + # pypi package comes without tests, other homepage does not provide all verisons + doCheck = false; meta = with lib; { - homepage = "https://twill-tools.github.io/twill/"; description = "A simple scripting language for Web browsing"; - license = licenses.mit; + homepage = "https://twill-tools.github.io/twill/"; + license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index 49b7097549d6..ff26a9f1711e 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { "webssh" ]; + disabledTests = [ + # Test fails with AttributeError (possibly related to paramiko update) + "test_app_with_bad_host_key" + ]; + meta = with lib; { description = "Web based SSH client"; homepage = "https://github.com/huashengdun/webssh/"; diff --git a/pkgs/development/python-modules/webthing/default.nix b/pkgs/development/python-modules/webthing/default.nix index 92e4ea5a8fb5..aea123bc78c1 100644 --- a/pkgs/development/python-modules/webthing/default.nix +++ b/pkgs/development/python-modules/webthing/default.nix @@ -4,6 +4,7 @@ , ifaddr , jsonschema , pyee +, pythonOlder , tornado , zeroconf }: @@ -11,12 +12,15 @@ buildPythonPackage rec { pname = "webthing"; version = "0.15.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "WebThingsIO"; repo = "webthing-python"; rev = "v${version}"; - sha256 = "06264rwchy4qmbn7lv7m00qg864y7aw3rngcqqcr9nvaqz4rb0fg"; + hash = "sha256-z4GVycdq25QZxuzZPLg6nhj0MAD1bHrsqph4yHgmRhg="; }; propagatedBuildInputs = [ @@ -27,9 +31,12 @@ buildPythonPackage rec { zeroconf ]; - # no tests are present + # No tests are present doCheck = false; - pythonImportsCheck = [ "webthing" ]; + + pythonImportsCheck = [ + "webthing" + ]; meta = with lib; { description = "Python implementation of a Web Thing server"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 1a7d7807d696..73f32a356f46 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1067"; + version = "2.0.1068"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-WK6fot5YAC5l/0EiJuIQ5Xvz5NiEWnU+BfzsKv+caJ8="; + hash = "sha256-/WJiGWBGcVDoiX+FnEbIFaMRxQSnJTqLqHbKlEoCqWU="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 131c899dcfb9..b74add360be7 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, flex, bison }: stdenv.mkDerivation rec { pname = "minizinc"; - version = "2.6.1"; + version = "2.6.2"; nativeBuildInputs = [ cmake flex bison ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "MiniZinc"; repo = "libminizinc"; rev = version; - sha256 = "sha256-JCR2wvtMNyHBIIqrH5eBc0CIOVyo8mnPUZXtwjJt3sw="; + sha256 = "sha256-0yOZZJMDMmIBCJ2ZU3AfGvFSANqHNFN+UHYMI0nogOQ="; }; meta = with lib; { diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index fe60516b3e58..438b877bb271 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "confluent-platform"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { url = "https://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}.tar.gz"; - sha256 = "Q0/A/3M2tn530/+o1RpcgNsPKFQq6YJQnhgysRlpVfU="; + sha256 = "sha256-uoJQQZxUGniMLJk/BwwiNnpgYFcqJ+27GFQLEpsFxCw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 144a1b275926..03c95378a0ae 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -2,23 +2,27 @@ , lib , fetchurl + # Only used for x86/x86_64 , uasm -, useUasm ? stdenv.isLinux +, useUasm ? stdenv.hostPlatform.isx86 # RAR code is under non-free unRAR license # see the meta.license section below for more details , enableUnfree ? false + + # For tests +, _7zz +, testVersion }: let inherit (stdenv.hostPlatform) system; - platformSuffix = - lib.optionalString useUasm { - aarch64-linux = "_arm64"; - i686-linux = "_x86"; - x86_64-linux = "_x64"; - }.${system} or - (builtins.trace "7zz's ASM optimizations not available for `${system}`. Building without optimizations." ""); + platformSuffix = { + aarch64-linux = "_arm64"; + i686-linux = "_x86"; + x86_64-linux = "_x64"; + }.${system} or + (builtins.trace "`platformSuffix` not available for `${system}.` Making a generic `7zz` build." ""); in stdenv.mkDerivation rec { pname = "7zz"; @@ -50,6 +54,10 @@ stdenv.mkDerivation rec { sourceRoot = "CPP/7zip/Bundles/Alone2"; makeFlags = + [ + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + ] ++ lib.optionals useUasm [ "MY_ASM=uasm" ] ++ # it's the compression code with the restriction, see DOC/License.txt lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ]; @@ -69,17 +77,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/7zz --help | grep ${version} - - runHook postInstallCheck - ''; - - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests.version = testVersion { + package = _7zz; + command = "7zz --help"; + }; + }; meta = with lib; { description = "Command line archiver utility"; diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 4b5c5234bf94..2854456c1b05 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.19.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "0m6l6c71f40a6wc8w7cdikwx3blwqxw55p4frrww25qgd0xdcgls"; + sha256 = "sha256-3xIJkV/BC+qdMP2vsUr5wIwqzaz2uCV/j6VdC6uvzgY="; }; - cargoSha256 = "1pl4lrr1p3c7j9fb0mb4spjzgcn9zvr67nskzgmhrbr3kyzc2ssc"; + cargoSha256 = "sha256-GN8vz67/Pd39E3iYeqVfjC7zxvcA8u88lv42kWovlCo="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 2b0fdb190786..917a279a2c87 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.19.1"; + version = "3.19.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "sha256-URl0I2jtiw27IZSkxa0JR313+Et6OIZPB9SeRf2tqnk="; + sha256 = "sha256-EnhTbwOnq1zTYlnSvNiXduZCp4J65Ot5FR17+e16v2s="; }; - vendorSha256 = "sha256-emWAUxgM8HrDo5ThzqNlinUg6aEwh5TyOOTEQjM53wc="; + vendorSha256 = "sha256-Yh1OAoPPWSG83WdH1caHodRWovdyYcUsEoPdckmVfHQ="; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index 663cc38291cb..69e0f0a2e931 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,22 +4,43 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - sha256 = "sha256-y8klkb0hyITxLhcNWF7RYRVwF8rclDKzQF/MJs6y//Y="; + sha256 = "sha256-cihue4DMqHLFVz5kLZf17EcwbkfBxlxtqmto5K11sIo="; + # populate values that require us to use git. By doing this in postFetch we + # can delete .git afterwards and maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/COMMIT + # '0000-00-00T00:00:00Z' + date -u -d "@$(git log -1 --pretty=%ct)" "+'%Y-%m-%dT%H:%M:%SZ'" > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; - vendorSha256 = "sha256-0PPdnE3ND/YNIk50XkgBROpe5OhFiFre5Lwsml02DQU="; + vendorSha256 = "sha256-bJOWSf2MHeLdI1smFXCjN3PIFRcO76cDnxks+FgqZdY="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ packageToBuild ]; - ldflags = [ "-s" "-w" "-X github.com/sigstore/rekor/pkg/api.GitVersion=v${version}" ]; + ldflags = [ + "-s" + "-w" + "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}" + "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" + ]; + + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)" + ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" + ''; postInstall = '' installShellCompletion --cmd ${pname} \ diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 57c607e69c6b..edca9c1b7892 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -3,13 +3,13 @@ let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "4.1"; + version = "4.2"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "sha256-KktwbnL13Tcc2iWAjgqQSMSenUN6nYBEGbFrpB1kkr0="; + sha256 = "sha256-KkLN8b2sJhDbYVfNANEg1prPfIySoL9N48PSQyXqE8I="; }; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0faf57c85641..bf0e839a16c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27862,7 +27862,9 @@ with pkgs; mnamer = callPackage ../applications/misc/mnamer { }; - moc = callPackage ../applications/audio/moc { }; + moc = callPackage ../applications/audio/moc { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; mod-arpeggiator-lv2 = callPackage ../applications/audio/mod-arpeggiator-lv2 { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9998cc59c408..68ffcdcec776 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1260,6 +1260,8 @@ let reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { }); + rebez = callPackage ../development/ocaml-modules/rebez { }; + rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { }; ezresto = callPackage ../development/ocaml-modules/resto/ezresto.nix { };