diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 5ecbf4fc9790c..cb7355aac17a3 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -74,6 +74,10 @@ stdenv.mkDerivation rec { "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; + # fix "Killed: 9 test/test_bitcoin" + # https://github.com/NixOS/nixpkgs/issues/179474 + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + checkInputs = [ python3 ]; doCheck = true; diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index b8cf3765714c5..f0db2b9849225 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -63,11 +63,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "42.2"; + version = "42.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-eLolewn73cBYh5F00Tg3p5zVnpWoSQEX5Myi5SLJ6wA="; + sha256 = "sha256-zgrjZQ3ir368sKfh/JkS7dtu/40lfz/lD/iynBk0HH4="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index aa45ce2f55172..8fdc16ca74e3e 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "42.2"; + version = "42.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "6ENJYyp/XQhmzlwMVi5f6oQRoF8ickRBzZqCQgRiMiQ="; + sha256 = "OM9whWmj12TU0NLt7KqG9Og57CK5ZvQf2tVleKDdM8A="; }; patches = [ diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 30a16cb48df0f..ab8cbf6174125 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "amtk"; - version = "5.4.1"; + version = "5.5.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "frq8QpsO67KzI2DJv9vjaOSJs1w83AhqhWz8mzpGanI="; + sha256 = "7Ilt0BfiwUNoUuXmCXD80IML0SFI1XzBvcDZOCa925w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 059c79bfcbb53..d4d45713de254 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { url = "https://github.com/duckdb/duckdb/commit/82e13a4bb9f0683af6c52468af2fb903cce4286d.patch"; sha256 = "sha256-m0Bs0DOJQtkadbKZKk88NHyBFJkjxXUsiWYciuRIJLU="; }) + (fetchpatch { + name = "fix-list-type-metadata.patch"; + url = "https://github.com/duckdb/duckdb/commit/26d123fdc57273903573c72b1ddafc52f365e378.patch"; + sha256 = "sha256-ttqs5EjeSLhZQOXc43Y5/N5IYSESQTD1FZWV1uJ15Fo="; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index fce73f74660e1..edd54516853f1 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.72.0"; + version = "2.72.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EAquuzaShQQd5S2kIra3FnidXk11SaOnG6WHuTLggjs="; + sha256 = "b8G+3IBiSE3IoCBJZZle8jZ8PbXJNAWP8WB+WiTZWnQ="; }; patches = [ diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index db7db4cce626e..4900c15d10eb1 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.86.0"; + version = "1.87.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0="; + hash = "sha256-iRGLNMGs5WawzcqQb5AQTuD4NCJoBUSHfFUXXvm5+jE="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk="; + hash = "sha256-bmtm+cvjBIlZVRq/vjHd5Sl4FXJHP3cPp4+bWY5SKus="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 0831539dd570b..36b6c5b9bae43 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rapidfuzz-cpp"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${version}"; - hash = "sha256-8SJU+ERFRGkbGBmGJa5Ypetc3LPeytg5pR4S29RkvR8="; + hash = "sha256-ocR88dgRo7dF7scATv8kPYmcK3R6a8DcoJfNHq1hZnM="; }; patches = [ diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index dd7ad8737975a..d7878bd6a44df 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , duckdb , google-cloud-storage , mypy @@ -13,10 +14,12 @@ buildPythonPackage rec { pname = "duckdb"; - inherit (duckdb) version src; + inherit (duckdb) version src patches; format = "setuptools"; - sourceRoot = "source/tools/pythonpkg"; + preConfigure = '' + cd tools/pythonpkg + ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -45,6 +48,6 @@ buildPythonPackage rec { description = "Python binding for DuckDB"; homepage = "https://duckdb.org/"; license = licenses.mit; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ costrouc cpcloud ]; }; } diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix index de20ac26550ef..48b1385401d41 100644 --- a/pkgs/development/python-modules/jarowinkler/default.nix +++ b/pkgs/development/python-modules/jarowinkler/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "jarowinkler"; - version = "1.0.4"; + version = "1.0.5"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "JaroWinkler"; rev = "v${version}"; - hash = "sha256-2bhKl7l3ByfrtkXnXifQd/AhWVFGSMzULkzJftd1mVE="; + hash = "sha256-5LWJeNfQ0d8wiqjIha+CCcmBf+GU36VTYFqRlg4+6qA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index f3c4b77a70956..5d718aadd6f06 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.0.15"; + version = "2.1.0"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "v${version}"; - hash = "sha256-wn77gA6UCgsdDf3FZgjrA5gSWpWJg3YoUhx88X7aVcM="; + hash = "sha256-bvuT31qxYj/agEtPIJf/6YAOe6CGpEmaKpfNocw4wYQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 60c23e3c6a2b9..b897d6ced4a38 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -7,28 +7,41 @@ , requests , packaging , dparse +, ruamel-yaml , pytestCheckHook }: buildPythonPackage rec { pname = "safety"; - version = "1.10.3"; + version = "2.0.0"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; - format = "setuptools"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MOOU0CogrEm39lKS0Z04+pJ6j5WCzf060a27xmxkGtU="; + sha256 = "d739d00a9e4203cfaba34540c822a73ca1d327159ed7776b3dce09391f81c35d"; }; + postPatch = '' + substituteInPlace safety/safety.py \ + --replace "telemetry=True" "telemetry=False" + substituteInPlace safety/cli.py \ + --replace "telemetry', default=True" "telemetry', default=False" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ setuptools click requests packaging dparse + ruamel-yaml ]; checkInputs = [ @@ -37,6 +50,7 @@ buildPythonPackage rec { # Disable tests depending on online services disabledTests = [ + "test_announcements_if_is_not_tty" "test_check_live" "test_check_live_cached" ]; @@ -48,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Checks installed dependencies for known vulnerabilities"; homepage = "https://github.com/pyupio/safety"; + changelog = "https://github.com/pyupio/safety/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ thomasdesr dotlambda ]; }; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index a368d1a81131f..2b4cef2e30f8a 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -1,20 +1,29 @@ { lib , buildPythonPackage +, isPy27 , fetchFromGitHub , selenium +, cssselect +, django , flask +, lxml , pytestCheckHook +, zope-testbrowser }: buildPythonPackage rec { pname = "splinter"; - version = "0.17.0"; + version = "0.18.0"; + + disabled = isPy27; + + format = "setuptools"; src = fetchFromGitHub { owner = "cobrateam"; repo = "splinter"; rev = version; - hash = "sha256-7QhFz/qBh2ECyeyvjCyqOYy/YrUK7KVX13VC/gem5BQ="; + hash = "sha256-kJ5S/fBesaxTbxCQ0yBR30+CfCV6U5jgbfDZA7eF6ac="; }; propagatedBuildInputs = [ @@ -22,27 +31,35 @@ buildPythonPackage rec { ]; checkInputs = [ + cssselect + django flask + lxml pytestCheckHook + zope-testbrowser ]; disabledTests = [ # driver is present and fails with a different error during loading + "test_browser_local_driver_not_present" "test_local_driver_not_present" ]; disabledTestPaths = [ "samples" - # TODO: requires optional dependencies which should be defined in passthru.optional-dependencies.$name - "tests/test_djangoclient.py" - "tests/test_flaskclient.py" + # We run neither Chromium nor Firefox nor ... + "tests/test_async_finder.py" + "tests/test_html_snapshot.py" + "tests/test_iframes.py" + "tests/test_mouse_interaction.py" "tests/test_popups.py" + "tests/test_screenshot.py" + "tests/test_shadow_root.py" "tests/test_webdriver.py" "tests/test_webdriver_chrome.py" "tests/test_webdriver_edge_chromium.py" "tests/test_webdriver_firefox.py" "tests/test_webdriver_remote.py" - "tests/test_zopetestbrowser.py" ]; pythonImportsCheck = [ "splinter" ]; diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 0ca5f4accbb9c..9eae17b3e1788 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -28,11 +28,11 @@ buildPythonApplication rec { pname = "tempest"; - version = "31.0.0"; + version = "31.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g/fpVDGa2TFAzMVvC/370bStPJvhWSZ2tkbmP54nzc4="; + sha256 = "sha256-EaDFnIxaAGBDViAVzMjZev3jXmb3NIlMlcg4BiwoAq4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index ec55add71d69d..c97c2c5e7e9a7 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ua-parser"; - version = "0.10.0"; + version = "0.15.0"; format = "setuptools"; @@ -16,13 +16,18 @@ buildPythonPackage rec { repo = "uap-python"; rev = version; fetchSubmodules = true; - hash = "sha256-kaTAfUtHj2vH7i7eIU61efuB4/XVHoc/z6o3ny+sgrQ="; + hash = "sha256-CwwVaToy5se5dZ4m1EHn8qgvprK82/Sgpos4lHedIUc="; }; patches = [ ./dont-fetch-submodule.patch ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pyyaml ~= 5.4.0" pyyaml + ''; + nativeBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix new file mode 100644 index 0000000000000..4cbf9386b6cb0 --- /dev/null +++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "zope-cachedescriptors"; + version = "4.3.1"; + + format = "setuptools"; + + src = fetchPypi { + pname = "zope.cachedescriptors"; + inherit version; + sha256 = "1f4d1a702f2ea3d177a1ffb404235551bb85560100ec88e6c98691734b1d194a"; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "src/zope/cachedescriptors/tests.py" + ]; + + pythonImportsCheck = [ "zope.cachedescriptors" ]; + + meta = { + description = "Method and property caching decorators"; + homepage = "https://github.com/zopefoundation/zope.cachedescriptors"; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix new file mode 100644 index 0000000000000..31de6e28f2ee3 --- /dev/null +++ b/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -0,0 +1,75 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, zope_interface +, zope_schema +, zope-cachedescriptors +, pytz +, webtest +, beautifulsoup4 +, soupsieve +, wsgiproxy2 +, six +, mock +, zope_testing +, zope_testrunner +, python +}: + +buildPythonPackage rec { + pname = "zope-testbrowser"; + version = "5.6.1"; + + format = "setuptools"; + + src = fetchPypi { + pname = "zope.testbrowser"; + inherit version; + sha256 = "035bf63d9f7244e885786c3327448a7d9fff521dba596429698b8474961b05e7"; + }; + + postPatch = '' + # remove test that requires network access + substituteInPlace src/zope/testbrowser/tests/test_doctests.py \ + --replace "suite.addTests(wire)" "" + ''; + + propagatedBuildInputs = [ + setuptools + zope_interface + zope_schema + zope-cachedescriptors + pytz + webtest + beautifulsoup4 + soupsieve + wsgiproxy2 + six + ]; + + checkInputs = [ + mock + zope_testing + zope_testrunner + ]; + + checkPhase = '' + ${python.interpreter} -m zope.testrunner --test-path=src + ''; + + pythonImportsCheck = [ + "zope.testbrowser" + "zope.testbrowser.browser" + "zope.testbrowser.interfaces" + "zope.testbrowser.testing" + "zope.testbrowser.wsgi" + ]; + + meta = { + description = "Programmable browser for functional black-box tests"; + homepage = "https://github.com/zopefoundation/zope.testbrowser"; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix deleted file mode 100644 index ac6034dffa42d..0000000000000 --- a/pkgs/development/tools/go-langserver/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "go-langserver"; - version = "2.0.0"; - - goPackagePath = "github.com/sourcegraph/go-langserver"; - subPackages = [ "." ]; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "sourcegraph"; - repo = "go-langserver"; - sha256 = "1wv7xf81s3qi8xydxjkkp8vacdzrq8sbj04346fz73nsn85z0sgp"; - }; - - meta = with lib; { - description = "A Go language server protocol server"; - homepage = "https://github.com/sourcegraph/go-langserver"; - license = licenses.mit; - maintainers = with maintainers; [ johnchildren ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/gosca/default.nix b/pkgs/development/tools/gosca/default.nix deleted file mode 100644 index 18459ec943222..0000000000000 --- a/pkgs/development/tools/gosca/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, gosca -, testers -}: - -buildGoModule rec { - pname = "gosca"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "TARI0510"; - repo = pname; - rev = "v${version}"; - hash = "sha256-mjQSYkcLl9X3IPv0liX26hvystsQOSVXvovKp4VekAY="; - }; - - vendorSha256 = "sha256-0EqMW4aNYPZEuk+mxmLTuenGdam56YneEad8lodVeBo="; - - passthru.tests.version = testers.testVersion { - package = gosca; - command = "gosca -v"; - version = "GoSCA_v${version}"; - }; - - meta = with lib; { - description = "Golang dependence security checker"; - homepage = "https://github.com/TARI0510/gosca"; - changelog = "https://github.com/TARI0510/gosca/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index be819802394e5..7f90f5021ed5d 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchurl, lvm2, json_c -, openssl, libuuid, pkg-config, popt }: +{ lib +, stdenv +, fetchurl +, lvm2 +, json_c +, openssl +, libuuid +, pkg-config +, popt +}: stdenv.mkDerivation rec { pname = "cryptsetup"; @@ -13,8 +21,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-/A35RRiBciZOxb8dC9oIJk+tyKP4VtR+upHzH+NUtQc="; }; - # Disable 4 test cases that fail in a sandbox - patches = [ ./disable-failing-tests.patch ]; + patches = [ + # Disable 4 test cases that fail in sandbox + ./disable-failing-tests.patch + # Allow reading tokens from a relative path, see #167994 + ./relative-token-path.patch + ]; postPatch = '' patchShebangs tests diff --git a/pkgs/os-specific/linux/cryptsetup/relative-token-path.patch b/pkgs/os-specific/linux/cryptsetup/relative-token-path.patch new file mode 100644 index 0000000000000..7b3279099406c --- /dev/null +++ b/pkgs/os-specific/linux/cryptsetup/relative-token-path.patch @@ -0,0 +1,18 @@ +diff --git a/lib/luks2/luks2_token.c b/lib/luks2/luks2_token.c +index 88d84418..ed3a079b 100644 +--- a/lib/luks2/luks2_token.c ++++ b/lib/luks2/luks2_token.c +@@ -151,12 +151,10 @@ crypt_token_load_external(struct crypt_device *cd, const char *name, struct cryp + + token = &ret->u.v2; + +- r = snprintf(buf, sizeof(buf), "%s/libcryptsetup-token-%s.so", crypt_token_external_path(), name); ++ r = snprintf(buf, sizeof(buf), "libcryptsetup-token-%s.so", name); + if (r < 0 || (size_t)r >= sizeof(buf)) + return -EINVAL; + +- assert(*buf == '/'); +- + log_dbg(cd, "Trying to load %s.", buf); + + h = dlopen(buf, RTLD_LAZY); diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 5007895c006df..a18ea9740d0bd 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -7,6 +7,7 @@ , fetchpatch , fetchzip , buildPackages +, makeBinaryWrapper , ninja , meson , m4 @@ -353,6 +354,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config + makeBinaryWrapper gperf ninja meson @@ -671,8 +673,15 @@ stdenv.mkDerivation { preFixup = lib.optionalString withEfi '' mv $out/lib/systemd/boot/efi $out/dont-strip-me ''; - postFixup = lib.optionalString withEfi '' - mv $out/dont-strip-me $out/lib/systemd/boot/efi + + # Wrap in the correct path for LUKS2 tokens. Must be after the fixup phase + # or the rpath cleanup removes the directories again. + postFixup = lib.optionalString withCryptsetup '' + for f in lib/systemd/systemd-cryptsetup bin/systemd-cryptenroll; do + wrapProgram $out/$f --prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib/cryptsetup + done + '' + lib.optionalString withEfi '' + mv $out/dont-strip-me $out/lib/systemd/boot/efi ''; passthru = { diff --git a/pkgs/tools/misc/audible-cli/default.nix b/pkgs/tools/misc/audible-cli/default.nix index 98a34082184ea..21e0143ef158f 100644 --- a/pkgs/tools/misc/audible-cli/default.nix +++ b/pkgs/tools/misc/audible-cli/default.nix @@ -2,21 +2,21 @@ python3Packages.buildPythonApplication rec { pname = "audible-cli"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mkb79"; repo = pname; rev = "v${version}"; - sha256 = "0i71vwq2bhndndb0mlx21bc5jkv75cr60max5iaxk23agg3xpgwv"; + sha256 = "1dalil8aaywdshf48d45ap4mgzxbyzhklr8nga7qhpwi22w84cgz"; }; - propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools ]; + propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools questionary ]; postPatch = '' substituteInPlace setup.py \ - --replace "httpx==0.20.*" "httpx" \ - --replace "audible==0.7.2" "audible" + --replace "httpx>=0.20.0,<0.24.0" "httpx" \ + --replace "audible>=0.8.2" "audible" ''; meta = with lib; { diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index 8977f90139592..0f2d4e4fe11cb 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -1,34 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses, bash }: +{ lib, stdenv, fetchFromGitHub, substituteAll, makeWrapper, perl, procps, file, gnused, bash }: stdenv.mkDerivation rec { pname = "lesspipe"; - version = "1.85"; + version = "2.05"; - nativeBuildInputs = [ perl ]; + src = fetchFromGitHub { + owner = "wofr06"; + repo = "lesspipe"; + rev = "v${version}"; + sha256 = "sha256-mRgOndoDpyMnlj/BIoqwpZzuth4eA6yoB2VFZOigRw4="; + }; + + nativeBuildInputs = [ perl makeWrapper ]; buildInputs = [ perl bash ]; strictDeps = true; - preConfigure = '' + + postPatch = '' patchShebangs --build configure + substituteInPlace configure --replace '/etc/bash_completion.d' '/share/bash-completion/completions' ''; - configureFlags = [ "--shell=${bash}/bin/bash" "--yes" ]; - configurePlatforms = []; + + configureFlags = [ "--shell=${bash}/bin/bash" "--prefix=/" ]; + configurePlatforms = [ ]; + dontBuild = true; - src = fetchFromGitHub { - owner = "wofr06"; - repo = "lesspipe"; - rev = version; - sha256 = "1v1jdkdq1phc93gdr6mjlk98gipxrkkq4bj8kks0kfdvjgdwkdaa"; - }; + installFlags = [ "DESTDIR=$(out)" ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - file = "${file}/bin/file"; - tput = "${ncurses}/bin/tput"; - }) - ./override-shell-detection.patch - ]; + postInstall = '' + for f in lesspipe.sh lesscomplete; do + wrapProgram "$out/bin/$f" --prefix-each PATH : "${lib.makeBinPath [ file gnused procps ]}" + done + ''; meta = with lib; { description = "A preprocessor for less"; diff --git a/pkgs/tools/misc/lesspipe/fix-paths.patch b/pkgs/tools/misc/lesspipe/fix-paths.patch deleted file mode 100644 index 1bffcf53c8279..0000000000000 --- a/pkgs/tools/misc/lesspipe/fix-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/lesspipe.sh.in -+++ b/lesspipe.sh.in -@@ -48,8 +48,8 @@ if [[ "$LESS_ADVANCED_PREPROCESSOR" = '' ]]; then - fi - - filecmd() { -- file -L -s "$@" -- file -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z -+ @file@ -L -s "$@" -+ @file@ -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z - } - - sep=: # file name separator -@@ -546,7 +546,7 @@ isfinal() { - - # color requires -r or -R when calling less - typeset COLOR -- if [[ $(tput colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then -+ if [[ $(@tput@ colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then - COLOR="--color=always" - fi - diff --git a/pkgs/tools/misc/lesspipe/override-shell-detection.patch b/pkgs/tools/misc/lesspipe/override-shell-detection.patch deleted file mode 100644 index 08ef7e07b7cd0..0000000000000 --- a/pkgs/tools/misc/lesspipe/override-shell-detection.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/configure -+++ b/configure -@@ -101,7 +101,8 @@ - open OUT, ">lesspipe.sh.tmp"; - my $in = 1; - my $anyin; --my $shell = check_shell_vers(); -+my $shell = $opt_shell; -+print OUT "#!$shell\n"; - # ask if syntax highlighting should be included - $ifsyntax = ''; - if ($opt_yes) { diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index 9bcc0712c354a..1dddd4b64ce45 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , makeWrapper -, chafa , coreutils , curl , dmenu @@ -16,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-zfoICi1VChmrRHZ3dSHGTcXkVf/zirQTycFz98xj+QY="; + hash = "sha256-IQ6YIHcFriqLAGoB8QhvWiYkI7Aq4RL12TL3c/N+YqE="; }; nativeBuildInputs = [ makeWrapper ]; @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/ytfzf" \ --prefix PATH : ${lib.makeBinPath [ - chafa coreutils curl dmenu fzf gnused jq mpv ueberzug yt-dlp + coreutils curl dmenu fzf gnused jq mpv ueberzug yt-dlp ]} \ --set YTFZF_SYSTEM_ADDON_DIR "$out/share/ytfzf/addons" ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1e59dbddefc5b..a9c0377ba5bcc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -530,8 +530,10 @@ mapAliases ({ google-gflags = gflags; # Added 2019-07-25 google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07 google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + gosca = throw "gosca has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-30 gotags = throw "gotags has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 google-play-music-desktop-player = throw "GPMDP shows a black screen, upstream homepage is dead, use 'ytmdesktop' instead"; # Added 2022-06-16 + go-langserver = throw "go-langserver has been replaced by gopls"; # Added 2022-06-30 go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02 go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22 go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 357ce3eab5e17..3ead24e0eabd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2584,8 +2584,6 @@ with pkgs; buildGoModule = buildGo118Module; }; - gosca = callPackage ../development/tools/gosca { }; - gosh = callPackage ../tools/security/gosh { }; gospider = callPackage ../tools/security/gospider { }; @@ -23904,8 +23902,6 @@ with pkgs; gomodifytags = callPackage ../development/tools/gomodifytags { }; - go-langserver = callPackage ../development/tools/go-langserver { }; - gopls = callPackage ../development/tools/gopls { buildGoModule = buildGo118Module; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index beca93e797153..7fc930c6f764f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11637,6 +11637,8 @@ in { zope_broken = callPackage ../development/python-modules/zope_broken { }; + zope-cachedescriptors = callPackage ../development/python-modules/zope-cachedescriptors { }; + zope_component = callPackage ../development/python-modules/zope_component { }; zope_configuration = callPackage ../development/python-modules/zope_configuration { }; @@ -11673,6 +11675,8 @@ in { zope_size = callPackage ../development/python-modules/zope_size { }; + zope-testbrowser = callPackage ../development/python-modules/zope-testbrowser { }; + zope_testing = callPackage ../development/python-modules/zope_testing { }; zope_testrunner = callPackage ../development/python-modules/zope_testrunner { };