diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 1e34527ce6c4..8c7e3f2c4aa0 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -18,7 +18,7 @@ , libpngSupport ? true, libpng , liblqr1Support ? true, liblqr1 , librawSupport ? true, libraw -, librsvgSupport ? !stdenv.hostPlatform.isMinGW, librsvg +, librsvgSupport ? !stdenv.hostPlatform.isMinGW, librsvg, pango , libtiffSupport ? true, libtiff , libxml2Support ? true, libxml2 , openjpegSupport ? !stdenv.hostPlatform.isMinGW, openjpeg @@ -46,13 +46,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-48"; + version = "7.1.0-49"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-ExGeZVqRajuYcck0JrIFGDEam4PfUCXF/jI2dudHh+E="; + hash = "sha256-5EbmAPEUPFMY8VDJmXfcFuUzFI0xVw7fpVteSI9gotg="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { "--with-frozenpaths" (lib.withFeatureAs (arch != null) "gcc-arch" arch) (lib.withFeature librsvgSupport "rsvg") + (lib.withFeature librsvgSupport "pango") (lib.withFeature liblqr1Support "lqr") (lib.withFeature libjxlSupport "jxl") (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts") @@ -88,7 +89,10 @@ stdenv.mkDerivation rec { ++ lib.optional djvulibreSupport djvulibre ++ lib.optional libjxlSupport libjxl ++ lib.optional openexrSupport openexr - ++ lib.optional librsvgSupport librsvg + ++ lib.optionals librsvgSupport [ + librsvg + pango + ] ++ lib.optional openjpegSupport openjpeg ++ lib.optionals stdenv.isDarwin [ ApplicationServices diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix new file mode 100644 index 000000000000..80563a931292 --- /dev/null +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -0,0 +1,43 @@ +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, gtk4 +, stdenv +, DiskArbitration +, Foundation +, IOKit +}: + +rustPlatform.buildRustPackage rec { + pname = "process-viewer"; + version = "0.5.5"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-MHVKjbD1/h7G94x6dpyRT/BPWQVUFurW7EvAUJ2xZeU="; + }; + + cargoSha256 = "sha256-NkJjwB4rBV4hFRwYHILMET8o4x1+95sVsFqNaVN8tMg="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk4 ] ++ lib.optionals stdenv.isDarwin [ + DiskArbitration + Foundation + IOKit + ]; + + postInstall = '' + install -Dm644 assets/fr.guillaume_gomez.ProcessViewer.desktop -t $out/share/applications + install -Dm644 assets/fr.guillaume_gomez.ProcessViewer.svg -t $out/share/icons/hicolor/scalable/apps + install -Dm644 assets/fr.guillaume_gomez.ProcessViewer.metainfo.xml -t $out/share/metainfo + ''; + + meta = with lib; { + description = "A process viewer GUI in rust"; + homepage = "https://github.com/guillaumegomez/process-viewer"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 6e30534116ff..d8dd5eca7c8b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "106.0.5249.40", - "sha256": "14nidf49nqpirsd0qpq91pvsyhc7ngkhcyq3n3yl37mswvaalnm1", - "sha256bin64": "17x0mx4kzrrl2calibi9cjsq80kn30c396pv20qf5n6850dc0rx2", + "version": "106.0.5249.61", + "sha256": "15qljfg8w124yp65srp1rz3ywrlqhzqzkhimn1h9xz0jkf9cnypj", + "sha256bin64": "15149hwjlw6gyh4ismgv0b9k4xn3350s70pqij9n79jb53f4nj9s", "deps": { "gn": { "version": "2022-08-11", @@ -32,15 +32,15 @@ } }, "dev": { - "version": "107.0.5300.0", - "sha256": "1h059sma9g6kzaip3rvnb569d3x11h669330a68sif2krpl91bnv", - "sha256bin64": "1kwmhjc15d35lxmdn7f5v8nm8yfs4ckaks9zvxm73wlnvwv0i1qj", + "version": "107.0.5304.10", + "sha256": "0i7awirsqbzbx3s6ff9b8g584w8s69islmahiwjkprm192k98k70", + "sha256bin64": "1v524ygk59r68b8hc8qn9vx067613nbcrdrvwkx7vggd9yp9mcya", "deps": { "gn": { - "version": "2022-09-08", + "version": "2022-09-14", "url": "https://gn.googlesource.com/gn", - "rev": "b4851eb2062f76a880c07f7fa0d12913beb6d79e", - "sha256": "1cz7155rzsydg02j1yprczm4qjk5g4lqbnh5qdky8p1ghg3miq3i" + "rev": "fff29c1b3f9703ea449f720fe70fa73575ef24e5", + "sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp" } } }, diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index 2f9832d9193d..876a690de5a5 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , glib , gmime3 @@ -6,7 +7,7 @@ , gobject-introspection , gpgme , gtk3 -, gtksourceview +, gtksourceview4 , gtkspell3 , intltool , libcanberra-gtk3 @@ -16,17 +17,18 @@ , libsecret , openssl , pkg-config +, sqlite , webkitgtk , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "balsa"; - version = "2.6.1"; + version = "2.6.4"; src = fetchurl { - url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2"; - sha256 = "1xkxx801p7sbfkn0bh3cz85wra4xf1z1zhjqqc80z1z1nln7fhb4"; + url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.xz"; + sha256 = "1hcgmjka2x2igdrmvzlfs12mv892kv4vzv5iy90kvcqxa625kymy"; }; nativeBuildInputs = [ @@ -42,7 +44,7 @@ stdenv.mkDerivation rec { gnutls gpgme gtk3 - gtksourceview + gtksourceview4 gtkspell3 libcanberra-gtk3 libesmtp @@ -50,6 +52,7 @@ stdenv.mkDerivation rec { libnotify libsecret openssl + sqlite webkitgtk ]; @@ -57,14 +60,13 @@ stdenv.mkDerivation rec { "--with-canberra" "--with-gtksourceview" "--with-libsecret" + "--with-spell-checker=gtkspell" + "--with-sqlite" "--with-ssl" "--with-unique" "--without-gnome" - "--with-spell-checker=gtkspell" ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index a9cfd55dfab3..60e0d9d28d05 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.16.0"; + version = "2.16.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-PRU83hO6AH0DfCSSLL9rTh7nx9pEIvlLimu5thi8SYg="; + sha256 = "sha256-I8/vO7SfZr4JVbFNBgIaP7CwHn7q6CMIZMjLBsTLY2Q="; }; vendorSha256 = "sha256-TVMFOit2pi+ZVcppzs0iKNXluDW9ZQDH2d7cPSzg+ak="; diff --git a/pkgs/development/compilers/kind2/default.nix b/pkgs/development/compilers/kind2/default.nix new file mode 100644 index 000000000000..ffb02b3a90cb --- /dev/null +++ b/pkgs/development/compilers/kind2/default.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "kind2"; + version = "0.2.77"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-drWAWiSALq8rb3J2phNE/dt4e6xmJY7Ob8cES1kYEPo="; + }; + + cargoSha256 = "sha256-rF0TvNWE90sUqslBGPnGmD6mZFPlCCkM1jyuFt8n8Nw="; + + meta = with lib; { + description = "A functional programming language and proof assistant"; + homepage = "https://github.com/kindelia/kind2"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix index 4c60de1180ec..a099bf7d7d0a 100644 --- a/pkgs/development/python-modules/aioecowitt/default.nix +++ b/pkgs/development/python-modules/aioecowitt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioecowitt"; - version = "2022.09.2"; + version = "2022.09.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-U9Qg0kOeqLihw5YAZSy7zk39NKj48nOiwqIlHqffZi0="; + hash = "sha256-aYnRHr4YrYmO3a1V8HFac1T37WIC0Abp3Dhy9vDrQfE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiofile/default.nix b/pkgs/development/python-modules/aiofile/default.nix new file mode 100644 index 000000000000..ec09473e2072 --- /dev/null +++ b/pkgs/development/python-modules/aiofile/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiomisc +, asynctest +, caio +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiofile"; + version = "3.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-PIImQZ1ymazsOg8qmlO91tNYHwXqK/d8AuKPsWYvh0w="; + }; + + propagatedBuildInputs = [ + caio + ]; + + checkInputs = [ + aiomisc + asynctest + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiofile" + ]; + + meta = with lib; { + description = "File operations with asyncio support"; + homepage = "https://github.com/mosquito/aiofile"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix new file mode 100644 index 000000000000..d1fd33eb618e --- /dev/null +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -0,0 +1,88 @@ +{ lib +, aiocontextvars + #, aiocarbon +, aiohttp + #, aiohttp-asgi +, async-timeout +, buildPythonPackage +, colorlog +, croniter +, fastapi +, fetchFromGitHub +, logging-journald +, pytestCheckHook +, pythonOlder +, raven + #, raven-aiohttp +, setproctitle +, uvloop +}: + +buildPythonPackage rec { + pname = "aiomisc"; + version = "16.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aiokitchen"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-wxm7MrFHZ7TrUGw5w7iLWs1olU8ZmJmJ7M/BZ6Nf0fU="; + }; + + propagatedBuildInputs = [ + colorlog + logging-journald + ]; + + checkInputs = [ + aiocontextvars + async-timeout + fastapi + pytestCheckHook + raven + setproctitle + ] ++ passthru.optional-dependencies.aiohttp + ++ passthru.optional-dependencies.cron + ++ passthru.optional-dependencies.uvloop; + + passthru.optional-dependencies = { + aiohttp = [ + aiohttp + ]; + #asgi = [ + # aiohttp-asgi + #]; + cron = [ + croniter + ]; + #carbon = [ + # aiocarbon + #]; + #raven = [ + # raven-aiohttp + #]; + uvloop = [ + uvloop + ]; + }; + + pythonImportsCheck = [ + "aiomisc" + ]; + + disabledTestPaths = [ + # Dependencies are not available at the moment + "tests/test_entrypoint.py" + "tests/test_raven_service.py" + ]; + + meta = with lib; { + description = "Miscellaneous utils for asyncio"; + homepage = "https://github.com/aiokitchen/aiomisc"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix new file mode 100644 index 000000000000..28ba5a2f4d19 --- /dev/null +++ b/pkgs/development/python-modules/caio/default.nix @@ -0,0 +1,38 @@ +{ lib +, aiomisc +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "caio"; + version = "0.9.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-hUG5EaraoKj3D3K+Qm2Nm1AFe19qwRy/FnEb1SXWKDM="; + }; + + checkInputs = [ + aiomisc + pytestCheckHook + ]; + + pythonImportsCheck = [ + "caio" + ]; + + meta = with lib; { + description = "File operations with asyncio support"; + homepage = "https://github.com/mosquito/caio"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index bc489d5d71fc..5187c53683ca 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , buildPythonPackage , fetchFromGitHub , poetry-core @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.13.0"; + version = "1.15.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,13 +19,17 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-SADUeLD4quPxKChf1A4ph1iI8zu7oCDg4nJNFl77f+k="; + hash = "sha256-Uq+f0l9/W6PjP9MczF3VJNJicDgOnMrfXpOkHp7frVY="; }; nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ + async-timeout + ]; + checkInputs = [ pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix index 8bea9552b35b..a13a45b66c65 100644 --- a/pkgs/development/python-modules/eiswarnung/default.nix +++ b/pkgs/development/python-modules/eiswarnung/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "eiswarnung"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-eiswarnung"; rev = "refs/tags/v${version}"; - hash = "sha256-fyxqVSZcbo/rrItad5ZTwmp4N8s0HGBdxvx3LBax/hc="; + hash = "sha256-sMR16if2Q+lK+ilnVNYVootBN2LFwBQLlZFkoX+oS/g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index 8ac4f1022d81..621c5da5b6e1 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , flask , karton-core , mistune @@ -20,9 +21,17 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-XMyQ0mRF4y61hqlqdxC+He+697P1URfOXQUMnV0pT7o="; + hash = "sha256-XMyQ0mRF4y61hqlqdxC+He+697P1URfOXQUMnV0pT7o="; }; + patches = [ + (fetchpatch { + name = "update-mistune.patch"; + url = "https://github.com/CERT-Polska/karton-dashboard/commit/d0a2a1ffd21e9066acca77434acaff7b20e460d0.patch"; + hash = "sha256-LOqeLWoCXmVTthruBiQUYR03yPOPHhgYF/fJMhhT6Wo="; + }) + ]; + propagatedBuildInputs = [ flask karton-core diff --git a/pkgs/development/python-modules/logging-journald/default.nix b/pkgs/development/python-modules/logging-journald/default.nix new file mode 100644 index 000000000000..6abd9efeda27 --- /dev/null +++ b/pkgs/development/python-modules/logging-journald/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "logging-journald"; + version = "0.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-U6kqAvMSyLDbThc6wAN/ri0vmt/vAxgFFZT65Csbpss="; + }; + + # Circular dependency with aiomisc + doCheck = false; + + pythonImportsCheck = [ + "logging_journald" + ]; + + meta = with lib; { + description = "Logging handler for writing logs to the journald"; + homepage = "https://github.com/mosquito/logging-journald"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/temperusb/default.nix b/pkgs/development/python-modules/temperusb/default.nix new file mode 100644 index 000000000000..929560167e76 --- /dev/null +++ b/pkgs/development/python-modules/temperusb/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pyusb +}: + +buildPythonPackage rec { + pname = "temperusb"; + version = "1.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-enYhqtJnORKhBoZkZPISLCt9Ec5SN6txD3z0SXuPrQo="; + }; + + propagatedBuildInputs = [ + pyusb + ]; + + # Module has no tests which are shipped and source is not tagged + doCheck = false; + + pythonImportsCheck = [ + "temperusb" + ]; + + meta = with lib; { + description = "Library to read TEMPer USB HID devices"; + homepage = "https://github.com/padelt/temper-python"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 122190812bc3..315bcf87b17f 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "1.0.2"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-linVQqU45vmJ8zWyJl0W4o5Ci8N0M0jP/fiYekdaamc="; + sha256 = "sha256-Nam6TnjTAt5oV+IQ+6cS8L0/j/lp+x9adRHUTs69GA0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/garble/default.nix b/pkgs/development/tools/garble/default.nix index 2162b378ec01..0d01de127edf 100644 --- a/pkgs/development/tools/garble/default.nix +++ b/pkgs/development/tools/garble/default.nix @@ -6,23 +6,23 @@ }: buildGoModule rec { pname = "garble"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "burrowers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QQRnnH/lbleZYkmHj4XUj2uMB9h/mwolhqWfaWMk2ys="; + sha256 = "sha256-T6iUhfBcHlz9oUuovwU4ljHh4y6PRd3sRhwG6RwuspM="; }; - vendorSha256 = "sha256-Xax8KfNcFCLKqcLBNtRUNaneVCW4eUMFe4Ml+D4wLNA="; + vendorSha256 = "sha256-lGU9jbeOM8tSYZGIqQhH5I2RlBGnqrA6JUQpuHrLwKU="; # Used for some of the tests. checkInputs = [git]; preBuild = lib.optionalString (!stdenv.isx86_64) '' # The test assumex amd64 assembly - rm testdata/scripts/asm.txt + rm testdata/script/asm.txtar ''; meta = { diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index c2e3fac7e15d..f949cf69835d 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -4,8 +4,9 @@ , fetchpatch , scons , pkg-config -, SDL -, SDL_mixer +, SDL2 +, SDL2_image +, SDL2_mixer , libGLU , libGL , libpng @@ -21,21 +22,23 @@ let in stdenv.mkDerivation rec { pname = "dxx-rebirth"; - version = "0.59.20200202"; + version = "unstable-2022-09-17"; src = fetchFromGitHub { owner = "dxx-rebirth"; repo = "dxx-rebirth"; - rev = "8ebb66c5c9c74ebb93d49741cc9545f2bb7fa05d"; - sha256 = "1lsrlp47aby2m9hh7i3nv5rb0srlkmnq1w2ca6vyvlga9m9h7jrk"; + rev = "ad46235b67a24a38dec4734f94a59eba149ad94a"; + hash = "sha256-vIAY1O4VnOsV617J5yjg09JIL/vK4Fb/lopnX17g+uY="; }; nativeBuildInputs = [ pkg-config scons ]; - buildInputs = [ libGLU libGL libpng physfs SDL SDL_mixer ]; + buildInputs = [ libGLU libGL libpng physfs SDL2 SDL2_image SDL2_mixer ]; enableParallelBuilding = true; + sconsFlags = [ "sdl2=1" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-format-nonliteral" "-Wno-format-truncation" diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 569d8d70473a..46371245936c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2876,7 +2876,8 @@ "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ - ]; # missing inputs: temperusb + temperusb + ]; "template" = ps: with ps; [ ]; "tensorflow" = ps: with ps; [ diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index bbe11102cbbe..29479cdce9eb 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OOFmyTEiaZnCx15gkoMGooC4qlevKMBS7umawiKVZqE="; + sha256 = "sha256-0R9UB4xW5LYSA3rJIhJkYCEIN3Fn3eQaqZS1OP4kXNg="; }; - cargoSha256 = "sha256-jWYiZ6YNeGtmcHgqCgC8A7dEdJ29n3W/RdE0wQbOUOA="; + cargoSha256 = "sha256-elpMupN5Ah40+kWzXYDg+PUs0taOxdVhiPMO749H9fA="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit @@ -27,6 +27,11 @@ rustPlatform.buildRustPackage rec { # device::test_physical_device_name test fails on Darwin doCheck = !stdenv.isDarwin; + checkFlags = [ + # ofborg sometimes fails with "Resource temporarily unavailable" + "--skip=cache::test::return_none_if_different_transform_was_used" + ]; + meta = with lib; { description = "Efficient Duplicate File Finder and Remover"; homepage = "https://github.com/pkolaczk/fclones"; diff --git a/pkgs/tools/security/lethe/default.nix b/pkgs/tools/security/lethe/default.nix index 4af9466a3db2..08687482f94f 100644 --- a/pkgs/tools/security/lethe/default.nix +++ b/pkgs/tools/security/lethe/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lethe"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "kostassoid"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uMpqN9xgA0S861JChfJebU6azxJN8ScftmX8yJV8NM8="; + sha256 = "sha256-o57WtzTouIzB0yl6lEUwpav0rm+jwD5tyBqK/MRN+ME="; }; - cargoSha256 = "sha256-GeZ/25ZaD/vyQo02SUt1JtNUL2QCg0varOJC1M3Ji9s="; + cargoSha256 = "sha256-flj4p4qAMMy46/nY48lRNcyB8KzEUoYOfhDk7xR7qQU="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/text/huniq/default.nix b/pkgs/tools/text/huniq/default.nix new file mode 100644 index 000000000000..a1d30d2fb11d --- /dev/null +++ b/pkgs/tools/text/huniq/default.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "huniq"; + version = "2.7.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-5GvHM05qY/Jj1mPYwn88Zybn6Nn5nJIaw0XP8iCcrwE="; + }; + + cargoSha256 = "sha256-pwDaLHJbVpZe7dAtd5/ytyHZkUHjCcNjtw3q7HF1qVQ="; + + meta = with lib; { + description = "Command line utility to remove duplicates from the given input"; + homepage = "https://github.com/koraa/huniq"; + license = licenses.bsd3; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/text/rnr/default.nix b/pkgs/tools/text/rnr/default.nix new file mode 100644 index 000000000000..55a4c2ddf681 --- /dev/null +++ b/pkgs/tools/text/rnr/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "rnr"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "ismaelgv"; + repo = pname; + rev = "v${version}"; + sha256 = "1r1ahh8bmqrc7zb4bq5ka8bsngncf7im51nf5il49cvysij1i4q8"; + }; + + cargoSha256 = "sha256-qgKL+y+w+9ADClxLNwglHMufaysY0K9g29PyuXZ7x7g="; + + meta = with lib; { + description = "A command-line tool to batch rename files and directories"; + homepage = "https://github.com/ismaelgv/rnr"; + changelog = "https://github.com/ismaelgv/rnr/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a46d0b20390..2a00bd2615f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4132,6 +4132,8 @@ with pkgs; humioctl = callPackage ../applications/logging/humioctl {}; + huniq = callPackage ../tools/text/huniq { }; + hyprland = callPackage ../applications/window-managers/hyprland { wlroots = wlroots.overrideAttrs (_: { version = "unstable-2022-06-07"; @@ -10666,6 +10668,8 @@ with pkgs; rnp = callPackage ../tools/security/rnp { }; + rnr = callPackage ../tools/text/rnr { }; + rnv = callPackage ../tools/text/xml/rnv { }; rosie = callPackage ../tools/text/rosie { }; @@ -14146,6 +14150,8 @@ with pkgs; jwasm = callPackage ../development/compilers/jwasm { }; + kind2 = callPackage ../development/compilers/kind2 { }; + knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; regenkfs = callPackage ../development/tools/knightos/regenkfs { }; @@ -17045,6 +17051,10 @@ with pkgs; privacyidea = callPackage ../applications/misc/privacyidea { }; + process-viewer = callPackage ../applications/misc/process-viewer { + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; + }; + procodile = callPackage ../tools/system/procodile { }; pry = callPackage ../development/tools/pry { }; @@ -33325,8 +33335,7 @@ with pkgs; dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; - dxx-rebirth = callPackage ../games/dxx-rebirth - { stdenv = gcc10StdenvCompat; physfs = physfs_2; }; + dxx-rebirth = callPackage ../games/dxx-rebirth { }; inherit (callPackages ../games/dxx-rebirth/assets.nix { }) descent1-assets diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 156564dd371f..d3320d4cf3e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -307,6 +307,8 @@ in { aioextensions = callPackage ../development/python-modules/aioextensions { }; + aiofile = callPackage ../development/python-modules/aiofile { }; + aiofiles = callPackage ../development/python-modules/aiofiles { }; aioflo = callPackage ../development/python-modules/aioflo { }; @@ -375,6 +377,8 @@ in { aiolyric = callPackage ../development/python-modules/aiolyric { }; + aiomisc = callPackage ../development/python-modules/aiomisc { }; + aiomodernforms = callPackage ../development/python-modules/aiomodernforms { }; aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { }; @@ -1602,6 +1606,8 @@ in { inherit (self) python numpy boost; }); + caio = callPackage ../development/python-modules/caio { }; + cairo-lang = callPackage ../development/python-modules/cairo-lang { }; cairocffi = callPackage ../development/python-modules/cairocffi { }; @@ -5378,6 +5384,8 @@ in { logfury = callPackage ../development/python-modules/logfury { }; + logging-journald = callPackage ../development/python-modules/logging-journald { }; + logi-circle = callPackage ../development/python-modules/logi-circle { }; logical-unification = callPackage ../development/python-modules/logical-unification { }; @@ -10805,6 +10813,8 @@ in { temescal = callPackage ../development/python-modules/temescal { }; + temperusb = callPackage ../development/python-modules/temperusb { }; + tempest = callPackage ../development/python-modules/tempest { }; tempita = callPackage ../development/python-modules/tempita { };