diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index af0ec94e8a49..8ed71a1850db 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3404,6 +3404,12 @@ githubId = 6754950; name = "David Armstrong Lewis"; }; + davidcromp = { + email = "davidcrompton1192@gmail.com"; + github = "DavidCromp"; + githubId = 10701143; + name = "David Crompton"; + }; davidrusu = { email = "davidrusu.me@gmail.com"; github = "davidrusu"; diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 233bfdf9ebf5..c81cf293ab6d 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -82,8 +82,8 @@ in { }; boot.kernel.sysctl = mkIf (cfg.useRoutingFeatures == "server" || cfg.useRoutingFeatures == "both") { - "net.ipv4.conf.all.forwarding" = mkDefault true; - "net.ipv6.conf.all.forwarding" = mkDefault true; + "net.ipv4.conf.all.forwarding" = mkOverride 97 true; + "net.ipv6.conf.all.forwarding" = mkOverride 97 true; }; networking.firewall.checkReversePath = mkIf (cfg.useRoutingFeatures == "client" || cfg.useRoutingFeatures == "both") "loose"; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index e65684353642..ae1a60ec1db0 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-UiPwvZcdkeFOTMVcUT1Xr5ByrJC+yzodCfi8Br61hjU="; + sha256 = "sha256-yxb8cMAokAv0tl9FSjjtdvHkJP/UKlZxLLu/+gx8kyQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index 51b6d4d16b2b..e4823f1a66c3 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.38.1"; + version = "2.39.0"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sLJMmSEUQNsodZ9Ms0ipDwN2QOYa9pZTlEqt4CF23Sc="; + sha256 = "sha256-HlAnuc6n/de6EzHTit3xGCFLrc2+S+H/o0gCxH8d0aU="; fetchSubmodules = true; }; - vendorSha256 = "sha256-KESY+PSbWQHPJphop4GnVF4T8Q/MPb2GFDEko0ieXEM="; + vendorSha256 = "sha256-kKwaA6NjRdg97tTEzEI+TWMSx7izzFWcefR5B086cUY="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 1405bc5b90ca..3b2473795088 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-5PtMXipULnzAnarESu2biYOeHSlDeKXoX5XnlpvgIAk="; + sha256 = "sha256-67augXXZsriXdndrCFUFWZbL+rVKgTPAyqlbZua2Ul4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/rofi-bluetooth/default.nix b/pkgs/applications/misc/rofi-bluetooth/default.nix index ed80e5d5af0e..d9824ca9977a 100644 --- a/pkgs/applications/misc/rofi-bluetooth/default.nix +++ b/pkgs/applications/misc/rofi-bluetooth/default.nix @@ -2,20 +2,19 @@ , stdenv , fetchFromGitHub , makeWrapper -, rofi-unwrapped , bluez }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rofi-bluetooth"; - version = "unstable-2021-03-05"; + version = "unstable-2023-02-03"; src = fetchFromGitHub { owner = "nickclyde"; - repo = "rofi-bluetooth"; + repo = finalAttrs.pname; # https://github.com/nickclyde/rofi-bluetooth/issues/19 - rev = "893db1f2b549e7bc0e9c62e7670314349a29cdf2"; - sha256 = "sha256-3oROJKEQCuSnLfbJ+JSSc9hcmJTPrLHRQJsrUcaOMss="; + rev = "9d91c048ff129819f4c6e9e48a17bd54343bbffb"; + sha256 = "sha256-1Xe3QFThIvJDCUznDP5ZBzwZEMuqmxpDIV+BcVvQDG8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { install -D --target-directory=$out/bin/ ./rofi-bluetooth wrapProgram $out/bin/rofi-bluetooth \ - --prefix PATH ":" ${lib.makeBinPath [ rofi-unwrapped bluez ] } + --prefix PATH ":" ${lib.makeBinPath [ bluez ] } runHook postInstall ''; @@ -38,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ MoritzBoehme ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index fcbab9313ecd..fc7e0be004c9 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.16.2"; + version = "1.17.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-Qvpg6qLrtnnMrRWFHv7J+drM75V6DaMu1jxcxaCJ4kk="; + sha256 = "sha256-cMpFf+VTTH8d1KpvbUoB2pJYPp3FHhRthut8tjTEZtc="; }; - vendorHash = "sha256-wPkjRkgQiGvZm+eOGVlM5cgrYugF/E8H71bcR2ofP2U="; + vendorHash = "sha256-C8UyfVCCkLAU9/qY9Kcv8TKKfG3rLNzu8mfi23O18rU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/instant-messengers/jami/client.nix b/pkgs/applications/networking/instant-messengers/jami/client.nix deleted file mode 100644 index 80efff68e65f..000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/client.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ version -, src -, jami-meta -, lib -, stdenv -, pkg-config -, cmake -, networkmanager # for libnm -, python3 -, qttools # for translations -, wrapQtAppsHook -, ffmpeg_5 -, jami-daemon -, libnotify -, qt5compat -, qtbase -, qtdeclarative -, qrencode -, qtmultimedia -, qtnetworkauth -, qtsvg -, qtwebengine -, qtwebchannel -, withWebengine ? true -}: - -stdenv.mkDerivation { - pname = "jami-client"; - inherit version src; - - sourceRoot = "source/client-qt"; - - preConfigure = '' - echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h - ''; - - nativeBuildInputs = [ - wrapQtAppsHook - pkg-config - cmake - python3 - qttools - ]; - - buildInputs = [ - ffmpeg_5 - jami-daemon - libnotify - networkmanager - qtbase - qt5compat - qrencode - qtnetworkauth - qtdeclarative - qtmultimedia - qtsvg - qtwebchannel - ] ++ lib.optionals withWebengine [ - qtwebengine - ]; - - cmakeFlags = [ - "-DLIBJAMI_INCLUDE_DIR=${jami-daemon}/include/jami" - "-DLIBJAMI_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces" - ] ++ lib.optionals (!withWebengine) [ - "-DWITH_WEBENGINE=false" - ]; - - qtWrapperArgs = [ - # With wayland the titlebar is not themed and the wmclass is wrong. - "--set-default QT_QPA_PLATFORM xcb" - ]; - - meta = jami-meta // { - description = "The client based on QT" + jami-meta.description; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix deleted file mode 100644 index bf2392f63153..000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ src -, version -, jami-meta -, stdenv -, autoreconfHook -, pkg-config -, perl # for pod2man -, alsa-lib -, asio -, dbus -, dbus_cplusplus -, ffmpeg_5 -, fmt -, gmp -, gnutls -, http-parser -, jack -, jsoncpp -, libarchive -, libgit2 -, libnatpmp -, libpulseaudio -, libupnp -, yaml-cpp -, msgpack -, opendht-jami -, openssl -, pjsip-jami -, restinio -, secp256k1 -, speex -, udev -, webrtc-audio-processing -, zlib -}: - -stdenv.mkDerivation { - pname = "jami-daemon"; - inherit src version; - sourceRoot = "source/daemon"; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - perl - ]; - - buildInputs = [ - alsa-lib - asio - dbus - dbus_cplusplus - fmt - ffmpeg_5 - gmp - gnutls - http-parser - jack - jsoncpp - libarchive - libgit2 - libnatpmp - libpulseaudio - libupnp - yaml-cpp - msgpack - opendht-jami - openssl - pjsip-jami - restinio - secp256k1 - speex - udev - webrtc-audio-processing - zlib - ]; - - doCheck = false; # The tests fail to compile due to missing headers. - - enableParallelBuilding = true; - - passthru = { - updateScript = ./update.sh; - }; - - meta = jami-meta // { - description = "The daemon" + jami-meta.description; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 497616a6c038..1c9f581d463b 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -1,73 +1,95 @@ { stdenv , lib -, callPackage -, fetchFromGitHub -, fetchzip -, fetchpatch -, pjsip -, opendht +, pkg-config +, fetchFromGitLab +, gitUpdater +, ffmpeg_5 + +# for daemon +, autoreconfHook +, perl # for pod2man +, alsa-lib +, asio +, dbus +, dbus_cplusplus +, fmt +, gmp +, gnutls +, http-parser , jack +, jsoncpp +, libarchive +, libgit2 +, libnatpmp +, libpulseaudio +, libupnp +, yaml-cpp +, msgpack +, openssl +, restinio +, secp256k1 +, speex , udev -, qt6Packages +, webrtc-audio-processing +, zlib + +# for client +, cmake +, networkmanager # for libnm +, python3 +, qttools # for translations +, wrapQtAppsHook +, libnotify +, qt5compat +, qtbase +, qtdeclarative +, qrencode +, qtmultimedia +, qtnetworkauth +, qtsvg +, qtwebengine +, qtwebchannel +, withWebengine ? true + +# for pjsip +, fetchFromGitHub +, pjsip + +# for opendht +, opendht }: let - version = "20221220.0956.79e1207"; - - src = fetchzip { - url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - hash = "sha256-AQgz2GqueFG+yK42zJ9MzvP4BddGt0BFb+cIoA6Fif8="; - - stripRoot = false; - postFetch = '' - cd $out - mv jami-project/daemon ./ - mv jami-project/client-qt ./ - mv jami-project/COPYING ./ - rm -r jami-project.rst jami-project - rm daemon/contrib/tarballs/* - ''; - }; - - jami-meta = with lib; { - homepage = "https://jami.net/"; - description = " for Jami, the free and universal communication platform that respects the privacy and freedoms of its users"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.linsui ]; - }; - readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); in -rec { +stdenv.mkDerivation rec { + pname = "jami"; + version = "20230206.0"; + + src = fetchFromGitLab { + domain = "git.jami.net"; + owner = "savoirfairelinux"; + repo = "jami-client-qt"; + rev = "stable/${version}"; + hash = "sha256-MQ28UJUvgJoPk65neUgMrG+SxOcfnUl803urEFQ7468="; + fetchSubmodules = true; + }; + pjsip-jami = pjsip.overrideAttrs (old: let patch-src = src + "/daemon/contrib/src/pjproject/"; in rec { - version = "eae25732568e600d248aa8c226271ff6b81df170"; + version = "3b78ef1c48732d238ba284cdccb04dc6de79c54f"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "pjproject"; rev = version; - sha256 = "sha256-N7jn4qen+PgFiVkTFi2HSWhx2QPHwAYMtnrpE/ptDVc="; + hash = "sha256-hrm5tDM2jknU/gWMeO6/FhqOvay8bajFid39OiEtAAQ="; }; - patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [ - (fetchpatch { - name = "CVE-2022-23537.patch"; - url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch"; - sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA="; - }) - (fetchpatch { - name = "CVE-2022-23547.patch"; - url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch"; - sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k="; - }) - ]; - - patchFlags = [ "-p1" "-l" ]; + patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); configureFlags = (readLinesToList ./config/pjsip_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); @@ -78,11 +100,105 @@ rec { enablePushNotifications = true; }; - jami-daemon = callPackage ./daemon.nix { - inherit version src udev jack jami-meta pjsip-jami opendht-jami; + daemon = stdenv.mkDerivation { + pname = "jami-daemon"; + inherit src version meta; + sourceRoot = "source/daemon"; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + perl + ]; + + buildInputs = [ + alsa-lib + asio + dbus + dbus_cplusplus + fmt + ffmpeg_5 + gmp + gnutls + http-parser + jack + jsoncpp + libarchive + libgit2 + libnatpmp + libpulseaudio + libupnp + yaml-cpp + msgpack + opendht-jami + openssl + pjsip-jami + restinio + secp256k1 + speex + udev + webrtc-audio-processing + zlib + ]; + + enableParallelBuilding = true; }; - jami-client = qt6Packages.callPackage ./client.nix { - inherit version src jami-meta; + preConfigure = '' + echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h + ''; + + nativeBuildInputs = [ + wrapQtAppsHook + pkg-config + cmake + python3 + qttools + ]; + + buildInputs = [ + daemon + ffmpeg_5 + libnotify + networkmanager + qtbase + qt5compat + qrencode + qtnetworkauth + qtdeclarative + qtmultimedia + qtsvg + qtwebchannel + ] ++ lib.optionals withWebengine [ + qtwebengine + ]; + + cmakeFlags = [ + "-DLIBJAMI_INCLUDE_DIR=${daemon}/include/jami" + "-DLIBJAMI_XML_INTERFACES_DIR=${daemon}/share/dbus-1/interfaces" + ] ++ lib.optionals (!withWebengine) [ + "-DWITH_WEBENGINE=false" + ]; + + qtWrapperArgs = [ + # With wayland the titlebar is not themed and the wmclass is wrong. + "--set-default QT_QPA_PLATFORM xcb" + ]; + + postInstall = '' + # Make the jamid d-bus services available + ln -s ${daemon}/share/dbus-1 $out/share + ''; + + passthru.updateScript = gitUpdater { + rev-prefix = "stable/"; + }; + + meta = with lib; { + homepage = "https://jami.net/"; + description = "The free and universal communication platform that respects the privacy and freedoms of its users"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.linsui ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/jami/update.sh b/pkgs/applications/networking/instant-messengers/jami/update.sh deleted file mode 100755 index 27472d568c28..000000000000 --- a/pkgs/applications/networking/instant-messengers/jami/update.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl gnused common-updater-scripts nix-prefetch - -set -e - -jami_dir=$(readlink -e $(dirname "${BASH_SOURCE[0]}")) - -cd $jami_dir/../../../../.. - -# Update src version and hash -version=$(curl -s 'https://dl.jami.net/release/tarballs/?C=M;O=D' | sed -n -E 's/^.*jami_([0-9.a-f]+)\.tar\.gz.*$/\1/p' | head -n 1) -echo "Latest version: ${version}" - -update-source-version jami-daemon "$version" --file=$jami_dir/default.nix - -src=$(nix-build --no-out-link -A jami-daemon.src) - -config_dir="$jami_dir/config" -mkdir -p $config_dir - -ffmpeg_rules="${src}/daemon/contrib/src/ffmpeg/rules.mak" - -# Update FFmpeg patches -ffmpeg_patches=$(sed -n '/^ffmpeg:/,/^$/p' ${ffmpeg_rules} | sed -n -E 's/.*ffmpeg\/(.*patch).*/\1/p') -echo -e "Patches for FFmpeg:\n${ffmpeg_patches}\n" -echo "${ffmpeg_patches}" > "$config_dir/ffmpeg_patches" - -# Update FFmpeg args -ffmpeg_args_common=$(sed -n '/#disable everything/,/#platform specific options/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -echo -e "Common args for FFmpeg:\n${ffmpeg_args_common}\n" -echo "${ffmpeg_args_common}" > "$config_dir/ffmpeg_args_common" - -ffmpeg_args_linux1=$(sed -n '/ifdef HAVE_LINUX/,/ifdef HAVE_ANDROID/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -ffmpeg_args_linux2=$(sed -n '/# Desktop Linux/,/i386 x86_64/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -echo -e "Linux args for FFmpeg:\n${ffmpeg_args_linux1}\n${ffmpeg_args_linux2}\n" -echo "${ffmpeg_args_linux1}" > "$config_dir/ffmpeg_args_linux" -echo "${ffmpeg_args_linux2}" >> "$config_dir/ffmpeg_args_linux" - -ffmpeg_args_x86=$(sed -n '/i386 x86_64/,/# End Desktop Linux:/p' ${ffmpeg_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -echo -e "x86 args for FFmpeg:\n${ffmpeg_args_x86}\n" -echo "${ffmpeg_args_x86}" > "$config_dir/ffmpeg_args_x86" - -# Update pjsip patches -pjsip_patches=$(sed -n '/UNPACK/,/HAVE_ANDROID/p' ${src}/daemon/contrib/src/pjproject/rules.mak | sed -n -E 's/.*pjproject\/(00.*patch).*/\1/p') -echo -e "Patches for pjsip:\n${pjsip_patches}\n" -echo "${pjsip_patches}" > "$config_dir/pjsip_patches" - -# Update pjsip version -pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak) -update-source-version jami.pjsip-jami "$pjsip_version" --file=$jami_dir/default.nix - -pjsip_rules="${src}/daemon/contrib/src/pjproject/rules.mak" - -# Update pjsip args -pjsip_args_common=$(sed -n '/PJPROJECT_OPTIONS :=/,/with-gnutls/p' ${pjsip_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*\\/\1/p') -echo -e "Common args for pjsip:\n${pjsip_args_common}\n" -echo "${pjsip_args_common}" > "$config_dir/pjsip_args_common" - -pjsip_args_linux=$(sed -n '/HAVE_LINUX/,/endif/p' ${pjsip_rules} | sed -n -E 's/.*(--[0-9a-z=_-]+).*/\1/p') -echo -e "Linux args for pjsip:\n${pjsip_args_linux}\n" -echo "${pjsip_args_linux}" > "$config_dir/pjsip_args_linux" diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index bc853ae14fcc..34e83ab95ca2 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -3,11 +3,11 @@ python39Packages.buildPythonApplication rec { pname = "quisk"; - version = "4.2.12"; + version = "4.2.17"; src = fetchPypi { inherit pname version; - sha256 = "62b017d881139ed38bd906b0467b303fbdae17e5607e93b6b2fe929e26d0551d"; + sha256 = "sha256-eF/3++wRG0JulVTT+GvtqleBPkzLSZeu+RfHDI1xfOY="; }; buildInputs = [ fftw alsa-lib pulseaudio ]; diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index a35d586b9ac3..65d581e553b7 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -1,94 +1,104 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, pkg-config -, automake -, autoconf -, libtool -, ncurses , readline -, which -, python ? null -, useMpi ? false +, xorg , mpi -, iv +, cmake +, bison +, flex +, git +, perl +, gsl +, xcbuild +, python3 +, useMpi ? false +, useIv ? true +, useCore ? false +, useRx3d ? false }: + stdenv.mkDerivation rec { - pname = "neuron${lib.optionalString useMpi "-mpi"}"; - version = "7.5"; + pname = "neuron"; + version = "8.2.1"; - nativeBuildInputs = [ which pkg-config automake autoconf libtool ]; - buildInputs = [ ncurses readline python iv ] - ++ lib.optional useMpi mpi; + # format is for pythonModule conversion + format = "other"; - src = fetchurl { - url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz"; - sha256 = "0f26v3qvzblcdjg7isq0m9j2q8q7x3vhmkfllv8lsr3gyj44lljf"; - }; + nativeBuildInputs = [ + cmake + bison + flex + git + ] ++ lib.optional useCore [ perl gsl ] + ++ lib.optional stdenv.isDarwin [ xcbuild ]; - patches = (lib.optionals (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]); + buildInputs = lib.optional useIv [ + xorg.libX11.dev + xorg.libXcomposite.dev + xorg.libXext.dev + ]; - # With LLVM 3.8 and above, clang (really libc++) gets upset if you attempt to redefine these... - postPatch = lib.optionalString stdenv.cc.isClang '' - substituteInPlace src/gnu/neuron_gnu_builtin.h \ - --replace 'double abs(double arg);' "" \ - --replace 'float abs(float arg);' "" \ - --replace 'short abs(short arg);' "" \ - --replace 'long abs(long arg);' "" - '' + lib.optionalString stdenv.isDarwin '' - # we are darwin, but we don't have all the quirks the source wants to compensate for - substituteInPlace src/nrnpython/setup.py.in --replace 'readline="edit"' 'readline="readline"' - for f in src/nrnpython/*.[ch] ; do - substituteInPlace $f --replace "" "" + propagatedBuildInputs = [ + readline + python3 + python3.pkgs.wheel + python3.pkgs.setuptools + python3.pkgs.scikit-build + python3.pkgs.matplotlib + ] ++ lib.optional useMpi [ + mpi + ] ++ lib.optional useMpi [ + python3.pkgs.mpi4py + ] ++ lib.optional useRx3d [ + python3.pkgs.cython + python3.pkgs.numpy + ]; + + patches = [ ./neuron_darwin_rpath.patch ]; + + # Patch build shells for cmake (bin, src, cmake) and submodules (external) + postPatch = '' + patchShebangs ./bin ./src ./external ./cmake + sed -e 's#DESTDIR =#DESTDIR = '"$out"'#' -i external/coreneuron/extra/nrnivmodl_core_makefile.in + ''; + + cmakeFlags = [ + "-DNRN_ENABLE_INTERVIEWS=${if useIv then "ON" else "OFF"}" + "-DNRN_ENABLE_MPI=${if useMpi then "ON" else "OFF"}" + "-DNRN_ENABLE_CORENEURON=${if useCore then "ON" else "OFF"}" + "-DNRN_ENABLE_RX3D=${if useRx3d then "ON" else "OFF"}" + ]; + + postInstall = '' + mkdir -p $out/${python3.sitePackages} + mv $out/lib/python/* $out/${python3.sitePackages}/ + rm -rf $out/lib/python build + for entry in $out/lib/*.so; do + # remove references to build + patchelf --set-rpath $(patchelf --print-rpath $entry | tr ':' '\n' | sed '/^\/build/d' | tr '\n' ':') $entry done ''; - enableParallelBuilding = true; - - ## neuron install by default everything under prefix/${host_arch}/* - ## override this to support nix standard file hierarchy - ## without issues: install everything under prefix/ - preConfigure = '' - ./build.sh - export prefix="''${prefix} --exec-prefix=''${out}" - ''; - - configureFlags = with lib; - [ "--with-readline=${readline}" "--with-iv=${iv}" ] - ++ optionals (python != null) [ "--with-nrnpython=${python.interpreter}" ] - ++ (if useMpi then ["--with-mpi" "--with-paranrn"] - else ["--without-mpi"]); - - - postInstall = lib.optionalString (python != null) '' - ## standardise python neuron install dir if any - if [[ -d $out/lib/python ]]; then - mkdir -p ''${out}/${python.sitePackages} - mv ''${out}/lib/python/* ''${out}/${python.sitePackages}/ - fi - ''; - - propagatedBuildInputs = [ readline ncurses which libtool ]; + src = fetchurl { + url = "https://github.com/neuronsimulator/nrn/releases/download/${version}/full-src-package-${version}.tar.gz"; + sha256 = "0kb0dn7nmivv3zflzkbj2fj3184zwp2crkxp0mdxkwm4kpnxqz0v"; + }; meta = with lib; { - broken = stdenv.isDarwin; description = "Simulation environment for empirically-based simulations of neurons and networks of neurons"; - - longDescription = "NEURON is a simulation environment for developing and exercising models of - neurons and networks of neurons. It is particularly well-suited to problems where - cable properties of cells play an important role, possibly including extracellular - potential close to the membrane), and where cell membrane properties are complex, - involving many ion-specific channels, ion accumulation, and second messengers"; - - sourceProvenance = with sourceTypes; [ - fromSource - ] ++ lib.optionals (python != null) [ - binaryNativeCode # "geometry3d" bundled libraries - ]; - license = licenses.bsd3; - homepage = "http://www.neuron.yale.edu/neuron"; - maintainers = [ maintainers.adev ]; - # source claims it's only tested for x86 and powerpc - platforms = platforms.x86_64 ++ platforms.i686; + longDescription = '' + NEURON is a simulation environment for developing and exercising models of + neurons and networks of neurons. It is particularly well-suited to problems where + cable properties of cells play an important role, possibly including extracellular + potential close to the membrane), and where cell membrane properties are complex, + involving many ion-specific channels, ion accumulation, and second messengers + ''; + sourceProvenance = with sourceTypes; [ fromSource ]; + license = licenses.bsd3; + homepage = "http://www.neuron.yale.edu/neuron"; + maintainers = with maintainers; [ adev davidcromp ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch b/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch deleted file mode 100644 index 923bffb1c338..000000000000 --- a/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- nrn-7.4/src/mac/Makefile.am 2015-11-12 21:42:45.000000000 +0100 -+++ nrn-7.4.new/src/mac/Makefile.am 2016-08-24 17:43:39.000000000 +0200 -@@ -15,18 +15,8 @@ - host_cpu = @host_cpu@ - - if MAC_DARWIN --carbon = @enable_carbon@ - bin_SCRIPTS = $(launch_scripts) - install: install-am --if UniversalMacBinary -- $(CC) -arch ppc -o aoutppc -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon -- $(CC) -arch i386 -o aouti386 -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon -- lipo aouti386 aoutppc -create -output a.out --else -- gcc -g -arch i386 -Dncpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon -- --endif -- carbon=$(carbon) sh $(srcdir)/launch_inst.sh "$(host_cpu)" "$(DESTDIR)$(prefix)" "$(srcdir)" - for i in $(S) ; do \ - sed "s/^CPU.*/CPU=\"$(host_cpu)\"/" < $(DESTDIR)$(bindir)/$$i > temp; \ - mv temp $(DESTDIR)$(bindir)/$$i; \ diff --git a/pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch b/pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch new file mode 100644 index 000000000000..1b0fa2670782 --- /dev/null +++ b/pkgs/applications/science/biology/neuron/neuron_darwin_rpath.patch @@ -0,0 +1,11 @@ +--- a/src/nrnpython/setup.py.in ++++ b/src/nrnpython/setup.py.in +@@ -124,7 +124,7 @@ libdirs = [destdir + get_escaped_path("@NRN_LIBDIR@"), + rpath_prefix_flag='-Wl,-R' + extra_link_args = [@NRN_LINK_FLAGS_COMMA_SEPARATED_STRINGS@] + @MAC_DARWIN_FALSE@extra_link_args += [rpath_prefix_flag+lib_path for lib_path in libdirs] +-@MAC_DARWIN_TRUE@extra_link_args.append("-Wl,-rpath,@loader_path/../../") ++@MAC_DARWIN_TRUE@extra_link_args.append("-Wl,-rpath,@loader_path/../../../") + @MAC_DARWIN_TRUE@extra_link_args.append("-Wl,-rpath,%s" % ivlibdir) + + # as neuron module will be built during make, add build/lib diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 2ded0cf170d6..3141d08cdcec 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -15,12 +15,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.18.4"; + version = "1.18.5"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-LSSOmqSeiv9qNCAsRWYtjRLfUDLMd8mOVAxTOacvNOA="; + hash = "sha256-OGPn4fknYfzmuAi6CL8m/Ih4uRNraVDmpBm20qT3lKk="; }; vendorHash = null; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index a76068548122..44e5a4aa2de6 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "5.2.16"; + version = "5.2.23"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-LMbQz22ENTT27jr9tGakzNjidC5nfCuLDMZ6sFwtRKI="; + sha256 = "sha256-c73PCM+bRz6CjGRY2AapEcvKC1UqyEfzb7qsicmrkQU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index cd0320184b0f..7efb7d755ad4 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.108.0"; + version = "1.109.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-6nEjSo0EuYJd9/0NyvTzfUON1OMJt5FBLx7Y8sjnb3I="; + hash = "sha256-6zlXa9N7gaF1ta6mjszsA25+QRrHF8m1brKoSiL5OHo="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-/tCEiPvoIPScpKcDmJ0t21AN+bOBH5/XzOBajQg+7ck="; + hash = "sha256-Z7CLKhKWqAaLhsXi81OOKWmwQddHCebCJibbKiNNptk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index 41dddf2391ac..34c18cde23c5 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, which, cudatoolkit, addOpenGLRunpath }: +{ lib, stdenv, fetchFromGitHub, which, cudaPackages, addOpenGLRunpath }: + +let + inherit (cudaPackages) cudatoolkit; +in stdenv.mkDerivation rec { name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; - version = "2.12.10-1"; + version = "2.16.5-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nccl"; rev = "v${version}"; - sha256 = "sha256-QqORzm0gD+QG+P8rId8bQn2oZsxL5YyxCIobUVs85wE="; + hash = "sha256-JyhhYKSVIqUKIbC1rCJozPT1IrIyRLGrTjdPjJqsYaU="; }; outputs = [ "out" "dev" ]; @@ -39,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - inherit cudatoolkit; + inherit cudaPackages; }; meta = with lib; { diff --git a/pkgs/development/libraries/tinygltf/default.nix b/pkgs/development/libraries/tinygltf/default.nix index 65cd814c1e6c..fa9d79aed1a7 100644 --- a/pkgs/development/libraries/tinygltf/default.nix +++ b/pkgs/development/libraries/tinygltf/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "2.8.2"; + version = "2.8.3"; pname = "tinygltf"; src = fetchFromGitHub { owner = "syoyo"; repo = "tinygltf"; rev = "v${version}"; - sha256 = "sha256-0O+Vfsd1omCXeSGdjLZ29yTutC+527NCIBm6hU3qKj4="; + sha256 = "sha256-6rfC5nXGseXtqh2IonZto+DM8ZV/t5U1ulZ3GFHwoeg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/ascii-magic/default.nix b/pkgs/development/python-modules/ascii-magic/default.nix index 6a1b617c03ed..d509e0ef4624 100644 --- a/pkgs/development/python-modules/ascii-magic/default.nix +++ b/pkgs/development/python-modules/ascii-magic/default.nix @@ -3,16 +3,20 @@ , colorama , fetchPypi , pillow +, pythonOlder }: buildPythonPackage rec { pname = "ascii-magic"; - version = "1.6"; + version = "2.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "ascii_magic"; inherit version; - sha256 = "sha256-faVRj3No5z8R4hUaDAYIBKoUniZ7Npt+52U/vXsEalE="; + hash = "sha256-YfGa+3nuqAAo69TydxO6uKNMcqZAkOEi/PMP8Frasfw="; }; propagatedBuildInputs = [ @@ -21,6 +25,7 @@ buildPythonPackage rec { ]; # Project is not tagging releases and tests are not shipped with PyPI source + # https://github.com/LeandroBarone/python-ascii_magic/issues/10 doCheck = false; pythonImportsCheck = [ @@ -30,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to converts pictures into ASCII art"; homepage = "https://github.com/LeandroBarone/python-ascii_magic"; + changelog = "https://github.com/LeandroBarone/python-ascii_magic#changelog"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index 73ccaa62c3d3..49e75fc118ba 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -2,23 +2,30 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, typing-extensions , pytestCheckHook , pytest-asyncio }: buildPythonPackage rec { pname = "async-lru"; - version = "1.0.3"; + version = "2.0.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; + + format = "setuptools"; src = fetchFromGitHub { owner = "aio-libs"; repo = "async-lru"; rev = "v${version}"; - hash = "sha256-98ZPFSOFRnymTCfCG9OuajfxXAWyCrByyJEHhpPVPbM="; + hash = "sha256-mCmEMN9D6kEkHb3GoYuVk4XxvhaSX5eOHqpKawrcoxs="; }; + propagatedBuildInputs = [ + typing-extensions + ]; + postPatch = '' sed -i -e '/^addopts/d' -e '/^filterwarnings/,+2d' setup.cfg ''; @@ -28,10 +35,6 @@ buildPythonPackage rec { pytest-asyncio ]; - pytestFlagsArray = [ - "--asyncio-mode=strict" - ]; - pythonImportsCheck = [ "async_lru" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 3ec2635af773..4d9ed2cccdef 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -1,7 +1,7 @@ { lib -, asynctest , buildPythonPackage , fetchFromGitHub +, pytest-mock , pytestCheckHook , python-socks , pythonOlder @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pogzyb"; repo = pname; - rev = "v${version}"; - hash = "sha256-TpUiUW9ntrpuT/rUhucedl+DM5X88Mislrd+3D5/TUE="; + rev = "refs/tags/v${version}"; + hash = "sha256-MYK09kszv7CTvZjdA9YQFfhlJ/A5d/aebLRaiMlnuB0="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest + pytest-mock pytestCheckHook ]; @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for retrieving WHOIS information"; homepage = "https://github.com/pogzyb/asyncwhois"; + changelog = "https://github.com/pogzyb/asyncwhois/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index d0bdc0cd7179..11e652b3826b 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , pkg-config , pkgconfig , setuptools-scm +, wheel , libdeltachat , cffi , imap-tools @@ -18,12 +19,16 @@ buildPythonPackage rec { inherit (libdeltachat) version src; sourceRoot = "${src.name}/python"; - disabled = isPy27; + disabled = pythonOlder "3.7"; + format = "pyproject"; nativeBuildInputs = [ + cffi pkg-config pkgconfig + setuptools setuptools-scm + wheel ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -37,7 +42,7 @@ buildPythonPackage rec { imap-tools pluggy requests - setuptools + setuptools # for pkg_resources ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix index a0ebc7150756..4e2dc1d6d90f 100644 --- a/pkgs/development/python-modules/eiswarnung/default.nix +++ b/pkgs/development/python-modules/eiswarnung/default.nix @@ -7,12 +7,13 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, pytz , yarl }: buildPythonPackage rec { pname = "eiswarnung"; - version = "1.1.1"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-eiswarnung"; rev = "refs/tags/v${version}"; - hash = "sha256-sMR16if2Q+lK+ilnVNYVootBN2LFwBQLlZFkoX+oS/g="; + hash = "sha256-PVFAy34+UfNQNdzVdfvNiySrCTaKGuepnTINZYkOsuo="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + pytz yarl ]; @@ -52,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for getting Eiswarning API forecasts"; homepage = "https://github.com/klaasnicolaas/python-eiswarnung"; + changelog = "https://github.com/klaasnicolaas/python-eiswarnung/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix index 491fcd398053..0e75f61a9f70 100644 --- a/pkgs/development/python-modules/first/default.nix +++ b/pkgs/development/python-modules/first/default.nix @@ -1,19 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "first"; version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1gykyrm6zlrbf9iz318p57qwk594mx1jf0d79v79g32zql45na7z"; + hash = "sha256-/yhbCMVfjJfOTqcBJ0OvJJXJ8SkXhfFjcivTb2r2078="; }; doCheck = false; # no tests + pythonImportsCheck = [ + "first" + ]; + meta = with lib; { description = "The function you always missed in Python"; homepage = "https://github.com/hynek/first/"; + changelog = "https://github.com/hynek/first/blob/${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 7db92fffc88f..6af750b0bd00 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gdown"; - version = "4.6.3"; + version = "4.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7G6pIu9ONhagVAc2VtmqLNxxf729CpTS931S0yOUMwc="; + hash = "sha256-0zIQsbPXsS/vBda56n8ipRNzmQnKUR1dnSNtxnZmf3k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 01be9fb86511..1be852daa157 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "lightgbm"; version = "3.3.5"; - format = "other"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/neuronpy/default.nix b/pkgs/development/python-modules/neuronpy/default.nix deleted file mode 100644 index 2d388dfa4c27..000000000000 --- a/pkgs/development/python-modules/neuronpy/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, numpy -, matplotlib -, scipy -, isPy27 -}: - -buildPythonPackage rec { - pname = "neuronpy"; - version = "0.1.6"; - disabled = !isPy27; - - src = fetchPypi { - inherit pname version; - sha256 = "1clhc2b5fy2l8nfrji4dagmj9419nj6kam090yqxhq5c28sngk25"; - }; - - propagatedBuildInputs = [ numpy matplotlib scipy ]; - - #No tests included - doCheck = false; - - meta = with lib; { - description = "Interfaces and utilities for the NEURON simulator and analysis of neural data"; - maintainers = [ maintainers.nico202 ]; - license = licenses.mit; - }; - -} diff --git a/pkgs/development/python-modules/overrides/default.nix b/pkgs/development/python-modules/overrides/default.nix new file mode 100644 index 000000000000..6d916ffa639d --- /dev/null +++ b/pkgs/development/python-modules/overrides/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "overrides"; + version = "7.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mkorpela"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-mxMh1ifOnii2SqxYjupDKvslHVGwClGtRgyoJSCGfZo="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "overrides" + ]; + + meta = with lib; { + description = "Decorator to automatically detect mismatch when overriding a method"; + homepage = "https://github.com/mkorpela/overrides"; + changelog = "https://github.com/mkorpela/overrides/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 5a4532c598ef..3ccb8960f5ef 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "107"; + version = "108"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-5NR+N2UoWvzD/y1kP08qOS2djMsLIwLDuaIBmt0AV/s="; + hash = "sha256-CPFkfVwvk0AO/DoE1Nj1jLdLvuOpRzndmRK/M6SSGtk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix new file mode 100644 index 000000000000..759fe47221b7 --- /dev/null +++ b/pkgs/development/python-modules/pyfibaro/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, setuptools +}: + +buildPythonPackage rec { + pname = "pyfibaro"; + version = "0.6.8"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "rappenze"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-2BDVCukm2y4rZyIWozRWJ+pY2bI2A7Vpitjd8jSJoWQ="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ + "pyfibaro" + ]; + + meta = with lib; { + description = "Library to access FIBARO Home center"; + homepage = "https://github.com/rappenze/pyfibaro"; + changelog = "https://github.com/rappenze/pyfibaro/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-fx/default.nix b/pkgs/development/python-modules/python-fx/default.nix new file mode 100644 index 000000000000..729c5ed9a180 --- /dev/null +++ b/pkgs/development/python-modules/python-fx/default.nix @@ -0,0 +1,100 @@ +{ lib +, antlr4-python3-runtime +, asciimatics +, buildPythonPackage +, click +, dacite +, decorator +, fetchFromGitHub +, future +, first +, jsonpath-ng +, loguru +, overrides +, pillow +, ply +, pyfiglet +, pyperclip +, pytestCheckHook +, pythonOlder +, antlr4 +, pythonRelaxDepsHook +, pyyaml +, setuptools +, six +, urwid +, parameterized +, wcwidth +, yamale +}: + +buildPythonPackage rec { + pname = "python-fx"; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "cielong"; + repo = "pyfx"; + rev = "refs/tags/v${version}"; + hash = "sha256-nRMeYL0JGvCtUQBUMXUsZ4+F2KX+x/CbZ61sAidT9so="; + }; + + postPatch = '' + rm src/pyfx/model/common/jsonpath/*.{g4,interp,tokens} + antlr -Dlanguage=Python3 -visitor -o src/pyfx/model/common/jsonpath/ *.g4 + ''; + + pythonRelaxDeps = true; + + nativeBuildInputs = [ + antlr4 + pythonRelaxDepsHook + setuptools + ]; + + propagatedBuildInputs = [ + antlr4-python3-runtime + asciimatics + click + dacite + decorator + first + future + jsonpath-ng + loguru + overrides + pillow + ply + pyfiglet + pyperclip + pyyaml + six + urwid + wcwidth + yamale + ]; + + nativeCheckInputs = [ + pytestCheckHook + parameterized + ]; + + # antlr4 issue prevents us from running the tests + # https://github.com/antlr/antlr4/issues/4041 + doCheck = false; + + # pythonImportsCheck = [ + # "pyfx" + # ]; + + meta = with lib; { + description = "Module to view JSON in a TUI"; + homepage = "https://github.com/cielong/pyfx"; + changelog = "https://github.com/cielong/pyfx/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pywaterkotte/default.nix b/pkgs/development/python-modules/pywaterkotte/default.nix new file mode 100644 index 000000000000..43f276a2df82 --- /dev/null +++ b/pkgs/development/python-modules/pywaterkotte/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pytestCheckHook +, pythonOlder +, requests +, responses +}: + +buildPythonPackage rec { + pname = "pywaterkotte"; + version = "0.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "chboland"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-zK0x6LyXPPNPA20Zq+S1B1q7ZWGxQmWf4JxEfjNkPQw="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ + "pywaterkotte" + ]; + + meta = with lib; { + description = "Library to communicate with Waterkotte heatpumps"; + homepage = "https://github.com/chboland/pywaterkotte"; + changelog = "https://github.com/chboland/pywaterkotte/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index e47d0b9fbf29..0b008f86f884 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -9,21 +9,24 @@ , pefile , pyelftools , pythonOlder +, python-fx , python-registry , pyyaml +, questionary +, termcolor , unicorn }: buildPythonPackage rec { pname = "qiling"; - version = "1.4.4"; + version = "1.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gtPYwmQ96+jz6XrqU0ufaN7Ht6gqrtxGrDoaTWce7/U="; + hash = "sha256-MEafxry/ewqlzOMu9TJMQodXLChGMYjS2jX3yv7FZJk="; }; propagatedBuildInputs = [ @@ -33,8 +36,11 @@ buildPythonPackage rec { multiprocess pefile pyelftools + python-fx python-registry pyyaml + termcolor + questionary unicorn ]; @@ -49,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Qiling Advanced Binary Emulation Framework"; homepage = "https://qiling.io/"; + changelog = "https://github.com/qilingframework/qiling/releases/tag/${version}"; license = licenses.gpl2Only; maintainers = teams.determinatesystems.members; }; diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 20c52fd686a0..2b94a34989fc 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "3.7.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; rev = "v${version}"; - sha256 = "sha256-t6W5A877bSPcbKVzCLEhjPzOPwF8ZTGjlvnwt1CwWCE="; + sha256 = "sha256-OHuvUi5oa0fVcfo0FW9XwaUp52MEH4NTM6GqK4ic0oM="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index 6e66aa75b068..6847fd7d5889 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -29,7 +29,7 @@ in buildPythonPackage { format = "wheel"; - disabled = !(isPy37 || isPy38 || isPy39 || isPy310); + disabled = !(isPy38 || isPy39 || isPy310); src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; @@ -76,7 +76,7 @@ in buildPythonPackage { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; hydraPlatforms = []; # output size 3.2G on 1.11.0 maintainers = with maintainers; [ junjihashimoto ]; }; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 46e64ad15fcb..94d7080020be 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -7,11 +7,6 @@ version : builtins.getAttr version { "1.13.1" = { - x86_64-linux-37 = { - name = "torch-1.13.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-bXg6H3mHFyTK2jw3TKUJiGNZqMSseNBT34mxQu6QREA="; - }; x86_64-linux-38 = { name = "torch-1.13.1-cp38-cp38-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl"; @@ -27,11 +22,6 @@ version : builtins.getAttr version { url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl"; hash = "sha256-FMXJ2wnfjPGzlCo0ecd52m4pOoShYtimrHHiveMOMMU="; }; - x86_64-darwin-37 = { - name = "torch-1.13.1-cp37-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp37-none-macosx_10_9_x86_64.whl"; - hash = "sha256-DZuAYQSM+3jmdbnS6oUDv+MNtD1YNZmuhiaxJjoME4A="; - }; x86_64-darwin-38 = { name = "torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl"; url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl"; @@ -62,5 +52,20 @@ version : builtins.getAttr version { url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp310-none-macosx_11_0_arm64.whl"; hash = "sha256-ASKAaxEblJ0h+hpfl2TR/S/MSkfLf4/5FCBP1Px1LtU="; }; + aarch64-linux-38 = { + name = "torch-1.13.1-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torch-1.13.1-cp38-cp38-manylinux2014_aarch64.whl"; + hash = "sha256-34Q0sGlenOuMxwZQr8ExDYupSebbKgUl3dnDsrGB5f4="; + }; + aarch64-linux-39 = { + name = "torch-1.13.1-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torch-1.13.1-cp39-cp39-manylinux2014_aarch64.whl"; + hash = "sha256-LDWBo/2B6x8PIpl83f/qVp/qU7r6NyssBHHbNzsmqvw="; + }; + aarch64-linux-310 = { + name = "torch-1.13.1-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torch-1.13.1-cp310-cp310-manylinux2014_aarch64.whl"; + hash = "sha256-2f54XTdfLial1eul3pH4nmo75dEe+0l+dnBf35P6PC4="; + }; }; } diff --git a/pkgs/development/python-modules/torch/prefetch.sh b/pkgs/development/python-modules/torch/prefetch.sh index 47aab0430a06..4963bd8012c0 100755 --- a/pkgs/development/python-modules/torch/prefetch.sh +++ b/pkgs/development/python-modules/torch/prefetch.sh @@ -6,21 +6,23 @@ set -eou pipefail version=$1 linux_cuda_version="cu117" -linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" +linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" +linux_cpu_bucket="https://download.pytorch.org/whl" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-37 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" - "x86_64-linux-310 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-darwin-37 $darwin_bucket/torch-${version}-cp37-none-macosx_10_9_x86_64.whl torch-${version}-cp37-none-macosx_10_9_x86_64.whl" + "x86_64-linux-38 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_10_9_x86_64.whl torch-${version}-cp38-none-macosx_10_9_x86_64.whl" "x86_64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_10_9_x86_64.whl torch-${version}-cp39-none-macosx_10_9_x86_64.whl" "x86_64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_10_9_x86_64.whl torch-${version}-cp310-none-macosx_10_9_x86_64.whl" "aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" + "aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux2014_aarch64.whl" + "aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux2014_aarch64.whl" + "aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux2014_aarch64.whl" ) hashfile="binary-hashes-$version.nix" diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index f840b10e2b87..f74ac8082388 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported; in fetchurl srcs; - disabled = !(isPy37 || isPy38 || isPy39 || isPy310); + disabled = !(isPy38 || isPy39 || isPy310); propagatedBuildInputs = [ torch-bin @@ -51,7 +51,7 @@ buildPythonPackage rec { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index bbf1e9220b42..c6a903457c01 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,11 +7,6 @@ version : builtins.getAttr version { "0.13.1" = { - x86_64-linux-37 = { - name = "torchaudio-0.13.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-wQJJ2BPkQAGxXx8H0rt3P39wsl/6KhbF27wYHT5L6/o="; - }; x86_64-linux-38 = { name = "torchaudio-0.13.1-cp38-cp38-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl"; @@ -27,11 +22,6 @@ version : builtins.getAttr version { url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl"; hash = "sha256-k/RVSktT+WmNAiJJA8kjwSpsIrPJQtz8IXm1gdjzcUY="; }; - x86_64-darwin-37 = { - name = "torchaudio-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl"; - hash = "sha256-D6fMGiswVvxs7ubWDbze9YlVp8pTRmfQ25tPye+gh6E="; - }; x86_64-darwin-38 = { name = "torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl"; url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl"; @@ -62,5 +52,20 @@ version : builtins.getAttr version { url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp310-cp310-macosx_12_0_arm64.whl"; hash = "sha256-7HKhfU0heIKed4BoKZm1Nc9X/hYNDCCw1r3BrRqHxN0="; }; + aarch64-linux-38 = { + name = "torchaudio-0.13.1-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp38-cp38-manylinux2014_aarch64.whl"; + hash = "sha256-PEi8/wDq6BgPh/WNHJ5+n9jEy36z6ogXk1+2BI0VK8c="; + }; + aarch64-linux-39 = { + name = "torchaudio-0.13.1-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp39-cp39-manylinux2014_aarch64.whl"; + hash = "sha256-MCOutcGRBHvvFoGjdBv/1KIWS1imTK0k3TfaXhrC0fE="; + }; + aarch64-linux-310 = { + name = "torchaudio-0.13.1-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp310-cp310-manylinux2014_aarch64.whl"; + hash = "sha256-LkdWLNzdR8uO2Go88FO3BnzJ6INA9FUK5z15DdvBLyE="; + }; }; } diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 0807b00142c6..dad401d0d136 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -6,21 +6,23 @@ set -eou pipefail version=$1 linux_cuda_version="cu117" -linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" +linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" +linux_cpu_bucket="https://download.pytorch.org/whl" darwin_bucket="https://download.pytorch.org/whl" url_and_key_list=( - "x86_64-linux-37 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" - "x86_64-linux-310 $linux_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-darwin-37 $darwin_bucket/torchaudio-${version}-cp37-cp37m-macosx_10_9_x86_64.whl torchaudio-${version}-cp37-cp37m-macosx_10_9_x86_64.whl" + "x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl" "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl" "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl" "aarch64-darwin-38 $darwin_bucket/cpu/torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl" "aarch64-darwin-39 $darwin_bucket/cpu/torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl" "aarch64-darwin-310 $darwin_bucket/cpu/torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl" + "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" + "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" + "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" ) hashfile=binary-hashes-"$version".nix diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index 0a059b252b52..19190404a6b6 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.7"; + version = "0.4.15.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-2oToq+lcLhGtKyi6VXq45dyAhjvW+HOefBkWyVB1WvQ="; + hash = "sha256-xrskWqhox914w7Fr1ISEzTZhJ9YeTvoVZ26sI6zYK3Y="; }; # Module has no tests diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index 44389574ce5a..fb046be652ec 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.8.2"; + version = "5.1.8.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Sddr47Ry/U+k3DO6VapLke5h6/c3nRrSVfxWMvy9wAc="; + sha256 = "sha256-Mt04D8iNDnofJ6hLoc5uKboK1CyqobiOe10n5h9uSWI="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index a2ca0732797a..409fced16937 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.19.1.4"; + version = "0.19.1.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-G2SyG2Cf8fx3kdPZMPFLVrNq0JAp/ZfkXjTMiJ1nG18="; + hash = "sha256-uLSJwqDR3T5lu9i0HgX2vxMHVTUV3NowGX1j0bV2pe4="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index 81f56cd8040a..27778bfaa712 100644 --- a/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.7"; + version = "2.8.19.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-evWl0bgKsd+guk2Hn6yzgug2piwtQIwqUJvkaA/Yscg="; + hash = "sha256-MWxrEH0FW70GMktxNi5hBBAiIOaYiqSjiFUKo6itXQY="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 5968bb38f2e3..41b5baabd7fe 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2022.7.1.0"; + version = "2022.7.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kY+cPnqVC6fn1vhLGKfKyryIhstxJfsZJ/8cdStLWd4="; + sha256 = "sha256-WAELsdb3unKE+6Jks7ycJICrWGIB4lEo7Sqt6kwpizM="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index a3b6c33d9de3..4268affa9ebe 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.11.13"; + version = "2.28.11.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P9MyhC6HWepffrd4nfiqdyuhVSFszxDvSqOw5bQuG0Y="; + sha256 = "sha256-IyeShwtgrbB9IxdUUatOYZACGwxYTt8FLZLZuZMRjwY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-retry/default.nix b/pkgs/development/python-modules/types-retry/default.nix index 29652179d2f1..e0953ad7790d 100644 --- a/pkgs/development/python-modules/types-retry/default.nix +++ b/pkgs/development/python-modules/types-retry/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-retry"; - version = "0.9.9.1"; + version = "0.9.9.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NE6tQ4fg6YxtYDdYwTGO5OWwRCnOy5o0Khz4c947UQ0="; + hash = "sha256-VEgdUj/nvMXWujndTyBT5XUjoVoW4xK3yP6b5H/EVdU="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index e60c8a87c676..9e3c4efbab02 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.25.6"; + version = "1.26.25.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NVhnJ8vXdRrMzywPNKiLr/wJL0NatiRY8Qd2RmWQ8tU="; + hash = "sha256-300+VHK/iDC9dOrBLVbmWfiGYroEDH0Qa/OlvuJv/yg="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 7e7517980151..efdf7cb84467 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.42.0"; + version = "0.42.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-jxfV2RDyGLugnPae+uNtg/GBsWbKCSbKxuHll10guhU="; + hash = "sha256-/YCrnDOJdKc687pRKj1gVTOTj7dEpplN49VuFJOlQIE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 7a8c691a8011..998ae3cf0d6b 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.52.0"; + version = "0.54.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-SfdN/em4NrzNeItcaVuyOcUxmE50n5/jjmY4I5hfpQI="; + hash = "sha256-mCUaaWR8jRqm8V8ZQBMgycExkN2zjoJxWIEohVH2K/o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix index 8dd65d11911e..c4b207962987 100644 --- a/pkgs/development/python-modules/whodap/default.nix +++ b/pkgs/development/python-modules/whodap/default.nix @@ -1,7 +1,7 @@ { lib -, asynctest , buildPythonPackage , fetchFromGitHub +, pytest-asyncio , pytestCheckHook , pythonOlder , httpx @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.7"; + version = "0.1.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Aji8OqdcVOHB4TOv4W6x1qIGaJvoDmLGpr/PFz5mZ4w="; + hash = "sha256-hAU9143R/LDqDBgX3Y+gBG+dt4dpIIPDdO6HgH0ZTfg="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest + pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix index b54a351b47de..f1b81599c396 100644 --- a/pkgs/development/python-modules/wsgidav/default.nix +++ b/pkgs/development/python-modules/wsgidav/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wsgidav"; - version = "4.1.0"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mar10"; repo = pname; - rev = "v${version}"; - hash = "sha256-iNyXY0txKX4X1+O27T7my8dfs8wqXoG7Kuo9yN9SRnY="; + rev = "refs/tags/v${version}"; + hash = "sha256-1S3Zi92YRcu/PKNWJIn2ayr5Wbc+/+E7irFBQpMrKW8="; }; nativeBuildInputs = [ @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generic and extendable WebDAV server based on WSGI"; homepage = "https://wsgidav.readthedocs.io/"; + changelog = "https://github.com/mar10/wsgidav/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index ad9dd660315e..fa2c8ab83a8c 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.16.0"; + version = "1.17.0"; in buildGoModule { pname = "sqlc"; @@ -11,11 +11,11 @@ buildGoModule { owner = "kyleconroy"; repo = "sqlc"; rev = "v${version}"; - sha256 = "sha256-YxGMfGhcPT3Pcyxu1hAkadkJnEBMX26fE/rGfGSTsyc="; + sha256 = "sha256-knblQwO+c8AD0WJ+1l6FJP8j8pdsVhKa/oiPqUJfsVY="; }; proxyVendor = true; - vendorSha256 = "sha256-cMYTQ8rATCXOquSxc4iZ2MvxIaMO3RG8PZkpOwwntyc="; + vendorHash = "sha256-y5OYq1X4Y0DxFYW2CiedcIjhOyeHgMhJ3dMa+2PUCUY="; subPackages = [ "cmd/sqlc" ]; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 2f111370d222..de8e09d3e16b 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.14.1"; + version = "9.15.0"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-a4wApae08oQBVOSvLJFfU0ZB8mOJbjsnD/SgpCq6IYc="; + sha256 = "sha256-/rK7Kd1ofz1D7/o/yMFXS2YBklOEA7jExuYPpnX9xko="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index 6488ff63d665..4326556f13cb 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uftrace"; - version = "0.13"; + version = "0.13.1"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "sha256-czVKliF9qvA9TG4KJKs2X0VDfJi4vHwbVeuLZViwpdg="; + sha256 = "sha256-hpEExyvazCH+lNTK0Ej0zbnWyX0gVLPjM9XfOuAueis="; }; postUnpack = '' diff --git a/pkgs/os-specific/darwin/grandperspective/default.nix b/pkgs/os-specific/darwin/grandperspective/default.nix new file mode 100644 index 000000000000..a1156c7cb873 --- /dev/null +++ b/pkgs/os-specific/darwin/grandperspective/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchurl, undmg, ... }: + +stdenv.mkDerivation rec { + version = "3.0.1"; + pname = "grandperspective"; + + src = fetchurl { + inherit version; + url = "mirror://sourceforge/grandperspectiv/GrandPerspective-${builtins.replaceStrings [ "." ] [ "_" ] version}.dmg"; + sha256 = "sha256-ZPqrlN9aw5q7656GmmxCnTRBw3lu9n952rIyun8MsiI="; + }; + + sourceRoot = "GrandPerspective.app"; + buildInputs = [ undmg ]; + installPhase = '' + mkdir -p "$out/Applications/GrandPerspective.app"; + cp -R . "$out/Applications/GrandPerspective.app"; + ''; + + meta = with lib; { + description = "Open-source macOS application to analyze disk usage"; + longDescription = '' + GrandPerspective is a small utility application for macOS that graphically shows the disk usage within a file + system. It can help you to manage your disk, as you can easily spot which files and folders take up the most + space. It uses a so called tree map for visualisation. Each file is shown as a rectangle with an area proportional to + the file's size. Files in the same folder appear together, but their placement is otherwise arbitrary. + ''; + homepage = "https://grandperspectiv.sourceforge.net"; + license = licenses.gpl2; + maintainers = with maintainers; [ eliandoran ]; + platforms = [ "x86_64-darwin" ]; + }; + +} diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index 8955bcfa5126..d01759e8ed69 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -9,11 +9,12 @@ , kmod , lxc , iproute2 -, nftables +, iptables , util-linux , which , wrapGAppsHook , xclip +, runtimeShell }: python3Packages.buildPythonApplication rec { @@ -50,14 +51,15 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; installPhase = '' - make install PREFIX=$out USE_SYSTEMD=0 USE_NFTABLES=1 + make install PREFIX=$out USE_SYSTEMD=0 ''; preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + patchShebangs --host $out/lib/waydroid/data/scripts wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \ - --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 nftables ]} + --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables ]} wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " [ "$out" @@ -71,6 +73,12 @@ python3Packages.buildPythonApplication rec { which xclip ]}" + + substituteInPlace $out/lib/waydroid/tools/helpers/*.py \ + --replace '"sh"' '"${runtimeShell}"' + + substituteInPlace $out/share/applications/*.desktop \ + --replace "/usr" "$out" ''; meta = with lib; { diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 7af675de41fe..d44145dfecc3 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -5,21 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "appdaemon"; - version = "4.0.8"; - disabled = python3.pythonOlder "3.6"; + version = "4.2.1"; + format = "setuptools"; + + disabled = python3.pythonOlder "3.7"; src = fetchFromGitHub { owner = "AppDaemon"; - repo = pname; - rev = version; - sha256 = "04a4qx0rbx2vpkzpibmwkpy7fawa6dbgqlrllryrl7dchbrf703q"; + repo = "appdaemon"; + rev = "refs/tags/${version}"; + hash = "sha256-4sN0optkMmyWb5Cd3F7AhcXYHh7aidJE/bieYMEKgSY="; }; - # relax dependencies postPatch = '' - substituteInPlace requirements.txt \ - --replace "deepdiff==5.2.3" "deepdiff" \ - --replace "pygments==2.8.1" "pygments" + # relax dependencies sed -i 's/==/>=/' requirements.txt ''; @@ -63,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Sandboxed Python execution environment for writing automation apps for Home Assistant"; homepage = "https://github.com/AppDaemon/appdaemon"; + changelog = "https://github.com/AppDaemon/appdaemon/blob/${version}/docs/HISTORY.rst"; license = licenses.mit; maintainers = teams.home-assistant.members; }; diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 12df9c02d071..0e3626228a49 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -1,33 +1,39 @@ { lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let + pname = "prowlarr"; + + unsupported = throw "Unsupported system ${stdenv.hostPlatform.system} for ${pname}"; + os = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else - throw "Not supported on ${stdenv.hostPlatform.system}."; + unsupported; arch = { - x86_64-linux = "x64"; + aarch64-darwin = "arm64"; aarch64-linux = "arm64"; x86_64-darwin = "x64"; - }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + x86_64-linux = "x64"; + }.${stdenv.hostPlatform.system} or unsupported; hash = { - x64-linux_hash = "sha256-Xx2z5aiIKRNbBxBMXCTfm1VacQOLyruC6sXB/+C7knk="; - arm64-linux_hash = "sha256-r6WuQhydSRZmsH1hp51gGcQ/7ZruxbEMrbrFps2nmcw="; - x64-osx_hash = "sha256-F8bE4lXcqyBVZhgYcQKPrza9cphCuC5j7968jL6qgxM="; - }."${arch}-${os}_hash"; + aarch64-darwin = "sha256-S9CrYDCwIssAtcP4pI1csbOOFKaZgM6UKEDNBp2VwVo="; + aarch64-linux = "sha256-UkoTWD4ljSfx/FzH5kQBpp/Bg+xwvc7n9KLBrqNNSR0="; + x86_64-darwin = "sha256-Wru+pwISVgjnSVe8HbiwU4M1aIIK5AGzml/2yqMGIlo="; + x86_64-linux = "sha256-eJRJ1LvQsmlMeWoUmGrAyLfoebG8g/Kl2lBQxMjIyTY="; + }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { - pname = "prowlarr"; - version = "1.2.0.2583"; + inherit pname; + version = "1.2.2.2699"; src = fetchurl { - url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; - sha256 = hash; + url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; + inherit hash; }; nativeBuildInputs = [ makeWrapper ]; @@ -54,8 +60,14 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "An indexer manager/proxy built on the popular arr .net/reactjs base stack"; homepage = "https://wiki.servarr.com/prowlarr"; + changelog = "https://github.com/Prowlarr/Prowlarr/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ jdreaver ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + ]; }; } diff --git a/pkgs/servers/prowlarr/update.sh b/pkgs/servers/prowlarr/update.sh index d61edda5a0a3..883f299d9aa0 100755 --- a/pkgs/servers/prowlarr/update.sh +++ b/pkgs/servers/prowlarr/update.sh @@ -7,17 +7,19 @@ dirname="$(dirname "$0")" updateHash() { + # nixos version=$1 - arch=$2 - os=$3 + system=$2 - hashKey="${arch}-${os}_hash" + # prowlarr + arch=$3 + os=$4 - url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.develop.$version.$os-core-$arch.tar.gz" + url="https://github.com/Prowlarr/Prowlarr/releases/download/v$version/Prowlarr.master.$version.$os-core-$arch.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) sriHash="$(nix hash to-sri --type sha256 $hash)" - sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" + sed -i "s|$system = \"sha256-[a-zA-Z0-9\/+-=]*\";|$system = \"$sriHash\";|g" "$dirname/default.nix" } updateVersion() @@ -27,16 +29,8 @@ updateVersion() currentVersion=$(cd $dirname && nix eval --raw -f ../../.. prowlarr.version) -# N.B. Prowlarr is still in development, so -# https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest -# returns nothing. Once this endpoint returns something, we should use -# it. Until then, we use jq to sort releases (N.B. the "sort_by(. | -# split(".") | map(tonumber))" incantation is to sort the version -# number properly and not as a string). - -# latestTag=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest | jq -r ".tag_name") -# latestVersion="$(expr $latestTag : 'v\(.*\)')" -latestVersion=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/git/refs/tags | jq '. | map(.ref | sub("refs/tags/v";"")) | sort_by(. | split(".") | map(tonumber)) | .[-1]' -r) +latestTag=$(curl https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest | jq -r ".tag_name") +latestVersion="$(expr $latestTag : 'v\(.*\)')" if [[ "$currentVersion" == "$latestVersion" ]]; then echo "Prowlarr is up-to-date: ${currentVersion}" @@ -45,6 +39,7 @@ fi updateVersion $latestVersion -updateHash $latestVersion x64 linux -updateHash $latestVersion arm64 linux -updateHash $latestVersion x64 osx +updateHash $latestVersion aarch64-darwin arm64 osx +updateHash $latestVersion aarch64-linux arm64 linux +updateHash $latestVersion x86_64-darwin x64 osx +updateHash $latestVersion x86_64-linux x64 linux diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix index 359dbfb5979d..65189094d0c7 100644 --- a/pkgs/servers/syncstorage-rs/default.nix +++ b/pkgs/servers/syncstorage-rs/default.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = version; - hash = "sha256-aRLTuP5He8rHsi4Qw+CptyGhp2JdQwL/jLNmHUPcYBU="; + hash = "sha256-zxpqQpzmPPU6V5QITK9SgAAI7l3/7+h0u3/bZgiU7y4="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} ''; - cargoSha256 = "sha256-95wK0jFbuu1xFacOAJFAQitm/tlvMUIny2As49QukQE="; + cargoHash = "sha256-U0xHqOh0ii4PE9UYKo+diqSoZ1ZjzBmHILvAhHSZD0A="; buildFeatures = [ "grpcio/openssl" ]; diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index 36121c10595a..7f7abbdb4afc 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -1,7 +1,7 @@ { "name": "lemmy-ui", "description": "An isomorphic UI for lemmy", - "version": "0.16.7", + "version": "0.17.1", "author": "Dessalines ", "license": "AGPL-3.0", "scripts": { @@ -9,7 +9,7 @@ "build:prod": "webpack --mode=production", "clean": "yarn run rimraf dist", "dev": "yarn start", - "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src", + "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src && prettier --check 'src/**/*.tsx'", "prebuild:dev": "yarn clean && node generate_translations.js", "prebuild:prod": "yarn clean && node generate_translations.js", "prepare": "husky install", @@ -17,82 +17,91 @@ }, "repository": "https://github.com/LemmyNet/lemmy-ui", "dependencies": { - "@typescript-eslint/parser": "^5.21.0", - "autosize": "^5.0.1", - "check-password-strength": "^2.0.5", - "choices.js": "^10.1.0", + "@babel/plugin-proposal-decorators": "^7.20.13", + "@babel/plugin-transform-runtime": "^7.19.6", + "@babel/plugin-transform-typescript": "^7.20.13", + "@babel/preset-env": "7.20.2", + "@babel/preset-typescript": "^7.18.6", + "@babel/runtime": "^7.20.13", + "autosize": "^5.0.2", + "babel-loader": "^9.1.2", + "babel-plugin-inferno": "^6.6.0", + "check-password-strength": "^2.0.7", + "choices.js": "^10.2.0", "classnames": "^2.3.1", + "clean-webpack-plugin": "^4.0.0", + "copy-webpack-plugin": "^11.0.0", + "css-loader": "^6.7.3", "emoji-short-name": "^2.0.0", - "express": "~4.18.0", - "i18next": "^21.6.16", - "inferno": "^7.4.11", - "inferno-create-element": "^7.4.11", + "express": "~4.18.2", + "html-to-text": "^9.0.3", + "i18next": "^22.4.9", + "inferno": "^8.0.5", + "inferno-create-element": "^8.0.5", "inferno-helmet": "^5.2.1", - "inferno-hydrate": "^7.4.11", - "inferno-i18next-dess": "^0.0.1", - "inferno-router": "^7.4.11", - "inferno-server": "^7.4.11", + "inferno-hydrate": "^8.0.5", + "inferno-i18next-dess": "0.0.2", + "inferno-router": "^8.0.5", + "inferno-server": "^8.0.5", "isomorphic-cookie": "^1.2.4", "jwt-decode": "^3.1.2", + "lemmy-js-client": "0.17.0-rc.62", "markdown-it": "^13.0.1", "markdown-it-container": "^3.0.0", "markdown-it-footnote": "^3.0.3", "markdown-it-html5-embed": "^1.0.0", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", - "moment": "^2.29.3", + "mini-css-extract-plugin": "^2.7.2", + "moment": "^2.29.4", + "node-fetch": "^2.6.1", "register-service-worker": "^1.7.2", - "rxjs": "^7.5.5", - "sass": "^1.51.0", - "serialize-javascript": "^6.0.0", + "run-node-webpack-plugin": "^1.3.0", + "rxjs": "^7.8.0", + "sanitize-html": "^2.8.1", + "sass": "^1.57.1", + "sass-loader": "^13.2.0", + "serialize-javascript": "^6.0.1", "tippy.js": "^6.3.7", - "toastify-js": "^1.11.2", + "toastify-js": "^1.12.0", "tributejs": "^5.1.3", + "webpack": "5.75.0", + "webpack-cli": "^5.0.1", + "webpack-node-externals": "^3.0.0", "websocket-ts": "^1.1.1" }, "devDependencies": { - "@babel/core": "^7.17.9", - "@babel/plugin-transform-runtime": "^7.17.0", - "@babel/plugin-transform-typescript": "^7.16.1", - "@babel/preset-env": "7.16.11", - "@babel/preset-typescript": "^7.16.0", - "@babel/runtime": "^7.17.9", + "@babel/core": "^7.20.12", "@types/autosize": "^4.0.0", - "@types/express": "^4.17.13", - "@types/node": "^17.0.29", - "@types/node-fetch": "^2.6.1", + "@types/express": "^4.17.16", + "@types/html-to-text": "^9.0.0", + "@types/markdown-it": "^12.2.3", + "@types/markdown-it-container": "^2.0.5", + "@types/node": "^18.11.18", + "@types/node-fetch": "^2.6.2", + "@types/sanitize-html": "^2.8.0", "@types/serialize-javascript": "^5.0.1", - "@typescript-eslint/eslint-plugin": "^5.21.0", - "babel-loader": "^8.2.5", - "babel-plugin-inferno": "^6.4.0", - "bootstrap": "^5.1.3", - "bootswatch": "^5.1.3", - "clean-webpack-plugin": "^4.0.0", - "copy-webpack-plugin": "^10.2.4", - "css-loader": "^6.7.1", - "eslint": "^8.14.0", - "eslint-plugin-prettier": "^4.0.0", - "husky": "^7.0.4", + "@types/toastify-js": "^1.11.1", + "@typescript-eslint/eslint-plugin": "^5.49.0", + "@typescript-eslint/parser": "^5.49.0", + "bootstrap": "^5.2.3", + "bootswatch": "^5.2.3", + "eslint": "^8.33.0", + "eslint-plugin-inferno": "^7.32.1", + "eslint-plugin-prettier": "^4.2.1", + "husky": "^8.0.3", "import-sort-style-module": "^6.0.0", - "lemmy-js-client": "0.16.4", - "lint-staged": "^12.4.1", - "mini-css-extract-plugin": "^2.6.0", - "node-fetch": "^2.6.1", - "prettier": "^2.6.2", + "lint-staged": "^13.1.0", + "prettier": "^2.8.3", "prettier-plugin-import-sort": "^0.0.7", - "prettier-plugin-organize-imports": "^2.3.4", - "prettier-plugin-packagejson": "^2.2.17", - "rimraf": "^3.0.2", - "run-node-webpack-plugin": "^1.3.0", - "sass-loader": "^12.6.0", - "sortpack": "^2.2.0", + "prettier-plugin-organize-imports": "^3.2.2", + "prettier-plugin-packagejson": "^2.4.2", + "rimraf": "^4.1.2", + "sortpack": "^2.3.3", "style-loader": "^3.3.1", - "terser": "^5.13.0", - "typescript": "^4.6.3", - "webpack": "5.72.0", - "webpack-cli": "^4.9.2", - "webpack-dev-server": "4.8.1", - "webpack-node-externals": "^3.0.0" + "terser": "^5.16.2", + "typescript": "^4.9.5", + "webpack-dev-server": "4.11.1" }, "engines": { "node": ">=8.9.0" diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index d27a5319309b..05960e62965d 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,7 +1,7 @@ { - "version": "0.16.7", - "serverSha256": "sha256-S0WomoWm3Bf3M6W6Q1+emLuwC4IPxGlM5aqY8yTPG6Q=", - "serverCargoSha256": "sha256-PxIFgQ6ngkpZInJX55feFg/R+nVO30z6q+apZKBXlkg=", - "uiSha256": "sha256-gM+L/gMNMuQQTnnlrGRqAlXKBrf27bpbZWoqufpb3LE=", - "uiYarnDepsSha256": "sha256-2NiDuqAyZeNn3c3XDeP2m5hHej4w4/gcabxfHgC8PV4=" + "version": "0.17.1", + "serverSha256": "sha256-2pSa3IvmEoZbDS3U0yvZfocpgmoHJKm6n2ggPCCXtxY=", + "serverCargoSha256": "sha256-uVqRuOSr5Smjpe/HUhIebrBaxJNdMOzHrtQkzTKsLC8=", + "uiSha256": "sha256-JehU0Bk0S1qjYRlQSQzQOYSLUScDAAbKp8O9zH40XRc=", + "uiYarnDepsSha256": "sha256-AeY6k1qkubTefUofq9ISzXq3huNWHoSpQFFRgCMdFhQ=" } diff --git a/pkgs/tools/misc/uwufetch/default.nix b/pkgs/tools/misc/uwufetch/default.nix index 03105b13e4ce..f86320a59b32 100644 --- a/pkgs/tools/misc/uwufetch/default.nix +++ b/pkgs/tools/misc/uwufetch/default.nix @@ -1,20 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, viu }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, viu }: stdenv.mkDerivation rec { pname = "uwufetch"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "TheDarkBug"; repo = pname; rev = version; - hash = "sha256-2kktKdQ1xjQRIQR2auwveHgNWGaX1jdJsdlgWrH6l2g="; + hash = "sha256-cA8sajh+puswyKikr0Jp9ei+EpVkH+vhEp+pTerkUqA="; }; - patches = [ - # cannot find images in /usr - ./fix-paths.patch - ]; + postPatch = '' + substituteInPlace uwufetch.c \ + --replace "/usr/lib/uwufetch" "$out/lib/uwufetch" \ + --replace "/usr/local/lib/uwufetch" "$out/lib/uwufetch" \ + --replace "/etc/uwufetch/config" "$out/etc/uwufetch/config" + # fix command_path for package manager (nix-store) + substituteInPlace fetch.c \ + --replace "/usr/bin" "/run/current-system/sw/bin" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace "local/bin" "bin" \ + --replace "local/lib" "lib" \ + --replace "local/include" "include" \ + --replace "local/share" "share" + ''; nativeBuildInputs = [ makeWrapper ]; @@ -24,13 +35,9 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=${placeholder "out"}" - "ETC_DIR=${placeholder "out"}" + "ETC_DIR=${placeholder "out"}/etc" ]; - postPatch = '' - substituteAllInPlace uwufetch.c - ''; - postFixup = '' wrapProgram $out/bin/uwufetch \ --prefix PATH ":" ${lib.makeBinPath [ viu ]} @@ -40,6 +47,7 @@ stdenv.mkDerivation rec { description = "A meme system info tool for Linux"; homepage = "https://github.com/TheDarkBug/uwufetch"; license = licenses.gpl3Plus; + platforms = platforms.unix; maintainers = with maintainers; [ lourkeur ]; }; } diff --git a/pkgs/tools/misc/uwufetch/fix-paths.patch b/pkgs/tools/misc/uwufetch/fix-paths.patch deleted file mode 100644 index 4869104819d6..000000000000 --- a/pkgs/tools/misc/uwufetch/fix-paths.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/uwufetch.c b/uwufetch.c -index f2d7857..8191888 100644 ---- a/uwufetch.c -+++ b/uwufetch.c -@@ -160,9 +160,9 @@ void print_image(struct info* user_info) { - if (strcmp(user_info->os_name, "android") == 0) - sprintf(command, "viu -t -w 18 -h 8 /data/data/com.termux/files/usr/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); // image command for android - else if (strcmp(user_info->os_name, "macos") == 0) -- sprintf(command, "viu -t -w 18 -h 8 /usr/local/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); -+ sprintf(command, "viu -t -w 18 -h 8 @out@/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); - else -- sprintf(command, "viu -t -w 18 -h 8 /usr/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); // image command for other systems -+ sprintf(command, "viu -t -w 18 -h 8 @out@/lib/uwufetch/%s.png 2> /dev/null", user_info->os_name); // image command for other systems - } - printf("\n"); - if (system(command) != 0) // if viu is not installed or the image is missing -@@ -587,9 +587,9 @@ void print_ascii(struct info* user_info) { - if (strcmp(user_info->os_name, "android") == 0) - sprintf(ascii_file, "/data/data/com.termux/files/usr/lib/uwufetch/ascii/%s.txt", user_info->os_name); - else if (strcmp(user_info->os_name, "macos") == 0) -- sprintf(ascii_file, "/usr/local/lib/uwufetch/ascii/%s.txt", user_info->os_name); -+ sprintf(ascii_file, "@out@/lib/uwufetch/ascii/%s.txt", user_info->os_name); - else -- sprintf(ascii_file, "/usr/lib/uwufetch/ascii/%s.txt", user_info->os_name); -+ sprintf(ascii_file, "@out@/lib/uwufetch/ascii/%s.txt", user_info->os_name); - - file = fopen(ascii_file, "r"); - if (!file) { diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 041fe636bd96..e734027b2208 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.45.1"; + version = "2.46.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-gyHnLoELjL/IQbtgH2W25xw30l+9akH7jgQfjp4y5sg="; + sha256 = "sha256-KK4fYMcLkmdZxLkNloVvkYoFrWDi8N5rRmsSGxUxwC4="; }; buildInputs = [ boost zlib openssl ] diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 69ab1b35c141..70496caf992c 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "6.3.0"; + version = "6.4.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-1xTXvuxQCksCT+pj4+eHyb8fAc4YcK9Tn3xIijB7P1s="; + sha256 = "sha256-Na6tMA4MlGn72dMM9G9BU4l9yygpEgkcpOySEtzp0VE="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index f806b46b6944..06cda8490021 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -1,41 +1,40 @@ -{ stdenv -, lib -, pkg-config +{ lib , rustPlatform , fetchFromGitHub , installShellFiles +, pkg-config , withNativeTls ? true +, stdenv , Security -, libiconv -, openssl }: +, openssl +}: rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-4rFtbCfx6QFdp62FPjOYAhSWM03g3rXsF4pD22+EhcA="; + sha256 = "sha256-2qZ+FGc8Y8HLJaQluVv036NG77lvaqsc3I5cmkD+r/M="; }; - cargoSha256 = "sha256-av/F1FHMd0o9NvwA2Q9mqSd89ZEqmUaVxC+JmSwEHhI="; + cargoSha256 = "sha256-0lPEZ8Th3PAw6AEnb+ciKMhi5wysFCvYwiHd9/o8VVc="; buildFeatures = lib.optional withNativeTls "native-tls"; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = lib.optionals withNativeTls - (if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]); + (if stdenv.isDarwin then [ Security ] else [ openssl ]); # Get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; postInstall = '' - installShellCompletion --cmd xh \ - --bash completions/xh.bash \ - --fish completions/xh.fish \ + installShellCompletion \ + completions/xh.{bash,fish} \ --zsh completions/_xh installManPage doc/xh.1 @@ -43,7 +42,6 @@ rustPlatform.buildRustPackage rec { install -m444 -Dt $out/share/doc/xh README.md CHANGELOG.md - # https://github.com/ducaale/xh#xh-and-xhs ln -s $out/bin/xh $out/bin/xhs ''; @@ -61,6 +59,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ducaale/xh"; changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ payas ]; + maintainers = with maintainers; [ figsoda payas ]; }; } diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index dd11549663c9..2decec7a2ca4 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -24,15 +24,19 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.3.4"; + version = "2.4.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zaSNM5Ey4oI2MtUPYBHG0PCMgJdasVatwkjaRBrT1RQ="; + hash = "sha256-Gp8ju26XX0A2+LX+7b9OuEBJx4qUwR2tNUq+Chj56q4="; }; + nativeBuildInputs = [ + pdm-pep517 + ]; + propagatedBuildInputs = [ blinker cachecontrol @@ -40,9 +44,6 @@ buildPythonApplication rec { findpython installer packaging - pdm-pep517 - pep517 - pip platformdirs pyproject-hooks python-dotenv @@ -50,20 +51,22 @@ buildPythonApplication rec { resolvelib rich shellingham - tomli tomlkit unearth virtualenv ] ++ cachecontrol.optional-dependencies.filecache - ++ lib.optionals (pythonOlder "3.8") [ + ++ lib.optionals (pythonOlder "3.11") [ + tomli + ] + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata - typing-extensions ]; nativeCheckInputs = [ pytestCheckHook pytest-mock + pytest-rerunfailures pytest-xdist ]; @@ -85,6 +88,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://pdm.fming.dev"; + changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}"; description = "A modern Python package manager with PEP 582 support"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 7c7562d1adb6..f3cb9e85dcec 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.5.4"; + version = "1.5.5"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DHN1JL4CYnme3hPbkNPXWXsgFpJ9BIRnGPl/csr43iY="; + sha256 = "sha256-nx4a5VH5UIvvBwwzB77XdBv/2ofoOY7iVgXFYyGclnI="; }; - vendorHash = "sha256-5MveK7wZ4KpUEZ4lhm95/8bOi5NtYR4n0fSfZhC+GPo="; + vendorHash = "sha256-RRC1eOSJBbaGMoc81OMu4OGDL950L7u1mheQLSpUXJk="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a9a8c4babd3a..fc10da8e441f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -695,6 +695,8 @@ mapAliases ({ jack2Full = jack2; # moved from top-level 2021-03-14 jami-client-gnome = throw "jami-client-gnome has been removed: abandoned upstream"; # Added 2022-05-15 jami-client-qt = jami-client; # Added 2022-11-06 + jami-client = jami; # Added 2023-02-10 + jami-daemon = jami.daemon; # Added 2023-02-10 jami-libclient = throw "jami-libclient has been removed: moved into jami-qt"; # Added 2022-07-29 jamomacore = throw "jamomacore has been removed: abandoned upstream"; # Added 2020-11-21 jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c58e9dd1f107..90b66b080174 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3443,6 +3443,8 @@ with pkgs; goku = callPackage ../os-specific/darwin/goku { }; + grandperspective = callPackage ../os-specific/darwin/grandperspective { }; + grb = callPackage ../applications/misc/grb { }; kerf = kerf_1; /* kerf2 is WIP */ @@ -36423,11 +36425,11 @@ with pkgs; nest-mpi = callPackage ../applications/science/biology/nest { withMpi = true; }; - neuron = callPackage ../applications/science/biology/neuron { python = null; }; + neuron = callPackage ../applications/science/biology/neuron { }; neuron-mpi = neuron.override {useMpi = true; }; - neuron-full = neuron-mpi.override { python = python2; }; + neuron-full = neuron-mpi.override { useCore = true; useRx3d = true; }; mrbayes = callPackage ../applications/science/biology/mrbayes { }; @@ -39146,12 +39148,11 @@ with pkgs; btcdeb = callPackage ../applications/blockchains/btcdeb { }; - jami = callPackages ../applications/networking/instant-messengers/jami { + jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami { # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; jack = libjack2; }; - inherit (jami) jami-daemon jami-client; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f09a8eb1a188..e70fa1b0acf4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6334,11 +6334,9 @@ self: super: with self; { networkx = callPackage ../development/python-modules/networkx { }; - neuron-mpi = toPythonModule (pkgs.neuron-mpi.override { inherit python; }); + neuron-full = pkgs.neuron-full.override { python3 = python; }; - neuron = toPythonModule (pkgs.neuron.override { inherit python; }); - - neuronpy = callPackage ../development/python-modules/neuronpy { }; + neuronpy = python.pkgs.toPythonModule neuron-full; nevow = callPackage ../development/python-modules/nevow { }; @@ -7094,6 +7092,8 @@ self: super: with self; { overpy = callPackage ../development/python-modules/overpy { }; + overrides = callPackage ../development/python-modules/overrides { }; + pandas-stubs = callPackage ../development/python-modules/pandas-stubs { }; pdunehd = callPackage ../development/python-modules/pdunehd { }; @@ -7241,6 +7241,8 @@ self: super: with self; { pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { }; + pyfibaro = callPackage ../development/python-modules/pyfibaro { }; + pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { }; pyflexit = callPackage ../development/python-modules/pyflexit { }; @@ -7333,6 +7335,8 @@ self: super: with self; { python-fullykiosk = callPackage ../development/python-modules/python-fullykiosk { }; + python-fx = callPackage ../development/python-modules/python-fx { }; + python-glanceclient = callPackage ../development/python-modules/python-glanceclient { }; python-google-nest = callPackage ../development/python-modules/python-google-nest { }; @@ -9674,6 +9678,8 @@ self: super: with self; { pywatchman = callPackage ../development/python-modules/pywatchman { }; + pywaterkotte = callPackage ../development/python-modules/pywaterkotte { }; + pywavelets = callPackage ../development/python-modules/pywavelets { }; pywayland = callPackage ../development/python-modules/pywayland { };