diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 074f4c00e791..4eefe3bea0f5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10330,6 +10330,12 @@ githubId = 3073833; name = "Massimo Redaelli"; }; + mrene = { + email = "mathieu.rene@gmail.com"; + github = "mrene"; + githubId = 254443; + name = "Mathieu Rene"; + }; mrfreezeex = { email = "arthur@cri.epita.fr"; github = "MrFreezeex"; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 438b3baf314d..76a0172747ff 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -1112,7 +1112,7 @@ in { ${optionalString (cfg.nginx.recommendedHttpHeaders) '' add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; + add_header X-Robots-Tag "noindex, nofollow"; add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; add_header X-Frame-Options sameorigin; diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix index bccd3dd157f3..5c3da313e3c4 100644 --- a/pkgs/applications/audio/minidsp/default.nix +++ b/pkgs/applications/audio/minidsp/default.nix @@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mrene/minidsp-rs"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; - maintainers = [maintainers.adamcstephens]; + maintainers = [maintainers.adamcstephens maintainers.mrene]; }; } diff --git a/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/pkgs/applications/file-managers/portfolio-filemanager/default.nix index 770491b4ffa6..e0b9954e1f5c 100644 --- a/pkgs/applications/file-managers/portfolio-filemanager/default.nix +++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix @@ -13,11 +13,12 @@ , ninja , pkg-config , wrapGAppsHook +, nix-update-script }: python3.pkgs.buildPythonApplication rec { pname = "portfolio"; - version = "0.9.14"; + version = "0.9.15"; format = "other"; @@ -25,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tchx84"; repo = "Portfolio"; rev = "v${version}"; - hash = "sha256-mrb202ON0B6VlY+U+jN0jJmbT36jQ8krNnuODynaCUA="; + hash = "sha256-/OwHeeUjpjm35O7mySoAfKt7Rsp1EK2WE+tfiV3oiQg="; }; postPatch = '' @@ -65,12 +66,18 @@ python3.pkgs.buildPythonApplication rec { ln -s dev.tchx84.Portfolio "$out/bin/portfolio" ''; + passthru = { + updateScript = nix-update-script { + attrPath = "portfolio-filemanager"; + }; + }; + meta = with lib; { description = "A minimalist file manager for those who want to use Linux mobile devices"; homepage = "https://github.com/tchx84/Portfolio"; changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda chuangzhu ]; }; } diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index c7dbb39ae5b2..aa6611f0d510 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libjpeg }: +{ lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.5.3"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PROQvOqsis8we58OOZ/kuY+L/CoV7XfnY9wvrpsTJu8="; + sha256 = "sha256-vNjXY/Qz6IT7rV+as2EBkSWd4O98slcXLNgAO9Dkc9E="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-27781.patch"; - url = "https://github.com/tjko/jpegoptim/commit/29a073ad297a0954f5e865264e24755d0ffe53ed.patch"; - hash = "sha256-YUjVg0cvElhzMG3b4t5bqcqnHAuzDoNvSqe0yvlgX4E="; - }) - ]; - # There are no checks, it seems. doCheck = false; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index ee25c5e8cc0f..368d6eddfe78 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -16,13 +16,13 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.6-RC3"; + version = "3.6-RC4"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; rev = "refs/tags/v${version}"; - hash = "sha256-/LGVDeWJZZXy5r5WxElDuxUagpA/RIwHGRbkcdO8IrE="; + hash = "sha256-2cwxsfy4Zc9fF3fe6QcZp3LPd2yWw2rDlYrK/QGiJYw="; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index fcc635f075b6..3e66ac90e9bb 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , nix-update-script , cmake , pkg-config @@ -17,15 +18,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.15.5"; + version = "1.15.6"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-TP9Q80QKSkpOOQ7mllnaE1dOnNPU7k3Ij6M3+n8Jv2E="; + hash = "sha256-V9zrwSAflatGcN5cOOzHyyW73FN3rU+l5xUlPwy8Huk="; }; + patches = [ + # https://github.com/skyjake/lagrange/issues/589 + (fetchpatch { + url = "https://github.com/skyjake/lagrange/commit/e8a4dad6930d16aa0811d04d06432cd6b59b472e.patch"; + hash = "sha256-60YPmZPalnoo9AjwqKpswHkKAM/hKSIOapgPwSi4Qzk="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config zip ]; buildInputs = [ the-foundation ] diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 971f43117e89..fc69a91d2290 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "3.73.3"; + version = "3.74.1"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-ri4ir5mOfefB23gVk+XltXNYEz1jMoIVbJ5b0sS444k="; + sha256 = "sha256-MKc0/eRyAA7xeKKI8ssBXppGKjkqo7/AlRLmNp8juFM="; }; - vendorHash = "sha256-YRNOOn/Ei0rHLZrTtQxlBBn48pePDHllnI65Iil160k="; + vendorHash = "sha256-8s+Fx62HkCX4JO5ixSvx4k1xm0N1N2z/28uVwlUnxqg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index e6e867f477ba..e0ae61743164 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -123,7 +123,7 @@ mkDerivation rec { ''; homepage = "https://github.com/f4exb/sdrangel"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ alkeryn ]; + maintainers = with maintainers; [ alkeryn Tungsten842 ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 1a084d8b94ba..27e9eaa0e10a 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.568"; + version = "0.569"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-ToNAduAKc4gJqO+fMZ2ZT43lnobonytdaSN5Yh0Q6A8="; + hash = "sha256-SvHwFsyM3Oe4k2Flx1XhTSkHOIDe9PKjlyJ+OyHFcQE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 8a396e40725e..e7d57d457bde 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -1,28 +1,28 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config, file +, cmake , cunit, ncurses , curlHTTP3 }: stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N4wgk21D1I0tNrKoTGWBtq3neeamCI8axQnFxdT1Txg="; + hash = "sha256-V0g/d1B9uMn7KZU6ShzyPGXOSAYCbz4ZubnhAwz+Qsc="; }; outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ autoreconfHook pkg-config file ]; + nativeBuildInputs = [ cmake ]; nativeCheckInputs = [ cunit ncurses ]; - preConfigure = '' - substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file - ''; + cmakeFlags = [ + "-DENABLE_STATIC_LIB=OFF" + ]; doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index b100450b732d..b64ba95528e8 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -1,27 +1,27 @@ { lib, stdenv, fetchFromGitHub , cmake -, libev, nghttp3, quictls , cunit, ncurses +, libev, nghttp3, quictls , withJemalloc ? false, jemalloc , curlHTTP3 }: stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bkTbnf7vyTxA623JVGUgrwAuXK7d8kzijOK1F4Sh4yY="; + hash = "sha256-6XHOMBsgKSVwpTwQlIt+H9tRPF8YBjfOLmHtdC/LVlE="; }; outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc; nativeCheckInputs = [ cunit ncurses ]; + buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc; cmakeFlags = [ "-DENABLE_STATIC_LIB=OFF" diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index c556b8dabe5f..11d50a9ec9df 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.14.2"; + version = "6.14.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3ofvEEMCwsb8tDeYp1xC1PClwH6IfCodB6C1qft3TeA="; + hash = "sha256-c+xZkptiFPbSzlhYwixk46HaunuM3BJxgzu208cVVEk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/anyascii/default.nix b/pkgs/development/python-modules/anyascii/default.nix index d810b5030482..d781a552cca1 100644 --- a/pkgs/development/python-modules/anyascii/default.nix +++ b/pkgs/development/python-modules/anyascii/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "anyascii"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - hash = "sha256-3t9XcoIG4obJHu18dZUFpeRcjNATZ91Awvcki7FcEfY="; + hash = "sha256-nV0y74RP4iW4vHy6f5UFNPrk2iepvzpr6iyw6kbORzA="; }; nativeCheckInputs = [ @@ -21,6 +21,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/anyascii/anyascii/blob/${version}/CHANGELOG.md"; description = "Unicode to ASCII transliteration"; homepage = "https://github.com/anyascii/anyascii"; license = licenses.isc; diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 6338c46399de..a24e6aec8e1b 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "param"; - version = "1.12.3"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "holoviz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XVHYx0M/BLjNNneObxygPHtid65ti7nctKsUMF21fmw="; + hash = "sha256-5b3UTzb7OXBwcyYyDVCGLUpWxNOYZ3cv8Gfw+x7jsBI="; }; nativeCheckInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Declarative Python programming using Parameters"; - homepage = "https://github.com/pyviz/param"; + homepage = "https://param.holoviz.org/"; changelog = "https://github.com/holoviz/param/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index a6a7da582679..cb3062b72971 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pdoc"; - version = "12.3.1"; + version = "13.0.0"; disabled = pythonOlder "3.7"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-SaLrE/eHxKnlm6BZYbcZZrbrUZMeHJ4eCcqMsFvyZ7I="; + hash = "sha256-UzUAprvBimk2POi0QZdFuRWEeGDp+MLmdUYR0UiIubs="; }; nativeBuildInputs = [ @@ -41,13 +41,10 @@ buildPythonPackage rec { pytestCheckHook hypothesis ]; - disabledTests = [ - # Failing "test_snapshots" parametrization: Output does not match the stored snapshot - # This test seems to be sensitive to ordering of dictionary items and the version of dependencies. - # the only difference between the stored snapshot and the produced documentation is a debug javascript comment - "html-demopackage_dir" - # snapshot tests mismatch with latest pygments version - "test_snapshots" + disabledTestPaths = [ + # "test_snapshots" tries to match generated output against stored snapshots. + # They are highly sensitive dep versions, which we unlike upstream do not pin. + "test/test_snapshot.py" ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 53a1b877c05d..4d90e4e17e42 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -16,6 +16,7 @@ , nose , packaging , pdfminer-six +, pdm-pep517 , pillow , prettytable , pyqt5 @@ -32,8 +33,8 @@ buildPythonPackage rec { pname = "woob"; - version = "3.3.1"; - format = "setuptools"; + version = "3.4"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,12 +42,13 @@ buildPythonPackage rec { owner = "woob"; repo = pname; rev = version; - hash = "sha256-aPkMfPRDjPfHIlGDEvorGwk09yQuEWwOkJJUST0vLAs="; + hash = "sha256-qVE1FQK3+jBKIHW+s1iNZwy8Srb2kQhWNTlZyzc1/jE="; }; nativeBuildInputs = [ packaging pyqt5 + pdm-pep517 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index c8a74bd03085..0b702582cfec 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FKnOqK3qmzWEmf+92up8ApeotyQyZpbmLDY72U3+mY8="; + hash = "sha256-A/LGn+CiqDja0gDuvydvu/fRJozrlnSV62kPjUdwEH8="; }; - vendorSha256 = "sha256-dYa6OuC2ingAh2VOzyGR4lK1GbTJ/l9iKXYWqRJmByc="; + vendorHash = "sha256-tiYF5Ni6GHRV3JdUkP6155lDN3NGId9/sA/iZSiD1II="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 3e3a137a5769..bef08b8b5130 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.15.1"; + version = "9.16.1"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-Ls7PGvpFfXEz93P+VSkI/w+mGjZPJr+Wrf+QdaDFtqE="; + sha256 = "sha256-PYqzshcU4jqffXrCuj6O7c5E3ABFSQKylmuz+fmzq1g="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index 026433cabcb2..0b310a049918 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swag"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-PDK1TI99/8hAuyK4NOb357WZG0JBno8er8HMfus5V7Q="; + sha256 = "sha256-clWYiDJN9fJLLkMfURPKb377+YX7DZzwXWZ/YDW4fLU="; }; - vendorHash = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ="; + vendorHash = "sha256-0fubBlipY4eogg68JHZVO+fOAQMRKOqhk8z0qNLvDjM="; subPackages = [ "cmd/swag" ]; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 1f11f96af37e..0f0c486ee617 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.52.0"; + version = "1.52.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-XcrWBHmxsDwsP/+H0OTmGKVG9NgBwR5dBY9sJZWo+K8="; + hash = "sha256-Du0u31P2Ay4MVLmgrQmbAstmczuIy+ONIUAUEbbK+j4="; }; vendorHash = "sha256-N20AJaREqmvCey5P0YuUd3l/5xRzrIG+mPOiVHOUFWc="; diff --git a/pkgs/development/tools/rust/cargo-release/Cargo.lock b/pkgs/development/tools/rust/cargo-release/Cargo.lock index 9a1d942bd07e..42bd5aeaa87c 100644 --- a/pkgs/development/tools/rust/cargo-release/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-release/Cargo.lock @@ -125,7 +125,7 @@ dependencies = [ [[package]] name = "cargo-release" -version = "0.24.6" +version = "0.24.8" dependencies = [ "anyhow", "assert_fs", @@ -1256,6 +1256,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "111.25.2+1.1.1t" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.80" @@ -1265,6 +1274,7 @@ dependencies = [ "autocfg", "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index 39213809070d..43b3317f0174 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.24.6"; + version = "0.24.8"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "refs/tags/v${version}"; - hash = "sha256-IB+p2pxS+ycPlHgURujBDPppkgF8SjTBa+j1qvzFbjc="; + hash = "sha256-cnewZXIgNUtzJk7GQZKdqUZCbp46xYULZKh0A7/La4k="; }; cargoLock = { @@ -42,6 +42,8 @@ rustPlatform.buildRustPackage rec { git ]; + OPENSSL_NO_VENDOR = true; + meta = with lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; homepage = "https://github.com/crate-ci/cargo-release"; diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index b49df81643b7..87ee8b49a768 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lgogdownloader"; - version = "3.9"; + version = "3.10"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - sha256 = "sha256-Qt9uTKsD0kQ6b9Y5+eC+YWpCHMIJGzP+pMfuUBt/fME="; + hash = "sha256-rS0RQLX/jGbIitQv7IWPkq8kIo6x7S2ZyHVWW2GJNdA="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix index 852143083334..26e90cbf6bba 100644 --- a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Brother MFC-5890CN CUPS wrapper driver."; - londDescription = "Brother MFC-5890CN CUPS wrapper driver. Use the connection string 'lpd://\${IP_ADDRESS}/binary_p1' when connecting to this printer via the network."; + longDescription = "Brother MFC-5890CN CUPS wrapper driver. Use the connection string 'lpd://\${IP_ADDRESS}/binary_p1' when connecting to this printer via the network."; homepage = "http://www.brother.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl2Plus; diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix index ae5ac99b6645..840860f90d91 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix @@ -35,7 +35,7 @@ mkYarnPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-bxDqv7KofinDuYDB1F0ZKWUQnz+ErU+OZc6i77nzM9Q="; + sha256 = data.cargoHash; }; packageResolutions = { diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json index 8b9701d09d76..23aa4ad34d25 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json @@ -1,6 +1,6 @@ { "name": "matrix-hookshot", - "version": "3.0.0", + "version": "3.0.1", "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", "main": "lib/app.js", "repository": "https://github.com/matrix-org/matrix-hookshot", diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json index b4c0f27ecfa0..bd8bc6de7512 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json @@ -1,5 +1,6 @@ { - "version": "3.0.0", - "srcHash": "2fuDV2h97VdBADygMeyk2B5etFKkQdNZeOWlhMD4hJk=", - "yarnHash": "0ivizv90wrbz583xjvbakv6vg782h7pjm5zbm8wb9qkpnj735avz" + "version": "3.0.1", + "srcHash": "GQfQWOyiI/rxRsj9GYoc2wPaG8phl+2d9Hulxrar5Jc=", + "yarnHash": "0ivizv90wrbz583xjvbakv6vg782h7pjm5zbm8wb9qkpnj735avz", + "cargoHash": "/yEupeMwzTh/Ujbh2mPXXQbUCajFK/yl1QM3XmFS/Cc=" } diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh b/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh index 4d91ec753329..1ffde25917d2 100755 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh @@ -26,10 +26,12 @@ yarn_hash=$(prefetch-yarn-deps yarn.lock) popd curl -O "$src/package.json" +# There is no prefetcher for the cargo hash, but care should still be taken to update it cat > pin.json << EOF { "version": "$version", "srcHash": "$src_hash", - "yarnHash": "$yarn_hash" + "yarnHash": "$yarn_hash", + "cargoHash": "0000000000000000000000000000000000000000000000000000" } EOF diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index 169222e4d43d..5a30fa52f7d3 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-sVvQQm2hE5J6ZesL8YRkdq/OwzHziBCsa3D/b1kYPpw="; + sha256 = "sha256-gqdskpAwv6/FDscnz4akWtYR8eIKSK4gXOnXFo27TVk="; }; vendorSha256 = null; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index a24a38081afe..cd8fe4d0ca26 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -135,7 +135,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -145,7 +145,7 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - hash = "sha512-oR6nYa2s4C73+IsliTMoAFzvB/ktNi+8eUVA3KJunPyXCHjQMSyuvRnWRIPp88PiStbCffziZNF3+T1lx+9plg=="; + hash = "sha256-VUArtHymc52KuiXkF4CQW1zhvOCl4N0X3KkItbwLSbI="; }; # Fix FHS paths in tests @@ -181,6 +181,10 @@ let rm tests/pexpects/exit.py rm tests/pexpects/job_summary.py rm tests/pexpects/signals.py + + # pexpect tests are flaky in general + # See https://github.com/fish-shell/fish-shell/issues/8789 + rm tests/pexpects/bind.py '' + lib.optionalString stdenv.isLinux '' # pexpect tests are flaky on aarch64-linux (also x86_64-linux) # See https://github.com/fish-shell/fish-shell/issues/8789 diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix index c09a10263f9d..2213067f9bc9 100644 --- a/pkgs/tools/misc/boxxy/default.nix +++ b/pkgs/tools/misc/boxxy/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-842vddqxxWh64uYrSk0bugx5hhhCnliSO1zoTmm5iVk="; + hash = "sha256-e6AkxC3TP2StApPSWaadLz/AFmaKBKCrS5HuocvmfQs="; }; - cargoHash = "sha256-BwdGed5PvlPxtx0FcT4G7RG0M8fAUOuX7c+uR/m0Sz4="; + cargoHash = "sha256-E3IX3JSc8Rq8Qnx6Lk+PQgGfHptidxPaOqejYJgudlw="; meta = with lib; { description = "Puts bad Linux applications in a box with only their files"; diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/tools/misc/urn-timer/default.nix index 83dad9ebe7f8..e871bb758b8b 100644 --- a/pkgs/tools/misc/urn-timer/default.nix +++ b/pkgs/tools/misc/urn-timer/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , unstableGitUpdater , xxd , pkg-config @@ -12,32 +11,18 @@ stdenv.mkDerivation { pname = "urn-timer"; - version = "unstable-2017-08-20"; + version = "unstable-2023-03-18"; src = fetchFromGitHub { - owner = "3snowp7im"; + owner = "paoloose"; repo = "urn"; - rev = "246a7a642fa7a673166c1bd281585d0fc22e75b2"; - sha256 = "0bniwf3nhsqapsss9m9y9ylh38v6v7q45999wa1qcsddpa72k0i0"; - fetchSubmodules = true; + rev = "09c075607a6e26307665b45095e133d6805f0aeb"; + hash = "sha256-0/V1KQxwHhpcruEsll0+JNtgT/6vEkpt+ff3SlsHYr8="; }; - patches = [ - # https://github.com/3snowp7im/urn/pull/50 - (fetchpatch { - name = "stop-hardcoding-prefix"; - url = "https://github.com/3snowp7im/urn/commit/6054ee62dcd6095e31e8fb2a229155dbbcb39f68.patch"; - sha256 = "1xdkylbqlqjwqx4pb9v1snf81ag7b6q8vybirz3ibsv6iy79v9pk"; - }) - # https://github.com/3snowp7im/urn/pull/53 - (fetchpatch { - name = "create-installation-directories"; - url = "https://github.com/3snowp7im/urn/commit/fb032851b9c5bebb5066d306f5366f0be34f0797.patch"; - sha256 = "0jjhcz4n8bm3hl56rvjzkvxr6imc05qlyavzjrlafa19hf036g4a"; - }) - ]; - - postPatch = ''substituteInPlace GNUmakefile --replace 'rsync -a --exclude=".*"' 'cp -r' ''; + postPatch = '' + substituteInPlace Makefile --replace 'rsync -a --exclude=".*"' 'cp -r' + ''; nativeBuildInputs = [ xxd @@ -54,13 +39,14 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; passthru.updateScript = unstableGitUpdater { - url = "https://github.com/3snowp7im/urn.git"; + url = "https://github.com/paoloose/urn.git"; }; meta = with lib; { - homepage = "https://github.com/3snowp7im/urn"; + homepage = "https://github.com/paoloose/urn"; description = "Split tracker / timer for speedrunning with GTK+ frontend"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; + mainProgram = "urn-gtk"; }; } diff --git a/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/tools/networking/xdp-tools/default.nix index 45b557e2739b..0e5a27ddd17a 100644 --- a/pkgs/tools/networking/xdp-tools/default.nix +++ b/pkgs/tools/networking/xdp-tools/default.nix @@ -6,6 +6,7 @@ , elfutils , zlib , libpcap +, bpftools , llvmPackages , pkg-config , m4 @@ -15,15 +16,23 @@ }: stdenv.mkDerivation rec { pname = "xdp-tools"; - version = "1.2.9"; + version = "1.3.1"; src = fetchFromGitHub { owner = "xdp-project"; repo = "xdp-tools"; rev = "v${version}"; - sha256 = "Q1vaogcAeNjLIPaB0ovOo96hzRv69tMO5xwHh5W4Ws0="; + sha256 = "ctggXzc3qA+m2/nJ9lmR/pERj0YyPko3MTttm8e85cU="; }; + patches = [ + # Fix function detection for btf__type_cnt() + (fetchpatch { + url = "https://github.com/xdp-project/xdp-tools/commit/a7df567634af77381832a2212c5f5099b07734f3.patch"; + sha256 = "1i4s4y0z9pf3dnjzxy8k0jkjshhz3b0v49qw4cspjrjlmcmy0x00"; + }) + ]; + outputs = [ "out" "lib" ]; buildInputs = [ @@ -37,6 +46,7 @@ stdenv.mkDerivation rec { emacs-nox # to generate man pages from .org ]; nativeBuildInputs = [ + bpftools llvmPackages.clang llvmPackages.llvm pkg-config diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 52b10dfae6d5..19a1b275028b 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.4"; + version = "2.36.5"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-bUXiF+GlmNe8zoEjC8aWsbKEnymUKQv+121dTUVtqEQ="; + sha256 = "sha256-v5lr0CtKBDNB3Cy9/3mA6E0koQyQvtGe1ET2Mm4EfDc="; }; - vendorHash = "sha256-APwtLd8+Imy4cBSlm4sHPdA/DQCN4pDFSM/R5ib3k4E="; + vendorHash = "sha256-MXm1V8GrjZn/x0Q6fW8zJN351zVsPGME4eFg6f8cEX8="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ffe4fab27f0..489e3d50e00c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26963,9 +26963,7 @@ with pkgs; sdparm = callPackage ../os-specific/linux/sdparm { }; - sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { - boost = boost172; - }; + sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { }; setools = callPackage ../os-specific/linux/setools { };