diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1cc16179a1d2..f040598e5d39 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3263,6 +3263,12 @@ githubId = 244239; name = "Mauricio Collares"; }; + coloquinte = { + email = "gabriel.gouvine_nix@m4x.org"; + github = "coloquinte"; + githubId = 4102525; + name = "Gabriel Gouvine"; + }; commandodev = { email = "ben@perurbis.com"; github = "commandodev"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index aa8c2e67073e..73242f22b0dc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1410,6 +1410,7 @@ ./tasks/filesystems/nfs.nix ./tasks/filesystems/ntfs.nix ./tasks/filesystems/reiserfs.nix + ./tasks/filesystems/squashfs.nix ./tasks/filesystems/unionfs-fuse.nix ./tasks/filesystems/vboxsf.nix ./tasks/filesystems/vfat.nix diff --git a/nixos/modules/tasks/filesystems/squashfs.nix b/nixos/modules/tasks/filesystems/squashfs.nix new file mode 100644 index 000000000000..10d45a21d3ca --- /dev/null +++ b/nixos/modules/tasks/filesystems/squashfs.nix @@ -0,0 +1,13 @@ +{ config, lib, ... }: + +let + + inInitrd = lib.any (fs: fs == "squashfs") config.boot.initrd.supportedFilesystems; + +in + +{ + + boot.initrd.availableKernelModules = lib.mkIf inInitrd [ "squashfs" ]; + +} diff --git a/nixos/tests/non-default-filesystems.nix b/nixos/tests/non-default-filesystems.nix index 6233e8d265d0..08a17107dd2f 100644 --- a/nixos/tests/non-default-filesystems.nix +++ b/nixos/tests/non-default-filesystems.nix @@ -94,6 +94,8 @@ with pkgs.lib; makeTest { name = "non-default-filesystems-erofs"; + meta.maintainers = with maintainers; [ nikstur ]; + nodes.machine = _: { virtualisation.qemu.drives = [{ name = "non-default-filesystem"; @@ -128,4 +130,43 @@ with pkgs.lib; assert "erofs" in file_contents ''; }; + + squashfs = + let + fsImage = "/tmp/non-default-filesystem.img"; + in + makeTest { + name = "non-default-filesystems-squashfs"; + + meta.maintainers = with maintainers; [ nikstur ]; + + nodes.machine = { + virtualisation.qemu.drives = [{ + name = "non-default-filesystem"; + file = fsImage; + deviceExtraOpts.serial = "non-default"; + }]; + + virtualisation.fileSystems."/non-default" = { + device = "/dev/disk/by-id/virtio-non-default"; + fsType = "squashfs"; + neededForBoot = true; + }; + }; + + testScript = '' + import subprocess + + with open("filesystem", "w") as f: + f.write("squashfs") + + subprocess.run([ + "${pkgs.squashfsTools}/bin/mksquashfs", + "filesystem", + "${fsImage}", + ]) + + assert "squashfs" in machine.succeed("cat /non-default/filesystem") + ''; + }; } diff --git a/pkgs/applications/audio/vital/default.nix b/pkgs/applications/audio/vital/default.nix new file mode 100644 index 000000000000..84c910eecb95 --- /dev/null +++ b/pkgs/applications/audio/vital/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchzip +, autoPatchelfHook +, makeBinaryWrapper + +, alsa-lib +, libjack2 +, curl +, xorg +, libGL +, freetype +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vital"; + version = "1.5.5"; + + src = fetchzip { + url = "https://builds.vital.audio/VitalAudio/vital/${builtins.replaceStrings ["."] ["_"] finalAttrs.version}/VitalInstaller.zip"; + hash = "sha256-hCwXSUiBB0YpQ1oN6adLprwAoel6f72tBG5fEb61OCI="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeBinaryWrapper + ]; + + buildInputs = [ + alsa-lib + stdenv.cc.cc.lib + libGL + xorg.libSM + xorg.libICE + xorg.libX11 + freetype + libjack2 + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + # copy each output to its destination (individually) + mkdir -p $out/{bin,lib/{clap,vst,vst3}} + for f in bin/Vital lib/{clap/Vital.clap,vst/Vital.so,vst3/Vital.vst3}; do + cp -r $f $out/$f + done + + wrapProgram $out/bin/Vital \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ curl libjack2 ]}" + + runHook postInstall + ''; + + + meta = with lib; { + description = "Spectral warping wavetable synth"; + homepage = "https://vital.audio/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = with licenses; [ unfree gpl3Plus ]; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ PowerUser64 ]; + mainProgram = "Vital"; + }; +}) diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 5c08af915d97..141e6f81a4a7 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.62.3"; + version = "2.62.5"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-/zIAF3LqOeIN91o33vntkBtQnESJhEDBljGPbMZvelc="; + hash = "sha256-g95cWzV2Hrm+0piCyHZQ4ky1k0aaFil9YJE9Hk5lfYE="; }; vendorHash = null; diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index 7850ae6909f6..28e7829a9c49 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/pkgs/applications/emulators/xemu/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.7.96"; + version = "0.7.97"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-6lEQotqVrfK+A67nTEKeqY70LrQRdH9dUGlzOt5CWZ0="; + hash = "sha256-Doyn+EHZ9nlYjufHnHARLXbyDjYIEGIHuLOXFHU5f3w="; fetchSubmodules = true; }; @@ -130,6 +130,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/xemu-project/xemu/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres genericnerdyusername ]; - platforms = with lib.platforms; linux; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix index d032238ca5b7..d56573d9d728 100644 --- a/pkgs/applications/networking/irc/catgirl/default.nix +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "catgirl"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-pov7gvYlvN97xbem4VKP41Wbze1B8NPJcvi36Ri87o4="; + sha256 = "sha256-+20EoJkwOvBdJ4xwXBVC5+5hZDwDDWoLaN7FNxCAo8c="; }; # catgirl's configure script uses pkg-config --variable exec_prefix openssl diff --git a/pkgs/applications/networking/p2p/rqbit/default.nix b/pkgs/applications/networking/p2p/rqbit/default.nix index 1364acc16cce..f8b151ac339a 100644 --- a/pkgs/applications/networking/p2p/rqbit/default.nix +++ b/pkgs/applications/networking/p2p/rqbit/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "2.1.5"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - sha256 = "sha256-AzlYeHPCDri/FxAh5R5AES+OAfzhwqB8/ewRwDU1nnU="; + hash = "sha256-RF/3eICbqYXSuOWTvRBImiLPWIh4Oip37S5gqoSmDzE="; }; - cargoSha256 = "sha256-CqEnQNbwiB6+zM8gWhplvFPblKp+mPMAtnHP8JZiKv4="; + cargoHash = "sha256-wawlqnPYCLEkR9XpTQRZqG+wsqN/Nd5Q1IXpE6ikmY4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/applications/video/kodi/addons/chardet/default.nix b/pkgs/applications/video/kodi/addons/chardet/default.nix index 0d20853412f5..5d3fd8421db9 100644 --- a/pkgs/applications/video/kodi/addons/chardet/default.nix +++ b/pkgs/applications/video/kodi/addons/chardet/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "chardet"; namespace = "script.module.chardet"; - version = "4.0.0+matrix.1"; + version = "5.1.0"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-sh1lMlB3+fkVr4yxzkRVHag+/GhySWFVk2iFVYsJTcs="; + sha256 = "sha256-cIQIX6LVAoGf1sBRKWonXJd3XYqGOa5WIUttabV0HeU="; }; passthru = { diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index b08978bcf59d..fd11a46dcd2b 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -38,15 +38,15 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20230312"; - kodiVersion = "20.1"; + kodiReleaseDate = "20230629"; + kodiVersion = "20.2"; rel = "Nexus"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - hash = "sha256-2nwjW0MYrMVk+dllrAv9yn+YNA6/loZzoK8mbFIZ8Xs="; + hash = "sha256-nNdBjqY9gkpv3g/hcyjWPENHFwOlxrKs2cT4IvRPuXs="; }; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index ed9c09087e41..b0ea1b04c258 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.9.7"; + version = "1.10.3"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-SviAuV+71pxnuEcmoLQkA1yti2jAAuG7yZZDlf3cODc="; + sha256 = "sha256-iuQ6ZHPrtIQzEqHYrLibZ8uOOwNqMbWYCD5plDQcBZg="; rev = "v${version}"; }; diff --git a/pkgs/development/libraries/science/electronics/coloquinte/default.nix b/pkgs/development/libraries/science/electronics/coloquinte/default.nix new file mode 100644 index 000000000000..6946080c100e --- /dev/null +++ b/pkgs/development/libraries/science/electronics/coloquinte/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, lemon-graph +, eigen +, boost +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "coloquinte"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "coloquinte"; + repo = "PlaceRoute"; + rev = finalAttrs.version; + hash = "sha256-bPDXaNZCNBM0qiu+46cL/zH/41lwqHPqfqTzJaERgVQ="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + lemon-graph + eigen + boost + ]; + + meta = { + description = "Placement library for electronic circuits"; + homepage = "https://github.com/Coloquinte/PlaceRoute"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.coloquinte ]; + }; +}) diff --git a/pkgs/development/ocaml-modules/tdigest/default.nix b/pkgs/development/ocaml-modules/tdigest/default.nix index 29732cc22faf..4dc40da9dac6 100644 --- a/pkgs/development/ocaml-modules/tdigest/default.nix +++ b/pkgs/development/ocaml-modules/tdigest/default.nix @@ -1,16 +1,17 @@ -{ lib, fetchFromGitHub, buildDunePackage +{ lib, fetchFromGitHub, nix-update-script +, buildDunePackage , core }: buildDunePackage rec { pname = "tdigest"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "SGrondin"; repo = pname; rev = version; - sha256 = "sha256-R1uaCN/6NiW+jdGQiflwfihaidngvaWjJM7UFyR4vxs="; + sha256 = "sha256-pkJRJeEbBbAR1STb6v3Zu11twvHkAKAO0YjifRBFTDw="; }; minimalOCamlVersion = "4.08"; @@ -19,6 +20,8 @@ buildDunePackage rec { core ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/SGrondin/${pname}"; description = "OCaml implementation of the T-Digest algorithm"; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index f1920b889f13..1d8705160648 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "15.1.3"; + version = "15.1.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IY9vRLbuQy4YDOE9RE2sSxOZaco5NuMG0cFrU2etTn0="; + hash = "sha256-X5nYoVnJOibFKpR7daKXxg+z9qWGsxaFpHkSVYlHuqk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 2d06e507fce5..2570552ca77a 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.3.2"; + version = "17.3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tJ8d02KbG4z6cUflvjSF/Y7UHH8UqWT8UY7XFqNPP+o="; + hash = "sha256-MSLZWBgky3PwQxBs1Mj8h/HcerlvzpFvNEZAPoidRpc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix index 1393a7084e1f..e4590daa631f 100644 --- a/pkgs/development/python-modules/babel/default.nix +++ b/pkgs/development/python-modules/babel/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, isPyPy , pythonAtLeast , pythonOlder +, tzdata # tests , freezegun @@ -31,11 +33,12 @@ buildPythonPackage rec { doCheck = pythonAtLeast "3.9"; nativeCheckInputs = [ - # via setup.py freezegun pytestCheckHook - # via tox.ini + # https://github.com/python-babel/babel/issues/988#issuecomment-1521765563 pytz + ] ++ lib.optionals isPyPy [ + tzdata ]; disabledTests = [ diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index bff945f52c39..9cae7f904784 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.30.0"; + version = "0.31.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OiDNK/NqC1nDiN2uoYaVj07BirzNB6DBKvMKNrfWDIA="; + hash = "sha256-xN+zMNUKy/zeBnY9TAdllCV6E9UG6ke+jaXkOZ59HFI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 40b9966f4345..9a146402da60 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.1.9"; + version = "2.1.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-fqBg0IHwREkDOEPIxMVBCcGH8dSyKIkOeYga3Jc+qQs="; + hash = "sha256-pa3hSrulnTfoOmNkaWvsqdd7ow+qENPJlBHFoFooZhw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mullvad-closest/default.nix b/pkgs/development/python-modules/mullvad-closest/default.nix new file mode 100644 index 000000000000..c5d45dfd1751 --- /dev/null +++ b/pkgs/development/python-modules/mullvad-closest/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, setuptools +, click +, geopy +, ping3 +, requests +, tabulate +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "mullvad-closest"; + version = "unstable-2023-07-09"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Ch00k"; + repo = "mullvad-closest"; + rev = "894d2075a520fcad238256725245030374693a16"; + hash = "sha256-scJiYjEmnDDElE5rHdPbnnuNjjRB0/X3vNGLoi2MAmo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + click + geopy + ping3 + requests + tabulate + ]; + + pythonImportsCheck = [ "mullvad_closest" ]; + + meta = with lib; { + description = "Find Mullvad servers with the lowest latency at your location"; + homepage = "https://github.com/Ch00k/mullvad-closest"; + license = licenses.unlicense; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/development/python-modules/ping3/default.nix b/pkgs/development/python-modules/ping3/default.nix new file mode 100644 index 000000000000..c5dd49ba0d59 --- /dev/null +++ b/pkgs/development/python-modules/ping3/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, setuptools +, wheel +, fetchPypi +}: + +buildPythonPackage rec { + pname = "ping3"; + version = "4.0.4"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HqEqz2dS1GZmFjQf18Y5PGZM/8UQxpPvBvc2+yZ6E7o="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "ping3" ]; + + meta = with lib; { + description = "A pure python3 version of ICMP ping implementation using raw socket"; + homepage = "https://pypi.org/project/ping3"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index eb6f34f8e5eb..654d1887804e 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydrive2"; - version = "1.16.0"; + version = "1.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyDrive2"; inherit version; - hash = "sha256-u9yNLgAuT4fSD5vYSfk/1lieu0Da2X+UtvOCtP/Ws8E="; + hash = "sha256-chBTXoNyiWpEcCxCQKop1GELAyWyX5TN0H1P7A/ScFM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 528c5e7f30b1..87cec63996be 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.2.0"; + version = "0.2.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = "refs/tags/${version}"; - hash = "sha256-o+hGPLptqzBHtQNquM/jP88QFQ1tiZqI/NXColHrcAM="; + hash = "sha256-ZBE9Vb6GsIbkznJszJNtmwb6e3vUl5+r99yFoF8LNZE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index a1ae946887f2..7f261a3cfd1b 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.9.0"; + version = "1.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-Xvwu4Npt9mCmeiQAqj8+s3bHnLBs1o595zdfkjnyaUc="; + hash = "sha256-03tbWCkSAG/aE6hsPxCPuGRFPTiMgkp/tCzWScPW8YE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 5d3216f0321d..a8749adfb616 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.10.0"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = pname; rev = version; - hash = "sha256-4nIKJKZR3H1jaubGTxW1U5pBWTv3lzKiuXgDvGYeUsY="; + hash = "sha256-4HwHNowif0/YflznQrn8YRITjuiaBCB2mFIO0iCf6tA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 5e87993f991a..5ce5deace5d0 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2023.2"; + version = "2023.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = "refs/tags/${version}"; - hash = "sha256-sZA+3UjYSHZnN87KUNukRCQ/kG7aobcPVWnhqNOLwJw="; + hash = "sha256-sx4KfWQCvGS+w83tECJSyLLWU9GkwYpo39gt4EKndPk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 2915e466d03e..042fa4d200b0 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.15.10"; + version = "1.16.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-m2AefZ7iNbbguRmXHvstWX8bc17ERiHI+hiYjDM0WNg="; + hash = "sha256-pF4zMHuNwrabIJ2kmnCVUWu7V2aEhROAskSxY8j71fQ="; }; - cargoHash = "sha256-Lu2FmBRjGmbx28jxN6w3u+eUCC4O5lkv9ve6nCXDaE4="; + cargoHash = "sha256-Bc7+ydHMWRwkhBN+dfaIIx5wwXkENDw2F1tyb/VcDhY="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 1498189de5a4..703916db553c 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -52,7 +52,7 @@ in src = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; - sha256 = "sha256-1szyjcwkhn2wbrcfhh9lh5bnfm1cavxrx6xj4q7521z3zj29a9kf"; + sha256 = "sha256-wpm9VnR4yPk6Ybo/V2DMLgRcSzDl3dWGSKDCjYfz+xQ="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix index 97966eed147f..2be39b7c2fa3 100644 --- a/pkgs/servers/nitter/default.nix +++ b/pkgs/servers/nitter/default.nix @@ -7,13 +7,13 @@ nimPackages.buildNimPackage rec { pname = "nitter"; - version = "unstable-2023-05-19"; + version = "unstable-2023-07-10"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "e3b3b38a2d43a83b5fc2239ab41e864ee686fb2f"; - hash = "sha256-1BEZcrraPc9qOWLy3Bq8M8G5P4fUmb2IX+T+cStHpmQ="; + rev = "0bc3c153d9b38a3c02f321fb64a375fef6b97e8e"; + hash = "sha256-msx14FZl2uRZvZjTlF7c3Va742HhiU6R2jdh4neIEV4="; }; patches = [ diff --git a/pkgs/tools/graphics/findimagedupes/default.nix b/pkgs/tools/graphics/findimagedupes/default.nix deleted file mode 100644 index 461919beb6fe..000000000000 --- a/pkgs/tools/graphics/findimagedupes/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, perl, perlPackages, installShellFiles }: - -stdenv.mkDerivation rec { - pname = "findimagedupes"; - version = "2.20.1"; - - # fetching this from GitHub does not contain the correct version number - src = fetchurl { - url = "http://www.jhnc.org/findimagedupes/findimagedupes-${version}.tar.gz"; - sha256 = "sha256-VYqSnOD/Ntr0RnktJ/R0t+Z8+NRExA2mAHT2unPt9/o="; - }; - - # Work around the "unpacker appears to have produced no directories" - setSourceRoot = "sourceRoot=$(pwd)"; - - nativeBuildInputs = [ makeWrapper installShellFiles ]; - - buildInputs = [ perl ] ++ (with perlPackages; [ - DBFile - FileMimeInfo - FileBaseDir - #GraphicsMagick - ImageMagick - Inline - InlineC - ParseRecDescent - ]); - - # use /tmp as a storage - # replace GraphicsMagick with ImageMagick, because perl bindings are not yet available - postPatch = '' - substituteInPlace findimagedupes \ - --replace "DIRECTORY => '/usr/local/lib/findimagedupes';" "DIRECTORY => '/tmp';" \ - --replace "Graphics::Magick" "Image::Magick" - ''; - - buildPhase = " - runHook preBuild - ${perl}/bin/pod2man findimagedupes > findimagedupes.1 - runHook postBuild - "; - - installPhase = '' - runHook preInstall - install -D -m 755 findimagedupes $out/bin/findimagedupes - installManPage findimagedupes.1 - runHook postInstall - ''; - - postFixup = '' - wrapProgram "$out/bin/findimagedupes" \ - --prefix PERL5LIB : "${with perlPackages; makePerlPath [ - DBFile - FileMimeInfo - FileBaseDir - #GraphicsMagick - ImageMagick - Inline - InlineC - ParseRecDescent - ]}" - ''; - - meta = with lib; { - homepage = "http://www.jhnc.org/findimagedupes/"; - description = "Finds visually similar or duplicate images"; - license = licenses.gpl3; - maintainers = with maintainers; [ stunkymonkey ]; - }; -} diff --git a/pkgs/tools/misc/tgpt/default.nix b/pkgs/tools/misc/tgpt/default.nix index a7c7a5430f3c..d3e186774f38 100644 --- a/pkgs/tools/misc/tgpt/default.nix +++ b/pkgs/tools/misc/tgpt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tgpt"; - version = "1.6.12"; + version = "1.7.0"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "tgpt"; rev = "refs/tags/v${version}"; - hash = "sha256-+D8elnJEDiHhInVHxFNTEfq9DewuuIc4e+gX4kIv7E0="; + hash = "sha256-g9gwLM7H7sPzR9Gpyun0Nc+Afe5phSFYrGBUOmyLG/I="; }; vendorHash = "sha256-2I5JJWxM6aZx0eZu7taUTL11Y/5HIrXYC5aezrTbbsM="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5953fd179185..cdb002947ad7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -499,6 +499,7 @@ mapAliases ({ ffmpeg-sixel = throw "ffmpeg-sixel has been removed, because it was an outdated/unmaintained fork of ffmpeg"; # Added 2022-03-23"; ffmpeg_3 = throw "ffmpeg_3 was removed from nixpkgs, because it was an outdated and insecure release"; # added 2022-01-17 filebeat6 = throw "filebeat6 has been removed because it reached end of life"; # Added 2022-10-04 + findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc3904692e41..0cbaa8c67d44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5009,8 +5009,6 @@ with pkgs; facedetect = callPackage ../tools/graphics/facedetect { }; - findimagedupes = callPackage ../tools/graphics/findimagedupes { }; - facter = callPackage ../tools/system/facter { }; faketty = callPackage ../tools/misc/faketty { }; @@ -20434,6 +20432,8 @@ with pkgs; collada-dom = callPackage ../development/libraries/collada-dom { }; + coloquinte = callPackage ../development/libraries/science/electronics/coloquinte { }; + cog = callPackage ../development/web/cog { }; cosmocc = callPackage ../development/tools/cosmocc { }; @@ -26157,6 +26157,8 @@ with pkgs; mullvad-browser = callPackage ../applications/networking/browsers/mullvad-browser { }; + mullvad-closest = with python3Packages; toPythonApplication mullvad-closest; + mycorrhiza = callPackage ../servers/mycorrhiza { }; napalm = with python3Packages; toPythonApplication ( @@ -33871,6 +33873,8 @@ with pkgs; vieb = callPackage ../applications/networking/browsers/vieb { }; + vital = callPackage ../applications/audio/vital { }; + vivaldi = callPackage ../applications/networking/browsers/vivaldi { }; vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5840c7d3bbef..c38c49c9ada7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6626,6 +6626,8 @@ self: super: with self; { mullvad-api = callPackage ../development/python-modules/mullvad-api { }; + mullvad-closest = callPackage ../development/python-modules/mullvad-closest { }; + mulpyplexer = callPackage ../development/python-modules/mulpyplexer { }; multidict = callPackage ../development/python-modules/multidict { }; @@ -7672,6 +7674,8 @@ self: super: with self; { pfzy = callPackage ../development/python-modules/pfzy { }; + ping3 = callPackage ../development/python-modules/ping3 { }; + pg8000 = callPackage ../development/python-modules/pg8000 { }; pgcli = callPackage ../development/python-modules/pgcli { };