diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee990c47c21e..0aefa5a90a5a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11745,12 +11745,6 @@ githubId = 1729331; name = "Dominique Martinet"; }; - martingms = { - email = "martin@mg.am"; - github = "martingms"; - githubId = 458783; - name = "Martin Gammelsæter"; - }; martinjlowm = { email = "martin@martinjlowm.dk"; github = "martinjlowm"; diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 47b4c6ab416e..48dd5b34757c 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -30,7 +30,7 @@ in }; logLevel = mkOption { - type = types.enum ([ "info" "debug" "trace" ]); + type = types.enum ([ "error" "warn" "info" "debug" "trace" ]); default = "info"; example = "debug"; description = lib.mdDoc "Garage log level, see for examples."; diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 67eb8cc314c4..78e2871ab557 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -7,7 +7,7 @@ , systemd # systemctl , wlr-randr # wlr-randr , nwg-menu # nwg-menu -, light # light +, brightnessctl # brightnessctl , pamixer # pamixer , pulseaudio # pactl , libdbusmenu-gtk3 # tray @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.20"; + version = "0.9.22"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - hash = "sha256-Cq/kj61OmnHLd8EQK6QF67ALv3lMXKPGYUvTIeh90zQ="; + hash = "sha256-2O3FMPA/QD+ZUmLvot+MMwbUo3zT6ZN5NIbulh2oGYk="; }; # No tests @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=( "''${gappsWrapperArgs[@]}" --prefix XDG_DATA_DIRS : "$out/share" - --prefix PATH : "${lib.makeBinPath [ hyprland light nwg-menu pamixer pulseaudio sway systemd wlr-randr ]}" + --prefix PATH : "${lib.makeBinPath [ brightnessctl hyprland nwg-menu pamixer pulseaudio sway systemd wlr-randr ]}" ) ''; diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index 8f6a8fb32c5f..7ca424bbf432 100644 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.1.2", + "version": "1.1.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.1.2", + "version": "1.1.5", "license": "None", "dependencies": { "chalk": "^4.1.2", @@ -90,9 +90,9 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "engines": { "node": ">=6" } diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index 6c490d665028..8ebe2d01c02f 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,14 +7,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.1.2"; + version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-NNBI1S33jD6ZKbztZXSRtYwt3w0T4A5Bg2zxMWw74cY="; + hash = "sha256-/JnhUjrZq1iiXwqCSXZH250gu3yh6gJt6JjZRJ2OQd8="; }; - npmDepsHash = "sha256-Nk0Aoyv4eEXZD4B9B/B6mJd/UDy8Kc/sHtQWXrLukSk="; + npmDepsHash = "sha256-oQLombXIZRyjnKA04xuDZoZf2NO/0/xFfuXXmp46OaI="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/sc/scripthaus/package.nix b/pkgs/by-name/sc/scripthaus/package.nix new file mode 100644 index 000000000000..be6b1e5f9b14 --- /dev/null +++ b/pkgs/by-name/sc/scripthaus/package.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule rec { + pname = "scripthaus"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "scripthaus-dev"; + repo = "scripthaus"; + rev = "v${version}"; + hash = "sha256-ZWOSLkqjauONa+fKkagpUgWB4k+l1mzEEiC0RAMUmo0="; + }; + + vendorHash = "sha256-GUZNPLBgqN1zBzCcPl7TB9/4/Yk4e7K6I20nVaM6ank="; + + CGO_ENABLED = 1; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/scripthaus + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex" "^(v[0-9.]+)$" ]; + }; + + meta = with lib; { + description = "Run bash, Python, and JS snippets from your Markdown files directly from the command-line"; + homepage = "https://github.com/scripthaus-dev/scripthaus"; + license = licenses.mpl20; + maintainers = with maintainers; [ raspher ]; + mainProgram = "scripthaus"; + }; +} diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 89c91ccd9206..3a37fcb87e6b 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -40,19 +40,19 @@ let domain = "gitlab.freedesktop.org"; owner = "poppler"; repo = "test"; - rev = "e3cdc82782941a8d7b8112f83b4a81b3d334601a"; - hash = "sha256-i/NjVWC/PXAXnv88qNaHFBQQNEjRgjdV224NgENaESo="; + rev = "400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"; + hash = "sha256-Y4aNOJLqo4g6tTW6TAb60jAWtBhRgT/JXsub12vi3aU="; }; in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "23.11.0"; # beware: updates often break cups-filters build, check scribus too! + version = "24.01.0"; # beware: updates often break cups-filters build, check scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-+ZzKZ5nLnLbJL8Hg63hUe2EctzN1CrfLBHyw5sJGU5w="; + hash = "sha256-x972k6ekkoMPSdSXqAzGuchctXsV6b4tLWFRU7ecrgg="; }; nativeBuildInputs = [ @@ -137,6 +137,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = with lib; { homepage = "https://poppler.freedesktop.org/"; + changelog = "https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-${version}/NEWS"; description = "A PDF rendering library"; longDescription = '' Poppler is a PDF rendering library based on the xpdf-3.0 code base. In diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 38a1338ab65b..0fcf45b717ea 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.88"; + version = "0.2.89"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = "boschshcpy"; rev = "refs/tags/${version}"; - hash = "sha256-tyx7VJGsU9YYNJQy1mly0AgwKULZ1BWeRzz1BDgXrUU="; + hash = "sha256-/BZz666b2qZ6Dzkw+l1OpoMP+MIsFzhohNutzZMooNQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 2a24f4c04b03..5894c2080ffb 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -33,7 +33,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # Flaky test. See https://github.com/NixOS/nixpkgs/issues/288424#issuecomment-1941609973. + "test_run_local_server_occupied_port" + ] ++ lib.optionals stdenv.isDarwin [ # This test fails if the hostname is not associated with an IP (e.g., in `/etc/hosts`). "test_run_local_server_bind_addr" ]; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 317f8a7fc2eb..ff10be0092ca 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.29.0"; + version = "6.29.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-td0wE8q3szDfcSiRyWzRq4aMJ6cVnmBvdiAV6b+M6z8="; + hash = "sha256-O63igATj/2JO1Xl0lIEWZwYErF9nbRIzlpPzFCF20/A="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 0de6db55b941..4e8377a9bd54 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -1,10 +1,13 @@ { buildPythonPackage , fetchPypi +, setuptools +, wheel +, comm , ipykernel , ipython +, jsonschema , jupyterlab-widgets , lib -, nbformat , pytestCheckHook , pytz , traitlets @@ -13,29 +16,37 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "8.1.1"; - format = "setuptools"; + version = "8.1.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QCEe+1Vq3sb6RQzMKnfVnKRKBg9PnxNoM99ZyfU45ug="; + hash = "sha256-0Lm0Hkm66SaoZuYTo5sPAJd0XSufHz3UBmQbSlfsQsk="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ + comm ipython - ipykernel jupyterlab-widgets traitlets - nbformat - pytz widgetsnbextension ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + ipykernel + jsonschema + pytestCheckHook + pytz + ]; meta = { description = "IPython HTML widgets for Jupyter"; - homepage = "https://ipython.org/"; + homepage = "https://github.com/jupyter-widgets/ipywidgets"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index f60310bdef14..0450f73e639b 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -28,7 +28,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.23"; + version = "0.4.24"; pyproject = true; disabled = pythonOlder "3.9"; @@ -38,7 +38,7 @@ buildPythonPackage rec { repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-PDa3yVH/sszGbWkVkJ+19FdOr3oqdYk+OdbeUTMTDuU="; + hash = "sha256-hmx7eo3pephc6BQfoJ3U0QwWBWmhkAc+7S4QmW32qQs="; }; nativeBuildInputs = [ @@ -89,6 +89,9 @@ buildPythonPackage rec { "testKde3" "testKde5" "testKde6" + # Invokes python manually in a subprocess, which does not have the correct dependencies + # ImportError: This version of jax requires jaxlib version >= 0.4.19. + "test_no_log_spam" ] ++ lib.optionals usingMKL [ # See # * https://github.com/google/jax/issues/9705 diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 5e27c0f605b8..4547916212b0 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -35,7 +35,7 @@ let inherit (cudaPackagesGoogle) cudatoolkit cudnn cudaVersion; - version = "0.4.23"; + version = "0.4.24"; inherit (python) pythonVersion; @@ -56,65 +56,65 @@ let "3.9-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp39"; - hash = "sha256-maN9RzK6/hYIuPRd8n8n5qa/HyPgAf6UD+mlqzZ1/Xc="; + hash = "sha256-6P5ArMoLZiUkHUoQ/mJccbNj5/7el/op+Qo6cGQ33xE="; }; "3.9-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp39"; - hash = "sha256-gdb07c12HCfK5VXT2C+9lYKSiIpPgD8sNmd4eG2M6M4="; + hash = "sha256-23JQZRwMLtt7sK/JlCBqqRyfTVIAVJFN2sL+nAkQgvU="; }; "3.9-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp39"; - hash = "sha256-TdU4wEoqEhsDq18MuLEpmKqpU51+xUYp/reZqEDJK1U="; + hash = "sha256-OgMedn9GHGs5THZf3pkP3Aw/jJ0vL5qK1b+Lzf634Ik="; }; "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-cnX75aSJxoPFUCYD1V5QgyPNovS9lSGqg4PGdPsKsvM="; + hash = "sha256-/VwUIIa7mTs/wLz0ArsEfNrz2pGriVVT5GX9XRFRxfY="; }; "3.10-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp310"; - hash = "sha256-H9sbeR4+4XytREYLP0LJphqGkQqHcinTC9NlT0Rj1aA="; + hash = "sha256-LgICOyDGts840SQQJh+yOMobMASb62llvJjpGvhzrSw="; }; "3.10-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp310"; - hash = "sha256-43VuBgGvdjauWPQtJK9w5GBI/++JvV4FwwO4maIXfDY="; + hash = "sha256-vhyULw+zBpz1UEi2tqgBMQEzY9a6YBgEIg6A4PPh3bQ="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-mEdm0wmyHKg4RlA7q9/e1OOu+BfGcPKBCSvLwXfFhJI="; + hash = "sha256-VJO/VVwBFkOEtq4y/sLVgAV8Cung01JULiuT6W96E/8="; }; "3.11-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp311"; - hash = "sha256-1kb/m8DODrtXO2drIfpttCLC72oNVszADbSDspllQVs="; + hash = "sha256-VtuwXxurpSp1KI8ty1bizs5cdy8GEBN2MgS227sOCmE="; }; "3.11-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp311"; - hash = "sha256-jhLX4ps+EtU1sku722v51mz2SSamo4/dkdRWX3zFcRE="; + hash = "sha256-4Dj5dEGKb9hpg3HlVogNO1Gc9UibJhy1eym2mjivxAQ="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-oimiuQopgN1oKhbDc7SsRJPnA6JiEI9UieikWR2qpVk="; + hash = "sha256-TlrGVtb3NTLmhnILWPLJR+jISCZ5SUV4wxNFpSfkCBo="; }; "3.12-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp312"; - hash = "sha256-J4zaKcx0c0Bgk7w/n6klqDlgY9IqTNINfg6g033LUDk="; + hash = "sha256-FIwK5CGykQjteuWzLZnbtAggIxLQeGV96bXlZGEytN0="; }; "3.12-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp312"; - hash = "sha256-UFEE/mBitEOVUoijhUfphyy24QfWPZ+FQPsQ0cjY79A="; + hash = "sha256-9/jw/wr6oUD9pOadVAaMRL086iVMUXwVgnUMcG1UNvE="; }; }; @@ -130,31 +130,35 @@ let gpuSrcs = { "cuda12.2-3.9" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp39-cp39-manylinux2014_x86_64.whl"; - hash = "sha256-our2mSwHPdjVoDAZP+9aNUkJ+vxv1Tq7G5UqA9HvhNI="; + hash = "sha256-xdJKLPtx+CIza2CrWKM3M0cZJzyNFVTTTsvlgh38bfM="; }; "cuda12.2-3.10" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-jkIABnJZnn7A6n9VGs/MldzdDiKwWh0fEvl7Vqn85Kg="; + hash = "sha256-QCjrOczD2mp+CDwVXBc0/4rJnAizeV62AK0Dpx9X6TE="; }; "cuda12.2-3.11" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp311-cp311-manylinux2014_x86_64.whl"; - hash = "sha256-dMUcRnHjl8NyUeO3P1x7CNgF0iAHFKIzUtHh+/CNkow="; + hash = "sha256-Ipy3vk1yUplpNzECAFt63aOIhgEWgXG7hkoeTIk9bQQ="; }; "cuda12.2-3.12" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp312-cp312-manylinux2014_x86_64.whl"; - hash = "sha256-kXJ6bUwX+QybqYPV9Kpwv+lhdoGEFRr4+1T0vfXoWRo="; + hash = "sha256-LSnZHaUga/8Z65iKXWBnZDk4yUpNykFTu3vukCchO6Q="; }; "cuda11.8-3.9" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp39-cp39-manylinux2014_x86_64.whl"; - hash = "sha256-m2Y5p12gF3OaADu+aGw5RjcKFrj9RB8xzNWnKNpSz60="; + hash = "sha256-UmyugL0VjlXkiD7fuDPWgW8XUpr/QaP5ggp6swoZTzU="; }; "cuda11.8-3.10" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-aQ7iX3o0kQ4liPexv7dkBVWVTUpaty83L083MybGkf0="; + hash = "sha256-luKULEiV1t/sO6eckDxddJTiOFa0dtJeDlrvp+WYmHk="; }; "cuda11.8-3.11" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp311-cp311-manylinux2014_x86_64.whl"; - hash = "sha256-uIEyjEmv0HBaiYVl5PuICTI9XnH4zAfQ1l9tjALRcP4="; + hash = "sha256-4+uJ8Ij6mFGEmjFEgi3fLnSLZs+v18BRoOt7mZuqydw="; + }; + "cuda11.8-3.12" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp312-cp312-manylinux2014_x86_64.whl"; + hash = "sha256-bUDFb94Ar/65SzzR9RLIs/SL/HdjaPT1Su5whmjkS00="; }; }; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index aadb9673dc6a..d1e9d8a9ad28 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -53,7 +53,7 @@ let inherit (cudaPackagesGoogle) backendStdenv cudatoolkit cudaFlags cudnn nccl; pname = "jaxlib"; - version = "0.4.23"; + version = "0.4.24"; meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; @@ -151,7 +151,7 @@ let repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jaxlib tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-PDa3yVH/sszGbWkVkJ+19FdOr3oqdYk+OdbeUTMTDuU="; + hash = "sha256-hmx7eo3pephc6BQfoJ3U0QwWBWmhkAc+7S4QmW32qQs="; }; nativeBuildInputs = [ @@ -195,7 +195,12 @@ let ''; bazelRunTarget = "//jaxlib/tools:build_wheel"; - runTargetFlags = [ "--output_path=$out" "--cpu=${arch}" ]; + runTargetFlags = [ + "--output_path=$out" + "--cpu=${arch}" + # This has no impact whatsoever... + "--jaxlib_git_hash='12345678'" + ]; removeRulesCC = false; @@ -263,10 +268,10 @@ let ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-q2wRaoCGnISEdtF6jDMk9Wccy/wTmLusVBI7dDATwi4="; + x86_64-linux = "sha256-c0avcURLAYNiLASjIeu5phXX3ze5TR812SW5SCG/iwk="; } else { - x86_64-linux = "sha256-0cDJ27HCi3J5xeT6TkTtfUzF/yESBYmEVG1r14kPdRs="; - aarch64-linux = "sha256-WbaN8VYjeW0mDthmtoSTttqd4K/Z8dP5+VkTo10pLtU="; + x86_64-linux = "sha256-1hrQ9ehFy3vBJxKNUzi/T0l+eZxo26Th7i5VRd/9U+0="; + aarch64-linux = "sha256-3QVYJOj1lNHgYVV9rOzVdfhq5q6GDwpcWCjKNrSZ4aU="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index 7d0fdb300558..b131e347393c 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-Uc57kxhaj/DQi5cX+kjV4PGRcFbxWmzc+B248+1VAYI="; + hash = "sha256-EpWFsVWCi/6IOuM/zgPIer3arMDGjPPxhm/tZC4aji4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix index 71012f747e47..eba16194d69c 100644 --- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab-lsp"; - version = "5.0.2"; + version = "5.0.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-JmiGhOkHUPjvikFimgpAUOc26IFVWqFBP7Xah54GNfE="; + hash = "sha256-qcijpkZJS+SE1+MXSrHSQV7WD0dzzshHmqW6N+XwS8k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 747556206a19..85ec4d6d48f9 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -4,15 +4,21 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "3.0.9"; - format = "setuptools"; + version = "3.0.10"; + pyproject = true; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - hash = "sha256-YAWk6XTHvu6EBg/fujQaMhhJUEbeiuPsZIiOX+Gf20w="; + hash = "sha256-BPKsBJdnJ+T50PqRzcLxq4YPll5QTCnb1qZciCydBMA="; }; + # jupyterlab is required to build from source but we use the pre-build package + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab~=4.0"' "" + ''; + nativeBuildInputs = [ jupyter-packaging ]; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 0ee96a6d690d..0087fa650d7a 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -118,6 +118,6 @@ buildPythonPackage rec { homepage = "https://www.mypy-lang.org"; license = licenses.mit; mainProgram = "mypy"; - maintainers = with maintainers; [ martingms lnl7 ]; + maintainers = with maintainers; [ lnl7 ]; }; } diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index bdd6c63da6fc..e8622b84eb7c 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Experimental type system extensions for programs checked with the mypy typechecker"; homepage = "https://www.mypy-lang.org"; license = licenses.mit; - maintainers = with maintainers; [ martingms lnl7 ]; + maintainers = with maintainers; [ lnl7 ]; }; } diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index f816abc1d740..27d977173e3e 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -20,6 +20,7 @@ , traitlets , importlib-metadata , flaky +, ipykernel , ipywidgets , pytestCheckHook }: @@ -32,14 +33,14 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.14.2"; + version = "7.16.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-p/iAj9TggkMWc6xThAAhjdRe/QdvvrB8xuWqWjpOlJ4="; + hash = "sha256-gT5lU3ljYkia5XLjm6G/+XhTYZL7UY4QgmsOjK3wPsg="; }; # Add $out/share/jupyter to the list of paths that are used to search for @@ -84,6 +85,7 @@ in buildPythonPackage rec { nativeCheckInputs = [ flaky + ipykernel ipywidgets pytestCheckHook ]; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 10b02d1bb620..f10bbe9dc1fa 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.0.7"; + version = "7.0.8"; disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-O8/wDBezrBQu9fQ21QY32TaydM+gtB9qwBdTY96bTgk="; + hash = "sha256-OVfs2VYFawAUZ3r8dtO7RMLS8pZJ+Hsk0TYG/x0Yk48="; }; postPatch = '' diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index 612be673dbc1..90c0db931e4c 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -62,6 +62,9 @@ buildPythonPackage rec { "test_zero_inflated_logits_probs_agree" # NameError: unbound axis name: _provenance "test_model_transformation" + # Using deprecated (removed in jax==0.4.24) jax.core.safe_map + # https://github.com/pyro-ppl/numpyro/issues/1733 + "test_beta_bernoulli" ]; # TODO: remove when tensorflow-probability gets fixed. diff --git a/pkgs/development/python-modules/pydeck/default.nix b/pkgs/development/python-modules/pydeck/default.nix index da009608b678..6edd7a379b3e 100644 --- a/pkgs/development/python-modules/pydeck/default.nix +++ b/pkgs/development/python-modules/pydeck/default.nix @@ -26,6 +26,12 @@ buildPythonPackage rec { hash = "sha256-B+3egz98/O9nSRJDURlap9zSRmPUkJ/XiY29C2+8Aew="; }; + # upstream has an invalid pyproject.toml + # https://github.com/visgl/deck.gl/issues/8469 + postPatch = '' + rm pyproject.toml + ''; + nativeBuildInputs = [ jinja2 jupyter diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index b8b7ca6a5eb9..72f04c72a8de 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "QCoDeS"; + owner = "microsoft"; repo = "Qcodes"; rev = "refs/tags/v${version}"; hash = "sha256-AggAVq/yfJUZRwoQb29QoIbVIAdV3solKCjivqucLZk="; @@ -147,6 +147,11 @@ buildPythonPackage rec { "qcodes" ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'default-version = "0.0"' 'default-version = "${version}"' + ''; + postInstall = '' export HOME="$TMPDIR" ''; diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 679e19722f45..97efa00b972c 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -2,24 +2,27 @@ , buildPythonPackage , fetchPypi , jupyter-packaging -, notebook , ipywidgets }: buildPythonPackage rec { pname = "widgetsnbextension"; - version = "4.0.9"; - format = "setuptools"; + version = "4.0.10"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-PB9eRtwRZt/UCkLWhealE5b9NP+Hh0Kj5HxvDMSio4U="; + hash = "sha256-ZBlsX/O5qRg6jmmaQif7C3AC8lLIFAmOZsTRzQZEaI8="; }; nativeBuildInputs = [ jupyter-packaging ]; + pythonImportsCheck = [ + "widgetsnbextension" + ]; + # No tests in archive doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix index d1f1da881681..2121258f3c04 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -12,6 +12,6 @@ buildGoModule { meta = common.meta // { description = "Command line client for the Woodpecker Continuous Integration server"; - mainProgram = "woodpecker-cli"; + mainProgram = "woodpecker"; }; } diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index bad183d98125..b8fb8b871c64 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -17,7 +17,19 @@ in postInstall = '' cd $out/bin for f in *; do - mv -- "$f" "woodpecker-$f" + if [ "$f" = cli ]; then + mv -- "$f" "woodpecker" + # Issue a warning to the user if they call the deprecated executable + cat >woodpecker-cli << EOF + #/bin/sh + echo 'WARNING: calling `woodpecker-cli` is deprecated, use `woodpecker` instead.' >&2 + $out/bin/woodpecker "\$@" + EOF + chmod +x woodpecker-cli + patchShebangs woodpecker-cli + else + mv -- "$f" "woodpecker-$f" + fi done cd - ''; diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock index f60d223aba03..0ff5c5f4afe4 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -1219,7 +1219,7 @@ dependencies = [ [[package]] name = "monotrail-utils" version = "0.0.1" -source = "git+https://github.com/konstin/poc-monotrail?rev=136807e1fe87e9319e0223f76b602ba5db881322#136807e1fe87e9319e0223f76b602ba5db881322" +source = "git+https://github.com/konstin/poc-monotrail?rev=e0251f68c254f834180198b8677fcf85d4b6a844#e0251f68c254f834180198b8677fcf85d4b6a844" dependencies = [ "anyhow", "cpufeatures", @@ -1383,9 +1383,9 @@ dependencies = [ [[package]] name = "pep508_rs" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9d1320b78f4a5715b3ec914f32b5e85a50287ad923730e3cbf0255259432eb" +checksum = "910c513bea0f4f833122321c0f20e8c704e01de98692f6989c2ec21f43d88b1e" dependencies = [ "once_cell", "pep440_rs", @@ -1792,7 +1792,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.22.0" +version = "0.23.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index aa3bb0674577..d8702db89cc9 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-gM/Vn/eBPZ39568LqUXyx+ZTTsKAVur30Qrl3GS1ID8="; + hash = "sha256-0sbfqiPxo68429q676hs3vB3wRNmF/+OO7Ykg2x7HIQ="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "dialoguer-0.10.4" = "sha256-WDqUKOu7Y0HElpPxf2T8EpzAY3mY8sSn9lf0V0jyAFc="; - "monotrail-utils-0.0.1" = "sha256-h2uxWsDrU9j2C5OWbYsfGz0S1VsPzYrfksQVEkwd2ys="; + "monotrail-utils-0.0.1" = "sha256-ydNdg6VI+Z5wXe2bEzRtavw0rsrcJkdsJ5DvXhbaDE4="; }; }; diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index c543434b610d..7315d5e2724f 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -7,21 +7,21 @@ }: buildPythonApplication rec { - pname = "PySolFC"; - version = "2.20.1"; + pname = "pysolfc"; + version = "2.21.0"; src = fetchzip { - url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC/PySolFC-${version}/PySolFC-${version}.tar.xz"; - hash = "sha256-mEnsq8Su0ses+nqoSFC+Wr0MHY7aTDMbtDV8toYVNPY="; + url = "mirror://sourceforge/pysolfc/PySolFC-${version}.tar.xz"; + hash = "sha256-Deye7KML5G6RZkth2veVgPOWZI8gnusEvszlrPTAhag="; }; cardsets = fetchzip { - url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.2/PySolFC-Cardsets-2.2.tar.bz2"; + url = "mirror://sourceforge/pysolfc/PySolFC-Cardsets-2.2.tar.bz2"; hash = "sha256-mWJ0l9rvn9KeZ9rCWy7VjngJzJtSQSmG8zGcYFE4yM0="; }; music = fetchzip { - url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySol-Music/PySol-Music-4.50/pysol-music-4.50.tar.xz"; + url = "mirror://sourceforge/pysolfc/pysol-music-4.50.tar.xz"; hash = "sha256-sOl5U98aIorrQHJRy34s0HHaSW8hMUE7q84FMQAj5Yg="; }; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index bfc57cc1f10e..3da8b8352b68 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,8 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.17.2"; - rev = "v${version}"; + version = "1.17.3"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -16,8 +15,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "hashicorp"; repo = pname; - inherit rev; - hash = "sha256-zfJZUDR6GJlJbnLIXa5duq8VOG0WUN+FP5BLQ4EgPKM="; + rev = "refs/tags/v${version}"; + hash = "sha256-uJN28p2fPQBBkqnlUWrlBwTNfmHr3Pn/4JiMbOBBppI="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +25,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorHash = "sha256-bKiKfLq/kbZYziUyD2v1o9X2Gs6uiqzPSYWE4cpeU9Q="; + vendorHash = "sha256-ToSCLAX+rNcUTnBBVWkWhLX+wjy7Y4vGLKuny1Ye3kY="; doCheck = false; @@ -38,6 +37,7 @@ buildGoModule rec { meta = with lib; { description = "Tool for service discovery, monitoring and configuration"; + changelog = "https://github.com/hashicorp/consul/releases/tag/v${version}"; homepage = "https://www.consul.io/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsl11; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 0f3055277efd..c6751136dd62 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.32.8.7639-fb6452ebf"; + version = "1.40.0.7998-c29d4c0c8"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "sha256-v9Fb5dlgIWqXfL9a4GkbGDEzYueyHs8P8R6TSyXDLrc="; + sha256 = "sha256-uVsOI6sItfq7wLP+xPOYSC9ueOv/lcDeL+vnrx1WdRA="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-jdGVAdvm7kjxTP3CQ5w6dKZbfCRwSy9TrtxRHaV0/cs="; + sha256 = "sha256-ucxDtnGpfTpQURaGvLwohHeIZPE3aulXtoITRZCYA9c="; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/tools/misc/tmux/CVE-2022-47016.patch b/pkgs/tools/misc/tmux/CVE-2022-47016.patch deleted file mode 100644 index e6ced830421e..000000000000 --- a/pkgs/tools/misc/tmux/CVE-2022-47016.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 01f753df5dc269cf054b94c3f210aa880872d602 Mon Sep 17 00:00:00 2001 -From: nicm -Date: Wed, 24 Aug 2022 07:22:30 +0000 -Subject: [PATCH] Check for NULL returns from bufferevent_new. - -(cherry picked from commit e86752820993a00e3d28350cbe46878ba95d9012) ---- - control.c | 4 ++++ - file.c | 4 ++++ - window.c | 2 ++ - 3 files changed, 10 insertions(+) - -diff --git a/control.c b/control.c -index 73286e00..6183a006 100644 ---- a/control.c -+++ b/control.c -@@ -775,6 +775,8 @@ control_start(struct client *c) - - cs->read_event = bufferevent_new(c->fd, control_read_callback, - control_write_callback, control_error_callback, c); -+ if (cs->read_event == NULL) -+ fatalx("out of memory"); - bufferevent_enable(cs->read_event, EV_READ); - - if (c->flags & CLIENT_CONTROLCONTROL) -@@ -782,6 +784,8 @@ control_start(struct client *c) - else { - cs->write_event = bufferevent_new(c->out_fd, NULL, - control_write_callback, control_error_callback, c); -+ if (cs->write_event == NULL) -+ fatalx("out of memory"); - } - bufferevent_setwatermark(cs->write_event, EV_WRITE, CONTROL_BUFFER_LOW, - 0); -diff --git a/file.c b/file.c -index b2f155fe..04a907bf 100644 ---- a/file.c -+++ b/file.c -@@ -585,6 +585,8 @@ file_write_open(struct client_files *files, struct tmuxpeer *peer, - - cf->event = bufferevent_new(cf->fd, NULL, file_write_callback, - file_write_error_callback, cf); -+ if (cf->event == NULL) -+ fatalx("out of memory"); - bufferevent_enable(cf->event, EV_WRITE); - goto reply; - -@@ -744,6 +746,8 @@ file_read_open(struct client_files *files, struct tmuxpeer *peer, - - cf->event = bufferevent_new(cf->fd, file_read_callback, NULL, - file_read_error_callback, cf); -+ if (cf->event == NULL) -+ fatalx("out of memory"); - bufferevent_enable(cf->event, EV_READ); - return; - -diff --git a/window.c b/window.c -index c0cd9bdc..294a1f08 100644 ---- a/window.c -+++ b/window.c -@@ -1042,6 +1042,8 @@ window_pane_set_event(struct window_pane *wp) - - wp->event = bufferevent_new(wp->fd, window_pane_read_callback, - NULL, window_pane_error_callback, wp); -+ if (wp->event == NULL) -+ fatalx("out of memory"); - wp->ictx = input_init(wp, wp->event, &wp->palette); - - bufferevent_enable(wp->event, EV_READ|EV_WRITE); --- -2.39.1 - diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 3cf6172891bd..a39f65d702ac 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -10,6 +10,7 @@ , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , withUtf8proc ? true, utf8proc # gets Unicode updates faster than glibc , withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter +, withSixel ? true }: let @@ -25,7 +26,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "tmux"; - version = "3.3a"; + version = "3.4"; outputs = [ "out" "man" ]; @@ -33,13 +34,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "tmux"; repo = "tmux"; rev = finalAttrs.version; - sha256 = "sha256-SygHxTe7N4y7SdzKixPFQvqRRL57Fm8zWYHfTpW+yVY="; + hash = "sha256-RX3RZ0Mcyda7C7im1r4QgUxTnp95nfpGgQ2HRxr0s64="; }; - patches = [ - ./CVE-2022-47016.patch - ]; - nativeBuildInputs = [ pkg-config autoreconfHook @@ -57,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { "--sysconfdir=/etc" "--localstatedir=/var" ] ++ lib.optionals withSystemd [ "--enable-systemd" ] + ++ lib.optionals withSixel [ "--enable-sixel" ] ++ lib.optionals withUtempter [ "--enable-utempter" ] ++ lib.optionals withUtf8proc [ "--enable-utf8proc" ]; diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index a1dbf674e98e..fc53f0b8997a 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -11,8 +11,11 @@ stdenv.mkDerivation rec { hash = "sha256-HBJvTDhp1CA96gRU2Q+lMxcFaZ+txXcmNb8Cg1BFiH4="; }; - buildInputs = [ + nativeBuildInputs = [ pkg-config + ]; + + buildInputs = [ ncurses ]; @@ -22,6 +25,7 @@ stdenv.mkDerivation rec { description = "A simple general purpose plotting utility for tty with data input from stdin"; homepage = "https://github.com/tenox7/ttyplot"; license = licenses.asl20; + platforms = platforms.all; maintainers = with maintainers; [ lassulus ]; mainProgram = "ttyplot"; };